Teach log search about --grep, --author and --committer

This makes the log searching more explicit, using a dropdown box to specify the commit field to match against. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
author: Lars Hjemli <hjemli@gmail.com> 2007-10-28 14:23:00 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2007-10-28 14:23:00 (UTC)
commit: 68ca032dbe7379f78775fb03ef34a9ad2abc409f (patch) (unidiff)
tree: 2209ae312eb932bc61b41ae9c774f6cfcc3dd372 /ui-shared.c
parent: 6ec5f36f279a85f59db2851ab476d9acd0015770 (diff)
download: cgit-68ca032dbe7379f78775fb03ef34a9ad2abc409f.zip
cgit-68ca032dbe7379f78775fb03ef34a9ad2abc409f.tar.gz
cgit-68ca032dbe7379f78775fb03ef34a9ad2abc409f.tar.bz2
1 files changed, 7 insertions, 2 deletions
diff --git a/ui-shared.c b/ui-shared.c
index e4bb98f..45105dc 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -292,148 +292,153 @@ void cgit_print_date(time_t secs, char *format)
        time = gmtime(&secs);
        strftime(buf, sizeof(buf)-1, format, time);
        html_txt(buf);
 }
 void cgit_print_age(time_t t, time_t max_relative, char *format)
 {
        time_t now, secs;
        time(&now);
        secs = now - t;
        if (secs > max_relative && max_relative >= 0) {
                cgit_print_date(t, format);
                return;
        }
        if (secs < TM_HOUR * 2) {
                htmlf("<span class='age-mins'>%.0f min.</span>",
                      secs * 1.0 / TM_MIN);
                return;
        }
        if (secs < TM_DAY * 2) {
                htmlf("<span class='age-hours'>%.0f hours</span>",
                      secs * 1.0 / TM_HOUR);
                return;
        }
        if (secs < TM_WEEK * 2) {
                htmlf("<span class='age-days'>%.0f days</span>",
                      secs * 1.0 / TM_DAY);
                return;
        }
        if (secs < TM_MONTH * 2) {
                htmlf("<span class='age-weeks'>%.0f weeks</span>",
                      secs * 1.0 / TM_WEEK);
                return;
        }
        if (secs < TM_YEAR * 2) {
                htmlf("<span class='age-months'>%.0f months</span>",
                      secs * 1.0 / TM_MONTH);
                return;
        }
        htmlf("<span class='age-years'>%.0f years</span>",
              secs * 1.0 / TM_YEAR);
 }
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
        html("Content-Type: text/html; charset=utf-8\n");
        htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
        htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                         ttl_seconds(item->ttl)));
        html("\n");
        html(cgit_doctype);
        html("<html>\n");
        html("<head>\n");
        html("<title>");
        html_txt(title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %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'>");
        html("<tr><td id='header'><a href='");
        html_attr(cgit_rooturl());
        html("'>");
        html_txt(cgit_root_title);
        html("</a></td><td id='logo'>");
        html("<a href='");
        html_attr(cgit_logo_link);
        htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo);
        html("</td></tr>");
        html("<tr><td id='crumb'>");
        if (cgit_query_repo) {
                html_txt(cgit_repo->name);
                html(" (");
                html_txt(cgit_query_head);
                html(") : &nbsp;");
                reporevlink(NULL, "summary", NULL, NULL, cgit_query_head,
                            NULL, NULL);
                html(" ");
                cgit_log_link("log", NULL, NULL, cgit_query_head,
                              cgit_query_sha1, cgit_query_path, 0);
                html(" ");
                cgit_tree_link("tree", NULL, NULL, cgit_query_head,
                               cgit_query_sha1, NULL);
                html(" ");
                cgit_commit_link("commit", NULL, NULL, cgit_query_head,
                              cgit_query_sha1);
                html(" ");
                cgit_diff_link("diff", NULL, NULL, cgit_query_head,
                               cgit_query_sha1, cgit_query_sha2,
                               cgit_query_path);
        } else {
                html_txt("Index of repositories");
        }
        html("</td>");
        html("<td id='search'>");
        if (show_search) {
                html("<form method='get' action='");
                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("<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_attr(cgit_query_search);
-                html("'/></form>");
+                html("'/><input class='btn' type='submit' value='...'/></form>");
        }
        html("</td></tr>");
        html("<tr><td id='content' colspan='2'>");
 }
 void cgit_print_snapshot_start(const char *mimetype, const char *filename,
                               struct cacheitem *item)
 {
        htmlf("Content-Type: %s\n", mimetype);
        htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
        htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
        htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                         ttl_seconds(item->ttl)));
        html("\n");
 }
 /* vim:set sw=8: */
author	Lars Hjemli <hjemli@gmail.com>	2007-10-28 14:23:00 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2007-10-28 14:23:00 (UTC)
commit	68ca032dbe7379f78775fb03ef34a9ad2abc409f (patch) (unidiff)
tree	2209ae312eb932bc61b41ae9c774f6cfcc3dd372 /ui-shared.c
parent	6ec5f36f279a85f59db2851ab476d9acd0015770 (diff)
download	cgit-68ca032dbe7379f78775fb03ef34a9ad2abc409f.zip cgit-68ca032dbe7379f78775fb03ef34a9ad2abc409f.tar.gz cgit-68ca032dbe7379f78775fb03ef34a9ad2abc409f.tar.bz2