| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | ui-commit.c | 11 | ||||
| -rw-r--r-- | ui-shared.c | 12 | ||||
| -rw-r--r-- | ui-summary.c | 20 |
4 files changed, 20 insertions, 24 deletions
@@ -85,7 +85,6 @@ extern char *cgit_pageurl(const char *reponame, const char *pagename, const char *query); extern void cgit_print_error(char *msg); -extern void cgit_print_date(unsigned long secs); extern void cgit_print_docstart(char *title, struct cacheitem *item); extern void cgit_print_docend(); extern void cgit_print_pageheader(char *title); diff --git a/ui-commit.c b/ui-commit.c index 2d38f0b..1c0e7e5 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -1,5 +1,16 @@ #include "cgit.h" +void cgit_print_date(unsigned long secs) +{ + char buf[32]; + struct tm *time; + + time = gmtime(&secs); + strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); + html_txt(buf); + +} + void cgit_print_commit(const char *hex) { struct commit *commit; diff --git a/ui-shared.c b/ui-shared.c index 1a6c127..cb8a8df 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -60,18 +60,6 @@ char *cgit_pageurl(const char *reponame, const char *pagename, } } - -void cgit_print_date(unsigned long secs) -{ - char buf[32]; - struct tm *time; - - time = gmtime(&secs); - strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); - html_txt(buf); - -} - void cgit_print_docstart(char *title, struct cacheitem *item) { html("Content-Type: text/html; charset=utf-8\n"); diff --git a/ui-summary.c b/ui-summary.c index 8ff3642..46814dd 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -12,12 +12,10 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct commit *commit; - struct commitinfo *info; char buf[256], *url; commit = lookup_commit(sha1); if (commit && !parse_commit(commit)){ - info = cgit_parse_commit(commit); html("<tr><td>"); url = cgit_pageurl(cgit_query_repo, "log", fmt("h=%s", refname)); @@ -26,14 +24,14 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, html_txt(buf); html_link_close(); html("</td><td>"); - cgit_print_date(commit->date); - html("</td><td>"); - url = cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(sha1))); - html_link_open(url, NULL, NULL); - html_txt(info->subject); - html_link_close(); - html("</td><td>"); - html_txt(info->author); + pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf, + sizeof(buf), 0, NULL, NULL, 0); + html_txt(buf); + html("</td><td><a href='"); + html_attr(cgit_pageurl(cgit_query_repo, "tree", + fmt("id=%s", + sha1_to_hex(commit->tree->object.sha1)))); + html("'>tree</a>"); html("</td></tr>\n"); } else { html("<tr><td>"); @@ -48,7 +46,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, static void cgit_print_branches() { html("<table class='list'>"); - html("<tr><th class='left'>Branch</th><th class='left'>Updated</th><th class='left'>Commit subject</th><th class='left'>Author</th></tr>\n"); + html("<tr><th>Branch</th><th>Last commit</th><th>Link</th></tr>\n"); for_each_branch_ref(cgit_print_branch_cb, NULL); html("</table>"); } |