summaryrefslogtreecommitdiffabout
path: root/ui-shared.c
authorJohan Herland <johan@herland.net>2010-06-09 23:09:25 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-06-19 08:40:22 (UTC)
commit0e34c6d1ef32ea8f69019272fe72dbf2aeaba392 (patch) (unidiff)
treebf9bab4a08119d97071c2c7f324acab9f4e0c5f7 /ui-shared.c
parentc3f23d4571c06c979eddbd4c973163ba76c7e50f (diff)
downloadcgit-0e34c6d1ef32ea8f69019272fe72dbf2aeaba392.zip
cgit-0e34c6d1ef32ea8f69019272fe72dbf2aeaba392.tar.gz
cgit-0e34c6d1ef32ea8f69019272fe72dbf2aeaba392.tar.bz2
ui-shared: Remove needless cgit_get_cmd() call, and refactor hc() accordingly
The call to cgit_get_cmd() and the following fallback handling (to "summary" or "repoindex") in cgit_print_pageheader() is unnecessary, since the same fallback handling was already done when ctx.qry.page was set when cgit_get_cmd() was called from process_request() in cgit.c. As such, hc() can also be rewritten to simply compare the given 'page' string against ctx.qry.page. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-shared.c31
1 files changed, 12 insertions, 19 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 7d7fff0..137e469 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -636,29 +636,27 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
636 html_hidden("id2", ctx.qry.sha2); 636 html_hidden("id2", ctx.qry.sha2);
637 if (ctx.qry.showmsg) 637 if (ctx.qry.showmsg)
638 html_hidden("showmsg", "1"); 638 html_hidden("showmsg", "1");
639 639
640 if (incl_search) { 640 if (incl_search) {
641 if (ctx.qry.grep) 641 if (ctx.qry.grep)
642 html_hidden("qt", ctx.qry.grep); 642 html_hidden("qt", ctx.qry.grep);
643 if (ctx.qry.search) 643 if (ctx.qry.search)
644 html_hidden("q", ctx.qry.search); 644 html_hidden("q", ctx.qry.search);
645 } 645 }
646} 646}
647 647
648const char *fallback_cmd = "repolist"; 648static const char *hc(struct cgit_context *ctx, const char *page)
649
650char *hc(struct cgit_cmd *cmd, const char *page)
651{ 649{
652 return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); 650 return strcmp(ctx->qry.page, page) ? NULL : "active";
653} 651}
654 652
655static void print_header(struct cgit_context *ctx) 653static void print_header(struct cgit_context *ctx)
656{ 654{
657 html("<table id='header'>\n"); 655 html("<table id='header'>\n");
658 html("<tr>\n"); 656 html("<tr>\n");
659 657
660 if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) { 658 if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
661 html("<td class='logo' rowspan='2'><a href='"); 659 html("<td class='logo' rowspan='2'><a href='");
662 if (ctx->cfg.logo_link) 660 if (ctx->cfg.logo_link)
663 html_attr(ctx->cfg.logo_link); 661 html_attr(ctx->cfg.logo_link);
664 else 662 else
@@ -692,75 +690,70 @@ static void print_header(struct cgit_context *ctx)
692 html_txt(ctx->repo->owner); 690 html_txt(ctx->repo->owner);
693 } else { 691 } else {
694 if (ctx->cfg.root_desc) 692 if (ctx->cfg.root_desc)
695 html_txt(ctx->cfg.root_desc); 693 html_txt(ctx->cfg.root_desc);
696 else if (ctx->cfg.index_info) 694 else if (ctx->cfg.index_info)
697 html_include(ctx->cfg.index_info); 695 html_include(ctx->cfg.index_info);
698 } 696 }
699 html("</td></tr></table>\n"); 697 html("</td></tr></table>\n");
700} 698}
701 699
702void cgit_print_pageheader(struct cgit_context *ctx) 700void cgit_print_pageheader(struct cgit_context *ctx)
703{ 701{
704 struct cgit_cmd *cmd = cgit_get_cmd(ctx);
705
706 if (!cmd && ctx->repo)
707 fallback_cmd = "summary";
708
709 html("<div id='cgit'>"); 702 html("<div id='cgit'>");
710 if (!ctx->cfg.noheader) 703 if (!ctx->cfg.noheader)
711 print_header(ctx); 704 print_header(ctx);
712 705
713 html("<table class='tabs'><tr><td>\n"); 706 html("<table class='tabs'><tr><td>\n");
714 if (ctx->repo) { 707 if (ctx->repo) {
715 cgit_summary_link("summary", NULL, hc(cmd, "summary"), 708 cgit_summary_link("summary", NULL, hc(ctx, "summary"),
716 ctx->qry.head); 709 ctx->qry.head);
717 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, 710 cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
718 ctx->qry.sha1, NULL); 711 ctx->qry.sha1, NULL);
719 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, 712 cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
720 NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); 713 NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
721 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, 714 cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
722 ctx->qry.sha1, NULL); 715 ctx->qry.sha1, NULL);
723 cgit_commit_link("commit", NULL, hc(cmd, "commit"), 716 cgit_commit_link("commit", NULL, hc(ctx, "commit"),
724 ctx->qry.head, ctx->qry.sha1, 0); 717 ctx->qry.head, ctx->qry.sha1, 0);
725 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, 718 cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
726 ctx->qry.sha1, ctx->qry.sha2, NULL, 0); 719 ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
727 if (ctx->repo->max_stats) 720 if (ctx->repo->max_stats)
728 cgit_stats_link("stats", NULL, hc(cmd, "stats"), 721 cgit_stats_link("stats", NULL, hc(ctx, "stats"),
729 ctx->qry.head, NULL); 722 ctx->qry.head, NULL);
730 if (ctx->repo->readme) 723 if (ctx->repo->readme)
731 reporevlink("about", "about", NULL, 724 reporevlink("about", "about", NULL,
732 hc(cmd, "about"), ctx->qry.head, NULL, 725 hc(ctx, "about"), ctx->qry.head, NULL,
733 NULL); 726 NULL);
734 html("</td><td class='form'>"); 727 html("</td><td class='form'>");
735 html("<form class='right' method='get' action='"); 728 html("<form class='right' method='get' action='");
736 if (ctx->cfg.virtual_root) 729 if (ctx->cfg.virtual_root)
737 html_url_path(cgit_fileurl(ctx->qry.repo, "log", 730 html_url_path(cgit_fileurl(ctx->qry.repo, "log",
738 ctx->qry.path, NULL)); 731 ctx->qry.path, NULL));
739 html("'>\n"); 732 html("'>\n");
740 cgit_add_hidden_formfields(1, 0, "log"); 733 cgit_add_hidden_formfields(1, 0, "log");
741 html("<select name='qt'>\n"); 734 html("<select name='qt'>\n");
742 html_option("grep", "log msg", ctx->qry.grep); 735 html_option("grep", "log msg", ctx->qry.grep);
743 html_option("author", "author", ctx->qry.grep); 736 html_option("author", "author", ctx->qry.grep);
744 html_option("committer", "committer", ctx->qry.grep); 737 html_option("committer", "committer", ctx->qry.grep);
745 html("</select>\n"); 738 html("</select>\n");
746 html("<input class='txt' type='text' size='10' name='q' value='"); 739 html("<input class='txt' type='text' size='10' name='q' value='");
747 html_attr(ctx->qry.search); 740 html_attr(ctx->qry.search);
748 html("'/>\n"); 741 html("'/>\n");
749 html("<input type='submit' value='search'/>\n"); 742 html("<input type='submit' value='search'/>\n");
750 html("</form>\n"); 743 html("</form>\n");
751 } else { 744 } else {
752 site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); 745 site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
753 if (ctx->cfg.root_readme) 746 if (ctx->cfg.root_readme)
754 site_link("about", "about", NULL, hc(cmd, "about"), 747 site_link("about", "about", NULL, hc(ctx, "about"),
755 NULL, 0); 748 NULL, 0);
756 html("</td><td class='form'>"); 749 html("</td><td class='form'>");
757 html("<form method='get' action='"); 750 html("<form method='get' action='");
758 html_attr(cgit_rooturl()); 751 html_attr(cgit_rooturl());
759 html("'>\n"); 752 html("'>\n");
760 html("<input type='text' name='q' size='10' value='"); 753 html("<input type='text' name='q' size='10' value='");
761 html_attr(ctx->qry.search); 754 html_attr(ctx->qry.search);
762 html("'/>\n"); 755 html("'/>\n");
763 html("<input type='submit' value='search'/>\n"); 756 html("<input type='submit' value='search'/>\n");
764 html("</form>"); 757 html("</form>");
765 } 758 }
766 html("</td></tr></table>\n"); 759 html("</td></tr></table>\n");