summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-repolist.c49
-rw-r--r--ui-shared.c11
2 files changed, 47 insertions, 13 deletions
diff --git a/ui-repolist.c b/ui-repolist.c
index 9eba222..a7de453 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -23,92 +23,117 @@ time_t read_agefile(char *path)
fclose(f);
if (parse_date(buf, buf2, sizeof(buf2)))
return strtoul(buf2, NULL, 10);
else
return 0;
}
static void print_modtime(struct cgit_repo *repo)
{
char *path;
struct stat s;
path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
if (stat(path, &s) == 0) {
cgit_print_age(read_agefile(path), -1, NULL);
return;
}
path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
if (stat(path, &s) != 0)
return;
cgit_print_age(s.st_mtime, -1, NULL);
}
-void cgit_print_repolist()
+int is_match(struct cgit_repo *repo)
{
- int i, columns = 4;
- char *last_group = NULL;
-
- if (ctx.cfg.enable_index_links)
- columns++;
-
- ctx.page.title = ctx.cfg.root_title;
- cgit_print_http_headers(&ctx);
- cgit_print_docstart(&ctx);
- cgit_print_pageheader(&ctx);
+ if (!ctx.qry.search)
+ return 1;
+ if (repo->url && strstr(repo->url, ctx.qry.search))
+ return 1;
+ if (repo->name && strstr(repo->name, ctx.qry.search))
+ return 1;
+ if (repo->desc && strstr(repo->desc, ctx.qry.search))
+ return 1;
+ if (repo->owner && strstr(repo->owner, ctx.qry.search))
+ return 1;
+ return 0;
+}
- html("<table summary='repository list' class='list nowrap'>");
+void print_header(int columns)
+{
if (ctx.cfg.index_header) {
htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
columns);
html_include(ctx.cfg.index_header);
html("</td></tr>");
}
html("<tr class='nohover'>"
"<th class='left'>Name</th>"
"<th class='left'>Description</th>"
"<th class='left'>Owner</th>"
"<th class='left'>Idle</th>");
if (ctx.cfg.enable_index_links)
html("<th class='left'>Links</th>");
html("</tr>\n");
+}
+void cgit_print_repolist()
+{
+ int i, columns = 4, hits = 0, header = 0;
+ char *last_group = NULL;
+
+ if (ctx.cfg.enable_index_links)
+ columns++;
+
+ ctx.page.title = ctx.cfg.root_title;
+ cgit_print_http_headers(&ctx);
+ cgit_print_docstart(&ctx);
+ cgit_print_pageheader(&ctx);
+
+ html("<table summary='repository list' class='list nowrap'>");
for (i=0; i<cgit_repolist.count; i++) {
ctx.repo = &cgit_repolist.repos[i];
+ if (!is_match(ctx.repo))
+ continue;
+ if (!header++)
+ print_header(columns);
+ hits++;
if ((last_group == NULL && ctx.repo->group != NULL) ||
(last_group != NULL && ctx.repo->group == NULL) ||
(last_group != NULL && ctx.repo->group != NULL &&
strcmp(ctx.repo->group, last_group))) {
htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
columns);
html_txt(ctx.repo->group);
html("</td></tr>");
last_group = ctx.repo->group;
}
htmlf("<tr><td class='%s'>",
ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
html_txt(ctx.repo->name);
html_link_close();
html("</td><td>");
html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
html("</td><td>");
html_txt(ctx.repo->owner);
html("</td><td>");
print_modtime(ctx.repo);
html("</td>");
if (ctx.cfg.enable_index_links) {
html("<td>");
html_link_open(cgit_repourl(ctx.repo->url),
NULL, "button");
html("summary</a>");
cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
0, NULL, NULL);
cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
html("</td>");
}
html("</tr>\n");
}
html("</table>");
+ if (!hits)
+ cgit_print_error("No repositories found");
cgit_print_docend();
}
diff --git a/ui-shared.c b/ui-shared.c
index 782caa7..6253a90 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -534,57 +534,66 @@ void cgit_print_pageheader(struct cgit_context *ctx)
cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
ctx->qry.sha1, NULL);
cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
NULL, NULL, 0, NULL, NULL);
cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
ctx->qry.sha1, NULL);
cgit_commit_link("commit", NULL, hc(cmd, "commit"),
ctx->qry.head, ctx->qry.sha1);
cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
ctx->qry.sha1, ctx->qry.sha2, NULL);
cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
ctx->qry.sha1);
html("</td><td class='form'>");
html("<form class='right' method='get' action='");
if (ctx->cfg.virtual_root)
html_attr(cgit_fileurl(ctx->qry.repo, "log",
ctx->qry.path, NULL));
html("'>\n");
add_hidden_formfields(1, 0, "log");
html("<select name='qt'>\n");
html_option("grep", "log msg", ctx->qry.grep);
html_option("author", "author", ctx->qry.grep);
html_option("committer", "committer", ctx->qry.grep);
html("</select>\n");
- html("<input class='txt' type='text' size='8' name='q' value='");
+ html("<input class='txt' type='text' size='10' name='q' value='");
html_attr(ctx->qry.search);
html("'/>\n");
html("<input type='submit' value='search'/>\n");
html("</form>\n");
} else {
html("<a class='active' href='");
html_attr(cgit_rooturl());
html("'>index</a>\n");
+ html("</td><td class='form'>");
+ html("<form method='get' action='");
+ html_attr(cgit_rooturl());
+ html("'>\n");
+ html("<input type='text' name='q' size='10' value='");
+ html_attr(ctx->qry.search);
+ html("'/>\n");
+ html("<input type='submit' value='search'/>\n");
+ html("</form>");
}
html("</td></tr></table>\n");
html("<div class='content'>");
}
void cgit_print_filemode(unsigned short mode)
{
if (S_ISDIR(mode))
html("d");
else if (S_ISLNK(mode))
html("l");
else if (S_ISGITLINK(mode))
html("m");
else
html("-");
html_fileperm(mode >> 6);
html_fileperm(mode >> 3);
html_fileperm(mode);
}
void cgit_print_snapshot_links(const char *repo, const char *head,
const char *hex, int snapshots)
{
const struct cgit_snapshot_format* f;