| -rw-r--r-- | cgit.c | 2 | ||||
| -rw-r--r-- | cgit.css | 19 | ||||
| -rw-r--r-- | cgit.h | 4 | ||||
| -rw-r--r-- | shared.c | 3 | ||||
| -rw-r--r-- | ui-log.c | 9 | ||||
| -rw-r--r-- | ui-shared.c | 9 | ||||
| -rw-r--r-- | ui-summary.c | 2 |
7 files changed, 9 insertions, 39 deletions
@@ -94,7 +94,7 @@ static void cgit_print_repo_page(struct cacheitem *item) switch(cgit_cmd) { case CMD_LOG: cgit_print_log(cgit_query_sha1, cgit_query_ofs, - cgit_max_commit_count, cgit_query_grep, cgit_query_search, + cgit_max_commit_count, cgit_query_search, cgit_query_path, 1); break; case CMD_TREE: @@ -144,32 +144,15 @@ td#search form { padding: 0px; } -td#search select { - font-size: 9pt; - padding: 0px; - border: solid 1px #333; - color: #333; - background-color: #fff; -} - td#search input { font-size: 9pt; padding: 0px; -} - -td#search input.txt { - width: 8em; + width: 10em; border: solid 1px #333; color: #333; background-color: #fff; } -td#search input.btn { - border: solid 1px #333; - color: #333; - background-color: #ccc; -} - div#summary { vertical-align: top; margin-bottom: 1em; @@ -158,7 +158,6 @@ extern char *cgit_querystring; extern char *cgit_query_repo; extern char *cgit_query_page; extern char *cgit_query_search; -extern char *cgit_query_grep; extern char *cgit_query_head; extern char *cgit_query_sha1; extern char *cgit_query_sha2; @@ -261,8 +260,7 @@ extern void cgit_print_tags(int maxcount); extern void cgit_print_repolist(struct cacheitem *item); extern void cgit_print_summary(); -extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, - char *pattern, char *path, int pager); +extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); extern void cgit_print_tree(const char *rev, char *path); extern void cgit_print_commit(char *hex); @@ -54,7 +54,6 @@ char *cgit_query_repo = NULL; char *cgit_query_page = NULL; char *cgit_query_head = NULL; char *cgit_query_search = NULL; -char *cgit_query_grep = NULL; char *cgit_query_sha1 = NULL; char *cgit_query_sha2 = NULL; char *cgit_query_path = NULL; @@ -233,8 +232,6 @@ void cgit_querystring_cb(const char *name, const char *value) cgit_cmd = cgit_get_cmd_index(value); } else if (!strcmp(name, "url")) { cgit_parse_url(value); - } else if (!strcmp(name, "qt")) { - cgit_query_grep = xstrdup(value); } else if (!strcmp(name, "q")) { cgit_query_search = xstrdup(value); } else if (!strcmp(name, "h")) { @@ -51,7 +51,7 @@ void print_commit(struct commit *commit) } -void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager) +void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) { struct rev_info rev; struct commit *commit; @@ -62,11 +62,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern if (!tip) argv[1] = cgit_query_head; - if (grep && pattern && (!strcmp(grep, "grep") || - !strcmp(grep, "author") || - !strcmp(grep, "committer"))) - argv[argc++] = fmt("--%s=%s", grep, pattern); - + if (grep) + argv[argc++] = fmt("--grep=%s", grep); if (path) { argv[argc++] = "--"; argv[argc++] = path; diff --git a/ui-shared.c b/ui-shared.c index 45105dc..e4bb98f 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -417,14 +417,9 @@ void cgit_print_pageheader(char *title, int show_search) html_hidden("id", cgit_query_sha1); if (cgit_query_sha2) html_hidden("id2", cgit_query_sha2); - html("<select name='qt'>"); - html_option("grep", "log msg", cgit_query_grep); - html_option("author", "author", cgit_query_grep); - html_option("committer", "committer", cgit_query_grep); - html("</select>"); - html("<input class='txt' type='text' name='q' value='"); + html("<input type='text' name='q' value='"); html_attr(cgit_query_search); - html("'/><input class='btn' type='submit' value='...'/></form>"); + html("'/></form>"); } html("</td></tr>"); html("<tr><td id='content' colspan='2'>"); diff --git a/ui-summary.c b/ui-summary.c index 04a466a..178e959 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -236,7 +236,7 @@ void cgit_print_summary() html_include(cgit_repo->readme); html("</div>"); if (cgit_summary_log > 0) - cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, NULL, 0); + cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0); html("<table class='list nowrap'>"); if (cgit_summary_log > 0) html("<tr class='nohover'><td colspan='4'> </td></tr>"); |