about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2007-05-22 23:15:36 +0200
committerLars Hjemli2007-05-22 23:15:36 +0200
commit237ef7b06d461ddf27b21cd13bfcb50befa4a916 (patch)
treeba64f8b921abf9025cb73daa5a57ff2878bd7c90
parentAdd cgit_print_age() function (diff)
downloadcgit-237ef7b06d461ddf27b21cd13bfcb50befa4a916.tar.gz
cgit-237ef7b06d461ddf27b21cd13bfcb50befa4a916.zip
Use cgit_print_age() on summary and log pages
Update the pages to show relative dates instead of yyyy-mm-dd hh:mm:ss

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--ui-log.c8
-rw-r--r--ui-summary.c8
2 files changed, 6 insertions, 10 deletions
diff --git a/ui-log.c b/ui-log.c index 4237921..c80fd73 100644 --- a/ui-log.c +++ b/ui-log.c
@@ -25,15 +25,11 @@ void inspect_files(struct diff_filepair *pair)
25 25
26void print_commit(struct commit *commit) 26void print_commit(struct commit *commit)
27{ 27{
28 char buf[32];
29 struct commitinfo *info; 28 struct commitinfo *info;
30 struct tm *time;
31 29
32 info = cgit_parse_commit(commit); 30 info = cgit_parse_commit(commit);
33 time = gmtime(&commit->date);
34 html("<tr><td>"); 31 html("<tr><td>");
35 strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time); 32 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
36 html_txt(buf);
37 html("</td><td>"); 33 html("</td><td>");
38 char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1)); 34 char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1));
39 char *url = cgit_pageurl(cgit_query_repo, "commit", qry); 35 char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
@@ -85,7 +81,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
85 prepare_revision_walk(&rev); 81 prepare_revision_walk(&rev);
86 82
87 html("<table class='list nowrap'>"); 83 html("<table class='list nowrap'>");
88 html("<tr class='nohover'><th class='left'>Date</th>" 84 html("<tr class='nohover'><th class='left'>Age</th>"
89 "<th class='left'>Message</th>"); 85 "<th class='left'>Message</th>");
90 86
91 if (cgit_repo->enable_log_filecount) { 87 if (cgit_repo->enable_log_filecount) {
diff --git a/ui-summary.c b/ui-summary.c index 20394de..5799773 100644 --- a/ui-summary.c +++ b/ui-summary.c
@@ -28,7 +28,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
28 html_txt(buf); 28 html_txt(buf);
29 html_link_close(); 29 html_link_close();
30 html("</td><td>"); 30 html("</td><td>");
31 cgit_print_date(commit->date, FMT_LONGDATE); 31 cgit_print_age(commit->date, -1, NULL);
32 html("</td><td>"); 32 html("</td><td>");
33 html_txt(info->author); 33 html_txt(info->author);
34 html("</td><td>"); 34 html("</td><td>");
@@ -76,7 +76,7 @@ static void cgit_print_object_ref(struct object *obj)
76static void print_tag_header() 76static void print_tag_header()
77{ 77{
78 html("<tr class='nohover'><th class='left'>Tag</th>" 78 html("<tr class='nohover'><th class='left'>Tag</th>"
79 "<th class='left'>Created</th>" 79 "<th class='left'>Age</th>"
80 "<th class='left'>Author</th>" 80 "<th class='left'>Author</th>"
81 "<th class='left'>Reference</th></tr>\n"); 81 "<th class='left'>Reference</th></tr>\n");
82 header = 1; 82 header = 1;
@@ -108,7 +108,7 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
108 html_link_close(); 108 html_link_close();
109 html("</td><td>"); 109 html("</td><td>");
110 if (info->tagger_date > 0) 110 if (info->tagger_date > 0)
111 cgit_print_date(info->tagger_date, FMT_LONGDATE); 111 cgit_print_age(info->tagger_date, -1, NULL);
112 html("</td><td>"); 112 html("</td><td>");
113 if (info->tagger) 113 if (info->tagger)
114 html(info->tagger); 114 html(info->tagger);
@@ -171,7 +171,7 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
171static void cgit_print_branches() 171static void cgit_print_branches()
172{ 172{
173 html("<tr class='nohover'><th class='left'>Branch</th>" 173 html("<tr class='nohover'><th class='left'>Branch</th>"
174 "<th class='left'>Updated</th>" 174 "<th class='left'>Idle</th>"
175 "<th class='left'>Author</th>" 175 "<th class='left'>Author</th>"
176 "<th class='left'>Head commit</th></tr>\n"); 176 "<th class='left'>Head commit</th></tr>\n");
177 for_each_branch_ref(cgit_print_branch_cb, NULL); 177 for_each_branch_ref(cgit_print_branch_cb, NULL);