| -rw-r--r-- | cgit.c | 16 | ||||
| -rw-r--r-- | cgit.h | 2 | ||||
| -rw-r--r-- | cmd.c | 9 | ||||
| -rw-r--r-- | ui-repolist.c | 15 | ||||
| -rw-r--r-- | ui-repolist.h | 1 | ||||
| -rw-r--r-- | ui-shared.c | 58 | ||||
| -rw-r--r-- | ui-summary.c | 14 | ||||
| -rw-r--r-- | ui-summary.h | 1 |
8 files changed, 100 insertions, 16 deletions
@@ -20,4 +20,8 @@ void config_cb(const char *name, const char *value) if (!strcmp(name, "root-title")) ctx.cfg.root_title = xstrdup(value); + else if (!strcmp(name, "root-desc")) + ctx.cfg.root_desc = xstrdup(value); + else if (!strcmp(name, "root-readme")) + ctx.cfg.root_readme = xstrdup(value); else if (!strcmp(name, "css")) ctx.cfg.css = xstrdup(value); @@ -160,4 +164,5 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.robots = "index, nofollow"; ctx->cfg.root_title = "Git repository browser"; + ctx->cfg.root_desc = "a fast webinterface for the git dscm"; ctx->cfg.script_name = CGIT_SCRIPT_NAME; ctx->page.mimetype = "text/html"; @@ -305,5 +310,14 @@ static void process_request(struct cgit_context *ctx) } - if (cmd->want_repo && prepare_repo_cmd(ctx)) + if (cmd->want_repo && !ctx->repo) { + cgit_print_http_headers(ctx); + cgit_print_docstart(ctx); + cgit_print_pageheader(ctx); + cgit_print_error(fmt("No repository selected")); + cgit_print_docend(); + return; + } + + if (ctx->repo && prepare_repo_cmd(ctx)) return; @@ -133,4 +133,6 @@ struct cgit_config { char *robots; char *root_title; + char *root_desc; + char *root_readme; char *script_name; char *virtual_root; @@ -21,4 +21,12 @@ #include "ui-tree.h" +static void about_fn(struct cgit_context *ctx) +{ + if (ctx->repo) + cgit_print_repo_readme(); + else + cgit_print_site_readme(); +} + static void blob_fn(struct cgit_context *ctx) { @@ -85,4 +93,5 @@ struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) { static struct cgit_cmd cmds[] = { + def_cmd(about, 0, 1), def_cmd(blob, 1, 0), def_cmd(commit, 1, 1), diff --git a/ui-repolist.c b/ui-repolist.c index 98009c0..3f78e28 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -62,10 +62,4 @@ int is_match(struct cgit_repo *repo) 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>" @@ -91,4 +85,7 @@ void cgit_print_repolist() 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++) { @@ -140,2 +137,8 @@ void cgit_print_repolist() cgit_print_docend(); } + +void cgit_print_site_readme() +{ + if (ctx.cfg.root_readme) + html_include(ctx.cfg.root_readme); +} diff --git a/ui-repolist.h b/ui-repolist.h index c23e5d2..5b1e542 100644 --- a/ui-repolist.h +++ b/ui-repolist.h @@ -3,4 +3,5 @@ extern void cgit_print_repolist(); +extern void cgit_print_site_readme(); #endif /* UI_REPOLIST_H */ diff --git a/ui-shared.c b/ui-shared.c index 8a804c2..d08ede9 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -115,4 +115,47 @@ char *cgit_currurl() } +static void site_url(char *page, char *search) +{ + char *delim = "?"; + + if (ctx.cfg.virtual_root) { + html_attr(ctx.cfg.virtual_root); + if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') + html("/"); + } else + html(ctx.cfg.script_name); + + if (page) { + htmlf("?p=%s", page); + delim = "&"; + } + if (search) { + html(delim); + html("q="); + html_attr(search); + } +} + +static void site_link(char *page, char *name, char *title, char *class, + char *search) +{ + html("<a"); + if (title) { + html(" title='"); + html_attr(title); + html("'"); + } + if (class) { + html(" class='"); + html_attr(class); + html("'"); + } + html(" href='"); + site_url(page, search); + html("'>"); + html_txt(name); + html("</a>"); +} + static char *repolink(char *title, char *class, char *page, char *head, char *path) @@ -511,5 +554,8 @@ void cgit_print_pageheader(struct cgit_context *ctx) } else { html(">"); - html_txt("a fast webinterface for the git dscm"); + if (ctx->cfg.root_desc) + html_txt(ctx->cfg.root_desc); + else if (ctx->cfg.index_info) + html_include(ctx->cfg.index_info); } html("</td></tr></table>\n"); @@ -529,4 +575,8 @@ void cgit_print_pageheader(struct cgit_context *ctx) cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, ctx->qry.sha1, ctx->qry.sha2, NULL); + if (ctx->repo->readme) + reporevlink("about", "about", NULL, + hc(cmd, "about"), ctx->qry.head, NULL, + NULL); html("</td><td class='form'>"); html("<form class='right' method='get' action='"); @@ -547,7 +597,7 @@ void cgit_print_pageheader(struct cgit_context *ctx) html("</form>\n"); } else { - html("<a class='active' href='"); - html_attr(cgit_rooturl()); - html("'>index</a>\n"); + site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL); + if (ctx->cfg.root_readme) + site_link("about", "about", NULL, hc(cmd, "about"), NULL); html("</td><td class='form'>"); html("<form method='get' action='"); diff --git a/ui-summary.c b/ui-summary.c index 318148a..ad0b4a7 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -14,9 +14,4 @@ void cgit_print_summary() { - if (ctx.repo->readme) { - html("<div id='summary'>"); - html_include(ctx.repo->readme); - html("</div>"); - } html("<table summary='repository info' class='list nowrap'>"); cgit_print_branches(ctx.cfg.summary_branches); @@ -30,2 +25,11 @@ void cgit_print_summary() html("</table>"); } + +void cgit_print_repo_readme() +{ + if (ctx.repo->readme) { + html("<div id='summary'>"); + html_include(ctx.repo->readme); + html("</div>"); + } +} diff --git a/ui-summary.h b/ui-summary.h index 37aedd2..3e13039 100644 --- a/ui-summary.h +++ b/ui-summary.h @@ -3,4 +3,5 @@ extern void cgit_print_summary(); +extern void cgit_print_repo_readme(); #endif /* UI_SUMMARY_H */ |