author | Lars Hjemli <hjemli@gmail.com> | 2008-10-06 14:00:42 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-10-06 14:00:42 (UTC) |
commit | cb1cc0d82d764051d8376281fcb556153f074c1a (patch) (unidiff) | |
tree | 55e2b1bb25f176f4e3128376a216d013daf1fd56 /ui-shared.c | |
parent | ae83752b418328a369d4a6658fc673458012e1f1 (diff) | |
download | cgit-cb1cc0d82d764051d8376281fcb556153f074c1a.zip cgit-cb1cc0d82d764051d8376281fcb556153f074c1a.tar.gz cgit-cb1cc0d82d764051d8376281fcb556153f074c1a.tar.bz2 |
ui-shared: specify correct css class for summary tab
When introducing cgit_summary_link() in 49ecbbdd I forgot to specify the
css class. This fixes it.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index 9b120ae..224e5f3 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -248,466 +248,467 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
248 | 248 | ||
249 | delim = repolink(title, class, page, head, path); | 249 | delim = repolink(title, class, page, head, path); |
250 | if (rev && strcmp(rev, ctx.qry.head)) { | 250 | if (rev && strcmp(rev, ctx.qry.head)) { |
251 | html(delim); | 251 | html(delim); |
252 | html("id="); | 252 | html("id="); |
253 | html_url_arg(rev); | 253 | html_url_arg(rev); |
254 | } | 254 | } |
255 | html("'>"); | 255 | html("'>"); |
256 | html_txt(name); | 256 | html_txt(name); |
257 | html("</a>"); | 257 | html("</a>"); |
258 | } | 258 | } |
259 | 259 | ||
260 | void cgit_summary_link(char *name, char *title, char *class, char *head) | 260 | void cgit_summary_link(char *name, char *title, char *class, char *head) |
261 | { | 261 | { |
262 | reporevlink(NULL, name, title, class, head, NULL, NULL); | 262 | reporevlink(NULL, name, title, class, head, NULL, NULL); |
263 | } | 263 | } |
264 | 264 | ||
265 | void cgit_tag_link(char *name, char *title, char *class, char *head, | 265 | void cgit_tag_link(char *name, char *title, char *class, char *head, |
266 | char *rev) | 266 | char *rev) |
267 | { | 267 | { |
268 | reporevlink("tag", name, title, class, head, rev, NULL); | 268 | reporevlink("tag", name, title, class, head, rev, NULL); |
269 | } | 269 | } |
270 | 270 | ||
271 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 271 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
272 | char *rev, char *path) | 272 | char *rev, char *path) |
273 | { | 273 | { |
274 | reporevlink("tree", name, title, class, head, rev, path); | 274 | reporevlink("tree", name, title, class, head, rev, path); |
275 | } | 275 | } |
276 | 276 | ||
277 | void cgit_plain_link(char *name, char *title, char *class, char *head, | 277 | void cgit_plain_link(char *name, char *title, char *class, char *head, |
278 | char *rev, char *path) | 278 | char *rev, char *path) |
279 | { | 279 | { |
280 | reporevlink("plain", name, title, class, head, rev, path); | 280 | reporevlink("plain", name, title, class, head, rev, path); |
281 | } | 281 | } |
282 | 282 | ||
283 | void cgit_log_link(char *name, char *title, char *class, char *head, | 283 | void cgit_log_link(char *name, char *title, char *class, char *head, |
284 | char *rev, char *path, int ofs, char *grep, char *pattern) | 284 | char *rev, char *path, int ofs, char *grep, char *pattern) |
285 | { | 285 | { |
286 | char *delim; | 286 | char *delim; |
287 | 287 | ||
288 | delim = repolink(title, class, "log", head, path); | 288 | delim = repolink(title, class, "log", head, path); |
289 | if (rev && strcmp(rev, ctx.qry.head)) { | 289 | if (rev && strcmp(rev, ctx.qry.head)) { |
290 | html(delim); | 290 | html(delim); |
291 | html("id="); | 291 | html("id="); |
292 | html_url_arg(rev); | 292 | html_url_arg(rev); |
293 | delim = "&"; | 293 | delim = "&"; |
294 | } | 294 | } |
295 | if (grep && pattern) { | 295 | if (grep && pattern) { |
296 | html(delim); | 296 | html(delim); |
297 | html("qt="); | 297 | html("qt="); |
298 | html_url_arg(grep); | 298 | html_url_arg(grep); |
299 | delim = "&"; | 299 | delim = "&"; |
300 | html(delim); | 300 | html(delim); |
301 | html("q="); | 301 | html("q="); |
302 | html_url_arg(pattern); | 302 | html_url_arg(pattern); |
303 | } | 303 | } |
304 | if (ofs > 0) { | 304 | if (ofs > 0) { |
305 | html(delim); | 305 | html(delim); |
306 | html("ofs="); | 306 | html("ofs="); |
307 | htmlf("%d", ofs); | 307 | htmlf("%d", ofs); |
308 | } | 308 | } |
309 | html("'>"); | 309 | html("'>"); |
310 | html_txt(name); | 310 | html_txt(name); |
311 | html("</a>"); | 311 | html("</a>"); |
312 | } | 312 | } |
313 | 313 | ||
314 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 314 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
315 | char *rev) | 315 | char *rev) |
316 | { | 316 | { |
317 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 317 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
318 | name[ctx.cfg.max_msg_len] = '\0'; | 318 | name[ctx.cfg.max_msg_len] = '\0'; |
319 | name[ctx.cfg.max_msg_len - 1] = '.'; | 319 | name[ctx.cfg.max_msg_len - 1] = '.'; |
320 | name[ctx.cfg.max_msg_len - 2] = '.'; | 320 | name[ctx.cfg.max_msg_len - 2] = '.'; |
321 | name[ctx.cfg.max_msg_len - 3] = '.'; | 321 | name[ctx.cfg.max_msg_len - 3] = '.'; |
322 | } | 322 | } |
323 | reporevlink("commit", name, title, class, head, rev, NULL); | 323 | reporevlink("commit", name, title, class, head, rev, NULL); |
324 | } | 324 | } |
325 | 325 | ||
326 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 326 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
327 | char *rev, char *path) | 327 | char *rev, char *path) |
328 | { | 328 | { |
329 | reporevlink("refs", name, title, class, head, rev, path); | 329 | reporevlink("refs", name, title, class, head, rev, path); |
330 | } | 330 | } |
331 | 331 | ||
332 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 332 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
333 | char *rev, char *archivename) | 333 | char *rev, char *archivename) |
334 | { | 334 | { |
335 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 335 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
336 | } | 336 | } |
337 | 337 | ||
338 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 338 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
339 | char *new_rev, char *old_rev, char *path) | 339 | char *new_rev, char *old_rev, char *path) |
340 | { | 340 | { |
341 | char *delim; | 341 | char *delim; |
342 | 342 | ||
343 | delim = repolink(title, class, "diff", head, path); | 343 | delim = repolink(title, class, "diff", head, path); |
344 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 344 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { |
345 | html(delim); | 345 | html(delim); |
346 | html("id="); | 346 | html("id="); |
347 | html_url_arg(new_rev); | 347 | html_url_arg(new_rev); |
348 | delim = "&"; | 348 | delim = "&"; |
349 | } | 349 | } |
350 | if (old_rev) { | 350 | if (old_rev) { |
351 | html(delim); | 351 | html(delim); |
352 | html("id2="); | 352 | html("id2="); |
353 | html_url_arg(old_rev); | 353 | html_url_arg(old_rev); |
354 | } | 354 | } |
355 | html("'>"); | 355 | html("'>"); |
356 | html_txt(name); | 356 | html_txt(name); |
357 | html("</a>"); | 357 | html("</a>"); |
358 | } | 358 | } |
359 | 359 | ||
360 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 360 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
361 | char *rev) | 361 | char *rev) |
362 | { | 362 | { |
363 | reporevlink("patch", name, title, class, head, rev, NULL); | 363 | reporevlink("patch", name, title, class, head, rev, NULL); |
364 | } | 364 | } |
365 | 365 | ||
366 | void cgit_object_link(struct object *obj) | 366 | void cgit_object_link(struct object *obj) |
367 | { | 367 | { |
368 | char *page, *rev, *name; | 368 | char *page, *rev, *name; |
369 | 369 | ||
370 | if (obj->type == OBJ_COMMIT) { | 370 | if (obj->type == OBJ_COMMIT) { |
371 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, | 371 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, |
372 | ctx.qry.head, sha1_to_hex(obj->sha1)); | 372 | ctx.qry.head, sha1_to_hex(obj->sha1)); |
373 | return; | 373 | return; |
374 | } else if (obj->type == OBJ_TREE) | 374 | } else if (obj->type == OBJ_TREE) |
375 | page = "tree"; | 375 | page = "tree"; |
376 | else if (obj->type == OBJ_TAG) | 376 | else if (obj->type == OBJ_TAG) |
377 | page = "tag"; | 377 | page = "tag"; |
378 | else | 378 | else |
379 | page = "blob"; | 379 | page = "blob"; |
380 | rev = sha1_to_hex(obj->sha1); | 380 | rev = sha1_to_hex(obj->sha1); |
381 | name = fmt("%s %s", typename(obj->type), rev); | 381 | name = fmt("%s %s", typename(obj->type), rev); |
382 | reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL); | 382 | reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL); |
383 | } | 383 | } |
384 | 384 | ||
385 | void cgit_print_date(time_t secs, char *format, int local_time) | 385 | void cgit_print_date(time_t secs, char *format, int local_time) |
386 | { | 386 | { |
387 | char buf[64]; | 387 | char buf[64]; |
388 | struct tm *time; | 388 | struct tm *time; |
389 | 389 | ||
390 | if (!secs) | 390 | if (!secs) |
391 | return; | 391 | return; |
392 | if(local_time) | 392 | if(local_time) |
393 | time = localtime(&secs); | 393 | time = localtime(&secs); |
394 | else | 394 | else |
395 | time = gmtime(&secs); | 395 | time = gmtime(&secs); |
396 | strftime(buf, sizeof(buf)-1, format, time); | 396 | strftime(buf, sizeof(buf)-1, format, time); |
397 | html_txt(buf); | 397 | html_txt(buf); |
398 | } | 398 | } |
399 | 399 | ||
400 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 400 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
401 | { | 401 | { |
402 | time_t now, secs; | 402 | time_t now, secs; |
403 | 403 | ||
404 | if (!t) | 404 | if (!t) |
405 | return; | 405 | return; |
406 | time(&now); | 406 | time(&now); |
407 | secs = now - t; | 407 | secs = now - t; |
408 | 408 | ||
409 | if (secs > max_relative && max_relative >= 0) { | 409 | if (secs > max_relative && max_relative >= 0) { |
410 | cgit_print_date(t, format, ctx.cfg.local_time); | 410 | cgit_print_date(t, format, ctx.cfg.local_time); |
411 | return; | 411 | return; |
412 | } | 412 | } |
413 | 413 | ||
414 | if (secs < TM_HOUR * 2) { | 414 | if (secs < TM_HOUR * 2) { |
415 | htmlf("<span class='age-mins'>%.0f min.</span>", | 415 | htmlf("<span class='age-mins'>%.0f min.</span>", |
416 | secs * 1.0 / TM_MIN); | 416 | secs * 1.0 / TM_MIN); |
417 | return; | 417 | return; |
418 | } | 418 | } |
419 | if (secs < TM_DAY * 2) { | 419 | if (secs < TM_DAY * 2) { |
420 | htmlf("<span class='age-hours'>%.0f hours</span>", | 420 | htmlf("<span class='age-hours'>%.0f hours</span>", |
421 | secs * 1.0 / TM_HOUR); | 421 | secs * 1.0 / TM_HOUR); |
422 | return; | 422 | return; |
423 | } | 423 | } |
424 | if (secs < TM_WEEK * 2) { | 424 | if (secs < TM_WEEK * 2) { |
425 | htmlf("<span class='age-days'>%.0f days</span>", | 425 | htmlf("<span class='age-days'>%.0f days</span>", |
426 | secs * 1.0 / TM_DAY); | 426 | secs * 1.0 / TM_DAY); |
427 | return; | 427 | return; |
428 | } | 428 | } |
429 | if (secs < TM_MONTH * 2) { | 429 | if (secs < TM_MONTH * 2) { |
430 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 430 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
431 | secs * 1.0 / TM_WEEK); | 431 | secs * 1.0 / TM_WEEK); |
432 | return; | 432 | return; |
433 | } | 433 | } |
434 | if (secs < TM_YEAR * 2) { | 434 | if (secs < TM_YEAR * 2) { |
435 | htmlf("<span class='age-months'>%.0f months</span>", | 435 | htmlf("<span class='age-months'>%.0f months</span>", |
436 | secs * 1.0 / TM_MONTH); | 436 | secs * 1.0 / TM_MONTH); |
437 | return; | 437 | return; |
438 | } | 438 | } |
439 | htmlf("<span class='age-years'>%.0f years</span>", | 439 | htmlf("<span class='age-years'>%.0f years</span>", |
440 | secs * 1.0 / TM_YEAR); | 440 | secs * 1.0 / TM_YEAR); |
441 | } | 441 | } |
442 | 442 | ||
443 | void cgit_print_http_headers(struct cgit_context *ctx) | 443 | void cgit_print_http_headers(struct cgit_context *ctx) |
444 | { | 444 | { |
445 | if (ctx->page.mimetype && ctx->page.charset) | 445 | if (ctx->page.mimetype && ctx->page.charset) |
446 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 446 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
447 | ctx->page.charset); | 447 | ctx->page.charset); |
448 | else if (ctx->page.mimetype) | 448 | else if (ctx->page.mimetype) |
449 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 449 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
450 | if (ctx->page.size) | 450 | if (ctx->page.size) |
451 | htmlf("Content-Length: %ld\n", ctx->page.size); | 451 | htmlf("Content-Length: %ld\n", ctx->page.size); |
452 | if (ctx->page.filename) | 452 | if (ctx->page.filename) |
453 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 453 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
454 | ctx->page.filename); | 454 | ctx->page.filename); |
455 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 455 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
456 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 456 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
457 | html("\n"); | 457 | html("\n"); |
458 | } | 458 | } |
459 | 459 | ||
460 | void cgit_print_docstart(struct cgit_context *ctx) | 460 | void cgit_print_docstart(struct cgit_context *ctx) |
461 | { | 461 | { |
462 | char *host = cgit_hosturl(); | 462 | char *host = cgit_hosturl(); |
463 | html(cgit_doctype); | 463 | html(cgit_doctype); |
464 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 464 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
465 | html("<head>\n"); | 465 | html("<head>\n"); |
466 | html("<title>"); | 466 | html("<title>"); |
467 | html_txt(ctx->page.title); | 467 | html_txt(ctx->page.title); |
468 | html("</title>\n"); | 468 | html("</title>\n"); |
469 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 469 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
470 | if (ctx->cfg.robots && *ctx->cfg.robots) | 470 | if (ctx->cfg.robots && *ctx->cfg.robots) |
471 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 471 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
472 | html("<link rel='stylesheet' type='text/css' href='"); | 472 | html("<link rel='stylesheet' type='text/css' href='"); |
473 | html_attr(ctx->cfg.css); | 473 | html_attr(ctx->cfg.css); |
474 | html("'/>\n"); | 474 | html("'/>\n"); |
475 | if (ctx->cfg.favicon) { | 475 | if (ctx->cfg.favicon) { |
476 | html("<link rel='shortcut icon' href='"); | 476 | html("<link rel='shortcut icon' href='"); |
477 | html_attr(ctx->cfg.favicon); | 477 | html_attr(ctx->cfg.favicon); |
478 | html("'/>\n"); | 478 | html("'/>\n"); |
479 | } | 479 | } |
480 | if (host && ctx->repo) { | 480 | if (host && ctx->repo) { |
481 | html("<link rel='alternate' title='Atom feed' href='http://"); | 481 | html("<link rel='alternate' title='Atom feed' href='http://"); |
482 | html_attr(cgit_hosturl()); | 482 | html_attr(cgit_hosturl()); |
483 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 483 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
484 | fmt("h=%s", ctx->qry.head))); | 484 | fmt("h=%s", ctx->qry.head))); |
485 | html("' type='application/atom+xml'/>"); | 485 | html("' type='application/atom+xml'/>"); |
486 | } | 486 | } |
487 | html("</head>\n"); | 487 | html("</head>\n"); |
488 | html("<body>\n"); | 488 | html("<body>\n"); |
489 | } | 489 | } |
490 | 490 | ||
491 | void cgit_print_docend() | 491 | void cgit_print_docend() |
492 | { | 492 | { |
493 | html("</div>"); | 493 | html("</div>"); |
494 | if (ctx.cfg.footer) | 494 | if (ctx.cfg.footer) |
495 | html_include(ctx.cfg.footer); | 495 | html_include(ctx.cfg.footer); |
496 | else { | 496 | else { |
497 | htmlf("<div class='footer'>generated by cgit %s at ", | 497 | htmlf("<div class='footer'>generated by cgit %s at ", |
498 | cgit_version); | 498 | cgit_version); |
499 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 499 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
500 | html("</div>\n"); | 500 | html("</div>\n"); |
501 | } | 501 | } |
502 | html("</body>\n</html>\n"); | 502 | html("</body>\n</html>\n"); |
503 | } | 503 | } |
504 | 504 | ||
505 | int print_branch_option(const char *refname, const unsigned char *sha1, | 505 | int print_branch_option(const char *refname, const unsigned char *sha1, |
506 | int flags, void *cb_data) | 506 | int flags, void *cb_data) |
507 | { | 507 | { |
508 | char *name = (char *)refname; | 508 | char *name = (char *)refname; |
509 | html_option(name, name, ctx.qry.head); | 509 | html_option(name, name, ctx.qry.head); |
510 | return 0; | 510 | return 0; |
511 | } | 511 | } |
512 | 512 | ||
513 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 513 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
514 | int flags, void *cb_data) | 514 | int flags, void *cb_data) |
515 | { | 515 | { |
516 | struct tag *tag; | 516 | struct tag *tag; |
517 | struct taginfo *info; | 517 | struct taginfo *info; |
518 | struct object *obj; | 518 | struct object *obj; |
519 | char buf[256], *url; | 519 | char buf[256], *url; |
520 | unsigned char fileid[20]; | 520 | unsigned char fileid[20]; |
521 | int *header = (int *)cb_data; | 521 | int *header = (int *)cb_data; |
522 | 522 | ||
523 | if (prefixcmp(refname, "refs/archives")) | 523 | if (prefixcmp(refname, "refs/archives")) |
524 | return 0; | 524 | return 0; |
525 | strncpy(buf, refname+14, sizeof(buf)); | 525 | strncpy(buf, refname+14, sizeof(buf)); |
526 | obj = parse_object(sha1); | 526 | obj = parse_object(sha1); |
527 | if (!obj) | 527 | if (!obj) |
528 | return 1; | 528 | return 1; |
529 | if (obj->type == OBJ_TAG) { | 529 | if (obj->type == OBJ_TAG) { |
530 | tag = lookup_tag(sha1); | 530 | tag = lookup_tag(sha1); |
531 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 531 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
532 | return 0; | 532 | return 0; |
533 | hashcpy(fileid, tag->tagged->sha1); | 533 | hashcpy(fileid, tag->tagged->sha1); |
534 | } else if (obj->type != OBJ_BLOB) { | 534 | } else if (obj->type != OBJ_BLOB) { |
535 | return 0; | 535 | return 0; |
536 | } else { | 536 | } else { |
537 | hashcpy(fileid, sha1); | 537 | hashcpy(fileid, sha1); |
538 | } | 538 | } |
539 | if (!*header) { | 539 | if (!*header) { |
540 | html("<h1>download</h1>\n"); | 540 | html("<h1>download</h1>\n"); |
541 | *header = 1; | 541 | *header = 1; |
542 | } | 542 | } |
543 | url = cgit_pageurl(ctx.qry.repo, "blob", | 543 | url = cgit_pageurl(ctx.qry.repo, "blob", |
544 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 544 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
545 | buf)); | 545 | buf)); |
546 | html_link_open(url, NULL, "menu"); | 546 | html_link_open(url, NULL, "menu"); |
547 | html_txt(strlpart(buf, 20)); | 547 | html_txt(strlpart(buf, 20)); |
548 | html_link_close(); | 548 | html_link_close(); |
549 | return 0; | 549 | return 0; |
550 | } | 550 | } |
551 | 551 | ||
552 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 552 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
553 | { | 553 | { |
554 | char *url; | 554 | char *url; |
555 | 555 | ||
556 | if (!ctx.cfg.virtual_root) { | 556 | if (!ctx.cfg.virtual_root) { |
557 | url = fmt("%s/%s", ctx.qry.repo, page); | 557 | url = fmt("%s/%s", ctx.qry.repo, page); |
558 | if (ctx.qry.path) | 558 | if (ctx.qry.path) |
559 | url = fmt("%s/%s", url, ctx.qry.path); | 559 | url = fmt("%s/%s", url, ctx.qry.path); |
560 | html_hidden("url", url); | 560 | html_hidden("url", url); |
561 | } | 561 | } |
562 | 562 | ||
563 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 563 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
564 | strcmp(ctx.qry.head, ctx.repo->defbranch)) | 564 | strcmp(ctx.qry.head, ctx.repo->defbranch)) |
565 | html_hidden("h", ctx.qry.head); | 565 | html_hidden("h", ctx.qry.head); |
566 | 566 | ||
567 | if (ctx.qry.sha1) | 567 | if (ctx.qry.sha1) |
568 | html_hidden("id", ctx.qry.sha1); | 568 | html_hidden("id", ctx.qry.sha1); |
569 | if (ctx.qry.sha2) | 569 | if (ctx.qry.sha2) |
570 | html_hidden("id2", ctx.qry.sha2); | 570 | html_hidden("id2", ctx.qry.sha2); |
571 | 571 | ||
572 | if (incl_search) { | 572 | if (incl_search) { |
573 | if (ctx.qry.grep) | 573 | if (ctx.qry.grep) |
574 | html_hidden("qt", ctx.qry.grep); | 574 | html_hidden("qt", ctx.qry.grep); |
575 | if (ctx.qry.search) | 575 | if (ctx.qry.search) |
576 | html_hidden("q", ctx.qry.search); | 576 | html_hidden("q", ctx.qry.search); |
577 | } | 577 | } |
578 | } | 578 | } |
579 | 579 | ||
580 | char *hc(struct cgit_cmd *cmd, const char *page) | 580 | char *hc(struct cgit_cmd *cmd, const char *page) |
581 | { | 581 | { |
582 | return (strcmp(cmd->name, page) ? NULL : "active"); | 582 | return (strcmp(cmd->name, page) ? NULL : "active"); |
583 | } | 583 | } |
584 | 584 | ||
585 | void cgit_print_pageheader(struct cgit_context *ctx) | 585 | void cgit_print_pageheader(struct cgit_context *ctx) |
586 | { | 586 | { |
587 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 587 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
588 | 588 | ||
589 | html("<table id='header'>\n"); | 589 | html("<table id='header'>\n"); |
590 | html("<tr>\n"); | 590 | html("<tr>\n"); |
591 | html("<td class='logo' rowspan='2'><a href='"); | 591 | html("<td class='logo' rowspan='2'><a href='"); |
592 | if (ctx->cfg.logo_link) | 592 | if (ctx->cfg.logo_link) |
593 | html_attr(ctx->cfg.logo_link); | 593 | html_attr(ctx->cfg.logo_link); |
594 | else | 594 | else |
595 | html_attr(cgit_rooturl()); | 595 | html_attr(cgit_rooturl()); |
596 | html("'><img src='"); | 596 | html("'><img src='"); |
597 | html_attr(ctx->cfg.logo); | 597 | html_attr(ctx->cfg.logo); |
598 | html("' alt='cgit logo'/></a></td>\n"); | 598 | html("' alt='cgit logo'/></a></td>\n"); |
599 | 599 | ||
600 | html("<td class='main'>"); | 600 | html("<td class='main'>"); |
601 | if (ctx->repo) { | 601 | if (ctx->repo) { |
602 | cgit_index_link("index", NULL, NULL, NULL, 0); | 602 | cgit_index_link("index", NULL, NULL, NULL, 0); |
603 | html(" : "); | 603 | html(" : "); |
604 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); | 604 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); |
605 | html("</td><td class='form'>"); | 605 | html("</td><td class='form'>"); |
606 | html("<form method='get' action=''>\n"); | 606 | html("<form method='get' action=''>\n"); |
607 | add_hidden_formfields(0, 1, ctx->qry.page); | 607 | add_hidden_formfields(0, 1, ctx->qry.page); |
608 | html("<select name='h' onchange='this.form.submit();'>\n"); | 608 | html("<select name='h' onchange='this.form.submit();'>\n"); |
609 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 609 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
610 | html("</select> "); | 610 | html("</select> "); |
611 | html("<input type='submit' name='' value='switch'/>"); | 611 | html("<input type='submit' name='' value='switch'/>"); |
612 | html("</form>"); | 612 | html("</form>"); |
613 | } else | 613 | } else |
614 | html_txt(ctx->cfg.root_title); | 614 | html_txt(ctx->cfg.root_title); |
615 | html("</td></tr>\n"); | 615 | html("</td></tr>\n"); |
616 | 616 | ||
617 | html("<tr><td class='sub'>"); | 617 | html("<tr><td class='sub'>"); |
618 | if (ctx->repo) { | 618 | if (ctx->repo) { |
619 | html_txt(ctx->repo->desc); | 619 | html_txt(ctx->repo->desc); |
620 | html("</td><td class='sub right'>"); | 620 | html("</td><td class='sub right'>"); |
621 | html_txt(ctx->repo->owner); | 621 | html_txt(ctx->repo->owner); |
622 | } else { | 622 | } else { |
623 | if (ctx->cfg.root_desc) | 623 | if (ctx->cfg.root_desc) |
624 | html_txt(ctx->cfg.root_desc); | 624 | html_txt(ctx->cfg.root_desc); |
625 | else if (ctx->cfg.index_info) | 625 | else if (ctx->cfg.index_info) |
626 | html_include(ctx->cfg.index_info); | 626 | html_include(ctx->cfg.index_info); |
627 | } | 627 | } |
628 | html("</td></tr></table>\n"); | 628 | html("</td></tr></table>\n"); |
629 | 629 | ||
630 | html("<table class='tabs'><tr><td>\n"); | 630 | html("<table class='tabs'><tr><td>\n"); |
631 | if (ctx->repo) { | 631 | if (ctx->repo) { |
632 | cgit_summary_link("summary", NULL, NULL, ctx->qry.head); | 632 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
633 | ctx->qry.head); | ||
633 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 634 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
634 | ctx->qry.sha1, NULL); | 635 | ctx->qry.sha1, NULL); |
635 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 636 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
636 | NULL, NULL, 0, NULL, NULL); | 637 | NULL, NULL, 0, NULL, NULL); |
637 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 638 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
638 | ctx->qry.sha1, NULL); | 639 | ctx->qry.sha1, NULL); |
639 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 640 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
640 | ctx->qry.head, ctx->qry.sha1); | 641 | ctx->qry.head, ctx->qry.sha1); |
641 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 642 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
642 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 643 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
643 | if (ctx->repo->readme) | 644 | if (ctx->repo->readme) |
644 | reporevlink("about", "about", NULL, | 645 | reporevlink("about", "about", NULL, |
645 | hc(cmd, "about"), ctx->qry.head, NULL, | 646 | hc(cmd, "about"), ctx->qry.head, NULL, |
646 | NULL); | 647 | NULL); |
647 | html("</td><td class='form'>"); | 648 | html("</td><td class='form'>"); |
648 | html("<form class='right' method='get' action='"); | 649 | html("<form class='right' method='get' action='"); |
649 | if (ctx->cfg.virtual_root) | 650 | if (ctx->cfg.virtual_root) |
650 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 651 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
651 | ctx->qry.path, NULL)); | 652 | ctx->qry.path, NULL)); |
652 | html("'>\n"); | 653 | html("'>\n"); |
653 | add_hidden_formfields(1, 0, "log"); | 654 | add_hidden_formfields(1, 0, "log"); |
654 | html("<select name='qt'>\n"); | 655 | html("<select name='qt'>\n"); |
655 | html_option("grep", "log msg", ctx->qry.grep); | 656 | html_option("grep", "log msg", ctx->qry.grep); |
656 | html_option("author", "author", ctx->qry.grep); | 657 | html_option("author", "author", ctx->qry.grep); |
657 | html_option("committer", "committer", ctx->qry.grep); | 658 | html_option("committer", "committer", ctx->qry.grep); |
658 | html("</select>\n"); | 659 | html("</select>\n"); |
659 | html("<input class='txt' type='text' size='10' name='q' value='"); | 660 | html("<input class='txt' type='text' size='10' name='q' value='"); |
660 | html_attr(ctx->qry.search); | 661 | html_attr(ctx->qry.search); |
661 | html("'/>\n"); | 662 | html("'/>\n"); |
662 | html("<input type='submit' value='search'/>\n"); | 663 | html("<input type='submit' value='search'/>\n"); |
663 | html("</form>\n"); | 664 | html("</form>\n"); |
664 | } else { | 665 | } else { |
665 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 666 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |
666 | if (ctx->cfg.root_readme) | 667 | if (ctx->cfg.root_readme) |
667 | site_link("about", "about", NULL, hc(cmd, "about"), | 668 | site_link("about", "about", NULL, hc(cmd, "about"), |
668 | NULL, 0); | 669 | NULL, 0); |
669 | html("</td><td class='form'>"); | 670 | html("</td><td class='form'>"); |
670 | html("<form method='get' action='"); | 671 | html("<form method='get' action='"); |
671 | html_attr(cgit_rooturl()); | 672 | html_attr(cgit_rooturl()); |
672 | html("'>\n"); | 673 | html("'>\n"); |
673 | html("<input type='text' name='q' size='10' value='"); | 674 | html("<input type='text' name='q' size='10' value='"); |
674 | html_attr(ctx->qry.search); | 675 | html_attr(ctx->qry.search); |
675 | html("'/>\n"); | 676 | html("'/>\n"); |
676 | html("<input type='submit' value='search'/>\n"); | 677 | html("<input type='submit' value='search'/>\n"); |
677 | html("</form>"); | 678 | html("</form>"); |
678 | } | 679 | } |
679 | html("</td></tr></table>\n"); | 680 | html("</td></tr></table>\n"); |
680 | html("<div class='content'>"); | 681 | html("<div class='content'>"); |
681 | } | 682 | } |
682 | 683 | ||
683 | void cgit_print_filemode(unsigned short mode) | 684 | void cgit_print_filemode(unsigned short mode) |
684 | { | 685 | { |
685 | if (S_ISDIR(mode)) | 686 | if (S_ISDIR(mode)) |
686 | html("d"); | 687 | html("d"); |
687 | else if (S_ISLNK(mode)) | 688 | else if (S_ISLNK(mode)) |
688 | html("l"); | 689 | html("l"); |
689 | else if (S_ISGITLINK(mode)) | 690 | else if (S_ISGITLINK(mode)) |
690 | html("m"); | 691 | html("m"); |
691 | else | 692 | else |
692 | html("-"); | 693 | html("-"); |
693 | html_fileperm(mode >> 6); | 694 | html_fileperm(mode >> 6); |
694 | html_fileperm(mode >> 3); | 695 | html_fileperm(mode >> 3); |
695 | html_fileperm(mode); | 696 | html_fileperm(mode); |
696 | } | 697 | } |
697 | 698 | ||
698 | void cgit_print_snapshot_links(const char *repo, const char *head, | 699 | void cgit_print_snapshot_links(const char *repo, const char *head, |
699 | const char *hex, int snapshots) | 700 | const char *hex, int snapshots) |
700 | { | 701 | { |
701 | const struct cgit_snapshot_format* f; | 702 | const struct cgit_snapshot_format* f; |
702 | char *filename; | 703 | char *filename; |
703 | 704 | ||
704 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 705 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
705 | if (!(snapshots & f->bit)) | 706 | if (!(snapshots & f->bit)) |
706 | continue; | 707 | continue; |
707 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 708 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, |
708 | f->suffix); | 709 | f->suffix); |
709 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, | 710 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, |
710 | (char *)hex, filename); | 711 | (char *)hex, filename); |
711 | html("<br/>"); | 712 | html("<br/>"); |
712 | } | 713 | } |
713 | } | 714 | } |