| -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, 24 insertions, 20 deletions
@@ -72,28 +72,29 @@ extern void html_link_close(void); extern int cgit_read_config(const char *filename, configfn fn); extern int cgit_parse_query(char *txt, configfn fn); extern struct commitinfo *cgit_parse_commit(struct commit *commit); extern void cache_prepare(struct cacheitem *item); extern int cache_lock(struct cacheitem *item); extern int cache_unlock(struct cacheitem *item); extern int cache_cancel_lock(struct cacheitem *item); extern int cache_exist(struct cacheitem *item); extern int cache_expired(struct cacheitem *item); extern char *cgit_repourl(const char *reponame); 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); extern void cgit_print_repolist(struct cacheitem *item); extern void cgit_print_summary(); extern void cgit_print_log(const char *tip, int ofs, int cnt); extern void cgit_print_view(const char *hex); extern void cgit_print_tree(const char *hex); extern void cgit_print_commit(const char *hex); #endif /* CGIT_H */ diff --git a/ui-commit.c b/ui-commit.c index 1c0e7e5..2d38f0b 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -1,29 +1,18 @@ #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; struct commitinfo *info; struct commit_list *p; unsigned long size; char type[20]; char *buf; unsigned char sha1[20]; if (get_sha1(hex, sha1)) { cgit_print_error(fmt("Bad object id: %s", hex)); return; } diff --git a/ui-shared.c b/ui-shared.c index cb8a8df..1a6c127 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -47,32 +47,44 @@ char *cgit_repourl(const char *reponame) } else { return fmt("?r=%s", reponame); } } char *cgit_pageurl(const char *reponame, const char *pagename, const char *query) { if (cgit_virtual_root) { return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, pagename, query); } else { return fmt("?r=%s&p=%s&%s", reponame, pagename, query); } } + +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"); htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); htmlf("Expires: %s\n", http_date(item->st.st_mtime + ttl_seconds(item->ttl))); html("\n"); html(cgit_doctype); html("<html>\n"); html("<head>\n"); html("<title>"); html_txt(title); html("</title>\n"); htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version); html("<link rel='stylesheet' type='text/css' href='"); html_attr(cgit_css); diff --git a/ui-summary.c b/ui-summary.c index 46814dd..8ff3642 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -1,60 +1,62 @@ /* ui-summary.c: functions for generating repo summary page * * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" 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)); html_link_open(url, NULL, NULL); strncpy(buf, refname, sizeof(buf)); html_txt(buf); html_link_close(); html("</td><td>"); - 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>"); + 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); html("</td></tr>\n"); } else { html("<tr><td>"); html_txt(buf); html("</td><td>"); htmlf("*** bad ref %s", sha1_to_hex(sha1)); html("</td></tr>\n"); } return 0; } static void cgit_print_branches() { html("<table class='list'>"); - html("<tr><th>Branch</th><th>Last commit</th><th>Link</th></tr>\n"); + 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"); for_each_branch_ref(cgit_print_branch_cb, NULL); html("</table>"); } void cgit_print_summary() { html("<h2>"); html_txt("Repo summary page"); html("</h2>"); cgit_print_branches(); } |