-rw-r--r-- | ui-shared.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index 8a00099..6f83d2a 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -344,192 +344,197 @@ void cgit_object_link(struct object *obj) | |||
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 | ||
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 | if (ctx->cfg.favicon) { | ||
441 | html("<link rel='shortcut icon' href='"); | ||
442 | html_attr(ctx->cfg.favicon); | ||
443 | html("'/>\n"); | ||
444 | } | ||
440 | html("</head>\n"); | 445 | html("</head>\n"); |
441 | html("<body>\n"); | 446 | html("<body>\n"); |
442 | } | 447 | } |
443 | 448 | ||
444 | void cgit_print_docend() | 449 | void cgit_print_docend() |
445 | { | 450 | { |
446 | html("</div>"); | 451 | html("</div>"); |
447 | if (ctx.cfg.footer) | 452 | if (ctx.cfg.footer) |
448 | html_include(ctx.cfg.footer); | 453 | html_include(ctx.cfg.footer); |
449 | else { | 454 | else { |
450 | html("<div class='footer'>generated "); | 455 | html("<div class='footer'>generated "); |
451 | cgit_print_date(time(NULL), FMT_LONGDATE); | 456 | cgit_print_date(time(NULL), FMT_LONGDATE); |
452 | htmlf(" by cgit %s", cgit_version); | 457 | htmlf(" by cgit %s", cgit_version); |
453 | html("</div>\n"); | 458 | html("</div>\n"); |
454 | } | 459 | } |
455 | html("</body>\n</html>\n"); | 460 | html("</body>\n</html>\n"); |
456 | } | 461 | } |
457 | 462 | ||
458 | int print_branch_option(const char *refname, const unsigned char *sha1, | 463 | int print_branch_option(const char *refname, const unsigned char *sha1, |
459 | int flags, void *cb_data) | 464 | int flags, void *cb_data) |
460 | { | 465 | { |
461 | char *name = (char *)refname; | 466 | char *name = (char *)refname; |
462 | html_option(name, name, ctx.qry.head); | 467 | html_option(name, name, ctx.qry.head); |
463 | return 0; | 468 | return 0; |
464 | } | 469 | } |
465 | 470 | ||
466 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 471 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
467 | int flags, void *cb_data) | 472 | int flags, void *cb_data) |
468 | { | 473 | { |
469 | struct tag *tag; | 474 | struct tag *tag; |
470 | struct taginfo *info; | 475 | struct taginfo *info; |
471 | struct object *obj; | 476 | struct object *obj; |
472 | char buf[256], *url; | 477 | char buf[256], *url; |
473 | unsigned char fileid[20]; | 478 | unsigned char fileid[20]; |
474 | int *header = (int *)cb_data; | 479 | int *header = (int *)cb_data; |
475 | 480 | ||
476 | if (prefixcmp(refname, "refs/archives")) | 481 | if (prefixcmp(refname, "refs/archives")) |
477 | return 0; | 482 | return 0; |
478 | strncpy(buf, refname+14, sizeof(buf)); | 483 | strncpy(buf, refname+14, sizeof(buf)); |
479 | obj = parse_object(sha1); | 484 | obj = parse_object(sha1); |
480 | if (!obj) | 485 | if (!obj) |
481 | return 1; | 486 | return 1; |
482 | if (obj->type == OBJ_TAG) { | 487 | if (obj->type == OBJ_TAG) { |
483 | tag = lookup_tag(sha1); | 488 | tag = lookup_tag(sha1); |
484 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 489 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
485 | return 0; | 490 | return 0; |
486 | hashcpy(fileid, tag->tagged->sha1); | 491 | hashcpy(fileid, tag->tagged->sha1); |
487 | } else if (obj->type != OBJ_BLOB) { | 492 | } else if (obj->type != OBJ_BLOB) { |
488 | return 0; | 493 | return 0; |
489 | } else { | 494 | } else { |
490 | hashcpy(fileid, sha1); | 495 | hashcpy(fileid, sha1); |
491 | } | 496 | } |
492 | if (!*header) { | 497 | if (!*header) { |
493 | html("<h1>download</h1>\n"); | 498 | html("<h1>download</h1>\n"); |
494 | *header = 1; | 499 | *header = 1; |
495 | } | 500 | } |
496 | url = cgit_pageurl(ctx.qry.repo, "blob", | 501 | url = cgit_pageurl(ctx.qry.repo, "blob", |
497 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 502 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
498 | buf)); | 503 | buf)); |
499 | html_link_open(url, NULL, "menu"); | 504 | html_link_open(url, NULL, "menu"); |
500 | html_txt(strlpart(buf, 20)); | 505 | html_txt(strlpart(buf, 20)); |
501 | html_link_close(); | 506 | html_link_close(); |
502 | return 0; | 507 | return 0; |
503 | } | 508 | } |
504 | 509 | ||
505 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 510 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
506 | { | 511 | { |
507 | char *url; | 512 | char *url; |
508 | 513 | ||
509 | if (!ctx.cfg.virtual_root) { | 514 | if (!ctx.cfg.virtual_root) { |
510 | url = fmt("%s/%s", ctx.qry.repo, page); | 515 | url = fmt("%s/%s", ctx.qry.repo, page); |
511 | if (ctx.qry.path) | 516 | if (ctx.qry.path) |
512 | url = fmt("%s/%s", url, ctx.qry.path); | 517 | url = fmt("%s/%s", url, ctx.qry.path); |
513 | html_hidden("url", url); | 518 | html_hidden("url", url); |
514 | } | 519 | } |
515 | 520 | ||
516 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) | 521 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) |
517 | html_hidden("h", ctx.qry.head); | 522 | html_hidden("h", ctx.qry.head); |
518 | 523 | ||
519 | if (ctx.qry.sha1) | 524 | if (ctx.qry.sha1) |
520 | html_hidden("id", ctx.qry.sha1); | 525 | html_hidden("id", ctx.qry.sha1); |
521 | if (ctx.qry.sha2) | 526 | if (ctx.qry.sha2) |
522 | html_hidden("id2", ctx.qry.sha2); | 527 | html_hidden("id2", ctx.qry.sha2); |
523 | 528 | ||
524 | if (incl_search) { | 529 | if (incl_search) { |
525 | if (ctx.qry.grep) | 530 | if (ctx.qry.grep) |
526 | html_hidden("qt", ctx.qry.grep); | 531 | html_hidden("qt", ctx.qry.grep); |
527 | if (ctx.qry.search) | 532 | if (ctx.qry.search) |
528 | html_hidden("q", ctx.qry.search); | 533 | html_hidden("q", ctx.qry.search); |
529 | } | 534 | } |
530 | } | 535 | } |
531 | 536 | ||
532 | char *hc(struct cgit_cmd *cmd, const char *page) | 537 | char *hc(struct cgit_cmd *cmd, const char *page) |
533 | { | 538 | { |
534 | return (strcmp(cmd->name, page) ? NULL : "active"); | 539 | return (strcmp(cmd->name, page) ? NULL : "active"); |
535 | } | 540 | } |