Author: Lars Hjemli <hjemli@gmail.com>
Merge branch 'br/misc' * br/misc: Use transparent background for the cgit logo ssdiff: anchors for ssdiff implement repo.logo and repo.logo-link
cgit.c | 8 ++++++-- cgit.css | 2 +- cgit.h | 2 ++ cgitrc.5.txt | 9 +++++++++ ui-diff.c | 12 ++++++++++++ ui-diff.h | 6 ++++++ ui-shared.c | 18 ++++++++++++++---- ui-ssdiff.c | 34 ++++++++++++++++++++++++----------
diff --git a/cgit.c b/cgit.c index 71f3fc8b36fbc56d403d188dcce02172f502e780..916feb4f10dd3f128a10381d39f139cfa318b9a9 100644 --- a/cgit.c +++ b/cgit.c @@ -73,9 +73,13 @@ else if (!strcmp(name, "module-link")) repo->module_link= xstrdup(value); else if (!strcmp(name, "section")) repo->section = xstrdup(value); - else if (!strcmp(name, "readme") && value != NULL) { + else if (!strcmp(name, "readme") && value != NULL) 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")) repo->about_filter = new_filter(value, 0); else if (!strcmp(name, "commit-filter")) diff --git a/cgit.css b/cgit.css index 008cff8e0c766fa4bf85a6f7fbaee7e644335b60..1d90057802df162747d744eb9345616992122528 100644 --- a/cgit.css +++ b/cgit.css @@ -293,7 +293,7 @@ table.blob pre { padding: 0; margin: 0; } -table.blob a.no { +table.blob a.no, table.ssdiff a.no { color: gray; text-align: right; text-decoration: none; diff --git a/cgit.h b/cgit.h index 74aa340b1014d1cebb965202d29638d0236356ac..b5f00fc9c1c1d6d6e7f7a8cdc2695cab334752ab 100644 --- a/cgit.h +++ b/cgit.h @@ -71,6 +71,8 @@ char *module_link; char *readme; char *section; char *clone_url; + char *logo; + char *logo_link; int snapshots; int enable_commit_graph; int enable_log_filecount; diff --git a/cgit.png b/cgit.png index d7f70bc45593279bd88856b0fc318031660019a7..0bdf5a7e72fc7d4b746527cd89e540e2b6f6c292 100644 Binary files a/cgit.png and b/cgit.png differ diff --git a/cgitrc.5.txt b/cgitrc.5.txt index a83283073c04cd167e03d7deb9b5eeca22f2f4f3..c3698a643dc65a7d7cee43d3da780bbe9e844c2c 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -387,6 +387,15 @@ repo.enable-subject-links:: A flag which can be used to override the global setting `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:: Override the default maximum statistics period. Valid values are equal to the values specified for the global "max-stats" setting. Default diff --git a/ui-diff.c b/ui-diff.c index 7ff7e46d9e5b1551736900e0719a1d8147b69b67..a53425dbf069fee2de38f621528c2e6753beba51 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -34,6 +34,17 @@ int binary:1; } *items; 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) { @@ -284,6 +295,7 @@ unsigned long new_size = 0; int binary = 0; linediff_fn print_line_fn = print_line; + current_filepair = pair; if (use_ssdiff) { cgit_ssdiff_header_begin(); print_line_fn = cgit_ssdiff_line_cb; diff --git a/ui-diff.h b/ui-diff.h index 70b2926c02e911d4a2086a6506e44745afc7d9a8..12d0c623cabf24265bef8546a2693114ad041c95 100644 --- a/ui-diff.h +++ b/ui-diff.h @@ -7,4 +7,10 @@ extern void cgit_print_diff(const char *new_hex, const char *old_hex, 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 */ diff --git a/ui-shared.c b/ui-shared.c index ae29615a32d04ac8c3e933815e61b64543fdecee..7efae7ab04982bf6d5f557cba1d9cdc9b91f9ede 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -756,17 +756,27 @@ } static void print_header(struct cgit_context *ctx) { + char *logo = NULL, *logo_link = NULL; + html("<table id='header'>\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='"); - if (ctx->cfg.logo_link) - html_attr(ctx->cfg.logo_link); + if (logo_link && *logo_link) + html_attr(logo_link); else html_attr(cgit_rooturl()); html("'><img src='"); - html_attr(ctx->cfg.logo); + html_attr(logo); html("' alt='cgit logo'/></a></td>\n"); } diff --git a/ui-ssdiff.c b/ui-ssdiff.c index 408e620533ac0dd3f61d1f868ec3aeede246f9d7..2481585fb619966173fcde2e4d35ba1614482093 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c @@ -1,6 +1,7 @@ #include "cgit.h" #include "html.h" #include "ui-shared.h" +#include "ui-diff.h" extern int use_ssdiff; @@ -191,17 +192,24 @@ int new_line_no, char *new_line, int individual_chars) { char *lcs = NULL; + if (old_line) old_line = replace_tabs(old_line + 1); if (new_line) new_line = replace_tabs(new_line + 1); if (individual_chars && old_line && new_line) lcs = longest_common_subsequence(old_line, new_line); - html("<tr>"); - if (old_line_no > 0) - htmlf("<td class='lineno'>%d</td><td class='%s'>", - old_line_no, class); - else if (old_line) + html("<tr>\n"); + if (old_line_no > 0) { + struct diff_filespec *old_file = cgit_get_current_old_file(); + char *lineno_str = fmt("n%d", old_line_no); + 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); else htmlf("<td class='lineno'></td><td class='%s_dark'>", class); @@ -212,11 +220,17 @@ else html_txt(old_line); } - html("</td>"); - if (new_line_no > 0) - htmlf("<td class='lineno'>%d</td><td class='%s'>", - new_line_no, class); - else if (new_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>"); + htmlf("<td class='%s'>", class); + } else if (new_line) htmlf("<td class='lineno'></td><td class='%s'>", class); else htmlf("<td class='lineno'></td><td class='%s_dark'>", class);