From 808c685ebb7cd2d24d3881b74e3be2439bd1393b Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 23 Dec 2010 12:47:54 +0100 Subject: implement repo.logo and repo.logo-link Allow for per repo logo and logo-link; Use global logo and logo-link per default. Signed-off-by: Bernhard Reutner-Fischer Signed-off-by: Lars Hjemli --- cgit.c | 8 ++++++-- cgit.h | 2 ++ cgitrc.5.txt | 9 +++++++++ ui-shared.c | 18 ++++++++++++++---- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/cgit.c b/cgit.c index 412fbf0..e8c1f94 100644 --- a/cgit.c +++ b/cgit.c @@ -71,9 +71,13 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) 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.h b/cgit.h index f5f68ac..8a9d5fa 100644 --- a/cgit.h +++ b/cgit.h @@ -70,6 +70,8 @@ struct cgit_repo { char *readme; char *section; char *clone_url; + char *logo; + char *logo_link; int snapshots; int enable_log_filecount; int enable_log_linecount; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 8e51ca5..01157a9 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -370,6 +370,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-shared.c b/ui-shared.c index ae29615..7efae7a 100644 --- a/ui-shared.c +++ b/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) { + char *logo = NULL, *logo_link = NULL; + html("\n"); html("\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("\n"); } -- cgit 1.3.0-6-gf8a5 From e52040bf90b034aebbfa32756638a24d6b1b3712 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 23 Dec 2010 12:47:55 +0100 Subject: ssdiff: anchors for ssdiff Emit anchors to the respective revisions in side-by-side diff view Signed-off-by: Bernhard Reutner-Fischer Signed-off-by: Lars Hjemli --- cgit.css | 2 +- ui-diff.c | 12 ++++++++++++ ui-diff.h | 6 ++++++ ui-ssdiff.c | 34 ++++++++++++++++++++++++---------- 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/cgit.css b/cgit.css index a2a685b..3ed1989 100644 --- a/cgit.css +++ b/cgit.css @@ -275,7 +275,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/ui-diff.c b/ui-diff.c index 7ff7e46..a53425d 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -34,6 +34,17 @@ static struct fileinfo { } *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 @@ static void filepair_cb(struct diff_filepair *pair) 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 70b2926..12d0c62 100644 --- a/ui-diff.h +++ b/ui-diff.h @@ -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, 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-ssdiff.c b/ui-ssdiff.c index 408e620..2481585 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 @@ static void print_ssdiff_line(char *class, 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(""); - if (old_line_no > 0) - htmlf("\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(""); + htmlf(""); - if (new_line_no > 0) - htmlf("\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(""); + htmlf("