summaryrefslogtreecommitdiffabout
path: root/ui-refs.c
Unidiff
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
@@ -57,35 +57,35 @@ static int print_branch(struct refinfo *ref)
57 57
58 if (!info) 58 if (!info)
59 return 1; 59 return 1;
60 html("<tr><td>"); 60 html("<tr><td>");
61 cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL); 61 cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
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);
73 } 73 }
74 html("</td></tr>\n"); 74 html("</td></tr>\n");
75 return 0; 75 return 0;
76} 76}
77 77
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
87static int print_tag(struct refinfo *ref) 87static int print_tag(struct refinfo *ref)
88{ 88{
89 struct tag *tag; 89 struct tag *tag;
90 struct taginfo *info; 90 struct taginfo *info;
91 char *url, *name = (char *)ref->refname; 91 char *url, *name = (char *)ref->refname;
@@ -97,30 +97,30 @@ static int print_tag(struct refinfo *ref)
97 return 1; 97 return 1;
98 html("<tr><td>"); 98 html("<tr><td>");
99 url = cgit_pageurl(ctx.qry.repo, "tag", 99 url = cgit_pageurl(ctx.qry.repo, "tag",
100 fmt("id=%s", name)); 100 fmt("id=%s", name));
101 html_link_open(url, NULL, NULL); 101 html_link_open(url, NULL, NULL);
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 }
122 return 0; 122 return 0;
123} 123}
124 124
125static void print_refs_link(char *path) 125static void print_refs_link(char *path)
126{ 126{
@@ -130,19 +130,19 @@ static void print_refs_link(char *path)
130} 130}
131 131
132void cgit_print_branches(int maxcount) 132void cgit_print_branches(int maxcount)
133{ 133{
134 struct reflist list; 134 struct reflist list;
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;
144 for_each_branch_ref(cgit_refs_cb, &list); 144 for_each_branch_ref(cgit_refs_cb, &list);
145 145
146 if (maxcount == 0 || maxcount > list.count) 146 if (maxcount == 0 || maxcount > list.count)
147 maxcount = list.count; 147 maxcount = list.count;
148 148
@@ -191,11 +191,10 @@ void cgit_print_refs()
191 cgit_print_branches(0); 191 cgit_print_branches(0);
192 else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4)) 192 else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4))
193 cgit_print_tags(0); 193 cgit_print_tags(0);
194 else { 194 else {
195 cgit_print_branches(0); 195 cgit_print_branches(0);
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}