summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-04-28 22:35:49 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-04-28 22:35:49 (UTC)
commit8062817885495b07cf70304c484e8f18c78ab2b5 (patch) (side-by-side diff)
tree5cb5c13a176ba400dcc65d65cd5b03588b41686d
parent90f64ad96d2e4490d68db71554ebce7a54206f80 (diff)
downloadcgit-8062817885495b07cf70304c484e8f18c78ab2b5.zip
cgit-8062817885495b07cf70304c484e8f18c78ab2b5.tar.gz
cgit-8062817885495b07cf70304c484e8f18c78ab2b5.tar.bz2
Move included header-file out of repolist table
When the 'index-header' option is specified in cgitrc we used to print the included file content inside the repolist table, which is bad style. This commit makes the included file be printed before the table. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-repolist.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/ui-repolist.c b/ui-repolist.c
index 98009c0..200640c 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -40,77 +40,74 @@ static void print_modtime(struct cgit_repo *repo)
path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
if (stat(path, &s) != 0)
return;
cgit_print_age(s.st_mtime, -1, NULL);
}
int is_match(struct cgit_repo *repo)
{
if (!ctx.qry.search)
return 1;
if (repo->url && strcasestr(repo->url, ctx.qry.search))
return 1;
if (repo->name && strcasestr(repo->name, ctx.qry.search))
return 1;
if (repo->desc && strcasestr(repo->desc, ctx.qry.search))
return 1;
if (repo->owner && strcasestr(repo->owner, ctx.qry.search))
return 1;
return 0;
}
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);
+ if (ctx.cfg.index_header)
+ html_include(ctx.cfg.index_header);
+
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>");