| -rw-r--r-- | cgit.h | 2 | ||||
| -rw-r--r-- | ui-repolist.c | 4 | ||||
| -rw-r--r-- | ui-shared.c | 20 | ||||
| -rw-r--r-- | ui-summary.c | 6 | ||||
| -rw-r--r-- | ui-tree.c | 12 |
5 files changed, 20 insertions, 24 deletions
@@ -203,8 +203,6 @@ extern char *cgit_pageurl(const char *reponame, const char *pagename, extern void cgit_tree_link(char *name, char *title, char *class, char *head, char *rev, char *path); -extern void cgit_log_link(char *name, char *title, char *class, char *head, - char *rev, char *path); extern void cgit_print_error(char *msg); extern void cgit_print_date(time_t secs, char *format); diff --git a/ui-repolist.c b/ui-repolist.c index 2018dab..8ade91a 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -89,7 +89,9 @@ void cgit_print_repolist(struct cacheitem *item) html_link_open(cgit_repourl(cgit_repo->url), "Summary", "button"); html("S</a>"); - cgit_log_link("L", "Log", "button", NULL, NULL, NULL); + html_link_open(cgit_pageurl(cgit_repo->name, "log", NULL), + "Log", "button"); + html("L</a>"); cgit_tree_link("F", "Files", "button", NULL, NULL, NULL); html("</td></tr>\n"); } diff --git a/ui-shared.c b/ui-shared.c index 64ee79c..657e8af 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -127,7 +127,7 @@ static char *repolink(char *title, char *class, char *page, char *head, html_attr(path); delim = "&"; } - if (head && strcmp(head, cgit_repo->defbranch)) { + if (head && strcmp(head, cgit_query_head)) { html(delim); html("h="); html_attr(head); @@ -136,12 +136,12 @@ static char *repolink(char *title, char *class, char *page, char *head, return fmt("%s", delim); } -static char *reporevlink(char *page, char *name, char *title, char *class, - char *head, char *rev, char *path) +void cgit_tree_link(char *name, char *title, char *class, char *head, + char *rev, char *path) { char *delim; - delim = repolink(title, class, page, head, path); + delim = repolink(title, class, "tree", head, path); if (rev && strcmp(rev, cgit_query_head)) { html(delim); html("id="); @@ -152,18 +152,6 @@ static char *reporevlink(char *page, char *name, char *title, char *class, html("</a>"); } -void cgit_tree_link(char *name, char *title, char *class, char *head, - char *rev, char *path) -{ - reporevlink("tree", name, title, class, head, rev, path); -} - -void cgit_log_link(char *name, char *title, char *class, char *head, - char *rev, char *path) -{ - reporevlink("log", name, title, class, head, rev, path); -} - void cgit_print_date(time_t secs, char *format) { char buf[64]; diff --git a/ui-summary.c b/ui-summary.c index 29b76e3..4bda4c2 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -25,7 +25,11 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, if (commit && !parse_commit(commit)){ info = cgit_parse_commit(commit); html("<tr><td>"); - cgit_log_link(refname, NULL, NULL, refname, NULL, NULL); + url = cgit_pageurl(cgit_query_repo, "log", + fmt("h=%s", refname)); + html_link_open(url, NULL, NULL); + html_txt(buf); + html_link_close(); html("</td><td>"); cgit_print_age(commit->date, -1, NULL); html("</td><td>"); @@ -92,10 +92,14 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, } htmlf("</td><td class='ls-size'>%li</td>", size); - html("<td>"); - cgit_log_link("L", "Log", "button", cgit_query_head, curr_rev, - fullpath); - html("</td></tr>\n"); + html("<td><a href='"); + qry = fmt("h=%s&path=%s%s%s", curr_rev, + cgit_query_path ? cgit_query_path : "", + cgit_query_path ? "/" : "", pathname); + url = cgit_pageurl(cgit_query_repo, "log", qry); + html_attr(url); + html("' title='Log' class='button'>L</a></td>"); + html("</tr>\n"); free(name); return 0; } |