author | Lars Hjemli <hjemli@gmail.com> | 2008-04-28 23:06:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-28 23:06:30 (UTC) |
commit | c6431a71508f1b61a95b01d85fe4534a0245e626 (patch) (unidiff) | |
tree | 8a6200d51cd5d00f63b45a9a91c2e1cefa3c5740 | |
parent | 651ef79768dde30aabc61189974c9047ee43752f (diff) | |
download | cgit-c6431a71508f1b61a95b01d85fe4534a0245e626.zip cgit-c6431a71508f1b61a95b01d85fe4534a0245e626.tar.gz cgit-c6431a71508f1b61a95b01d85fe4534a0245e626.tar.bz2 |
Prepare for 'about site' page / add 'root-readme' option to cgitrc
The new option names a file which will be included on a new page, next
to the current 'index' page.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-repolist.c | 6 | ||||
-rw-r--r-- | ui-repolist.h | 1 |
4 files changed, 10 insertions, 0 deletions
@@ -8,32 +8,34 @@ | |||
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "cache.h" | 10 | #include "cache.h" |
11 | #include "cmd.h" | 11 | #include "cmd.h" |
12 | #include "configfile.h" | 12 | #include "configfile.h" |
13 | #include "html.h" | 13 | #include "html.h" |
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")) | 22 | else if (!strcmp(name, "root-desc")) |
23 | ctx.cfg.root_desc = xstrdup(value); | 23 | ctx.cfg.root_desc = xstrdup(value); |
24 | else if (!strcmp(name, "root-readme")) | ||
25 | ctx.cfg.root_readme = xstrdup(value); | ||
24 | else if (!strcmp(name, "css")) | 26 | else if (!strcmp(name, "css")) |
25 | ctx.cfg.css = xstrdup(value); | 27 | ctx.cfg.css = xstrdup(value); |
26 | else if (!strcmp(name, "logo")) | 28 | else if (!strcmp(name, "logo")) |
27 | ctx.cfg.logo = xstrdup(value); | 29 | ctx.cfg.logo = xstrdup(value); |
28 | else if (!strcmp(name, "index-header")) | 30 | else if (!strcmp(name, "index-header")) |
29 | ctx.cfg.index_header = xstrdup(value); | 31 | ctx.cfg.index_header = xstrdup(value); |
30 | else if (!strcmp(name, "index-info")) | 32 | else if (!strcmp(name, "index-info")) |
31 | ctx.cfg.index_info = xstrdup(value); | 33 | ctx.cfg.index_info = xstrdup(value); |
32 | else if (!strcmp(name, "logo-link")) | 34 | else if (!strcmp(name, "logo-link")) |
33 | ctx.cfg.logo_link = xstrdup(value); | 35 | ctx.cfg.logo_link = xstrdup(value); |
34 | else if (!strcmp(name, "module-link")) | 36 | else if (!strcmp(name, "module-link")) |
35 | ctx.cfg.module_link = xstrdup(value); | 37 | ctx.cfg.module_link = xstrdup(value); |
36 | else if (!strcmp(name, "virtual-root")) { | 38 | else if (!strcmp(name, "virtual-root")) { |
37 | ctx.cfg.virtual_root = trim_end(value, '/'); | 39 | ctx.cfg.virtual_root = trim_end(value, '/'); |
38 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 40 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
39 | ctx.cfg.virtual_root = ""; | 41 | ctx.cfg.virtual_root = ""; |
@@ -120,32 +120,33 @@ struct cgit_query { | |||
120 | }; | 120 | }; |
121 | 121 | ||
122 | struct cgit_config { | 122 | struct cgit_config { |
123 | char *agefile; | 123 | char *agefile; |
124 | char *cache_root; | 124 | char *cache_root; |
125 | char *clone_prefix; | 125 | char *clone_prefix; |
126 | char *css; | 126 | char *css; |
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 *root_desc; |
136 | char *root_readme; | ||
136 | char *script_name; | 137 | char *script_name; |
137 | char *virtual_root; | 138 | char *virtual_root; |
138 | int cache_dynamic_ttl; | 139 | int cache_dynamic_ttl; |
139 | int cache_max_create_time; | 140 | int cache_max_create_time; |
140 | int cache_repo_ttl; | 141 | int cache_repo_ttl; |
141 | int cache_root_ttl; | 142 | int cache_root_ttl; |
142 | int cache_static_ttl; | 143 | int cache_static_ttl; |
143 | int enable_index_links; | 144 | int enable_index_links; |
144 | int enable_log_filecount; | 145 | int enable_log_filecount; |
145 | int enable_log_linecount; | 146 | int enable_log_linecount; |
146 | int max_commit_count; | 147 | int max_commit_count; |
147 | int max_lock_attempts; | 148 | int max_lock_attempts; |
148 | int max_msg_len; | 149 | int max_msg_len; |
149 | int max_repodesc_len; | 150 | int max_repodesc_len; |
150 | int nocache; | 151 | int nocache; |
151 | int renamelimit; | 152 | int renamelimit; |
diff --git a/ui-repolist.c b/ui-repolist.c index 200640c..3f78e28 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -123,16 +123,22 @@ void cgit_print_repolist() | |||
123 | html("<td>"); | 123 | html("<td>"); |
124 | html_link_open(cgit_repourl(ctx.repo->url), | 124 | html_link_open(cgit_repourl(ctx.repo->url), |
125 | NULL, "button"); | 125 | NULL, "button"); |
126 | html("summary</a>"); | 126 | html("summary</a>"); |
127 | cgit_log_link("log", NULL, "button", NULL, NULL, NULL, | 127 | cgit_log_link("log", NULL, "button", NULL, NULL, NULL, |
128 | 0, NULL, NULL); | 128 | 0, NULL, NULL); |
129 | cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); | 129 | cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); |
130 | html("</td>"); | 130 | html("</td>"); |
131 | } | 131 | } |
132 | html("</tr>\n"); | 132 | html("</tr>\n"); |
133 | } | 133 | } |
134 | html("</table>"); | 134 | html("</table>"); |
135 | if (!hits) | 135 | if (!hits) |
136 | cgit_print_error("No repositories found"); | 136 | cgit_print_error("No repositories found"); |
137 | cgit_print_docend(); | 137 | cgit_print_docend(); |
138 | } | 138 | } |
139 | |||
140 | void cgit_print_site_readme() | ||
141 | { | ||
142 | if (ctx.cfg.root_readme) | ||
143 | html_include(ctx.cfg.root_readme); | ||
144 | } | ||
diff --git a/ui-repolist.h b/ui-repolist.h index c23e5d2..5b1e542 100644 --- a/ui-repolist.h +++ b/ui-repolist.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef UI_REPOLIST_H | 1 | #ifndef UI_REPOLIST_H |
2 | #define UI_REPOLIST_H | 2 | #define UI_REPOLIST_H |
3 | 3 | ||
4 | extern void cgit_print_repolist(); | 4 | extern void cgit_print_repolist(); |
5 | extern void cgit_print_site_readme(); | ||
5 | 6 | ||
6 | #endif /* UI_REPOLIST_H */ | 7 | #endif /* UI_REPOLIST_H */ |