summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-02-03 12:08:21 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-02-03 12:10:26 (UTC)
commitbb3e7950c39b67e863a618b3a0e766544b65d3cb (patch) (side-by-side diff)
treeab77725e99399db25406fe46c28948922e5fc997
parent66414b68cf30f9ae7613c68833e7cbc8e93adae2 (diff)
downloadcgit-bb3e7950c39b67e863a618b3a0e766544b65d3cb.zip
cgit-bb3e7950c39b67e863a618b3a0e766544b65d3cb.tar.gz
cgit-bb3e7950c39b67e863a618b3a0e766544b65d3cb.tar.bz2
Fix search for non-virtual urls
When cgit don't use virtual urls, the current repo and page url parameters must be included in the search form as hidden input fields. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-shared.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 6300516..3322561 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -100,41 +100,47 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
html("<link rel='stylesheet' type='text/css' href='");
html_attr(cgit_css);
html("'/>\n");
html("</head>\n");
html("<body>\n");
}
void cgit_print_docend()
{
html("</td></tr></table>");
html("</body>\n</html>\n");
}
void cgit_print_pageheader(char *title, int show_search)
{
html("<table id='layout'><tr><td id='header'>");
htmlf("<a href='%s'>", cgit_logo_link);
htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
htmlf("</a>");
if (show_search) {
html("<form method='get' href='");
html_attr(cgit_currurl());
html("'>");
+ if (!cgit_virtual_root) {
+ if (cgit_query_repo)
+ html_hidden("r", cgit_query_repo);
+ if (cgit_query_page)
+ html_hidden("p", cgit_query_page);
+ }
if (cgit_query_head)
html_hidden("h", cgit_query_head);
if (cgit_query_sha1)
html_hidden("id", cgit_query_sha1);
if (cgit_query_sha2)
html_hidden("id2", cgit_query_sha2);
html("<input type='text' name='q' value='");
html_attr(cgit_query_search);
html("'/></form>");
}
if (cgit_query_repo)
htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo));
html_txt(title);
if (cgit_query_repo)
html("</a>");
html("</td></tr><tr><td id='content'>");
}