-rw-r--r-- | cgit.c | 4 | ||||
-rw-r--r-- | cgit.css | 5 | ||||
-rw-r--r-- | cgit.h | 4 | ||||
-rw-r--r-- | html.c | 10 | ||||
-rw-r--r-- | shared.c | 3 | ||||
-rw-r--r-- | ui-repolist.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 28 |
7 files changed, 51 insertions, 5 deletions
@@ -18,3 +18,3 @@ static void cgit_print_repo_page(struct cacheitem *item) cgit_print_docstart(title, item); - cgit_print_pageheader(title); + cgit_print_pageheader(title, 0); cgit_print_error(fmt("Unable to scan repository: %s", @@ -27,3 +27,3 @@ static void cgit_print_repo_page(struct cacheitem *item) cgit_print_docstart(title, item); - cgit_print_pageheader(title); + cgit_print_pageheader(title, 0); if (!cgit_query_page) { @@ -63,2 +63,7 @@ div#header img#logo { } + +div#header input { + float: right; + margin: 0.25em 1em; +} div#header a { @@ -57,2 +57,3 @@ extern char *cgit_query_repo; extern char *cgit_query_page; +extern char *cgit_query_search; extern char *cgit_query_head; @@ -77,2 +78,3 @@ extern void html_ntxt(int len, char *txt); extern void html_attr(char *txt); +extern void html_hidden(char *name, char *value); extern void html_link_open(char *url, char *title, char *class); @@ -100,3 +102,3 @@ extern void cgit_print_docstart(char *title, struct cacheitem *item); extern void cgit_print_docend(); -extern void cgit_print_pageheader(char *title); +extern void cgit_print_pageheader(char *title, int show_search); @@ -119,2 +119,11 @@ void html_attr(char *txt) +void html_hidden(char *name, char *value) +{ + html("<input type='hidden' name='"); + html_attr(name); + html("' value='"); + html_attr(value); + html("'/>"); +} + void html_link_open(char *url, char *title, char *class) @@ -157 +166,2 @@ void html_filemode(unsigned short mode) } + @@ -38,2 +38,3 @@ char *cgit_query_page = NULL; char *cgit_query_head = NULL; +char *cgit_query_search = NULL; char *cgit_query_sha1 = NULL; @@ -88,2 +89,4 @@ void cgit_querystring_cb(const char *name, const char *value) cgit_query_page = xstrdup(value); + } else if (!strcmp(name, "q")) { + cgit_query_search = xstrdup(value); } else if (!strcmp(name, "h")) { diff --git a/ui-repolist.c b/ui-repolist.c index 7090c12..9f12b18 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -19,3 +19,3 @@ void cgit_print_repolist(struct cacheitem *item) cgit_print_docstart(cgit_root_title, item); - cgit_print_pageheader(cgit_root_title); + cgit_print_pageheader(cgit_root_title, 0); diff --git a/ui-shared.c b/ui-shared.c index 9ec4be8..b9c1243 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -62,2 +62,14 @@ char *cgit_pageurl(const char *reponame, const char *pagename, +char *cgit_currurl() +{ + if (!cgit_virtual_root) + return "./cgit.cgi"; + else if (cgit_query_page) + return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); + else if (cgit_query_repo) + return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); + else + return fmt("%s/", cgit_virtual_root); +} + @@ -100,3 +112,3 @@ void cgit_print_docend() -void cgit_print_pageheader(char *title) +void cgit_print_pageheader(char *title, int show_search) { @@ -106,2 +118,16 @@ void cgit_print_pageheader(char *title) htmlf("</a>"); + if (show_search) { + html("<form method='get' href='"); + html_attr(cgit_currurl()); + html("'>"); + 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) |