Move cgit_print_date into ui-shared, reuse in ui-summary

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/cgit.h b/cgit.h
index a905e479b703d1873f75c01d39eddabb0c6a47cc..a54f2b5fc2980bb280294cf710f69c0d8c79bd61 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -85,6 +85,7 @@ 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 1c0e7e5f593361e19712070e0367886eb99e1830..2d38f0b836a5af0e55c5140411ac7a58cb4f9030 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,16 +1,5 @@
 #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 cb8a8dffadde3bf43f81186496b65210e7aaadf3..1a6c127a3b657b96b88df72c9eeb445320b0a46e 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -60,6 +60,18 @@ 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 46814dd7c9b12192c650f6f180ff0227666d8b0b..8ff36425e99c7953a82f11b02c7e585d08890211 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -12,10 +12,12 @@ 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));
@@ -24,14 +26,14 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                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>");
@@ -46,7 +48,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>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>");
 }