author | Matthew Metnetsky <mimetnet@vidu.us> | 2009-06-30 01:27:51 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-18 11:13:51 (UTC) |
commit | 6421dc38db02eff8d3ada93e87a2f7e5292af131 (patch) (unidiff) | |
tree | 90828ea6f44b6d59f29b2e589a5552ba50a0aa5d | |
parent | 435a1da8d1c43bff2f2ccd5649ea8510eec0b2af (diff) | |
download | cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.zip cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.tar.gz cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.tar.bz2 |
ui-shared: don't print header <img/> if there isn't a logo defined
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index de77bbf..40060ba 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -518,200 +518,203 @@ void cgit_print_docend() | |||
518 | html("</body>\n</html>\n"); | 518 | html("</body>\n</html>\n"); |
519 | } | 519 | } |
520 | 520 | ||
521 | int print_branch_option(const char *refname, const unsigned char *sha1, | 521 | int print_branch_option(const char *refname, const unsigned char *sha1, |
522 | int flags, void *cb_data) | 522 | int flags, void *cb_data) |
523 | { | 523 | { |
524 | char *name = (char *)refname; | 524 | char *name = (char *)refname; |
525 | html_option(name, name, ctx.qry.head); | 525 | html_option(name, name, ctx.qry.head); |
526 | return 0; | 526 | return 0; |
527 | } | 527 | } |
528 | 528 | ||
529 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 529 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
530 | int flags, void *cb_data) | 530 | int flags, void *cb_data) |
531 | { | 531 | { |
532 | struct tag *tag; | 532 | struct tag *tag; |
533 | struct taginfo *info; | 533 | struct taginfo *info; |
534 | struct object *obj; | 534 | struct object *obj; |
535 | char buf[256], *url; | 535 | char buf[256], *url; |
536 | unsigned char fileid[20]; | 536 | unsigned char fileid[20]; |
537 | int *header = (int *)cb_data; | 537 | int *header = (int *)cb_data; |
538 | 538 | ||
539 | if (prefixcmp(refname, "refs/archives")) | 539 | if (prefixcmp(refname, "refs/archives")) |
540 | return 0; | 540 | return 0; |
541 | strncpy(buf, refname+14, sizeof(buf)); | 541 | strncpy(buf, refname+14, sizeof(buf)); |
542 | obj = parse_object(sha1); | 542 | obj = parse_object(sha1); |
543 | if (!obj) | 543 | if (!obj) |
544 | return 1; | 544 | return 1; |
545 | if (obj->type == OBJ_TAG) { | 545 | if (obj->type == OBJ_TAG) { |
546 | tag = lookup_tag(sha1); | 546 | tag = lookup_tag(sha1); |
547 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 547 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
548 | return 0; | 548 | return 0; |
549 | hashcpy(fileid, tag->tagged->sha1); | 549 | hashcpy(fileid, tag->tagged->sha1); |
550 | } else if (obj->type != OBJ_BLOB) { | 550 | } else if (obj->type != OBJ_BLOB) { |
551 | return 0; | 551 | return 0; |
552 | } else { | 552 | } else { |
553 | hashcpy(fileid, sha1); | 553 | hashcpy(fileid, sha1); |
554 | } | 554 | } |
555 | if (!*header) { | 555 | if (!*header) { |
556 | html("<h1>download</h1>\n"); | 556 | html("<h1>download</h1>\n"); |
557 | *header = 1; | 557 | *header = 1; |
558 | } | 558 | } |
559 | url = cgit_pageurl(ctx.qry.repo, "blob", | 559 | url = cgit_pageurl(ctx.qry.repo, "blob", |
560 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 560 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
561 | buf)); | 561 | buf)); |
562 | html_link_open(url, NULL, "menu"); | 562 | html_link_open(url, NULL, "menu"); |
563 | html_txt(strlpart(buf, 20)); | 563 | html_txt(strlpart(buf, 20)); |
564 | html_link_close(); | 564 | html_link_close(); |
565 | return 0; | 565 | return 0; |
566 | } | 566 | } |
567 | 567 | ||
568 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) | 568 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) |
569 | { | 569 | { |
570 | char *url; | 570 | char *url; |
571 | 571 | ||
572 | if (!ctx.cfg.virtual_root) { | 572 | if (!ctx.cfg.virtual_root) { |
573 | url = fmt("%s/%s", ctx.qry.repo, page); | 573 | url = fmt("%s/%s", ctx.qry.repo, page); |
574 | if (ctx.qry.path) | 574 | if (ctx.qry.path) |
575 | url = fmt("%s/%s", url, ctx.qry.path); | 575 | url = fmt("%s/%s", url, ctx.qry.path); |
576 | html_hidden("url", url); | 576 | html_hidden("url", url); |
577 | } | 577 | } |
578 | 578 | ||
579 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 579 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
580 | strcmp(ctx.qry.head, ctx.repo->defbranch)) | 580 | strcmp(ctx.qry.head, ctx.repo->defbranch)) |
581 | html_hidden("h", ctx.qry.head); | 581 | html_hidden("h", ctx.qry.head); |
582 | 582 | ||
583 | if (ctx.qry.sha1) | 583 | if (ctx.qry.sha1) |
584 | html_hidden("id", ctx.qry.sha1); | 584 | html_hidden("id", ctx.qry.sha1); |
585 | if (ctx.qry.sha2) | 585 | if (ctx.qry.sha2) |
586 | html_hidden("id2", ctx.qry.sha2); | 586 | html_hidden("id2", ctx.qry.sha2); |
587 | if (ctx.qry.showmsg) | 587 | if (ctx.qry.showmsg) |
588 | html_hidden("showmsg", "1"); | 588 | html_hidden("showmsg", "1"); |
589 | 589 | ||
590 | if (incl_search) { | 590 | if (incl_search) { |
591 | if (ctx.qry.grep) | 591 | if (ctx.qry.grep) |
592 | html_hidden("qt", ctx.qry.grep); | 592 | html_hidden("qt", ctx.qry.grep); |
593 | if (ctx.qry.search) | 593 | if (ctx.qry.search) |
594 | html_hidden("q", ctx.qry.search); | 594 | html_hidden("q", ctx.qry.search); |
595 | } | 595 | } |
596 | } | 596 | } |
597 | 597 | ||
598 | const char *fallback_cmd = "repolist"; | 598 | const char *fallback_cmd = "repolist"; |
599 | 599 | ||
600 | char *hc(struct cgit_cmd *cmd, const char *page) | 600 | char *hc(struct cgit_cmd *cmd, const char *page) |
601 | { | 601 | { |
602 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); | 602 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); |
603 | } | 603 | } |
604 | 604 | ||
605 | void cgit_print_pageheader(struct cgit_context *ctx) | 605 | void cgit_print_pageheader(struct cgit_context *ctx) |
606 | { | 606 | { |
607 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 607 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
608 | 608 | ||
609 | if (!cmd && ctx->repo) | 609 | if (!cmd && ctx->repo) |
610 | fallback_cmd = "summary"; | 610 | fallback_cmd = "summary"; |
611 | 611 | ||
612 | html("<table id='header'>\n"); | 612 | html("<table id='header'>\n"); |
613 | html("<tr>\n"); | 613 | html("<tr>\n"); |
614 | |||
615 | if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) { | ||
614 | html("<td class='logo' rowspan='2'><a href='"); | 616 | html("<td class='logo' rowspan='2'><a href='"); |
615 | if (ctx->cfg.logo_link) | 617 | if (ctx->cfg.logo_link) |
616 | html_attr(ctx->cfg.logo_link); | 618 | html_attr(ctx->cfg.logo_link); |
617 | else | 619 | else |
618 | html_attr(cgit_rooturl()); | 620 | html_attr(cgit_rooturl()); |
619 | html("'><img src='"); | 621 | html("'><img src='"); |
620 | html_attr(ctx->cfg.logo); | 622 | html_attr(ctx->cfg.logo); |
621 | html("' alt='cgit logo'/></a></td>\n"); | 623 | html("' alt='cgit logo'/></a></td>\n"); |
624 | } | ||
622 | 625 | ||
623 | html("<td class='main'>"); | 626 | html("<td class='main'>"); |
624 | if (ctx->repo) { | 627 | if (ctx->repo) { |
625 | cgit_index_link("index", NULL, NULL, NULL, 0); | 628 | cgit_index_link("index", NULL, NULL, NULL, 0); |
626 | html(" : "); | 629 | html(" : "); |
627 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); | 630 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); |
628 | html("</td><td class='form'>"); | 631 | html("</td><td class='form'>"); |
629 | html("<form method='get' action=''>\n"); | 632 | html("<form method='get' action=''>\n"); |
630 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); | 633 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); |
631 | html("<select name='h' onchange='this.form.submit();'>\n"); | 634 | html("<select name='h' onchange='this.form.submit();'>\n"); |
632 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 635 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
633 | html("</select> "); | 636 | html("</select> "); |
634 | html("<input type='submit' name='' value='switch'/>"); | 637 | html("<input type='submit' name='' value='switch'/>"); |
635 | html("</form>"); | 638 | html("</form>"); |
636 | } else | 639 | } else |
637 | html_txt(ctx->cfg.root_title); | 640 | html_txt(ctx->cfg.root_title); |
638 | html("</td></tr>\n"); | 641 | html("</td></tr>\n"); |
639 | 642 | ||
640 | html("<tr><td class='sub'>"); | 643 | html("<tr><td class='sub'>"); |
641 | if (ctx->repo) { | 644 | if (ctx->repo) { |
642 | html_txt(ctx->repo->desc); | 645 | html_txt(ctx->repo->desc); |
643 | html("</td><td class='sub right'>"); | 646 | html("</td><td class='sub right'>"); |
644 | html_txt(ctx->repo->owner); | 647 | html_txt(ctx->repo->owner); |
645 | } else { | 648 | } else { |
646 | if (ctx->cfg.root_desc) | 649 | if (ctx->cfg.root_desc) |
647 | html_txt(ctx->cfg.root_desc); | 650 | html_txt(ctx->cfg.root_desc); |
648 | else if (ctx->cfg.index_info) | 651 | else if (ctx->cfg.index_info) |
649 | html_include(ctx->cfg.index_info); | 652 | html_include(ctx->cfg.index_info); |
650 | } | 653 | } |
651 | html("</td></tr></table>\n"); | 654 | html("</td></tr></table>\n"); |
652 | 655 | ||
653 | html("<table class='tabs'><tr><td>\n"); | 656 | html("<table class='tabs'><tr><td>\n"); |
654 | if (ctx->repo) { | 657 | if (ctx->repo) { |
655 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 658 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
656 | ctx->qry.head); | 659 | ctx->qry.head); |
657 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 660 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
658 | ctx->qry.sha1, NULL); | 661 | ctx->qry.sha1, NULL); |
659 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 662 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
660 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 663 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
661 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 664 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
662 | ctx->qry.sha1, NULL); | 665 | ctx->qry.sha1, NULL); |
663 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 666 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
664 | ctx->qry.head, ctx->qry.sha1); | 667 | ctx->qry.head, ctx->qry.sha1); |
665 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 668 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
666 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 669 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
667 | if (ctx->repo->max_stats) | 670 | if (ctx->repo->max_stats) |
668 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), | 671 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), |
669 | ctx->qry.head, NULL); | 672 | ctx->qry.head, NULL); |
670 | if (ctx->repo->readme) | 673 | if (ctx->repo->readme) |
671 | reporevlink("about", "about", NULL, | 674 | reporevlink("about", "about", NULL, |
672 | hc(cmd, "about"), ctx->qry.head, NULL, | 675 | hc(cmd, "about"), ctx->qry.head, NULL, |
673 | NULL); | 676 | NULL); |
674 | html("</td><td class='form'>"); | 677 | html("</td><td class='form'>"); |
675 | html("<form class='right' method='get' action='"); | 678 | html("<form class='right' method='get' action='"); |
676 | if (ctx->cfg.virtual_root) | 679 | if (ctx->cfg.virtual_root) |
677 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 680 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
678 | ctx->qry.path, NULL)); | 681 | ctx->qry.path, NULL)); |
679 | html("'>\n"); | 682 | html("'>\n"); |
680 | cgit_add_hidden_formfields(1, 0, "log"); | 683 | cgit_add_hidden_formfields(1, 0, "log"); |
681 | html("<select name='qt'>\n"); | 684 | html("<select name='qt'>\n"); |
682 | html_option("grep", "log msg", ctx->qry.grep); | 685 | html_option("grep", "log msg", ctx->qry.grep); |
683 | html_option("author", "author", ctx->qry.grep); | 686 | html_option("author", "author", ctx->qry.grep); |
684 | html_option("committer", "committer", ctx->qry.grep); | 687 | html_option("committer", "committer", ctx->qry.grep); |
685 | html("</select>\n"); | 688 | html("</select>\n"); |
686 | html("<input class='txt' type='text' size='10' name='q' value='"); | 689 | html("<input class='txt' type='text' size='10' name='q' value='"); |
687 | html_attr(ctx->qry.search); | 690 | html_attr(ctx->qry.search); |
688 | html("'/>\n"); | 691 | html("'/>\n"); |
689 | html("<input type='submit' value='search'/>\n"); | 692 | html("<input type='submit' value='search'/>\n"); |
690 | html("</form>\n"); | 693 | html("</form>\n"); |
691 | } else { | 694 | } else { |
692 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 695 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |
693 | if (ctx->cfg.root_readme) | 696 | if (ctx->cfg.root_readme) |
694 | site_link("about", "about", NULL, hc(cmd, "about"), | 697 | site_link("about", "about", NULL, hc(cmd, "about"), |
695 | NULL, 0); | 698 | NULL, 0); |
696 | html("</td><td class='form'>"); | 699 | html("</td><td class='form'>"); |
697 | html("<form method='get' action='"); | 700 | html("<form method='get' action='"); |
698 | html_attr(cgit_rooturl()); | 701 | html_attr(cgit_rooturl()); |
699 | html("'>\n"); | 702 | html("'>\n"); |
700 | html("<input type='text' name='q' size='10' value='"); | 703 | html("<input type='text' name='q' size='10' value='"); |
701 | html_attr(ctx->qry.search); | 704 | html_attr(ctx->qry.search); |
702 | html("'/>\n"); | 705 | html("'/>\n"); |
703 | html("<input type='submit' value='search'/>\n"); | 706 | html("<input type='submit' value='search'/>\n"); |
704 | html("</form>"); | 707 | html("</form>"); |
705 | } | 708 | } |
706 | html("</td></tr></table>\n"); | 709 | html("</td></tr></table>\n"); |
707 | html("<div class='content'>"); | 710 | html("<div class='content'>"); |
708 | } | 711 | } |
709 | 712 | ||
710 | void cgit_print_filemode(unsigned short mode) | 713 | void cgit_print_filemode(unsigned short mode) |
711 | { | 714 | { |
712 | if (S_ISDIR(mode)) | 715 | if (S_ISDIR(mode)) |
713 | html("d"); | 716 | html("d"); |
714 | else if (S_ISLNK(mode)) | 717 | else if (S_ISLNK(mode)) |
715 | html("l"); | 718 | html("l"); |
716 | else if (S_ISGITLINK(mode)) | 719 | else if (S_ISGITLINK(mode)) |
717 | html("m"); | 720 | html("m"); |