-rw-r--r-- | ui-shared.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui-shared.c b/ui-shared.c index 6f83d2a..209af6e 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -479,194 +479,194 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
479 | int *header = (int *)cb_data; | 479 | int *header = (int *)cb_data; |
480 | 480 | ||
481 | if (prefixcmp(refname, "refs/archives")) | 481 | if (prefixcmp(refname, "refs/archives")) |
482 | return 0; | 482 | return 0; |
483 | strncpy(buf, refname+14, sizeof(buf)); | 483 | strncpy(buf, refname+14, sizeof(buf)); |
484 | obj = parse_object(sha1); | 484 | obj = parse_object(sha1); |
485 | if (!obj) | 485 | if (!obj) |
486 | return 1; | 486 | return 1; |
487 | if (obj->type == OBJ_TAG) { | 487 | if (obj->type == OBJ_TAG) { |
488 | tag = lookup_tag(sha1); | 488 | tag = lookup_tag(sha1); |
489 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 489 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
490 | return 0; | 490 | return 0; |
491 | hashcpy(fileid, tag->tagged->sha1); | 491 | hashcpy(fileid, tag->tagged->sha1); |
492 | } else if (obj->type != OBJ_BLOB) { | 492 | } else if (obj->type != OBJ_BLOB) { |
493 | return 0; | 493 | return 0; |
494 | } else { | 494 | } else { |
495 | hashcpy(fileid, sha1); | 495 | hashcpy(fileid, sha1); |
496 | } | 496 | } |
497 | if (!*header) { | 497 | if (!*header) { |
498 | html("<h1>download</h1>\n"); | 498 | html("<h1>download</h1>\n"); |
499 | *header = 1; | 499 | *header = 1; |
500 | } | 500 | } |
501 | url = cgit_pageurl(ctx.qry.repo, "blob", | 501 | url = cgit_pageurl(ctx.qry.repo, "blob", |
502 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 502 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
503 | buf)); | 503 | buf)); |
504 | html_link_open(url, NULL, "menu"); | 504 | html_link_open(url, NULL, "menu"); |
505 | html_txt(strlpart(buf, 20)); | 505 | html_txt(strlpart(buf, 20)); |
506 | html_link_close(); | 506 | html_link_close(); |
507 | return 0; | 507 | return 0; |
508 | } | 508 | } |
509 | 509 | ||
510 | 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) |
511 | { | 511 | { |
512 | char *url; | 512 | char *url; |
513 | 513 | ||
514 | if (!ctx.cfg.virtual_root) { | 514 | if (!ctx.cfg.virtual_root) { |
515 | url = fmt("%s/%s", ctx.qry.repo, page); | 515 | url = fmt("%s/%s", ctx.qry.repo, page); |
516 | if (ctx.qry.path) | 516 | if (ctx.qry.path) |
517 | url = fmt("%s/%s", url, ctx.qry.path); | 517 | url = fmt("%s/%s", url, ctx.qry.path); |
518 | html_hidden("url", url); | 518 | html_hidden("url", url); |
519 | } | 519 | } |
520 | 520 | ||
521 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) | 521 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) |
522 | html_hidden("h", ctx.qry.head); | 522 | html_hidden("h", ctx.qry.head); |
523 | 523 | ||
524 | if (ctx.qry.sha1) | 524 | if (ctx.qry.sha1) |
525 | html_hidden("id", ctx.qry.sha1); | 525 | html_hidden("id", ctx.qry.sha1); |
526 | if (ctx.qry.sha2) | 526 | if (ctx.qry.sha2) |
527 | html_hidden("id2", ctx.qry.sha2); | 527 | html_hidden("id2", ctx.qry.sha2); |
528 | 528 | ||
529 | if (incl_search) { | 529 | if (incl_search) { |
530 | if (ctx.qry.grep) | 530 | if (ctx.qry.grep) |
531 | html_hidden("qt", ctx.qry.grep); | 531 | html_hidden("qt", ctx.qry.grep); |
532 | if (ctx.qry.search) | 532 | if (ctx.qry.search) |
533 | html_hidden("q", ctx.qry.search); | 533 | html_hidden("q", ctx.qry.search); |
534 | } | 534 | } |
535 | } | 535 | } |
536 | 536 | ||
537 | char *hc(struct cgit_cmd *cmd, const char *page) | 537 | char *hc(struct cgit_cmd *cmd, const char *page) |
538 | { | 538 | { |
539 | return (strcmp(cmd->name, page) ? NULL : "active"); | 539 | return (strcmp(cmd->name, page) ? NULL : "active"); |
540 | } | 540 | } |
541 | 541 | ||
542 | void cgit_print_pageheader(struct cgit_context *ctx) | 542 | void cgit_print_pageheader(struct cgit_context *ctx) |
543 | { | 543 | { |
544 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 544 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
545 | 545 | ||
546 | html("<table id='header'>\n"); | 546 | html("<table id='header'>\n"); |
547 | html("<tr>\n"); | 547 | html("<tr>\n"); |
548 | html("<td class='logo' rowspan='2'><a href='"); | 548 | html("<td class='logo' rowspan='2'><a href='"); |
549 | if (ctx->cfg.logo_link) | 549 | if (ctx->cfg.logo_link) |
550 | html_attr(ctx->cfg.logo_link); | 550 | html_attr(ctx->cfg.logo_link); |
551 | else | 551 | else |
552 | html_attr(cgit_rooturl()); | 552 | html_attr(cgit_rooturl()); |
553 | html("'><img src='"); | 553 | html("'><img src='"); |
554 | html_attr(ctx->cfg.logo); | 554 | html_attr(ctx->cfg.logo); |
555 | html("' alt='cgit logo'/></a></td>\n"); | 555 | html("' alt='cgit logo'/></a></td>\n"); |
556 | 556 | ||
557 | html("<td class='main'>"); | 557 | html("<td class='main'>"); |
558 | if (ctx->repo) { | 558 | if (ctx->repo) { |
559 | cgit_index_link("index", NULL, NULL, NULL, 0); | 559 | cgit_index_link("index", NULL, NULL, NULL, 0); |
560 | html(" : "); | 560 | html(" : "); |
561 | reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"), | 561 | reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"), |
562 | ctx->qry.head, NULL, NULL); | 562 | ctx->qry.head, NULL, NULL); |
563 | html("</td><td class='form'>"); | 563 | html("</td><td class='form'>"); |
564 | html("<form method='get' action=''>\n"); | 564 | html("<form method='get' action=''>\n"); |
565 | add_hidden_formfields(0, 1, ctx->qry.page); | 565 | add_hidden_formfields(0, 1, ctx->qry.page); |
566 | html("<select name='h' onchange='this.form.submit();'>\n"); | 566 | html("<select name='h' onchange='this.form.submit();'>\n"); |
567 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 567 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
568 | html("</select> "); | 568 | html("</select> "); |
569 | html("<input type='submit' name='' value='switch'/>"); | 569 | html("<input type='submit' name='' value='switch'/>"); |
570 | html("</form>"); | 570 | html("</form>"); |
571 | } else | 571 | } else |
572 | html_txt(ctx->cfg.root_title); | 572 | html_txt(ctx->cfg.root_title); |
573 | html("</td></tr>\n"); | 573 | html("</td></tr>\n"); |
574 | 574 | ||
575 | html("<tr><td class='sub'"); | 575 | html("<tr><td class='sub'>"); |
576 | if (ctx->repo) { | 576 | if (ctx->repo) { |
577 | html(" colspan='2'>"); | ||
578 | html_txt(ctx->repo->desc); | 577 | html_txt(ctx->repo->desc); |
578 | html("</td><td class='sub right'>"); | ||
579 | html_txt(ctx->repo->owner); | ||
579 | } else { | 580 | } else { |
580 | html(">"); | ||
581 | if (ctx->cfg.root_desc) | 581 | if (ctx->cfg.root_desc) |
582 | html_txt(ctx->cfg.root_desc); | 582 | html_txt(ctx->cfg.root_desc); |
583 | else if (ctx->cfg.index_info) | 583 | else if (ctx->cfg.index_info) |
584 | html_include(ctx->cfg.index_info); | 584 | html_include(ctx->cfg.index_info); |
585 | } | 585 | } |
586 | html("</td></tr></table>\n"); | 586 | html("</td></tr></table>\n"); |
587 | 587 | ||
588 | html("<table class='tabs'><tr><td>\n"); | 588 | html("<table class='tabs'><tr><td>\n"); |
589 | if (ctx->repo) { | 589 | if (ctx->repo) { |
590 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), | 590 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), |
591 | ctx->qry.head, NULL, NULL); | 591 | ctx->qry.head, NULL, NULL); |
592 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 592 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
593 | ctx->qry.sha1, NULL); | 593 | ctx->qry.sha1, NULL); |
594 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 594 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
595 | NULL, NULL, 0, NULL, NULL); | 595 | NULL, NULL, 0, NULL, NULL); |
596 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 596 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
597 | ctx->qry.sha1, NULL); | 597 | ctx->qry.sha1, NULL); |
598 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 598 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
599 | ctx->qry.head, ctx->qry.sha1); | 599 | ctx->qry.head, ctx->qry.sha1); |
600 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 600 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
601 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 601 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
602 | if (ctx->repo->readme) | 602 | if (ctx->repo->readme) |
603 | reporevlink("about", "about", NULL, | 603 | reporevlink("about", "about", NULL, |
604 | hc(cmd, "about"), ctx->qry.head, NULL, | 604 | hc(cmd, "about"), ctx->qry.head, NULL, |
605 | NULL); | 605 | NULL); |
606 | html("</td><td class='form'>"); | 606 | html("</td><td class='form'>"); |
607 | html("<form class='right' method='get' action='"); | 607 | html("<form class='right' method='get' action='"); |
608 | if (ctx->cfg.virtual_root) | 608 | if (ctx->cfg.virtual_root) |
609 | html_attr(cgit_fileurl(ctx->qry.repo, "log", | 609 | html_attr(cgit_fileurl(ctx->qry.repo, "log", |
610 | ctx->qry.path, NULL)); | 610 | ctx->qry.path, NULL)); |
611 | html("'>\n"); | 611 | html("'>\n"); |
612 | add_hidden_formfields(1, 0, "log"); | 612 | add_hidden_formfields(1, 0, "log"); |
613 | html("<select name='qt'>\n"); | 613 | html("<select name='qt'>\n"); |
614 | html_option("grep", "log msg", ctx->qry.grep); | 614 | html_option("grep", "log msg", ctx->qry.grep); |
615 | html_option("author", "author", ctx->qry.grep); | 615 | html_option("author", "author", ctx->qry.grep); |
616 | html_option("committer", "committer", ctx->qry.grep); | 616 | html_option("committer", "committer", ctx->qry.grep); |
617 | html("</select>\n"); | 617 | html("</select>\n"); |
618 | html("<input class='txt' type='text' size='10' name='q' value='"); | 618 | html("<input class='txt' type='text' size='10' name='q' value='"); |
619 | html_attr(ctx->qry.search); | 619 | html_attr(ctx->qry.search); |
620 | html("'/>\n"); | 620 | html("'/>\n"); |
621 | html("<input type='submit' value='search'/>\n"); | 621 | html("<input type='submit' value='search'/>\n"); |
622 | html("</form>\n"); | 622 | html("</form>\n"); |
623 | } else { | 623 | } else { |
624 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 624 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |
625 | if (ctx->cfg.root_readme) | 625 | if (ctx->cfg.root_readme) |
626 | site_link("about", "about", NULL, hc(cmd, "about"), | 626 | site_link("about", "about", NULL, hc(cmd, "about"), |
627 | NULL, 0); | 627 | NULL, 0); |
628 | html("</td><td class='form'>"); | 628 | html("</td><td class='form'>"); |
629 | html("<form method='get' action='"); | 629 | html("<form method='get' action='"); |
630 | html_attr(cgit_rooturl()); | 630 | html_attr(cgit_rooturl()); |
631 | html("'>\n"); | 631 | html("'>\n"); |
632 | html("<input type='text' name='q' size='10' value='"); | 632 | html("<input type='text' name='q' size='10' value='"); |
633 | html_attr(ctx->qry.search); | 633 | html_attr(ctx->qry.search); |
634 | html("'/>\n"); | 634 | html("'/>\n"); |
635 | html("<input type='submit' value='search'/>\n"); | 635 | html("<input type='submit' value='search'/>\n"); |
636 | html("</form>"); | 636 | html("</form>"); |
637 | } | 637 | } |
638 | html("</td></tr></table>\n"); | 638 | html("</td></tr></table>\n"); |
639 | html("<div class='content'>"); | 639 | html("<div class='content'>"); |
640 | } | 640 | } |
641 | 641 | ||
642 | void cgit_print_filemode(unsigned short mode) | 642 | void cgit_print_filemode(unsigned short mode) |
643 | { | 643 | { |
644 | if (S_ISDIR(mode)) | 644 | if (S_ISDIR(mode)) |
645 | html("d"); | 645 | html("d"); |
646 | else if (S_ISLNK(mode)) | 646 | else if (S_ISLNK(mode)) |
647 | html("l"); | 647 | html("l"); |
648 | else if (S_ISGITLINK(mode)) | 648 | else if (S_ISGITLINK(mode)) |
649 | html("m"); | 649 | html("m"); |
650 | else | 650 | else |
651 | html("-"); | 651 | html("-"); |
652 | html_fileperm(mode >> 6); | 652 | html_fileperm(mode >> 6); |
653 | html_fileperm(mode >> 3); | 653 | html_fileperm(mode >> 3); |
654 | html_fileperm(mode); | 654 | html_fileperm(mode); |
655 | } | 655 | } |
656 | 656 | ||
657 | void cgit_print_snapshot_links(const char *repo, const char *head, | 657 | void cgit_print_snapshot_links(const char *repo, const char *head, |
658 | const char *hex, int snapshots) | 658 | const char *hex, int snapshots) |
659 | { | 659 | { |
660 | const struct cgit_snapshot_format* f; | 660 | const struct cgit_snapshot_format* f; |
661 | char *filename; | 661 | char *filename; |
662 | 662 | ||
663 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 663 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
664 | if (!(snapshots & f->bit)) | 664 | if (!(snapshots & f->bit)) |
665 | continue; | 665 | continue; |
666 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 666 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, |
667 | f->suffix); | 667 | f->suffix); |
668 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, | 668 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, |
669 | (char *)hex, filename); | 669 | (char *)hex, filename); |
670 | html("<br/>"); | 670 | html("<br/>"); |
671 | } | 671 | } |
672 | } | 672 | } |