author | Lars Hjemli <hjemli@gmail.com> | 2008-04-28 23:13:08 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-28 23:13:08 (UTC) |
commit | 905dbaef5aa33ea11d385b82de0188fee73dd655 (patch) (unidiff) | |
tree | 34712da2eef917be04b2acc5585612b65c1e49cc | |
parent | d188ed4f2905e6d10abd26c45572a0d48eb53969 (diff) | |
parent | 71adba1f1678914063fc109cf3805afde2c68f75 (diff) | |
download | cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.zip cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.tar.gz cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.tar.bz2 |
Merge branch 'lh/about'
* lh/about:
Add 'about site' and 'about repo' pages
Prepare for 'about site' page / add 'root-readme' option to cgitrc
Make it possible for a single cmd to work both with and without a repo
Re-enable 'index-info' and add support for 'root-desc' in cgitrc
Move included header-file out of repolist table
Prepare for 'about repo' page
-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
@@ -18,8 +18,12 @@ const char *cgit_version = CGIT_VERSION; | |||
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); | ||
24 | else if (!strcmp(name, "root-readme")) | ||
25 | ctx.cfg.root_readme = xstrdup(value); | ||
22 | else if (!strcmp(name, "css")) | 26 | else if (!strcmp(name, "css")) |
23 | ctx.cfg.css = xstrdup(value); | 27 | ctx.cfg.css = xstrdup(value); |
24 | else if (!strcmp(name, "logo")) | 28 | else if (!strcmp(name, "logo")) |
25 | ctx.cfg.logo = xstrdup(value); | 29 | ctx.cfg.logo = xstrdup(value); |
@@ -158,8 +162,9 @@ static void prepare_context(struct cgit_context *ctx) | |||
158 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 162 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
159 | ctx->cfg.renamelimit = -1; | 163 | ctx->cfg.renamelimit = -1; |
160 | ctx->cfg.robots = "index, nofollow"; | 164 | ctx->cfg.robots = "index, nofollow"; |
161 | ctx->cfg.root_title = "Git repository browser"; | 165 | ctx->cfg.root_title = "Git repository browser"; |
166 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | ||
162 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 167 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
163 | ctx->page.mimetype = "text/html"; | 168 | ctx->page.mimetype = "text/html"; |
164 | ctx->page.charset = PAGE_ENCODING; | 169 | ctx->page.charset = PAGE_ENCODING; |
165 | ctx->page.filename = NULL; | 170 | ctx->page.filename = NULL; |
@@ -303,9 +308,18 @@ static void process_request(struct cgit_context *ctx) | |||
303 | cgit_print_docend(); | 308 | cgit_print_docend(); |
304 | return; | 309 | return; |
305 | } | 310 | } |
306 | 311 | ||
307 | if (cmd->want_repo && prepare_repo_cmd(ctx)) | 312 | if (cmd->want_repo && !ctx->repo) { |
313 | cgit_print_http_headers(ctx); | ||
314 | cgit_print_docstart(ctx); | ||
315 | cgit_print_pageheader(ctx); | ||
316 | cgit_print_error(fmt("No repository selected")); | ||
317 | cgit_print_docend(); | ||
318 | return; | ||
319 | } | ||
320 | |||
321 | if (ctx->repo && prepare_repo_cmd(ctx)) | ||
308 | return; | 322 | return; |
309 | 323 | ||
310 | if (cmd->want_layout) { | 324 | if (cmd->want_layout) { |
311 | cgit_print_http_headers(ctx); | 325 | cgit_print_http_headers(ctx); |
@@ -131,8 +131,10 @@ struct cgit_config { | |||
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; | ||
136 | char *root_readme; | ||
135 | char *script_name; | 137 | char *script_name; |
136 | char *virtual_root; | 138 | char *virtual_root; |
137 | int cache_dynamic_ttl; | 139 | int cache_dynamic_ttl; |
138 | int cache_max_create_time; | 140 | int cache_max_create_time; |
@@ -19,8 +19,16 @@ | |||
19 | #include "ui-summary.h" | 19 | #include "ui-summary.h" |
20 | #include "ui-tag.h" | 20 | #include "ui-tag.h" |
21 | #include "ui-tree.h" | 21 | #include "ui-tree.h" |
22 | 22 | ||
23 | static void about_fn(struct cgit_context *ctx) | ||
24 | { | ||
25 | if (ctx->repo) | ||
26 | cgit_print_repo_readme(); | ||
27 | else | ||
28 | cgit_print_site_readme(); | ||
29 | } | ||
30 | |||
23 | static void blob_fn(struct cgit_context *ctx) | 31 | static void blob_fn(struct cgit_context *ctx) |
24 | { | 32 | { |
25 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path); | 33 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path); |
26 | } | 34 | } |
@@ -83,8 +91,9 @@ static void tree_fn(struct cgit_context *ctx) | |||
83 | 91 | ||
84 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) | 92 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
85 | { | 93 | { |
86 | static struct cgit_cmd cmds[] = { | 94 | static struct cgit_cmd cmds[] = { |
95 | def_cmd(about, 0, 1), | ||
87 | def_cmd(blob, 1, 0), | 96 | def_cmd(blob, 1, 0), |
88 | def_cmd(commit, 1, 1), | 97 | def_cmd(commit, 1, 1), |
89 | def_cmd(diff, 1, 1), | 98 | def_cmd(diff, 1, 1), |
90 | def_cmd(log, 1, 1), | 99 | def_cmd(log, 1, 1), |
diff --git a/ui-repolist.c b/ui-repolist.c index 98009c0..3f78e28 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -60,14 +60,8 @@ int is_match(struct cgit_repo *repo) | |||
60 | } | 60 | } |
61 | 61 | ||
62 | void print_header(int columns) | 62 | void print_header(int columns) |
63 | { | 63 | { |
64 | if (ctx.cfg.index_header) { | ||
65 | htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", | ||
66 | columns); | ||
67 | html_include(ctx.cfg.index_header); | ||
68 | html("</td></tr>"); | ||
69 | } | ||
70 | html("<tr class='nohover'>" | 64 | html("<tr class='nohover'>" |
71 | "<th class='left'>Name</th>" | 65 | "<th class='left'>Name</th>" |
72 | "<th class='left'>Description</th>" | 66 | "<th class='left'>Description</th>" |
73 | "<th class='left'>Owner</th>" | 67 | "<th class='left'>Owner</th>" |
@@ -89,8 +83,11 @@ void cgit_print_repolist() | |||
89 | cgit_print_http_headers(&ctx); | 83 | cgit_print_http_headers(&ctx); |
90 | cgit_print_docstart(&ctx); | 84 | cgit_print_docstart(&ctx); |
91 | cgit_print_pageheader(&ctx); | 85 | cgit_print_pageheader(&ctx); |
92 | 86 | ||
87 | if (ctx.cfg.index_header) | ||
88 | html_include(ctx.cfg.index_header); | ||
89 | |||
93 | html("<table summary='repository list' class='list nowrap'>"); | 90 | html("<table summary='repository list' class='list nowrap'>"); |
94 | for (i=0; i<cgit_repolist.count; i++) { | 91 | for (i=0; i<cgit_repolist.count; i++) { |
95 | ctx.repo = &cgit_repolist.repos[i]; | 92 | ctx.repo = &cgit_repolist.repos[i]; |
96 | if (!is_match(ctx.repo)) | 93 | if (!is_match(ctx.repo)) |
@@ -138,4 +135,10 @@ void cgit_print_repolist() | |||
138 | if (!hits) | 135 | if (!hits) |
139 | cgit_print_error("No repositories found"); | 136 | cgit_print_error("No repositories found"); |
140 | cgit_print_docend(); | 137 | cgit_print_docend(); |
141 | } | 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 */ |
diff --git a/ui-shared.c b/ui-shared.c index 8a804c2..d08ede9 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -113,8 +113,51 @@ char *cgit_currurl() | |||
113 | else | 113 | else |
114 | return fmt("%s/", ctx.cfg.virtual_root); | 114 | return fmt("%s/", ctx.cfg.virtual_root); |
115 | } | 115 | } |
116 | 116 | ||
117 | static void site_url(char *page, char *search) | ||
118 | { | ||
119 | char *delim = "?"; | ||
120 | |||
121 | if (ctx.cfg.virtual_root) { | ||
122 | html_attr(ctx.cfg.virtual_root); | ||
123 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') | ||
124 | html("/"); | ||
125 | } else | ||
126 | html(ctx.cfg.script_name); | ||
127 | |||
128 | if (page) { | ||
129 | htmlf("?p=%s", page); | ||
130 | delim = "&"; | ||
131 | } | ||
132 | if (search) { | ||
133 | html(delim); | ||
134 | html("q="); | ||
135 | html_attr(search); | ||
136 | } | ||
137 | } | ||
138 | |||
139 | static void site_link(char *page, char *name, char *title, char *class, | ||
140 | char *search) | ||
141 | { | ||
142 | html("<a"); | ||
143 | if (title) { | ||
144 | html(" title='"); | ||
145 | html_attr(title); | ||
146 | html("'"); | ||
147 | } | ||
148 | if (class) { | ||
149 | html(" class='"); | ||
150 | html_attr(class); | ||
151 | html("'"); | ||
152 | } | ||
153 | html(" href='"); | ||
154 | site_url(page, search); | ||
155 | html("'>"); | ||
156 | html_txt(name); | ||
157 | html("</a>"); | ||
158 | } | ||
159 | |||
117 | static char *repolink(char *title, char *class, char *page, char *head, | 160 | static char *repolink(char *title, char *class, char *page, char *head, |
118 | char *path) | 161 | char *path) |
119 | { | 162 | { |
120 | char *delim = "?"; | 163 | char *delim = "?"; |
@@ -509,9 +552,12 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
509 | html(" colspan='2'>"); | 552 | html(" colspan='2'>"); |
510 | html_txt(ctx->repo->desc); | 553 | html_txt(ctx->repo->desc); |
511 | } else { | 554 | } else { |
512 | html(">"); | 555 | html(">"); |
513 | html_txt("a fast webinterface for the git dscm"); | 556 | if (ctx->cfg.root_desc) |
557 | html_txt(ctx->cfg.root_desc); | ||
558 | else if (ctx->cfg.index_info) | ||
559 | html_include(ctx->cfg.index_info); | ||
514 | } | 560 | } |
515 | html("</td></tr></table>\n"); | 561 | html("</td></tr></table>\n"); |
516 | 562 | ||
517 | html("<table class='tabs'><tr><td>\n"); | 563 | html("<table class='tabs'><tr><td>\n"); |
@@ -527,8 +573,12 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
527 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 573 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
528 | ctx->qry.head, ctx->qry.sha1); | 574 | ctx->qry.head, ctx->qry.sha1); |
529 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 575 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
530 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 576 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
577 | if (ctx->repo->readme) | ||
578 | reporevlink("about", "about", NULL, | ||
579 | hc(cmd, "about"), ctx->qry.head, NULL, | ||
580 | NULL); | ||
531 | html("</td><td class='form'>"); | 581 | html("</td><td class='form'>"); |
532 | html("<form class='right' method='get' action='"); | 582 | html("<form class='right' method='get' action='"); |
533 | if (ctx->cfg.virtual_root) | 583 | if (ctx->cfg.virtual_root) |
534 | html_attr(cgit_fileurl(ctx->qry.repo, "log", | 584 | html_attr(cgit_fileurl(ctx->qry.repo, "log", |
@@ -545,11 +595,11 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
545 | html("'/>\n"); | 595 | html("'/>\n"); |
546 | html("<input type='submit' value='search'/>\n"); | 596 | html("<input type='submit' value='search'/>\n"); |
547 | html("</form>\n"); | 597 | html("</form>\n"); |
548 | } else { | 598 | } else { |
549 | html("<a class='active' href='"); | 599 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL); |
550 | html_attr(cgit_rooturl()); | 600 | if (ctx->cfg.root_readme) |
551 | html("'>index</a>\n"); | 601 | site_link("about", "about", NULL, hc(cmd, "about"), NULL); |
552 | html("</td><td class='form'>"); | 602 | html("</td><td class='form'>"); |
553 | html("<form method='get' action='"); | 603 | html("<form method='get' action='"); |
554 | html_attr(cgit_rooturl()); | 604 | html_attr(cgit_rooturl()); |
555 | html("'>\n"); | 605 | html("'>\n"); |
diff --git a/ui-summary.c b/ui-summary.c index 318148a..ad0b4a7 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -12,13 +12,8 @@ | |||
12 | #include "ui-refs.h" | 12 | #include "ui-refs.h" |
13 | 13 | ||
14 | void cgit_print_summary() | 14 | void cgit_print_summary() |
15 | { | 15 | { |
16 | if (ctx.repo->readme) { | ||
17 | html("<div id='summary'>"); | ||
18 | html_include(ctx.repo->readme); | ||
19 | html("</div>"); | ||
20 | } | ||
21 | html("<table summary='repository info' class='list nowrap'>"); | 16 | html("<table summary='repository info' class='list nowrap'>"); |
22 | cgit_print_branches(ctx.cfg.summary_branches); | 17 | cgit_print_branches(ctx.cfg.summary_branches); |
23 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); | 18 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
24 | cgit_print_tags(ctx.cfg.summary_tags); | 19 | cgit_print_tags(ctx.cfg.summary_tags); |
@@ -28,4 +23,13 @@ void cgit_print_summary() | |||
28 | NULL, NULL, 0); | 23 | NULL, NULL, 0); |
29 | } | 24 | } |
30 | html("</table>"); | 25 | html("</table>"); |
31 | } | 26 | } |
27 | |||
28 | void cgit_print_repo_readme() | ||
29 | { | ||
30 | if (ctx.repo->readme) { | ||
31 | html("<div id='summary'>"); | ||
32 | html_include(ctx.repo->readme); | ||
33 | html("</div>"); | ||
34 | } | ||
35 | } | ||
diff --git a/ui-summary.h b/ui-summary.h index 37aedd2..3e13039 100644 --- a/ui-summary.h +++ b/ui-summary.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef UI_SUMMARY_H | 1 | #ifndef UI_SUMMARY_H |
2 | #define UI_SUMMARY_H | 2 | #define UI_SUMMARY_H |
3 | 3 | ||
4 | extern void cgit_print_summary(); | 4 | extern void cgit_print_summary(); |
5 | extern void cgit_print_repo_readme(); | ||
5 | 6 | ||
6 | #endif /* UI_SUMMARY_H */ | 7 | #endif /* UI_SUMMARY_H */ |