summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.css3
-rw-r--r--ui-shared.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/cgit.css b/cgit.css
index fac5f85..a37d218 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,455 +1,458 @@
1body, table, form { 1body, table, form {
2 padding: 0em; 2 padding: 0em;
3 margin: 0em; 3 margin: 0em;
4} 4}
5 5
6body { 6body {
7 font-family: sans-serif; 7 font-family: sans-serif;
8 font-size: 10pt; 8 font-size: 10pt;
9 color: #333; 9 color: #333;
10 background: white; 10 background: white;
11 padding: 4px; 11 padding: 4px;
12} 12}
13 13
14a { 14a {
15 color: blue; 15 color: blue;
16 text-decoration: none; 16 text-decoration: none;
17} 17}
18 18
19a:hover { 19a:hover {
20 text-decoration: underline; 20 text-decoration: underline;
21} 21}
22 22
23table { 23table {
24 border-collapse: collapse; 24 border-collapse: collapse;
25} 25}
26 26
27table#header { 27table#header {
28 width: 100%; 28 width: 100%;
29 margin-bottom: 1em; 29 margin-bottom: 1em;
30} 30}
31 31
32table#header td.logo { 32table#header td.logo {
33 width: 96px; 33 width: 96px;
34} 34}
35 35
36table#header td.main { 36table#header td.main {
37 font-size: 250%; 37 font-size: 250%;
38 padding-left: 10px; 38 padding-left: 10px;
39 white-space: nowrap;
39} 40}
40 41
41table#header td.main a { 42table#header td.main a {
42 color: #000; 43 color: #000;
43} 44}
44 45
45table#header td.form { 46table#header td.form {
46 text-align: right; 47 text-align: right;
47 vertical-align: bottom; 48 vertical-align: bottom;
48 padding-right: 1em; 49 padding-right: 1em;
49 padding-bottom: 2px; 50 padding-bottom: 2px;
51 white-space: nowrap;
50} 52}
51 53
52table#header td.form form, 54table#header td.form form,
53table#header td.form input, 55table#header td.form input,
54table#header td.form select { 56table#header td.form select {
55 font-size: 90%; 57 font-size: 90%;
56} 58}
57 59
58table#header td.sub { 60table#header td.sub {
59 color: #777; 61 color: #777;
60 border-top: solid 1px #ccc; 62 border-top: solid 1px #ccc;
61 padding-left: 10px; 63 padding-left: 10px;
62} 64}
63 65
64table.tabs { 66table.tabs {
65 /* border-bottom: solid 2px #ccc; */ 67 /* border-bottom: solid 2px #ccc; */
66 border-collapse: collapse; 68 border-collapse: collapse;
67 margin-top: 2em; 69 margin-top: 2em;
68 margin-bottom: 0px; 70 margin-bottom: 0px;
69 width: 100%; 71 width: 100%;
70} 72}
71 73
72table.tabs td { 74table.tabs td {
73 padding: 0px 1em; 75 padding: 0px 1em;
74 vertical-align: bottom; 76 vertical-align: bottom;
75} 77}
76 78
77table.tabs td a { 79table.tabs td a {
78 padding: 2px 0.75em; 80 padding: 2px 0.75em;
79 color: #777; 81 color: #777;
80 font-size: 110%; 82 font-size: 110%;
81} 83}
82 84
83table.tabs td a.active { 85table.tabs td a.active {
84 color: #000; 86 color: #000;
85 background-color: #ccc; 87 background-color: #ccc;
86} 88}
87 89
88table.tabs td.form { 90table.tabs td.form {
89 text-align: right; 91 text-align: right;
90} 92}
91 93
92table.tabs td.form form { 94table.tabs td.form form {
93 padding-bottom: 2px; 95 padding-bottom: 2px;
94 font-size: 90%; 96 font-size: 90%;
97 white-space: nowrap;
95} 98}
96 99
97table.tabs td.form input, 100table.tabs td.form input,
98table.tabs td.form select { 101table.tabs td.form select {
99 font-size: 90%; 102 font-size: 90%;
100} 103}
101 104
102div.content { 105div.content {
103 margin: 0px; 106 margin: 0px;
104 padding: 2em; 107 padding: 2em;
105 border-top: solid 3px #ccc; 108 border-top: solid 3px #ccc;
106 border-bottom: solid 3px #ccc; 109 border-bottom: solid 3px #ccc;
107} 110}
108 111
109 112
110table.list { 113table.list {
111 width: 100%; 114 width: 100%;
112 border: none; 115 border: none;
113 border-collapse: collapse; 116 border-collapse: collapse;
114} 117}
115 118
116table.list tr { 119table.list tr {
117 background: white; 120 background: white;
118} 121}
119 122
120table.list tr:hover { 123table.list tr:hover {
121 background: #eee; 124 background: #eee;
122} 125}
123 126
124table.list tr.nohover:hover { 127table.list tr.nohover:hover {
125 background: white; 128 background: white;
126} 129}
127 130
128table.list th { 131table.list th {
129 font-weight: bold; 132 font-weight: bold;
130 /* color: #888; 133 /* color: #888;
131 border-top: dashed 1px #888; 134 border-top: dashed 1px #888;
132 border-bottom: dashed 1px #888; 135 border-bottom: dashed 1px #888;
133 */ 136 */
134 padding: 0.1em 0.5em 0.05em 0.5em; 137 padding: 0.1em 0.5em 0.05em 0.5em;
135 vertical-align: baseline; 138 vertical-align: baseline;
136} 139}
137 140
138table.list td { 141table.list td {
139 border: none; 142 border: none;
140 padding: 0.1em 0.5em 0.1em 0.5em; 143 padding: 0.1em 0.5em 0.1em 0.5em;
141} 144}
142 145
143table.list td a { 146table.list td a {
144 color: black; 147 color: black;
145} 148}
146 149
147table.list td a:hover { 150table.list td a:hover {
148 color: #00f; 151 color: #00f;
149} 152}
150 153
151img { 154img {
152 border: none; 155 border: none;
153} 156}
154 157
155input#switch-btn { 158input#switch-btn {
156 margin: 2px 0px 0px 0px; 159 margin: 2px 0px 0px 0px;
157} 160}
158 161
159td#sidebar input.txt { 162td#sidebar input.txt {
160 width: 100%; 163 width: 100%;
161 margin: 2px 0px 0px 0px; 164 margin: 2px 0px 0px 0px;
162} 165}
163 166
164table#grid { 167table#grid {
165 margin: 0px; 168 margin: 0px;
166} 169}
167 170
168td#content { 171td#content {
169 vertical-align: top; 172 vertical-align: top;
170 padding: 1em 2em 1em 1em; 173 padding: 1em 2em 1em 1em;
171 border: none; 174 border: none;
172} 175}
173 176
174div#summary { 177div#summary {
175 vertical-align: top; 178 vertical-align: top;
176 margin-bottom: 1em; 179 margin-bottom: 1em;
177} 180}
178 181
179table#downloads { 182table#downloads {
180 float: right; 183 float: right;
181 border-collapse: collapse; 184 border-collapse: collapse;
182 border: solid 1px #777; 185 border: solid 1px #777;
183 margin-left: 0.5em; 186 margin-left: 0.5em;
184 margin-bottom: 0.5em; 187 margin-bottom: 0.5em;
185} 188}
186 189
187table#downloads th { 190table#downloads th {
188 background-color: #ccc; 191 background-color: #ccc;
189} 192}
190 193
191div#blob { 194div#blob {
192 border: solid 1px black; 195 border: solid 1px black;
193} 196}
194 197
195div.error { 198div.error {
196 color: red; 199 color: red;
197 font-weight: bold; 200 font-weight: bold;
198 margin: 1em 2em; 201 margin: 1em 2em;
199} 202}
200 203
201a.ls-blob, a.ls-dir, a.ls-mod { 204a.ls-blob, a.ls-dir, a.ls-mod {
202 font-family: monospace; 205 font-family: monospace;
203} 206}
204 207
205td.ls-size { 208td.ls-size {
206 text-align: right; 209 text-align: right;
207 font-family: monospace; 210 font-family: monospace;
208 width: 10em; 211 width: 10em;
209} 212}
210 213
211td.ls-mode { 214td.ls-mode {
212 font-family: monospace; 215 font-family: monospace;
213 width: 10em; 216 width: 10em;
214} 217}
215 218
216table.blob { 219table.blob {
217 margin-top: 0.5em; 220 margin-top: 0.5em;
218 border-top: solid 1px black; 221 border-top: solid 1px black;
219} 222}
220 223
221table.blob td.no { 224table.blob td.no {
222 border-right: solid 1px black; 225 border-right: solid 1px black;
223 color: black; 226 color: black;
224 background-color: #eee; 227 background-color: #eee;
225 text-align: right; 228 text-align: right;
226} 229}
227 230
228table.blob td.no a { 231table.blob td.no a {
229 color: black; 232 color: black;
230} 233}
231 234
232table.blob td.no a:hover { 235table.blob td.no a:hover {
233 color: black; 236 color: black;
234 text-decoration: none; 237 text-decoration: none;
235} 238}
236 239
237table.blob td.txt { 240table.blob td.txt {
238 white-space: pre; 241 white-space: pre;
239 font-family: monospace; 242 font-family: monospace;
240 padding-left: 0.5em; 243 padding-left: 0.5em;
241} 244}
242 245
243table.nowrap td { 246table.nowrap td {
244 white-space: nowrap; 247 white-space: nowrap;
245} 248}
246 249
247table.commit-info { 250table.commit-info {
248 border-collapse: collapse; 251 border-collapse: collapse;
249 margin-top: 1.5em; 252 margin-top: 1.5em;
250} 253}
251 254
252table.commit-info th { 255table.commit-info th {
253 text-align: left; 256 text-align: left;
254 font-weight: normal; 257 font-weight: normal;
255 padding: 0.1em 1em 0.1em 0.1em; 258 padding: 0.1em 1em 0.1em 0.1em;
256 vertical-align: top; 259 vertical-align: top;
257} 260}
258 261
259table.commit-info td { 262table.commit-info td {
260 font-weight: normal; 263 font-weight: normal;
261 padding: 0.1em 1em 0.1em 0.1em; 264 padding: 0.1em 1em 0.1em 0.1em;
262} 265}
263 266
264div.commit-subject { 267div.commit-subject {
265 font-weight: bold; 268 font-weight: bold;
266 font-size: 125%; 269 font-size: 125%;
267 margin: 1.5em 0em 0.5em 0em; 270 margin: 1.5em 0em 0.5em 0em;
268 padding: 0em; 271 padding: 0em;
269} 272}
270 273
271div.commit-msg { 274div.commit-msg {
272 white-space: pre; 275 white-space: pre;
273 font-family: monospace; 276 font-family: monospace;
274} 277}
275 278
276div.diffstat-header { 279div.diffstat-header {
277 font-weight: bold; 280 font-weight: bold;
278 padding-top: 1.5em; 281 padding-top: 1.5em;
279} 282}
280 283
281table.diffstat { 284table.diffstat {
282 border-collapse: collapse; 285 border-collapse: collapse;
283 border: solid 1px #aaa; 286 border: solid 1px #aaa;
284 background-color: #eee; 287 background-color: #eee;
285} 288}
286 289
287table.diffstat th { 290table.diffstat th {
288 font-weight: normal; 291 font-weight: normal;
289 text-align: left; 292 text-align: left;
290 text-decoration: underline; 293 text-decoration: underline;
291 padding: 0.1em 1em 0.1em 0.1em; 294 padding: 0.1em 1em 0.1em 0.1em;
292 font-size: 100%; 295 font-size: 100%;
293} 296}
294 297
295table.diffstat td { 298table.diffstat td {
296 padding: 0.2em 0.2em 0.1em 0.1em; 299 padding: 0.2em 0.2em 0.1em 0.1em;
297 font-size: 100%; 300 font-size: 100%;
298 border: none; 301 border: none;
299} 302}
300 303
301table.diffstat td.mode { 304table.diffstat td.mode {
302 white-space: nowrap; 305 white-space: nowrap;
303} 306}
304 307
305table.diffstat td span.modechange { 308table.diffstat td span.modechange {
306 padding-left: 1em; 309 padding-left: 1em;
307 color: red; 310 color: red;
308} 311}
309 312
310table.diffstat td.add a { 313table.diffstat td.add a {
311 color: green; 314 color: green;
312} 315}
313 316
314table.diffstat td.del a { 317table.diffstat td.del a {
315 color: red; 318 color: red;
316} 319}
317 320
318table.diffstat td.upd a { 321table.diffstat td.upd a {
319 color: blue; 322 color: blue;
320} 323}
321 324
322table.diffstat td.graph { 325table.diffstat td.graph {
323 width: 500px; 326 width: 500px;
324 vertical-align: middle; 327 vertical-align: middle;
325} 328}
326 329
327table.diffstat td.graph table { 330table.diffstat td.graph table {
328 border: none; 331 border: none;
329} 332}
330 333
331table.diffstat td.graph td { 334table.diffstat td.graph td {
332 padding: 0px; 335 padding: 0px;
333 border: 0px; 336 border: 0px;
334 height: 7pt; 337 height: 7pt;
335} 338}
336 339
337table.diffstat td.graph td.add { 340table.diffstat td.graph td.add {
338 background-color: #5c5; 341 background-color: #5c5;
339} 342}
340 343
341table.diffstat td.graph td.rem { 344table.diffstat td.graph td.rem {
342 background-color: #c55; 345 background-color: #c55;
343} 346}
344 347
345div.diffstat-summary { 348div.diffstat-summary {
346 color: #888; 349 color: #888;
347 padding-top: 0.5em; 350 padding-top: 0.5em;
348} 351}
349 352
350table.diff { 353table.diff {
351 width: 100%; 354 width: 100%;
352} 355}
353 356
354table.diff td { 357table.diff td {
355 font-family: monospace; 358 font-family: monospace;
356 white-space: pre; 359 white-space: pre;
357} 360}
358 361
359table.diff td div.head { 362table.diff td div.head {
360 font-weight: bold; 363 font-weight: bold;
361 margin-top: 1em; 364 margin-top: 1em;
362 color: black; 365 color: black;
363} 366}
364 367
365table.diff td div.hunk { 368table.diff td div.hunk {
366 color: #009; 369 color: #009;
367} 370}
368 371
369table.diff td div.add { 372table.diff td div.add {
370 color: green; 373 color: green;
371} 374}
372 375
373table.diff td div.del { 376table.diff td div.del {
374 color: red; 377 color: red;
375} 378}
376 379
377.sha1 { 380.sha1 {
378 font-family: monospace; 381 font-family: monospace;
379 font-size: 90%; 382 font-size: 90%;
380} 383}
381 384
382.left { 385.left {
383 text-align: left; 386 text-align: left;
384} 387}
385 388
386.right { 389.right {
387 text-align: right; 390 text-align: right;
388} 391}
389 392
390table.list td.repogroup { 393table.list td.repogroup {
391 font-style: italic; 394 font-style: italic;
392 color: #888; 395 color: #888;
393} 396}
394 397
395a.button { 398a.button {
396 font-size: 80%; 399 font-size: 80%;
397 padding: 0em 0.5em; 400 padding: 0em 0.5em;
398} 401}
399 402
400a.primary { 403a.primary {
401 font-size: 100%; 404 font-size: 100%;
402} 405}
403 406
404a.secondary { 407a.secondary {
405 font-size: 90%; 408 font-size: 90%;
406} 409}
407 410
408td.toplevel-repo { 411td.toplevel-repo {
409 412
410} 413}
411 414
412table.list td.sublevel-repo { 415table.list td.sublevel-repo {
413 padding-left: 1.5em; 416 padding-left: 1.5em;
414} 417}
415 418
416div.pager { 419div.pager {
417 text-align: center; 420 text-align: center;
418 margin: 1em 0em 0em 0em; 421 margin: 1em 0em 0em 0em;
419} 422}
420 423
421div.pager a { 424div.pager a {
422 color: #777; 425 color: #777;
423 margin: 0em 0.5em; 426 margin: 0em 0.5em;
424} 427}
425 428
426span.age-mins { 429span.age-mins {
427 font-weight: bold; 430 font-weight: bold;
428 color: #080; 431 color: #080;
429} 432}
430 433
431span.age-hours { 434span.age-hours {
432 color: #080; 435 color: #080;
433} 436}
434 437
435span.age-days { 438span.age-days {
436 color: #040; 439 color: #040;
437} 440}
438 441
439span.age-weeks { 442span.age-weeks {
440 color: #444; 443 color: #444;
441} 444}
442 445
443span.age-months { 446span.age-months {
444 color: #888; 447 color: #888;
445} 448}
446 449
447span.age-years { 450span.age-years {
448 color: #bbb; 451 color: #bbb;
449} 452}
450div.footer { 453div.footer {
451 margin-top: 0.5em; 454 margin-top: 0.5em;
452 text-align: center; 455 text-align: center;
453 font-size: 80%; 456 font-size: 80%;
454 color: #ccc; 457 color: #ccc;
455} 458}
diff --git a/ui-shared.c b/ui-shared.c
index 44269a7..cd98387 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,661 +1,661 @@
1/* ui-shared.c: common web output functions 1/* ui-shared.c: common web output functions
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "cmd.h" 10#include "cmd.h"
11#include "html.h" 11#include "html.h"
12 12
13const char cgit_doctype[] = 13const char cgit_doctype[] =
14"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" 14"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; 15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
16 16
17static char *http_date(time_t t) 17static char *http_date(time_t t)
18{ 18{
19 static char day[][4] = 19 static char day[][4] =
20 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; 20 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
21 static char month[][4] = 21 static char month[][4] =
22 {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 22 {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
23 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; 23 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
24 struct tm *tm = gmtime(&t); 24 struct tm *tm = gmtime(&t);
25 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], 25 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
26 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, 26 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
27 tm->tm_hour, tm->tm_min, tm->tm_sec); 27 tm->tm_hour, tm->tm_min, tm->tm_sec);
28} 28}
29 29
30void cgit_print_error(char *msg) 30void cgit_print_error(char *msg)
31{ 31{
32 html("<div class='error'>"); 32 html("<div class='error'>");
33 html_txt(msg); 33 html_txt(msg);
34 html("</div>\n"); 34 html("</div>\n");
35} 35}
36 36
37char *cgit_rooturl() 37char *cgit_rooturl()
38{ 38{
39 if (ctx.cfg.virtual_root) 39 if (ctx.cfg.virtual_root)
40 return fmt("%s/", ctx.cfg.virtual_root); 40 return fmt("%s/", ctx.cfg.virtual_root);
41 else 41 else
42 return ctx.cfg.script_name; 42 return ctx.cfg.script_name;
43} 43}
44 44
45char *cgit_repourl(const char *reponame) 45char *cgit_repourl(const char *reponame)
46{ 46{
47 if (ctx.cfg.virtual_root) { 47 if (ctx.cfg.virtual_root) {
48 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); 48 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
49 } else { 49 } else {
50 return fmt("?r=%s", reponame); 50 return fmt("?r=%s", reponame);
51 } 51 }
52} 52}
53 53
54char *cgit_fileurl(const char *reponame, const char *pagename, 54char *cgit_fileurl(const char *reponame, const char *pagename,
55 const char *filename, const char *query) 55 const char *filename, const char *query)
56{ 56{
57 char *tmp; 57 char *tmp;
58 char *delim; 58 char *delim;
59 59
60 if (ctx.cfg.virtual_root) { 60 if (ctx.cfg.virtual_root) {
61 tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame, 61 tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
62 pagename, (filename ? filename:"")); 62 pagename, (filename ? filename:""));
63 delim = "?"; 63 delim = "?";
64 } else { 64 } else {
65 tmp = fmt("?url=%s/%s/%s", reponame, pagename, 65 tmp = fmt("?url=%s/%s/%s", reponame, pagename,
66 (filename ? filename : "")); 66 (filename ? filename : ""));
67 delim = "&"; 67 delim = "&";
68 } 68 }
69 if (query) 69 if (query)
70 tmp = fmt("%s%s%s", tmp, delim, query); 70 tmp = fmt("%s%s%s", tmp, delim, query);
71 return tmp; 71 return tmp;
72} 72}
73 73
74char *cgit_pageurl(const char *reponame, const char *pagename, 74char *cgit_pageurl(const char *reponame, const char *pagename,
75 const char *query) 75 const char *query)
76{ 76{
77 return cgit_fileurl(reponame,pagename,0,query); 77 return cgit_fileurl(reponame,pagename,0,query);
78} 78}
79 79
80const char *cgit_repobasename(const char *reponame) 80const char *cgit_repobasename(const char *reponame)
81{ 81{
82 /* I assume we don't need to store more than one repo basename */ 82 /* I assume we don't need to store more than one repo basename */
83 static char rvbuf[1024]; 83 static char rvbuf[1024];
84 int p; 84 int p;
85 const char *rv; 85 const char *rv;
86 strncpy(rvbuf,reponame,sizeof(rvbuf)); 86 strncpy(rvbuf,reponame,sizeof(rvbuf));
87 if(rvbuf[sizeof(rvbuf)-1]) 87 if(rvbuf[sizeof(rvbuf)-1])
88 die("cgit_repobasename: truncated repository name '%s'", reponame); 88 die("cgit_repobasename: truncated repository name '%s'", reponame);
89 p = strlen(rvbuf)-1; 89 p = strlen(rvbuf)-1;
90 /* strip trailing slashes */ 90 /* strip trailing slashes */
91 while(p && rvbuf[p]=='/') rvbuf[p--]=0; 91 while(p && rvbuf[p]=='/') rvbuf[p--]=0;
92 /* strip trailing .git */ 92 /* strip trailing .git */
93 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { 93 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
94 p -= 3; rvbuf[p--] = 0; 94 p -= 3; rvbuf[p--] = 0;
95 } 95 }
96 /* strip more trailing slashes if any */ 96 /* strip more trailing slashes if any */
97 while( p && rvbuf[p]=='/') rvbuf[p--]=0; 97 while( p && rvbuf[p]=='/') rvbuf[p--]=0;
98 /* find last slash in the remaining string */ 98 /* find last slash in the remaining string */
99 rv = strrchr(rvbuf,'/'); 99 rv = strrchr(rvbuf,'/');
100 if(rv) 100 if(rv)
101 return ++rv; 101 return ++rv;
102 return rvbuf; 102 return rvbuf;
103} 103}
104 104
105char *cgit_currurl() 105char *cgit_currurl()
106{ 106{
107 if (!ctx.cfg.virtual_root) 107 if (!ctx.cfg.virtual_root)
108 return ctx.cfg.script_name; 108 return ctx.cfg.script_name;
109 else if (ctx.qry.page) 109 else if (ctx.qry.page)
110 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page); 110 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
111 else if (ctx.qry.repo) 111 else if (ctx.qry.repo)
112 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo); 112 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
113 else 113 else
114 return fmt("%s/", ctx.cfg.virtual_root); 114 return fmt("%s/", ctx.cfg.virtual_root);
115} 115}
116 116
117static void site_url(char *page, char *search, int ofs) 117static void site_url(char *page, char *search, int ofs)
118{ 118{
119 char *delim = "?"; 119 char *delim = "?";
120 120
121 if (ctx.cfg.virtual_root) { 121 if (ctx.cfg.virtual_root) {
122 html_attr(ctx.cfg.virtual_root); 122 html_attr(ctx.cfg.virtual_root);
123 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') 123 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
124 html("/"); 124 html("/");
125 } else 125 } else
126 html(ctx.cfg.script_name); 126 html(ctx.cfg.script_name);
127 127
128 if (page) { 128 if (page) {
129 htmlf("?p=%s", page); 129 htmlf("?p=%s", page);
130 delim = "&"; 130 delim = "&";
131 } 131 }
132 if (search) { 132 if (search) {
133 html(delim); 133 html(delim);
134 html("q="); 134 html("q=");
135 html_attr(search); 135 html_attr(search);
136 delim = "&"; 136 delim = "&";
137 } 137 }
138 if (ofs) { 138 if (ofs) {
139 html(delim); 139 html(delim);
140 htmlf("ofs=%d", ofs); 140 htmlf("ofs=%d", ofs);
141 } 141 }
142} 142}
143 143
144static void site_link(char *page, char *name, char *title, char *class, 144static void site_link(char *page, char *name, char *title, char *class,
145 char *search, int ofs) 145 char *search, int ofs)
146{ 146{
147 html("<a"); 147 html("<a");
148 if (title) { 148 if (title) {
149 html(" title='"); 149 html(" title='");
150 html_attr(title); 150 html_attr(title);
151 html("'"); 151 html("'");
152 } 152 }
153 if (class) { 153 if (class) {
154 html(" class='"); 154 html(" class='");
155 html_attr(class); 155 html_attr(class);
156 html("'"); 156 html("'");
157 } 157 }
158 html(" href='"); 158 html(" href='");
159 site_url(page, search, ofs); 159 site_url(page, search, ofs);
160 html("'>"); 160 html("'>");
161 html_txt(name); 161 html_txt(name);
162 html("</a>"); 162 html("</a>");
163} 163}
164 164
165void cgit_index_link(char *name, char *title, char *class, char *pattern, 165void cgit_index_link(char *name, char *title, char *class, char *pattern,
166 int ofs) 166 int ofs)
167{ 167{
168 site_link(NULL, name, title, class, pattern, ofs); 168 site_link(NULL, name, title, class, pattern, ofs);
169} 169}
170 170
171static char *repolink(char *title, char *class, char *page, char *head, 171static char *repolink(char *title, char *class, char *page, char *head,
172 char *path) 172 char *path)
173{ 173{
174 char *delim = "?"; 174 char *delim = "?";
175 175
176 html("<a"); 176 html("<a");
177 if (title) { 177 if (title) {
178 html(" title='"); 178 html(" title='");
179 html_attr(title); 179 html_attr(title);
180 html("'"); 180 html("'");
181 } 181 }
182 if (class) { 182 if (class) {
183 html(" class='"); 183 html(" class='");
184 html_attr(class); 184 html_attr(class);
185 html("'"); 185 html("'");
186 } 186 }
187 html(" href='"); 187 html(" href='");
188 if (ctx.cfg.virtual_root) { 188 if (ctx.cfg.virtual_root) {
189 html_attr(ctx.cfg.virtual_root); 189 html_attr(ctx.cfg.virtual_root);
190 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') 190 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
191 html("/"); 191 html("/");
192 html_attr(ctx.repo->url); 192 html_attr(ctx.repo->url);
193 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') 193 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
194 html("/"); 194 html("/");
195 if (page) { 195 if (page) {
196 html(page); 196 html(page);
197 html("/"); 197 html("/");
198 if (path) 198 if (path)
199 html_attr(path); 199 html_attr(path);
200 } 200 }
201 } else { 201 } else {
202 html(ctx.cfg.script_name); 202 html(ctx.cfg.script_name);
203 html("?url="); 203 html("?url=");
204 html_attr(ctx.repo->url); 204 html_attr(ctx.repo->url);
205 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') 205 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
206 html("/"); 206 html("/");
207 if (page) { 207 if (page) {
208 html(page); 208 html(page);
209 html("/"); 209 html("/");
210 if (path) 210 if (path)
211 html_attr(path); 211 html_attr(path);
212 } 212 }
213 delim = "&amp;"; 213 delim = "&amp;";
214 } 214 }
215 if (head && strcmp(head, ctx.repo->defbranch)) { 215 if (head && strcmp(head, ctx.repo->defbranch)) {
216 html(delim); 216 html(delim);
217 html("h="); 217 html("h=");
218 html_attr(head); 218 html_attr(head);
219 delim = "&amp;"; 219 delim = "&amp;";
220 } 220 }
221 return fmt("%s", delim); 221 return fmt("%s", delim);
222} 222}
223 223
224static void reporevlink(char *page, char *name, char *title, char *class, 224static void reporevlink(char *page, char *name, char *title, char *class,
225 char *head, char *rev, char *path) 225 char *head, char *rev, char *path)
226{ 226{
227 char *delim; 227 char *delim;
228 228
229 delim = repolink(title, class, page, head, path); 229 delim = repolink(title, class, page, head, path);
230 if (rev && strcmp(rev, ctx.qry.head)) { 230 if (rev && strcmp(rev, ctx.qry.head)) {
231 html(delim); 231 html(delim);
232 html("id="); 232 html("id=");
233 html_attr(rev); 233 html_attr(rev);
234 } 234 }
235 html("'>"); 235 html("'>");
236 html_txt(name); 236 html_txt(name);
237 html("</a>"); 237 html("</a>");
238} 238}
239 239
240void cgit_tree_link(char *name, char *title, char *class, char *head, 240void cgit_tree_link(char *name, char *title, char *class, char *head,
241 char *rev, char *path) 241 char *rev, char *path)
242{ 242{
243 reporevlink("tree", name, title, class, head, rev, path); 243 reporevlink("tree", name, title, class, head, rev, path);
244} 244}
245 245
246void cgit_log_link(char *name, char *title, char *class, char *head, 246void cgit_log_link(char *name, char *title, char *class, char *head,
247 char *rev, char *path, int ofs, char *grep, char *pattern) 247 char *rev, char *path, int ofs, char *grep, char *pattern)
248{ 248{
249 char *delim; 249 char *delim;
250 250
251 delim = repolink(title, class, "log", head, path); 251 delim = repolink(title, class, "log", head, path);
252 if (rev && strcmp(rev, ctx.qry.head)) { 252 if (rev && strcmp(rev, ctx.qry.head)) {
253 html(delim); 253 html(delim);
254 html("id="); 254 html("id=");
255 html_attr(rev); 255 html_attr(rev);
256 delim = "&"; 256 delim = "&";
257 } 257 }
258 if (grep && pattern) { 258 if (grep && pattern) {
259 html(delim); 259 html(delim);
260 html("qt="); 260 html("qt=");
261 html_attr(grep); 261 html_attr(grep);
262 delim = "&"; 262 delim = "&";
263 html(delim); 263 html(delim);
264 html("q="); 264 html("q=");
265 html_attr(pattern); 265 html_attr(pattern);
266 } 266 }
267 if (ofs > 0) { 267 if (ofs > 0) {
268 html(delim); 268 html(delim);
269 html("ofs="); 269 html("ofs=");
270 htmlf("%d", ofs); 270 htmlf("%d", ofs);
271 } 271 }
272 html("'>"); 272 html("'>");
273 html_txt(name); 273 html_txt(name);
274 html("</a>"); 274 html("</a>");
275} 275}
276 276
277void cgit_commit_link(char *name, char *title, char *class, char *head, 277void cgit_commit_link(char *name, char *title, char *class, char *head,
278 char *rev) 278 char *rev)
279{ 279{
280 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { 280 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
281 name[ctx.cfg.max_msg_len] = '\0'; 281 name[ctx.cfg.max_msg_len] = '\0';
282 name[ctx.cfg.max_msg_len - 1] = '.'; 282 name[ctx.cfg.max_msg_len - 1] = '.';
283 name[ctx.cfg.max_msg_len - 2] = '.'; 283 name[ctx.cfg.max_msg_len - 2] = '.';
284 name[ctx.cfg.max_msg_len - 3] = '.'; 284 name[ctx.cfg.max_msg_len - 3] = '.';
285 } 285 }
286 reporevlink("commit", name, title, class, head, rev, NULL); 286 reporevlink("commit", name, title, class, head, rev, NULL);
287} 287}
288 288
289void cgit_refs_link(char *name, char *title, char *class, char *head, 289void cgit_refs_link(char *name, char *title, char *class, char *head,
290 char *rev, char *path) 290 char *rev, char *path)
291{ 291{
292 reporevlink("refs", name, title, class, head, rev, path); 292 reporevlink("refs", name, title, class, head, rev, path);
293} 293}
294 294
295void cgit_snapshot_link(char *name, char *title, char *class, char *head, 295void cgit_snapshot_link(char *name, char *title, char *class, char *head,
296 char *rev, char *archivename) 296 char *rev, char *archivename)
297{ 297{
298 reporevlink("snapshot", name, title, class, head, rev, archivename); 298 reporevlink("snapshot", name, title, class, head, rev, archivename);
299} 299}
300 300
301void cgit_diff_link(char *name, char *title, char *class, char *head, 301void cgit_diff_link(char *name, char *title, char *class, char *head,
302 char *new_rev, char *old_rev, char *path) 302 char *new_rev, char *old_rev, char *path)
303{ 303{
304 char *delim; 304 char *delim;
305 305
306 delim = repolink(title, class, "diff", head, path); 306 delim = repolink(title, class, "diff", head, path);
307 if (new_rev && strcmp(new_rev, ctx.qry.head)) { 307 if (new_rev && strcmp(new_rev, ctx.qry.head)) {
308 html(delim); 308 html(delim);
309 html("id="); 309 html("id=");
310 html_attr(new_rev); 310 html_attr(new_rev);
311 delim = "&amp;"; 311 delim = "&amp;";
312 } 312 }
313 if (old_rev) { 313 if (old_rev) {
314 html(delim); 314 html(delim);
315 html("id2="); 315 html("id2=");
316 html_attr(old_rev); 316 html_attr(old_rev);
317 } 317 }
318 html("'>"); 318 html("'>");
319 html_txt(name); 319 html_txt(name);
320 html("</a>"); 320 html("</a>");
321} 321}
322 322
323void cgit_patch_link(char *name, char *title, char *class, char *head, 323void cgit_patch_link(char *name, char *title, char *class, char *head,
324 char *rev) 324 char *rev)
325{ 325{
326 reporevlink("patch", name, title, class, head, rev, NULL); 326 reporevlink("patch", name, title, class, head, rev, NULL);
327} 327}
328 328
329void cgit_object_link(struct object *obj) 329void cgit_object_link(struct object *obj)
330{ 330{
331 char *page, *arg, *url; 331 char *page, *arg, *url;
332 332
333 if (obj->type == OBJ_COMMIT) { 333 if (obj->type == OBJ_COMMIT) {
334 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, 334 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
335 ctx.qry.head, sha1_to_hex(obj->sha1)); 335 ctx.qry.head, sha1_to_hex(obj->sha1));
336 return; 336 return;
337 } else if (obj->type == OBJ_TREE) { 337 } else if (obj->type == OBJ_TREE) {
338 page = "tree"; 338 page = "tree";
339 arg = "id"; 339 arg = "id";
340 } else if (obj->type == OBJ_TAG) { 340 } else if (obj->type == OBJ_TAG) {
341 page = "tag"; 341 page = "tag";
342 arg = "id"; 342 arg = "id";
343 } else { 343 } else {
344 page = "blob"; 344 page = "blob";
345 arg = "id"; 345 arg = "id";
346 } 346 }
347 347
348 url = cgit_pageurl(ctx.qry.repo, page, 348 url = cgit_pageurl(ctx.qry.repo, page,
349 fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); 349 fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
350 html_link_open(url, NULL, NULL); 350 html_link_open(url, NULL, NULL);
351 htmlf("%s %s", typename(obj->type), 351 htmlf("%s %s", typename(obj->type),
352 sha1_to_hex(obj->sha1)); 352 sha1_to_hex(obj->sha1));
353 html_link_close(); 353 html_link_close();
354} 354}
355 355
356void cgit_print_date(time_t secs, char *format) 356void cgit_print_date(time_t secs, char *format)
357{ 357{
358 char buf[64]; 358 char buf[64];
359 struct tm *time; 359 struct tm *time;
360 360
361 if (!secs) 361 if (!secs)
362 return; 362 return;
363 time = gmtime(&secs); 363 time = gmtime(&secs);
364 strftime(buf, sizeof(buf)-1, format, time); 364 strftime(buf, sizeof(buf)-1, format, time);
365 html_txt(buf); 365 html_txt(buf);
366} 366}
367 367
368void cgit_print_age(time_t t, time_t max_relative, char *format) 368void cgit_print_age(time_t t, time_t max_relative, char *format)
369{ 369{
370 time_t now, secs; 370 time_t now, secs;
371 371
372 if (!t) 372 if (!t)
373 return; 373 return;
374 time(&now); 374 time(&now);
375 secs = now - t; 375 secs = now - t;
376 376
377 if (secs > max_relative && max_relative >= 0) { 377 if (secs > max_relative && max_relative >= 0) {
378 cgit_print_date(t, format); 378 cgit_print_date(t, format);
379 return; 379 return;
380 } 380 }
381 381
382 if (secs < TM_HOUR * 2) { 382 if (secs < TM_HOUR * 2) {
383 htmlf("<span class='age-mins'>%.0f min.</span>", 383 htmlf("<span class='age-mins'>%.0f min.</span>",
384 secs * 1.0 / TM_MIN); 384 secs * 1.0 / TM_MIN);
385 return; 385 return;
386 } 386 }
387 if (secs < TM_DAY * 2) { 387 if (secs < TM_DAY * 2) {
388 htmlf("<span class='age-hours'>%.0f hours</span>", 388 htmlf("<span class='age-hours'>%.0f hours</span>",
389 secs * 1.0 / TM_HOUR); 389 secs * 1.0 / TM_HOUR);
390 return; 390 return;
391 } 391 }
392 if (secs < TM_WEEK * 2) { 392 if (secs < TM_WEEK * 2) {
393 htmlf("<span class='age-days'>%.0f days</span>", 393 htmlf("<span class='age-days'>%.0f days</span>",
394 secs * 1.0 / TM_DAY); 394 secs * 1.0 / TM_DAY);
395 return; 395 return;
396 } 396 }
397 if (secs < TM_MONTH * 2) { 397 if (secs < TM_MONTH * 2) {
398 htmlf("<span class='age-weeks'>%.0f weeks</span>", 398 htmlf("<span class='age-weeks'>%.0f weeks</span>",
399 secs * 1.0 / TM_WEEK); 399 secs * 1.0 / TM_WEEK);
400 return; 400 return;
401 } 401 }
402 if (secs < TM_YEAR * 2) { 402 if (secs < TM_YEAR * 2) {
403 htmlf("<span class='age-months'>%.0f months</span>", 403 htmlf("<span class='age-months'>%.0f months</span>",
404 secs * 1.0 / TM_MONTH); 404 secs * 1.0 / TM_MONTH);
405 return; 405 return;
406 } 406 }
407 htmlf("<span class='age-years'>%.0f years</span>", 407 htmlf("<span class='age-years'>%.0f years</span>",
408 secs * 1.0 / TM_YEAR); 408 secs * 1.0 / TM_YEAR);
409} 409}
410 410
411void cgit_print_http_headers(struct cgit_context *ctx) 411void cgit_print_http_headers(struct cgit_context *ctx)
412{ 412{
413 if (ctx->page.mimetype && ctx->page.charset) 413 if (ctx->page.mimetype && ctx->page.charset)
414 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, 414 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
415 ctx->page.charset); 415 ctx->page.charset);
416 else if (ctx->page.mimetype) 416 else if (ctx->page.mimetype)
417 htmlf("Content-Type: %s\n", ctx->page.mimetype); 417 htmlf("Content-Type: %s\n", ctx->page.mimetype);
418 if (ctx->page.filename) 418 if (ctx->page.filename)
419 htmlf("Content-Disposition: inline; filename=\"%s\"\n", 419 htmlf("Content-Disposition: inline; filename=\"%s\"\n",
420 ctx->page.filename); 420 ctx->page.filename);
421 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); 421 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
422 htmlf("Expires: %s\n", http_date(ctx->page.expires)); 422 htmlf("Expires: %s\n", http_date(ctx->page.expires));
423 html("\n"); 423 html("\n");
424} 424}
425 425
426void cgit_print_docstart(struct cgit_context *ctx) 426void cgit_print_docstart(struct cgit_context *ctx)
427{ 427{
428 html(cgit_doctype); 428 html(cgit_doctype);
429 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 429 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
430 html("<head>\n"); 430 html("<head>\n");
431 html("<title>"); 431 html("<title>");
432 html_txt(ctx->page.title); 432 html_txt(ctx->page.title);
433 html("</title>\n"); 433 html("</title>\n");
434 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 434 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
435 if (ctx->cfg.robots && *ctx->cfg.robots) 435 if (ctx->cfg.robots && *ctx->cfg.robots)
436 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); 436 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
437 html("<link rel='stylesheet' type='text/css' href='"); 437 html("<link rel='stylesheet' type='text/css' href='");
438 html_attr(ctx->cfg.css); 438 html_attr(ctx->cfg.css);
439 html("'/>\n"); 439 html("'/>\n");
440 html("</head>\n"); 440 html("</head>\n");
441 html("<body>\n"); 441 html("<body>\n");
442} 442}
443 443
444void cgit_print_docend() 444void cgit_print_docend()
445{ 445{
446 html("</div><div class='footer'>generated "); 446 html("</div><div class='footer'>generated ");
447 cgit_print_date(time(NULL), FMT_LONGDATE); 447 cgit_print_date(time(NULL), FMT_LONGDATE);
448 htmlf(" by cgit %s", cgit_version); 448 htmlf(" by cgit %s", cgit_version);
449 html("</div>\n</body>\n</html>\n"); 449 html("</div>\n</body>\n</html>\n");
450} 450}
451 451
452int print_branch_option(const char *refname, const unsigned char *sha1, 452int print_branch_option(const char *refname, const unsigned char *sha1,
453 int flags, void *cb_data) 453 int flags, void *cb_data)
454{ 454{
455 char *name = (char *)refname; 455 char *name = (char *)refname;
456 html_option(name, name, ctx.qry.head); 456 html_option(name, name, ctx.qry.head);
457 return 0; 457 return 0;
458} 458}
459 459
460int print_archive_ref(const char *refname, const unsigned char *sha1, 460int print_archive_ref(const char *refname, const unsigned char *sha1,
461 int flags, void *cb_data) 461 int flags, void *cb_data)
462{ 462{
463 struct tag *tag; 463 struct tag *tag;
464 struct taginfo *info; 464 struct taginfo *info;
465 struct object *obj; 465 struct object *obj;
466 char buf[256], *url; 466 char buf[256], *url;
467 unsigned char fileid[20]; 467 unsigned char fileid[20];
468 int *header = (int *)cb_data; 468 int *header = (int *)cb_data;
469 469
470 if (prefixcmp(refname, "refs/archives")) 470 if (prefixcmp(refname, "refs/archives"))
471 return 0; 471 return 0;
472 strncpy(buf, refname+14, sizeof(buf)); 472 strncpy(buf, refname+14, sizeof(buf));
473 obj = parse_object(sha1); 473 obj = parse_object(sha1);
474 if (!obj) 474 if (!obj)
475 return 1; 475 return 1;
476 if (obj->type == OBJ_TAG) { 476 if (obj->type == OBJ_TAG) {
477 tag = lookup_tag(sha1); 477 tag = lookup_tag(sha1);
478 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) 478 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
479 return 0; 479 return 0;
480 hashcpy(fileid, tag->tagged->sha1); 480 hashcpy(fileid, tag->tagged->sha1);
481 } else if (obj->type != OBJ_BLOB) { 481 } else if (obj->type != OBJ_BLOB) {
482 return 0; 482 return 0;
483 } else { 483 } else {
484 hashcpy(fileid, sha1); 484 hashcpy(fileid, sha1);
485 } 485 }
486 if (!*header) { 486 if (!*header) {
487 html("<h1>download</h1>\n"); 487 html("<h1>download</h1>\n");
488 *header = 1; 488 *header = 1;
489 } 489 }
490 url = cgit_pageurl(ctx.qry.repo, "blob", 490 url = cgit_pageurl(ctx.qry.repo, "blob",
491 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid), 491 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
492 buf)); 492 buf));
493 html_link_open(url, NULL, "menu"); 493 html_link_open(url, NULL, "menu");
494 html_txt(strlpart(buf, 20)); 494 html_txt(strlpart(buf, 20));
495 html_link_close(); 495 html_link_close();
496 return 0; 496 return 0;
497} 497}
498 498
499void add_hidden_formfields(int incl_head, int incl_search, char *page) 499void add_hidden_formfields(int incl_head, int incl_search, char *page)
500{ 500{
501 char *url; 501 char *url;
502 502
503 if (!ctx.cfg.virtual_root) { 503 if (!ctx.cfg.virtual_root) {
504 url = fmt("%s/%s", ctx.qry.repo, page); 504 url = fmt("%s/%s", ctx.qry.repo, page);
505 if (ctx.qry.path) 505 if (ctx.qry.path)
506 url = fmt("%s/%s", url, ctx.qry.path); 506 url = fmt("%s/%s", url, ctx.qry.path);
507 html_hidden("url", url); 507 html_hidden("url", url);
508 } 508 }
509 509
510 if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) 510 if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
511 html_hidden("h", ctx.qry.head); 511 html_hidden("h", ctx.qry.head);
512 512
513 if (ctx.qry.sha1) 513 if (ctx.qry.sha1)
514 html_hidden("id", ctx.qry.sha1); 514 html_hidden("id", ctx.qry.sha1);
515 if (ctx.qry.sha2) 515 if (ctx.qry.sha2)
516 html_hidden("id2", ctx.qry.sha2); 516 html_hidden("id2", ctx.qry.sha2);
517 517
518 if (incl_search) { 518 if (incl_search) {
519 if (ctx.qry.grep) 519 if (ctx.qry.grep)
520 html_hidden("qt", ctx.qry.grep); 520 html_hidden("qt", ctx.qry.grep);
521 if (ctx.qry.search) 521 if (ctx.qry.search)
522 html_hidden("q", ctx.qry.search); 522 html_hidden("q", ctx.qry.search);
523 } 523 }
524} 524}
525 525
526char *hc(struct cgit_cmd *cmd, const char *page) 526char *hc(struct cgit_cmd *cmd, const char *page)
527{ 527{
528 return (strcmp(cmd->name, page) ? NULL : "active"); 528 return (strcmp(cmd->name, page) ? NULL : "active");
529} 529}
530 530
531void cgit_print_pageheader(struct cgit_context *ctx) 531void cgit_print_pageheader(struct cgit_context *ctx)
532{ 532{
533 struct cgit_cmd *cmd = cgit_get_cmd(ctx); 533 struct cgit_cmd *cmd = cgit_get_cmd(ctx);
534 534
535 html("<table id='header'>\n"); 535 html("<table id='header'>\n");
536 html("<tr>\n"); 536 html("<tr>\n");
537 html("<td class='logo' rowspan='2'><a href='"); 537 html("<td class='logo' rowspan='2'><a href='");
538 if (ctx->cfg.logo_link) 538 if (ctx->cfg.logo_link)
539 html_attr(ctx->cfg.logo_link); 539 html_attr(ctx->cfg.logo_link);
540 else 540 else
541 html_attr(cgit_rooturl()); 541 html_attr(cgit_rooturl());
542 html("'><img src='"); 542 html("'><img src='");
543 html_attr(ctx->cfg.logo); 543 html_attr(ctx->cfg.logo);
544 html("' alt='cgit logo'/></a></td>\n"); 544 html("' alt='cgit logo'/></a></td>\n");
545 545
546 html("<td class='main'>"); 546 html("<td class='main'>");
547 if (ctx->repo) { 547 if (ctx->repo) {
548 cgit_index_link("index", NULL, NULL, NULL, 0);
549 html(" : ");
548 reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"), 550 reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
549 ctx->qry.head, NULL, NULL); 551 ctx->qry.head, NULL, NULL);
550 html(" : ");
551 html_txt(ctx->qry.page);
552 html("</td><td class='form'>"); 552 html("</td><td class='form'>");
553 html("<form method='get' action=''>\n"); 553 html("<form method='get' action=''>\n");
554 add_hidden_formfields(0, 1, ctx->qry.page); 554 add_hidden_formfields(0, 1, ctx->qry.page);
555 html("<select name='h' onchange='this.form.submit();'>\n"); 555 html("<select name='h' onchange='this.form.submit();'>\n");
556 for_each_branch_ref(print_branch_option, ctx->qry.head); 556 for_each_branch_ref(print_branch_option, ctx->qry.head);
557 html("</select> "); 557 html("</select> ");
558 html("<input type='submit' name='' value='switch'/>"); 558 html("<input type='submit' name='' value='switch'/>");
559 html("</form>"); 559 html("</form>");
560 } else 560 } else
561 html_txt(ctx->cfg.root_title); 561 html_txt(ctx->cfg.root_title);
562 html("</td></tr>\n"); 562 html("</td></tr>\n");
563 563
564 html("<tr><td class='sub'"); 564 html("<tr><td class='sub'");
565 if (ctx->repo) { 565 if (ctx->repo) {
566 html(" colspan='2'>"); 566 html(" colspan='2'>");
567 html_txt(ctx->repo->desc); 567 html_txt(ctx->repo->desc);
568 } else { 568 } else {
569 html(">"); 569 html(">");
570 if (ctx->cfg.root_desc) 570 if (ctx->cfg.root_desc)
571 html_txt(ctx->cfg.root_desc); 571 html_txt(ctx->cfg.root_desc);
572 else if (ctx->cfg.index_info) 572 else if (ctx->cfg.index_info)
573 html_include(ctx->cfg.index_info); 573 html_include(ctx->cfg.index_info);
574 } 574 }
575 html("</td></tr></table>\n"); 575 html("</td></tr></table>\n");
576 576
577 html("<table class='tabs'><tr><td>\n"); 577 html("<table class='tabs'><tr><td>\n");
578 if (ctx->repo) { 578 if (ctx->repo) {
579 reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), 579 reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
580 ctx->qry.head, NULL, NULL); 580 ctx->qry.head, NULL, NULL);
581 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, 581 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
582 ctx->qry.sha1, NULL); 582 ctx->qry.sha1, NULL);
583 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, 583 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
584 NULL, NULL, 0, NULL, NULL); 584 NULL, NULL, 0, NULL, NULL);
585 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, 585 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
586 ctx->qry.sha1, NULL); 586 ctx->qry.sha1, NULL);
587 cgit_commit_link("commit", NULL, hc(cmd, "commit"), 587 cgit_commit_link("commit", NULL, hc(cmd, "commit"),
588 ctx->qry.head, ctx->qry.sha1); 588 ctx->qry.head, ctx->qry.sha1);
589 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, 589 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
590 ctx->qry.sha1, ctx->qry.sha2, NULL); 590 ctx->qry.sha1, ctx->qry.sha2, NULL);
591 if (ctx->repo->readme) 591 if (ctx->repo->readme)
592 reporevlink("about", "about", NULL, 592 reporevlink("about", "about", NULL,
593 hc(cmd, "about"), ctx->qry.head, NULL, 593 hc(cmd, "about"), ctx->qry.head, NULL,
594 NULL); 594 NULL);
595 html("</td><td class='form'>"); 595 html("</td><td class='form'>");
596 html("<form class='right' method='get' action='"); 596 html("<form class='right' method='get' action='");
597 if (ctx->cfg.virtual_root) 597 if (ctx->cfg.virtual_root)
598 html_attr(cgit_fileurl(ctx->qry.repo, "log", 598 html_attr(cgit_fileurl(ctx->qry.repo, "log",
599 ctx->qry.path, NULL)); 599 ctx->qry.path, NULL));
600 html("'>\n"); 600 html("'>\n");
601 add_hidden_formfields(1, 0, "log"); 601 add_hidden_formfields(1, 0, "log");
602 html("<select name='qt'>\n"); 602 html("<select name='qt'>\n");
603 html_option("grep", "log msg", ctx->qry.grep); 603 html_option("grep", "log msg", ctx->qry.grep);
604 html_option("author", "author", ctx->qry.grep); 604 html_option("author", "author", ctx->qry.grep);
605 html_option("committer", "committer", ctx->qry.grep); 605 html_option("committer", "committer", ctx->qry.grep);
606 html("</select>\n"); 606 html("</select>\n");
607 html("<input class='txt' type='text' size='10' name='q' value='"); 607 html("<input class='txt' type='text' size='10' name='q' value='");
608 html_attr(ctx->qry.search); 608 html_attr(ctx->qry.search);
609 html("'/>\n"); 609 html("'/>\n");
610 html("<input type='submit' value='search'/>\n"); 610 html("<input type='submit' value='search'/>\n");
611 html("</form>\n"); 611 html("</form>\n");
612 } else { 612 } else {
613 site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); 613 site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
614 if (ctx->cfg.root_readme) 614 if (ctx->cfg.root_readme)
615 site_link("about", "about", NULL, hc(cmd, "about"), 615 site_link("about", "about", NULL, hc(cmd, "about"),
616 NULL, 0); 616 NULL, 0);
617 html("</td><td class='form'>"); 617 html("</td><td class='form'>");
618 html("<form method='get' action='"); 618 html("<form method='get' action='");
619 html_attr(cgit_rooturl()); 619 html_attr(cgit_rooturl());
620 html("'>\n"); 620 html("'>\n");
621 html("<input type='text' name='q' size='10' value='"); 621 html("<input type='text' name='q' size='10' value='");
622 html_attr(ctx->qry.search); 622 html_attr(ctx->qry.search);
623 html("'/>\n"); 623 html("'/>\n");
624 html("<input type='submit' value='search'/>\n"); 624 html("<input type='submit' value='search'/>\n");
625 html("</form>"); 625 html("</form>");
626 } 626 }
627 html("</td></tr></table>\n"); 627 html("</td></tr></table>\n");
628 html("<div class='content'>"); 628 html("<div class='content'>");
629} 629}
630 630
631void cgit_print_filemode(unsigned short mode) 631void cgit_print_filemode(unsigned short mode)
632{ 632{
633 if (S_ISDIR(mode)) 633 if (S_ISDIR(mode))
634 html("d"); 634 html("d");
635 else if (S_ISLNK(mode)) 635 else if (S_ISLNK(mode))
636 html("l"); 636 html("l");
637 else if (S_ISGITLINK(mode)) 637 else if (S_ISGITLINK(mode))
638 html("m"); 638 html("m");
639 else 639 else
640 html("-"); 640 html("-");
641 html_fileperm(mode >> 6); 641 html_fileperm(mode >> 6);
642 html_fileperm(mode >> 3); 642 html_fileperm(mode >> 3);
643 html_fileperm(mode); 643 html_fileperm(mode);
644} 644}
645 645
646void cgit_print_snapshot_links(const char *repo, const char *head, 646void cgit_print_snapshot_links(const char *repo, const char *head,
647 const char *hex, int snapshots) 647 const char *hex, int snapshots)
648{ 648{
649 const struct cgit_snapshot_format* f; 649 const struct cgit_snapshot_format* f;
650 char *filename; 650 char *filename;
651 651
652 for (f = cgit_snapshot_formats; f->suffix; f++) { 652 for (f = cgit_snapshot_formats; f->suffix; f++) {
653 if (!(snapshots & f->bit)) 653 if (!(snapshots & f->bit))
654 continue; 654 continue;
655 filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, 655 filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
656 f->suffix); 656 f->suffix);
657 cgit_snapshot_link(filename, NULL, NULL, (char *)head, 657 cgit_snapshot_link(filename, NULL, NULL, (char *)head,
658 (char *)hex, filename); 658 (char *)hex, filename);
659 html("<br/>"); 659 html("<br/>");
660 } 660 }
661} 661}