mirror of
https://git.zx2c4.com/cgit
synced 2024-11-09 18:18:42 +00:00
Merge branch 'br/misc'
* br/misc: Use transparent background for the cgit logo ssdiff: anchors for ssdiff implement repo.logo and repo.logo-link
This commit is contained in:
commit
979c460e7f
8
cgit.c
8
cgit.c
@ -73,9 +73,13 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
|
|||||||
repo->module_link= xstrdup(value);
|
repo->module_link= xstrdup(value);
|
||||||
else if (!strcmp(name, "section"))
|
else if (!strcmp(name, "section"))
|
||||||
repo->section = xstrdup(value);
|
repo->section = xstrdup(value);
|
||||||
else if (!strcmp(name, "readme") && value != NULL) {
|
else if (!strcmp(name, "readme") && value != NULL)
|
||||||
repo->readme = xstrdup(value);
|
repo->readme = xstrdup(value);
|
||||||
} else if (ctx.cfg.enable_filter_overrides) {
|
else if (!strcmp(name, "logo") && value != NULL)
|
||||||
|
repo->logo = xstrdup(value);
|
||||||
|
else if (!strcmp(name, "logo-link") && value != NULL)
|
||||||
|
repo->logo_link = xstrdup(value);
|
||||||
|
else if (ctx.cfg.enable_filter_overrides) {
|
||||||
if (!strcmp(name, "about-filter"))
|
if (!strcmp(name, "about-filter"))
|
||||||
repo->about_filter = new_filter(value, 0);
|
repo->about_filter = new_filter(value, 0);
|
||||||
else if (!strcmp(name, "commit-filter"))
|
else if (!strcmp(name, "commit-filter"))
|
||||||
|
2
cgit.css
2
cgit.css
@ -293,7 +293,7 @@ table.blob pre {
|
|||||||
padding: 0; margin: 0;
|
padding: 0; margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
table.blob a.no {
|
table.blob a.no, table.ssdiff a.no {
|
||||||
color: gray;
|
color: gray;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
2
cgit.h
2
cgit.h
@ -71,6 +71,8 @@ struct cgit_repo {
|
|||||||
char *readme;
|
char *readme;
|
||||||
char *section;
|
char *section;
|
||||||
char *clone_url;
|
char *clone_url;
|
||||||
|
char *logo;
|
||||||
|
char *logo_link;
|
||||||
int snapshots;
|
int snapshots;
|
||||||
int enable_commit_graph;
|
int enable_commit_graph;
|
||||||
int enable_log_filecount;
|
int enable_log_filecount;
|
||||||
|
BIN
cgit.png
BIN
cgit.png
Binary file not shown.
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.5 KiB |
@ -387,6 +387,15 @@ repo.enable-subject-links::
|
|||||||
A flag which can be used to override the global setting
|
A flag which can be used to override the global setting
|
||||||
`enable-subject-links'. Default value: none.
|
`enable-subject-links'. Default value: none.
|
||||||
|
|
||||||
|
repo.logo::
|
||||||
|
Url which specifies the source of an image which will be used as a logo
|
||||||
|
on this repo's pages. Default value: global logo.
|
||||||
|
|
||||||
|
repo.logo-link::
|
||||||
|
Url loaded when clicking on the cgit logo image. If unspecified the
|
||||||
|
calculated url of the repository index page will be used. Default
|
||||||
|
value: global logo-link.
|
||||||
|
|
||||||
repo.max-stats::
|
repo.max-stats::
|
||||||
Override the default maximum statistics period. Valid values are equal
|
Override the default maximum statistics period. Valid values are equal
|
||||||
to the values specified for the global "max-stats" setting. Default
|
to the values specified for the global "max-stats" setting. Default
|
||||||
|
12
ui-diff.c
12
ui-diff.c
@ -34,6 +34,17 @@ static struct fileinfo {
|
|||||||
} *items;
|
} *items;
|
||||||
|
|
||||||
static int use_ssdiff = 0;
|
static int use_ssdiff = 0;
|
||||||
|
static struct diff_filepair *current_filepair;
|
||||||
|
|
||||||
|
struct diff_filespec *cgit_get_current_old_file(void)
|
||||||
|
{
|
||||||
|
return current_filepair->one;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct diff_filespec *cgit_get_current_new_file(void)
|
||||||
|
{
|
||||||
|
return current_filepair->two;
|
||||||
|
}
|
||||||
|
|
||||||
static void print_fileinfo(struct fileinfo *info)
|
static void print_fileinfo(struct fileinfo *info)
|
||||||
{
|
{
|
||||||
@ -284,6 +295,7 @@ static void filepair_cb(struct diff_filepair *pair)
|
|||||||
int binary = 0;
|
int binary = 0;
|
||||||
linediff_fn print_line_fn = print_line;
|
linediff_fn print_line_fn = print_line;
|
||||||
|
|
||||||
|
current_filepair = pair;
|
||||||
if (use_ssdiff) {
|
if (use_ssdiff) {
|
||||||
cgit_ssdiff_header_begin();
|
cgit_ssdiff_header_begin();
|
||||||
print_line_fn = cgit_ssdiff_line_cb;
|
print_line_fn = cgit_ssdiff_line_cb;
|
||||||
|
@ -7,4 +7,10 @@ extern void cgit_print_diffstat(const unsigned char *old_sha1,
|
|||||||
extern void cgit_print_diff(const char *new_hex, const char *old_hex,
|
extern void cgit_print_diff(const char *new_hex, const char *old_hex,
|
||||||
const char *prefix);
|
const char *prefix);
|
||||||
|
|
||||||
|
extern struct diff_filespec *cgit_get_current_old_file(void);
|
||||||
|
extern struct diff_filespec *cgit_get_current_new_file(void);
|
||||||
|
|
||||||
|
extern unsigned char old_rev_sha1[20];
|
||||||
|
extern unsigned char new_rev_sha1[20];
|
||||||
|
|
||||||
#endif /* UI_DIFF_H */
|
#endif /* UI_DIFF_H */
|
||||||
|
18
ui-shared.c
18
ui-shared.c
@ -756,17 +756,27 @@ static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
|
|||||||
|
|
||||||
static void print_header(struct cgit_context *ctx)
|
static void print_header(struct cgit_context *ctx)
|
||||||
{
|
{
|
||||||
|
char *logo = NULL, *logo_link = NULL;
|
||||||
|
|
||||||
html("<table id='header'>\n");
|
html("<table id='header'>\n");
|
||||||
html("<tr>\n");
|
html("<tr>\n");
|
||||||
|
|
||||||
if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
|
if (ctx->repo && ctx->repo->logo && *ctx->repo->logo)
|
||||||
|
logo = ctx->repo->logo;
|
||||||
|
else
|
||||||
|
logo = ctx->cfg.logo;
|
||||||
|
if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link)
|
||||||
|
logo_link = ctx->repo->logo_link;
|
||||||
|
else
|
||||||
|
logo_link = ctx->cfg.logo_link;
|
||||||
|
if (logo && *logo) {
|
||||||
html("<td class='logo' rowspan='2'><a href='");
|
html("<td class='logo' rowspan='2'><a href='");
|
||||||
if (ctx->cfg.logo_link)
|
if (logo_link && *logo_link)
|
||||||
html_attr(ctx->cfg.logo_link);
|
html_attr(logo_link);
|
||||||
else
|
else
|
||||||
html_attr(cgit_rooturl());
|
html_attr(cgit_rooturl());
|
||||||
html("'><img src='");
|
html("'><img src='");
|
||||||
html_attr(ctx->cfg.logo);
|
html_attr(logo);
|
||||||
html("' alt='cgit logo'/></a></td>\n");
|
html("' alt='cgit logo'/></a></td>\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
32
ui-ssdiff.c
32
ui-ssdiff.c
@ -1,6 +1,7 @@
|
|||||||
#include "cgit.h"
|
#include "cgit.h"
|
||||||
#include "html.h"
|
#include "html.h"
|
||||||
#include "ui-shared.h"
|
#include "ui-shared.h"
|
||||||
|
#include "ui-diff.h"
|
||||||
|
|
||||||
extern int use_ssdiff;
|
extern int use_ssdiff;
|
||||||
|
|
||||||
@ -191,17 +192,24 @@ static void print_ssdiff_line(char *class,
|
|||||||
char *new_line, int individual_chars)
|
char *new_line, int individual_chars)
|
||||||
{
|
{
|
||||||
char *lcs = NULL;
|
char *lcs = NULL;
|
||||||
|
|
||||||
if (old_line)
|
if (old_line)
|
||||||
old_line = replace_tabs(old_line + 1);
|
old_line = replace_tabs(old_line + 1);
|
||||||
if (new_line)
|
if (new_line)
|
||||||
new_line = replace_tabs(new_line + 1);
|
new_line = replace_tabs(new_line + 1);
|
||||||
if (individual_chars && old_line && new_line)
|
if (individual_chars && old_line && new_line)
|
||||||
lcs = longest_common_subsequence(old_line, new_line);
|
lcs = longest_common_subsequence(old_line, new_line);
|
||||||
html("<tr>");
|
html("<tr>\n");
|
||||||
if (old_line_no > 0)
|
if (old_line_no > 0) {
|
||||||
htmlf("<td class='lineno'>%d</td><td class='%s'>",
|
struct diff_filespec *old_file = cgit_get_current_old_file();
|
||||||
old_line_no, class);
|
char *lineno_str = fmt("n%d", old_line_no);
|
||||||
else if (old_line)
|
char *id_str = fmt("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str);
|
||||||
|
html("<td class='lineno'><a class='no' href='");
|
||||||
|
html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str));
|
||||||
|
htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
|
||||||
|
html("</td>");
|
||||||
|
htmlf("<td class='%s'>", class);
|
||||||
|
} else if (old_line)
|
||||||
htmlf("<td class='lineno'></td><td class='%s'>", class);
|
htmlf("<td class='lineno'></td><td class='%s'>", class);
|
||||||
else
|
else
|
||||||
htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
|
htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
|
||||||
@ -212,11 +220,17 @@ static void print_ssdiff_line(char *class,
|
|||||||
html_txt(old_line);
|
html_txt(old_line);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html("</td>\n");
|
||||||
|
if (new_line_no > 0) {
|
||||||
|
struct diff_filespec *new_file = cgit_get_current_new_file();
|
||||||
|
char *lineno_str = fmt("n%d", new_line_no);
|
||||||
|
char *id_str = fmt("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str);
|
||||||
|
html("<td class='lineno'><a class='no' href='");
|
||||||
|
html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str));
|
||||||
|
htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
|
||||||
html("</td>");
|
html("</td>");
|
||||||
if (new_line_no > 0)
|
htmlf("<td class='%s'>", class);
|
||||||
htmlf("<td class='lineno'>%d</td><td class='%s'>",
|
} else if (new_line)
|
||||||
new_line_no, class);
|
|
||||||
else if (new_line)
|
|
||||||
htmlf("<td class='lineno'></td><td class='%s'>", class);
|
htmlf("<td class='lineno'></td><td class='%s'>", class);
|
||||||
else
|
else
|
||||||
htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
|
htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
|
||||||
|
Loading…
Reference in New Issue
Block a user