author | Lars Hjemli <hjemli@gmail.com> | 2008-05-03 09:07:41 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-05-03 09:07:41 (UTC) |
commit | aa3c4486b41b8b13d0f52477f033837fc8bb9524 (patch) (unidiff) | |
tree | 9ab3b6b2b3b27ce4d3d5bdb7bd42c870aec8ed54 | |
parent | c6078b8b006bcb0671a3c1bc21dd1a2c01035a2e (diff) | |
download | cgit-aa3c4486b41b8b13d0f52477f033837fc8bb9524.zip cgit-aa3c4486b41b8b13d0f52477f033837fc8bb9524.tar.gz cgit-aa3c4486b41b8b13d0f52477f033837fc8bb9524.tar.bz2 |
Add footer with page creation time and cgit version on all pages
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.css | 6 | ||||
-rw-r--r-- | ui-shared.c | 3 |
2 files changed, 9 insertions, 0 deletions
@@ -354,96 +354,102 @@ table.diff { | |||
354 | table.diff td { | 354 | table.diff td { |
355 | font-family: monospace; | 355 | font-family: monospace; |
356 | white-space: pre; | 356 | white-space: pre; |
357 | } | 357 | } |
358 | 358 | ||
359 | table.diff td div.head { | 359 | table.diff td div.head { |
360 | font-weight: bold; | 360 | font-weight: bold; |
361 | margin-top: 1em; | 361 | margin-top: 1em; |
362 | color: black; | 362 | color: black; |
363 | } | 363 | } |
364 | 364 | ||
365 | table.diff td div.hunk { | 365 | table.diff td div.hunk { |
366 | color: #009; | 366 | color: #009; |
367 | } | 367 | } |
368 | 368 | ||
369 | table.diff td div.add { | 369 | table.diff td div.add { |
370 | color: green; | 370 | color: green; |
371 | } | 371 | } |
372 | 372 | ||
373 | table.diff td div.del { | 373 | table.diff td div.del { |
374 | color: red; | 374 | color: red; |
375 | } | 375 | } |
376 | 376 | ||
377 | .sha1 { | 377 | .sha1 { |
378 | font-family: monospace; | 378 | font-family: monospace; |
379 | font-size: 90%; | 379 | font-size: 90%; |
380 | } | 380 | } |
381 | 381 | ||
382 | .left { | 382 | .left { |
383 | text-align: left; | 383 | text-align: left; |
384 | } | 384 | } |
385 | 385 | ||
386 | .right { | 386 | .right { |
387 | text-align: right; | 387 | text-align: right; |
388 | } | 388 | } |
389 | 389 | ||
390 | table.list td.repogroup { | 390 | table.list td.repogroup { |
391 | font-style: italic; | 391 | font-style: italic; |
392 | color: #888; | 392 | color: #888; |
393 | } | 393 | } |
394 | 394 | ||
395 | a.button { | 395 | a.button { |
396 | font-size: 80%; | 396 | font-size: 80%; |
397 | padding: 0em 0.5em; | 397 | padding: 0em 0.5em; |
398 | } | 398 | } |
399 | 399 | ||
400 | a.primary { | 400 | a.primary { |
401 | font-size: 100%; | 401 | font-size: 100%; |
402 | } | 402 | } |
403 | 403 | ||
404 | a.secondary { | 404 | a.secondary { |
405 | font-size: 90%; | 405 | font-size: 90%; |
406 | } | 406 | } |
407 | 407 | ||
408 | td.toplevel-repo { | 408 | td.toplevel-repo { |
409 | 409 | ||
410 | } | 410 | } |
411 | 411 | ||
412 | table.list td.sublevel-repo { | 412 | table.list td.sublevel-repo { |
413 | padding-left: 1.5em; | 413 | padding-left: 1.5em; |
414 | } | 414 | } |
415 | 415 | ||
416 | div.pager { | 416 | div.pager { |
417 | text-align: center; | 417 | text-align: center; |
418 | margin: 1em 0em 0em 0em; | 418 | margin: 1em 0em 0em 0em; |
419 | } | 419 | } |
420 | 420 | ||
421 | div.pager a { | 421 | div.pager a { |
422 | color: #777; | 422 | color: #777; |
423 | margin: 0em 0.5em; | 423 | margin: 0em 0.5em; |
424 | } | 424 | } |
425 | 425 | ||
426 | span.age-mins { | 426 | span.age-mins { |
427 | font-weight: bold; | 427 | font-weight: bold; |
428 | color: #080; | 428 | color: #080; |
429 | } | 429 | } |
430 | 430 | ||
431 | span.age-hours { | 431 | span.age-hours { |
432 | color: #080; | 432 | color: #080; |
433 | } | 433 | } |
434 | 434 | ||
435 | span.age-days { | 435 | span.age-days { |
436 | color: #040; | 436 | color: #040; |
437 | } | 437 | } |
438 | 438 | ||
439 | span.age-weeks { | 439 | span.age-weeks { |
440 | color: #444; | 440 | color: #444; |
441 | } | 441 | } |
442 | 442 | ||
443 | span.age-months { | 443 | span.age-months { |
444 | color: #888; | 444 | color: #888; |
445 | } | 445 | } |
446 | 446 | ||
447 | span.age-years { | 447 | span.age-years { |
448 | color: #bbb; | 448 | color: #bbb; |
449 | } | 449 | } |
450 | div.footer { | ||
451 | margin-top: 0.5em; | ||
452 | text-align: center; | ||
453 | font-size: 80%; | ||
454 | color: #ccc; | ||
455 | } | ||
diff --git a/ui-shared.c b/ui-shared.c index f366354..44269a7 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -350,192 +350,195 @@ void cgit_object_link(struct object *obj) | |||
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 | ||
356 | void cgit_print_date(time_t secs, char *format) | 356 | void 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 | ||
368 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 368 | void 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 | ||
411 | void cgit_print_http_headers(struct cgit_context *ctx) | 411 | void 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 | ||
426 | void cgit_print_docstart(struct cgit_context *ctx) | 426 | void 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 | ||
444 | void cgit_print_docend() | 444 | void cgit_print_docend() |
445 | { | 445 | { |
446 | html("</div><div class='footer'>generated "); | ||
447 | cgit_print_date(time(NULL), FMT_LONGDATE); | ||
448 | htmlf(" by cgit %s", cgit_version); | ||
446 | html("</div>\n</body>\n</html>\n"); | 449 | html("</div>\n</body>\n</html>\n"); |
447 | } | 450 | } |
448 | 451 | ||
449 | int print_branch_option(const char *refname, const unsigned char *sha1, | 452 | int print_branch_option(const char *refname, const unsigned char *sha1, |
450 | int flags, void *cb_data) | 453 | int flags, void *cb_data) |
451 | { | 454 | { |
452 | char *name = (char *)refname; | 455 | char *name = (char *)refname; |
453 | html_option(name, name, ctx.qry.head); | 456 | html_option(name, name, ctx.qry.head); |
454 | return 0; | 457 | return 0; |
455 | } | 458 | } |
456 | 459 | ||
457 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 460 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
458 | int flags, void *cb_data) | 461 | int flags, void *cb_data) |
459 | { | 462 | { |
460 | struct tag *tag; | 463 | struct tag *tag; |
461 | struct taginfo *info; | 464 | struct taginfo *info; |
462 | struct object *obj; | 465 | struct object *obj; |
463 | char buf[256], *url; | 466 | char buf[256], *url; |
464 | unsigned char fileid[20]; | 467 | unsigned char fileid[20]; |
465 | int *header = (int *)cb_data; | 468 | int *header = (int *)cb_data; |
466 | 469 | ||
467 | if (prefixcmp(refname, "refs/archives")) | 470 | if (prefixcmp(refname, "refs/archives")) |
468 | return 0; | 471 | return 0; |
469 | strncpy(buf, refname+14, sizeof(buf)); | 472 | strncpy(buf, refname+14, sizeof(buf)); |
470 | obj = parse_object(sha1); | 473 | obj = parse_object(sha1); |
471 | if (!obj) | 474 | if (!obj) |
472 | return 1; | 475 | return 1; |
473 | if (obj->type == OBJ_TAG) { | 476 | if (obj->type == OBJ_TAG) { |
474 | tag = lookup_tag(sha1); | 477 | tag = lookup_tag(sha1); |
475 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 478 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
476 | return 0; | 479 | return 0; |
477 | hashcpy(fileid, tag->tagged->sha1); | 480 | hashcpy(fileid, tag->tagged->sha1); |
478 | } else if (obj->type != OBJ_BLOB) { | 481 | } else if (obj->type != OBJ_BLOB) { |
479 | return 0; | 482 | return 0; |
480 | } else { | 483 | } else { |
481 | hashcpy(fileid, sha1); | 484 | hashcpy(fileid, sha1); |
482 | } | 485 | } |
483 | if (!*header) { | 486 | if (!*header) { |
484 | html("<h1>download</h1>\n"); | 487 | html("<h1>download</h1>\n"); |
485 | *header = 1; | 488 | *header = 1; |
486 | } | 489 | } |
487 | url = cgit_pageurl(ctx.qry.repo, "blob", | 490 | url = cgit_pageurl(ctx.qry.repo, "blob", |
488 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 491 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
489 | buf)); | 492 | buf)); |
490 | html_link_open(url, NULL, "menu"); | 493 | html_link_open(url, NULL, "menu"); |
491 | html_txt(strlpart(buf, 20)); | 494 | html_txt(strlpart(buf, 20)); |
492 | html_link_close(); | 495 | html_link_close(); |
493 | return 0; | 496 | return 0; |
494 | } | 497 | } |
495 | 498 | ||
496 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 499 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
497 | { | 500 | { |
498 | char *url; | 501 | char *url; |
499 | 502 | ||
500 | if (!ctx.cfg.virtual_root) { | 503 | if (!ctx.cfg.virtual_root) { |
501 | url = fmt("%s/%s", ctx.qry.repo, page); | 504 | url = fmt("%s/%s", ctx.qry.repo, page); |
502 | if (ctx.qry.path) | 505 | if (ctx.qry.path) |
503 | url = fmt("%s/%s", url, ctx.qry.path); | 506 | url = fmt("%s/%s", url, ctx.qry.path); |
504 | html_hidden("url", url); | 507 | html_hidden("url", url); |
505 | } | 508 | } |
506 | 509 | ||
507 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) | 510 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) |
508 | html_hidden("h", ctx.qry.head); | 511 | html_hidden("h", ctx.qry.head); |
509 | 512 | ||
510 | if (ctx.qry.sha1) | 513 | if (ctx.qry.sha1) |
511 | html_hidden("id", ctx.qry.sha1); | 514 | html_hidden("id", ctx.qry.sha1); |
512 | if (ctx.qry.sha2) | 515 | if (ctx.qry.sha2) |
513 | html_hidden("id2", ctx.qry.sha2); | 516 | html_hidden("id2", ctx.qry.sha2); |
514 | 517 | ||
515 | if (incl_search) { | 518 | if (incl_search) { |
516 | if (ctx.qry.grep) | 519 | if (ctx.qry.grep) |
517 | html_hidden("qt", ctx.qry.grep); | 520 | html_hidden("qt", ctx.qry.grep); |
518 | if (ctx.qry.search) | 521 | if (ctx.qry.search) |
519 | html_hidden("q", ctx.qry.search); | 522 | html_hidden("q", ctx.qry.search); |
520 | } | 523 | } |
521 | } | 524 | } |
522 | 525 | ||
523 | char *hc(struct cgit_cmd *cmd, const char *page) | 526 | char *hc(struct cgit_cmd *cmd, const char *page) |
524 | { | 527 | { |
525 | return (strcmp(cmd->name, page) ? NULL : "active"); | 528 | return (strcmp(cmd->name, page) ? NULL : "active"); |
526 | } | 529 | } |
527 | 530 | ||
528 | void cgit_print_pageheader(struct cgit_context *ctx) | 531 | void cgit_print_pageheader(struct cgit_context *ctx) |
529 | { | 532 | { |
530 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 533 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
531 | 534 | ||
532 | html("<table id='header'>\n"); | 535 | html("<table id='header'>\n"); |
533 | html("<tr>\n"); | 536 | html("<tr>\n"); |
534 | html("<td class='logo' rowspan='2'><a href='"); | 537 | html("<td class='logo' rowspan='2'><a href='"); |
535 | if (ctx->cfg.logo_link) | 538 | if (ctx->cfg.logo_link) |
536 | html_attr(ctx->cfg.logo_link); | 539 | html_attr(ctx->cfg.logo_link); |
537 | else | 540 | else |
538 | html_attr(cgit_rooturl()); | 541 | html_attr(cgit_rooturl()); |
539 | html("'><img src='"); | 542 | html("'><img src='"); |
540 | html_attr(ctx->cfg.logo); | 543 | html_attr(ctx->cfg.logo); |
541 | html("' alt='cgit logo'/></a></td>\n"); | 544 | html("' alt='cgit logo'/></a></td>\n"); |