summaryrefslogtreecommitdiffabout
path: root/ui-refs.c
authorLars Hjemli <hjemli@gmail.com>2008-04-14 20:13:38 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-04-14 20:13:38 (UTC)
commit5764fe95469f65fdee285467f0f87d188fc1a780 (patch) (unidiff)
tree0dc9e9545bd8b43fbf1a571f3ef239ff3aea771c /ui-refs.c
parent35d19bbb641aa56a21fb2c238994716c272e154f (diff)
downloadcgit-5764fe95469f65fdee285467f0f87d188fc1a780.zip
cgit-5764fe95469f65fdee285467f0f87d188fc1a780.tar.gz
cgit-5764fe95469f65fdee285467f0f87d188fc1a780.tar.bz2
Make branches, tags and log play better together in the summary view
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-refs.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-refs.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/ui-refs.c b/ui-refs.c
index 12533cd..44c8f9a 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -62,11 +62,11 @@ static int print_branch(struct refinfo *ref)
62 html("</td><td>"); 62 html("</td><td>");
63 63
64 if (ref->object->type == OBJ_COMMIT) { 64 if (ref->object->type == OBJ_COMMIT) {
65 cgit_print_age(info->commit->date, -1, NULL); 65 cgit_commit_link(info->subject, NULL, NULL, name, NULL);
66 html("</td><td>"); 66 html("</td><td>");
67 html_txt(info->author); 67 html_txt(info->author);
68 html("</td><td>"); 68 html("</td><td colspan='2'>");
69 cgit_commit_link(info->subject, NULL, NULL, name, NULL); 69 cgit_print_age(info->commit->date, -1, NULL);
70 } else { 70 } else {
71 html("</td><td></td><td>"); 71 html("</td><td></td><td>");
72 cgit_object_link(ref->object); 72 cgit_object_link(ref->object);
@@ -78,9 +78,9 @@ static int print_branch(struct refinfo *ref)
78static void print_tag_header() 78static void print_tag_header()
79{ 79{
80 html("<tr class='nohover'><th class='left'>Tag</th>" 80 html("<tr class='nohover'><th class='left'>Tag</th>"
81 "<th class='left'>Age</th>" 81 "<th class='left'>Reference</th>"
82 "<th class='left'>Author</th>" 82 "<th class='left'>Author</th>"
83 "<th class='left'>Reference</th></tr>\n"); 83 "<th class='left' colspan='2'>Age</th></tr>\n");
84 header = 1; 84 header = 1;
85} 85}
86 86
@@ -102,20 +102,20 @@ static int print_tag(struct refinfo *ref)
102 html_txt(name); 102 html_txt(name);
103 html_link_close(); 103 html_link_close();
104 html("</td><td>"); 104 html("</td><td>");
105 if (info->tagger_date > 0) 105 cgit_object_link(tag->tagged);
106 cgit_print_age(info->tagger_date, -1, NULL);
107 html("</td><td>"); 106 html("</td><td>");
108 if (info->tagger) 107 if (info->tagger)
109 html(info->tagger); 108 html(info->tagger);
110 html("</td><td>"); 109 html("</td><td colspan='2'>");
111 cgit_object_link(tag->tagged); 110 if (info->tagger_date > 0)
111 cgit_print_age(info->tagger_date, -1, NULL);
112 html("</td></tr>\n"); 112 html("</td></tr>\n");
113 } else { 113 } else {
114 if (!header) 114 if (!header)
115 print_tag_header(); 115 print_tag_header();
116 html("<tr><td>"); 116 html("<tr><td>");
117 html_txt(name); 117 html_txt(name);
118 html("</td><td colspan='2'/><td>"); 118 html("</td><td>");
119 cgit_object_link(ref->object); 119 cgit_object_link(ref->object);
120 html("</td></tr>\n"); 120 html("</td></tr>\n");
121 } 121 }
@@ -135,9 +135,9 @@ void cgit_print_branches(int maxcount)
135 int i; 135 int i;
136 136
137 html("<tr class='nohover'><th class='left'>Branch</th>" 137 html("<tr class='nohover'><th class='left'>Branch</th>"
138 "<th class='left'>Idle</th>" 138 "<th class='left'>Commit message</th>"
139 "<th class='left'>Author</th>" 139 "<th class='left'>Author</th>"
140 "<th class='left'>Head commit</th></tr>\n"); 140 "<th class='left' colspan='2'>Age</th></tr>\n");
141 141
142 list.refs = NULL; 142 list.refs = NULL;
143 list.alloc = list.count = 0; 143 list.alloc = list.count = 0;
@@ -196,6 +196,5 @@ void cgit_print_refs()
196 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 196 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
197 cgit_print_tags(0); 197 cgit_print_tags(0);
198 } 198 }
199
200 html("</table>"); 199 html("</table>");
201} 200}