-rw-r--r-- | cgit.c | 3 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-shared.c | 5 |
3 files changed, 8 insertions, 1 deletions
@@ -14,16 +14,18 @@ | |||
14 | #include "ui-shared.h" | 14 | #include "ui-shared.h" |
15 | 15 | ||
16 | const char *cgit_version = CGIT_VERSION; | 16 | const char *cgit_version = CGIT_VERSION; |
17 | 17 | ||
18 | void config_cb(const char *name, const char *value) | 18 | void config_cb(const char *name, const char *value) |
19 | { | 19 | { |
20 | if (!strcmp(name, "root-title")) | 20 | if (!strcmp(name, "root-title")) |
21 | ctx.cfg.root_title = xstrdup(value); | 21 | ctx.cfg.root_title = xstrdup(value); |
22 | else if (!strcmp(name, "root-desc")) | ||
23 | ctx.cfg.root_desc = xstrdup(value); | ||
22 | else if (!strcmp(name, "css")) | 24 | else if (!strcmp(name, "css")) |
23 | ctx.cfg.css = xstrdup(value); | 25 | ctx.cfg.css = xstrdup(value); |
24 | else if (!strcmp(name, "logo")) | 26 | else if (!strcmp(name, "logo")) |
25 | ctx.cfg.logo = xstrdup(value); | 27 | ctx.cfg.logo = xstrdup(value); |
26 | else if (!strcmp(name, "index-header")) | 28 | else if (!strcmp(name, "index-header")) |
27 | ctx.cfg.index_header = xstrdup(value); | 29 | ctx.cfg.index_header = xstrdup(value); |
28 | else if (!strcmp(name, "index-info")) | 30 | else if (!strcmp(name, "index-info")) |
29 | ctx.cfg.index_info = xstrdup(value); | 31 | ctx.cfg.index_info = xstrdup(value); |
@@ -154,16 +156,17 @@ static void prepare_context(struct cgit_context *ctx) | |||
154 | ctx->cfg.max_commit_count = 50; | 156 | ctx->cfg.max_commit_count = 50; |
155 | ctx->cfg.max_lock_attempts = 5; | 157 | ctx->cfg.max_lock_attempts = 5; |
156 | ctx->cfg.max_msg_len = 60; | 158 | ctx->cfg.max_msg_len = 60; |
157 | ctx->cfg.max_repodesc_len = 60; | 159 | ctx->cfg.max_repodesc_len = 60; |
158 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 160 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
159 | ctx->cfg.renamelimit = -1; | 161 | ctx->cfg.renamelimit = -1; |
160 | ctx->cfg.robots = "index, nofollow"; | 162 | ctx->cfg.robots = "index, nofollow"; |
161 | ctx->cfg.root_title = "Git repository browser"; | 163 | ctx->cfg.root_title = "Git repository browser"; |
164 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | ||
162 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 165 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
163 | ctx->page.mimetype = "text/html"; | 166 | ctx->page.mimetype = "text/html"; |
164 | ctx->page.charset = PAGE_ENCODING; | 167 | ctx->page.charset = PAGE_ENCODING; |
165 | ctx->page.filename = NULL; | 168 | ctx->page.filename = NULL; |
166 | } | 169 | } |
167 | 170 | ||
168 | static int cgit_prepare_cache(struct cacheitem *item) | 171 | static int cgit_prepare_cache(struct cacheitem *item) |
169 | { | 172 | { |
@@ -127,16 +127,17 @@ struct cgit_config { | |||
127 | char *index_header; | 127 | char *index_header; |
128 | char *index_info; | 128 | char *index_info; |
129 | char *logo; | 129 | char *logo; |
130 | char *logo_link; | 130 | char *logo_link; |
131 | char *module_link; | 131 | char *module_link; |
132 | char *repo_group; | 132 | char *repo_group; |
133 | char *robots; | 133 | char *robots; |
134 | char *root_title; | 134 | char *root_title; |
135 | char *root_desc; | ||
135 | char *script_name; | 136 | char *script_name; |
136 | char *virtual_root; | 137 | char *virtual_root; |
137 | int cache_dynamic_ttl; | 138 | int cache_dynamic_ttl; |
138 | int cache_max_create_time; | 139 | int cache_max_create_time; |
139 | int cache_repo_ttl; | 140 | int cache_repo_ttl; |
140 | int cache_root_ttl; | 141 | int cache_root_ttl; |
141 | int cache_static_ttl; | 142 | int cache_static_ttl; |
142 | int enable_index_links; | 143 | int enable_index_links; |
diff --git a/ui-shared.c b/ui-shared.c index 8a804c2..83758f7 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -505,17 +505,20 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
505 | html("</td></tr>\n"); | 505 | html("</td></tr>\n"); |
506 | 506 | ||
507 | html("<tr><td class='sub'"); | 507 | html("<tr><td class='sub'"); |
508 | if (ctx->repo) { | 508 | if (ctx->repo) { |
509 | html(" colspan='2'>"); | 509 | html(" colspan='2'>"); |
510 | html_txt(ctx->repo->desc); | 510 | html_txt(ctx->repo->desc); |
511 | } else { | 511 | } else { |
512 | html(">"); | 512 | html(">"); |
513 | html_txt("a fast webinterface for the git dscm"); | 513 | if (ctx->cfg.root_desc) |
514 | html_txt(ctx->cfg.root_desc); | ||
515 | else if (ctx->cfg.index_info) | ||
516 | html_include(ctx->cfg.index_info); | ||
514 | } | 517 | } |
515 | html("</td></tr></table>\n"); | 518 | html("</td></tr></table>\n"); |
516 | 519 | ||
517 | html("<table class='tabs'><tr><td>\n"); | 520 | html("<table class='tabs'><tr><td>\n"); |
518 | if (ctx->repo) { | 521 | if (ctx->repo) { |
519 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), | 522 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), |
520 | ctx->qry.head, NULL, NULL); | 523 | ctx->qry.head, NULL, NULL); |
521 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 524 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |