-rw-r--r-- | ui-log.c | 8 | ||||
-rw-r--r-- | ui-summary.c | 8 |
2 files changed, 6 insertions, 10 deletions
@@ -22,21 +22,17 @@ void inspect_files(struct diff_filepair *pair) | |||
22 | if (cgit_repo->enable_log_linecount) | 22 | if (cgit_repo->enable_log_linecount) |
23 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); | 23 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); |
24 | } | 24 | } |
25 | 25 | ||
26 | void print_commit(struct commit *commit) | 26 | void 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); |
40 | html_link_open(url, NULL, NULL); | 36 | html_link_open(url, NULL, NULL); |
41 | html_ntxt(cgit_max_msg_len, info->subject); | 37 | html_ntxt(cgit_max_msg_len, info->subject); |
42 | html_link_close(); | 38 | html_link_close(); |
@@ -82,13 +78,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path) | |||
82 | rev.grep_filter->regflags |= REG_ICASE; | 78 | rev.grep_filter->regflags |= REG_ICASE; |
83 | compile_grep_patterns(rev.grep_filter); | 79 | compile_grep_patterns(rev.grep_filter); |
84 | } | 80 | } |
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) { |
92 | html("<th class='left'>Files</th>"); | 88 | html("<th class='left'>Files</th>"); |
93 | if (cgit_repo->enable_log_linecount) | 89 | if (cgit_repo->enable_log_linecount) |
94 | html("<th class='left'>Lines</th>"); | 90 | html("<th class='left'>Lines</th>"); |
diff --git a/ui-summary.c b/ui-summary.c index 20394de..5799773 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -25,13 +25,13 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | |||
25 | url = cgit_pageurl(cgit_query_repo, "log", | 25 | url = cgit_pageurl(cgit_query_repo, "log", |
26 | fmt("h=%s", refname)); | 26 | fmt("h=%s", refname)); |
27 | html_link_open(url, NULL, NULL); | 27 | html_link_open(url, NULL, NULL); |
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>"); |
35 | url = cgit_pageurl(cgit_query_repo, "commit", | 35 | url = cgit_pageurl(cgit_query_repo, "commit", |
36 | fmt("h=%s", sha1_to_hex(sha1))); | 36 | fmt("h=%s", sha1_to_hex(sha1))); |
37 | html_link_open(url, NULL, NULL); | 37 | html_link_open(url, NULL, NULL); |
@@ -73,13 +73,13 @@ static void cgit_print_object_ref(struct object *obj) | |||
73 | html_link_close(); | 73 | html_link_close(); |
74 | } | 74 | } |
75 | 75 | ||
76 | static void print_tag_header() | 76 | static 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; |
83 | } | 83 | } |
84 | 84 | ||
85 | static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, | 85 | static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, |
@@ -105,13 +105,13 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, | |||
105 | fmt("id=%s", sha1_to_hex(sha1))); | 105 | fmt("id=%s", sha1_to_hex(sha1))); |
106 | html_link_open(url, NULL, NULL); | 106 | html_link_open(url, NULL, NULL); |
107 | html_txt(buf); | 107 | html_txt(buf); |
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); |
115 | html("</td><td>"); | 115 | html("</td><td>"); |
116 | cgit_print_object_ref(tag->tagged); | 116 | cgit_print_object_ref(tag->tagged); |
117 | html("</td></tr>\n"); | 117 | html("</td></tr>\n"); |
@@ -168,13 +168,13 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, | |||
168 | return 0; | 168 | return 0; |
169 | } | 169 | } |
170 | 170 | ||
171 | static void cgit_print_branches() | 171 | static 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); |
178 | } | 178 | } |
179 | 179 | ||
180 | static void cgit_print_tags() | 180 | static void cgit_print_tags() |