aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2006-12-15 23:33:28 +0000
committerLars Hjemli <hjemli@gmail.com>2006-12-15 23:33:28 +0000
commit148fb9622c6a96021e572d1a372e38896506031f (patch)
tree2bfde276f3fed3b3a42afbdd90a64c98d0502ae3
parent9a8f88658d51aeb86a79ac1121de13562ad2601f (diff)
downloadcgit-148fb9622c6a96021e572d1a372e38896506031f.tar
cgit-148fb9622c6a96021e572d1a372e38896506031f.tar.gz
cgit-148fb9622c6a96021e572d1a372e38896506031f.zip
Move cgit_print_date into ui-shared, reuse in ui-summary
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--cgit.h1
-rw-r--r--ui-commit.c11
-rw-r--r--ui-shared.c12
-rw-r--r--ui-summary.c20
4 files changed, 24 insertions, 20 deletions
diff --git a/cgit.h b/cgit.h
index a905e47..a54f2b5 100644
--- 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 1c0e7e5..2d38f0b 100644
--- 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 cb8a8df..1a6c127 100644
--- 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 46814dd..8ff3642 100644
--- 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>");
}