author | Lars Hjemli <hjemli@gmail.com> | 2009-01-27 19:16:37 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-27 19:16:37 (UTC) |
commit | 7710178e45dee61e85ea77c4221309ce8c086f95 (patch) (unidiff) | |
tree | 281c5251777308f18c05d323183b28470445f4bc /ui-shared.c | |
parent | e78186dcb63ec67a38dddfcd8f91d2108583320b (diff) | |
parent | b54ef9749c083afd86573112fad3b3ed8ee2d0e4 (diff) | |
download | cgit-7710178e45dee61e85ea77c4221309ce8c086f95.zip cgit-7710178e45dee61e85ea77c4221309ce8c086f95.tar.gz cgit-7710178e45dee61e85ea77c4221309ce8c086f95.tar.bz2 |
Merge branch 'lh/stats'
Conflicts:
cgit.c
cgit.css
cgit.h
ui-tree.c
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ui-shared.c b/ui-shared.c index fba1ba6..4f28512 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -370,4 +370,10 @@ void cgit_patch_link(char *name, char *title, char *class, char *head, | |||
370 | } | 370 | } |
371 | 371 | ||
372 | void cgit_stats_link(char *name, char *title, char *class, char *head, | ||
373 | char *path) | ||
374 | { | ||
375 | reporevlink("stats", name, title, class, head, NULL, path); | ||
376 | } | ||
377 | |||
372 | void cgit_object_link(struct object *obj) | 378 | void cgit_object_link(struct object *obj) |
373 | { | 379 | { |
@@ -558,5 +564,5 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
558 | } | 564 | } |
559 | 565 | ||
560 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 566 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) |
561 | { | 567 | { |
562 | char *url; | 568 | char *url; |
@@ -620,5 +626,5 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
620 | html("</td><td class='form'>"); | 626 | html("</td><td class='form'>"); |
621 | html("<form method='get' action=''>\n"); | 627 | html("<form method='get' action=''>\n"); |
622 | add_hidden_formfields(0, 1, ctx->qry.page); | 628 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); |
623 | html("<select name='h' onchange='this.form.submit();'>\n"); | 629 | html("<select name='h' onchange='this.form.submit();'>\n"); |
624 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 630 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
@@ -657,4 +663,7 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
657 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 663 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
658 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 664 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
665 | if (ctx->repo->max_stats) | ||
666 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), | ||
667 | ctx->qry.head, NULL); | ||
659 | if (ctx->repo->readme) | 668 | if (ctx->repo->readme) |
660 | reporevlink("about", "about", NULL, | 669 | reporevlink("about", "about", NULL, |
@@ -667,5 +676,5 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
667 | ctx->qry.path, NULL)); | 676 | ctx->qry.path, NULL)); |
668 | html("'>\n"); | 677 | html("'>\n"); |
669 | add_hidden_formfields(1, 0, "log"); | 678 | cgit_add_hidden_formfields(1, 0, "log"); |
670 | html("<select name='qt'>\n"); | 679 | html("<select name='qt'>\n"); |
671 | html_option("grep", "log msg", ctx->qry.grep); | 680 | html_option("grep", "log msg", ctx->qry.grep); |