author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:24 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:24 (UTC) |
commit | 6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d (patch) (unidiff) | |
tree | f03c3c3621b343493fb3c834ba3b8e4ebfe09471 /ui-shared.c | |
parent | 6f92f332e6a9ee3e16051bda9fe148607af67f65 (diff) | |
parent | a579fb02561c98a146c9e707d098d2b10aa02015 (diff) | |
download | cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.zip cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.tar.gz cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.tar.bz2 |
Merge branch 'lh/range-search'
-rw-r--r-- | ui-shared.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index c99bcec..c398d7a 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -801,64 +801,65 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
801 | if (ctx->repo) { | 801 | if (ctx->repo) { |
802 | cgit_summary_link("summary", NULL, hc(ctx, "summary"), | 802 | cgit_summary_link("summary", NULL, hc(ctx, "summary"), |
803 | ctx->qry.head); | 803 | ctx->qry.head); |
804 | cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head, | 804 | cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head, |
805 | ctx->qry.sha1, NULL); | 805 | ctx->qry.sha1, NULL); |
806 | cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head, | 806 | cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head, |
807 | NULL, ctx->qry.vpath, 0, NULL, NULL, | 807 | NULL, ctx->qry.vpath, 0, NULL, NULL, |
808 | ctx->qry.showmsg); | 808 | ctx->qry.showmsg); |
809 | cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head, | 809 | cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head, |
810 | ctx->qry.sha1, ctx->qry.vpath); | 810 | ctx->qry.sha1, ctx->qry.vpath); |
811 | cgit_commit_link("commit", NULL, hc(ctx, "commit"), | 811 | cgit_commit_link("commit", NULL, hc(ctx, "commit"), |
812 | ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0); | 812 | ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0); |
813 | cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head, | 813 | cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head, |
814 | ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0); | 814 | ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0); |
815 | if (ctx->repo->max_stats) | 815 | if (ctx->repo->max_stats) |
816 | cgit_stats_link("stats", NULL, hc(ctx, "stats"), | 816 | cgit_stats_link("stats", NULL, hc(ctx, "stats"), |
817 | ctx->qry.head, ctx->qry.vpath); | 817 | ctx->qry.head, ctx->qry.vpath); |
818 | if (ctx->repo->readme) | 818 | if (ctx->repo->readme) |
819 | reporevlink("about", "about", NULL, | 819 | reporevlink("about", "about", NULL, |
820 | hc(ctx, "about"), ctx->qry.head, NULL, | 820 | hc(ctx, "about"), ctx->qry.head, NULL, |
821 | NULL); | 821 | NULL); |
822 | html("</td><td class='form'>"); | 822 | html("</td><td class='form'>"); |
823 | html("<form class='right' method='get' action='"); | 823 | html("<form class='right' method='get' action='"); |
824 | if (ctx->cfg.virtual_root) | 824 | if (ctx->cfg.virtual_root) |
825 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 825 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
826 | ctx->qry.vpath, NULL)); | 826 | ctx->qry.vpath, NULL)); |
827 | html("'>\n"); | 827 | html("'>\n"); |
828 | cgit_add_hidden_formfields(1, 0, "log"); | 828 | cgit_add_hidden_formfields(1, 0, "log"); |
829 | html("<select name='qt'>\n"); | 829 | html("<select name='qt'>\n"); |
830 | html_option("grep", "log msg", ctx->qry.grep); | 830 | html_option("grep", "log msg", ctx->qry.grep); |
831 | html_option("author", "author", ctx->qry.grep); | 831 | html_option("author", "author", ctx->qry.grep); |
832 | html_option("committer", "committer", ctx->qry.grep); | 832 | html_option("committer", "committer", ctx->qry.grep); |
833 | html_option("range", "range", ctx->qry.grep); | ||
833 | html("</select>\n"); | 834 | html("</select>\n"); |
834 | html("<input class='txt' type='text' size='10' name='q' value='"); | 835 | html("<input class='txt' type='text' size='10' name='q' value='"); |
835 | html_attr(ctx->qry.search); | 836 | html_attr(ctx->qry.search); |
836 | html("'/>\n"); | 837 | html("'/>\n"); |
837 | html("<input type='submit' value='search'/>\n"); | 838 | html("<input type='submit' value='search'/>\n"); |
838 | html("</form>\n"); | 839 | html("</form>\n"); |
839 | } else { | 840 | } else { |
840 | site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0); | 841 | site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0); |
841 | if (ctx->cfg.root_readme) | 842 | if (ctx->cfg.root_readme) |
842 | site_link("about", "about", NULL, hc(ctx, "about"), | 843 | site_link("about", "about", NULL, hc(ctx, "about"), |
843 | NULL, 0); | 844 | NULL, 0); |
844 | html("</td><td class='form'>"); | 845 | html("</td><td class='form'>"); |
845 | html("<form method='get' action='"); | 846 | html("<form method='get' action='"); |
846 | html_attr(cgit_rooturl()); | 847 | html_attr(cgit_rooturl()); |
847 | html("'>\n"); | 848 | html("'>\n"); |
848 | html("<input type='text' name='q' size='10' value='"); | 849 | html("<input type='text' name='q' size='10' value='"); |
849 | html_attr(ctx->qry.search); | 850 | html_attr(ctx->qry.search); |
850 | html("'/>\n"); | 851 | html("'/>\n"); |
851 | html("<input type='submit' value='search'/>\n"); | 852 | html("<input type='submit' value='search'/>\n"); |
852 | html("</form>"); | 853 | html("</form>"); |
853 | } | 854 | } |
854 | html("</td></tr></table>\n"); | 855 | html("</td></tr></table>\n"); |
855 | if (ctx->qry.vpath) { | 856 | if (ctx->qry.vpath) { |
856 | html("<div class='path'>"); | 857 | html("<div class='path'>"); |
857 | html("path: "); | 858 | html("path: "); |
858 | cgit_print_path_crumbs(ctx, ctx->qry.vpath); | 859 | cgit_print_path_crumbs(ctx, ctx->qry.vpath); |
859 | html("</div>"); | 860 | html("</div>"); |
860 | } | 861 | } |
861 | html("<div class='content'>"); | 862 | html("<div class='content'>"); |
862 | } | 863 | } |
863 | 864 | ||
864 | void cgit_print_filemode(unsigned short mode) | 865 | void cgit_print_filemode(unsigned short mode) |