-rw-r--r-- | cgit.c | 16 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | cmd.c | 9 | ||||
-rw-r--r-- | html.c | 6 | ||||
-rw-r--r-- | ui-commit.c | 146 | ||||
-rw-r--r-- | ui-diff.c | 151 | ||||
-rw-r--r-- | ui-diff.h | 3 | ||||
-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 |
12 files changed, 257 insertions, 165 deletions
@@ -20,4 +20,8 @@ void config_cb(const char *name, const char *value) | |||
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); |
@@ -164,4 +168,5 @@ static void prepare_context(struct cgit_context *ctx) | |||
164 | ctx->cfg.robots = "index, nofollow"; | 168 | ctx->cfg.robots = "index, nofollow"; |
165 | ctx->cfg.root_title = "Git repository browser"; | 169 | ctx->cfg.root_title = "Git repository browser"; |
170 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | ||
166 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 171 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
167 | ctx->page.mimetype = "text/html"; | 172 | ctx->page.mimetype = "text/html"; |
@@ -271,5 +276,14 @@ static void process_request(void *cbdata) | |||
271 | } | 276 | } |
272 | 277 | ||
273 | if (cmd->want_repo && prepare_repo_cmd(ctx)) | 278 | if (cmd->want_repo && !ctx->repo) { |
279 | cgit_print_http_headers(ctx); | ||
280 | cgit_print_docstart(ctx); | ||
281 | cgit_print_pageheader(ctx); | ||
282 | cgit_print_error(fmt("No repository selected")); | ||
283 | cgit_print_docend(); | ||
284 | return; | ||
285 | } | ||
286 | |||
287 | if (ctx->repo && prepare_repo_cmd(ctx)) | ||
274 | return; | 288 | return; |
275 | 289 | ||
@@ -133,4 +133,6 @@ struct cgit_config { | |||
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; |
@@ -23,4 +23,12 @@ | |||
23 | #include "ui-tree.h" | 23 | #include "ui-tree.h" |
24 | 24 | ||
25 | static void about_fn(struct cgit_context *ctx) | ||
26 | { | ||
27 | if (ctx->repo) | ||
28 | cgit_print_repo_readme(); | ||
29 | else | ||
30 | cgit_print_site_readme(); | ||
31 | } | ||
32 | |||
25 | static void blob_fn(struct cgit_context *ctx) | 33 | static void blob_fn(struct cgit_context *ctx) |
26 | { | 34 | { |
@@ -95,4 +103,5 @@ struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) | |||
95 | { | 103 | { |
96 | static struct cgit_cmd cmds[] = { | 104 | static struct cgit_cmd cmds[] = { |
105 | def_cmd(about, 0, 1), | ||
97 | def_cmd(blob, 1, 0), | 106 | def_cmd(blob, 1, 0), |
98 | def_cmd(commit, 1, 1), | 107 | def_cmd(commit, 1, 1), |
@@ -12,4 +12,5 @@ | |||
12 | #include <stdarg.h> | 12 | #include <stdarg.h> |
13 | #include <string.h> | 13 | #include <string.h> |
14 | #include <errno.h> | ||
14 | 15 | ||
15 | int htmlfd = STDOUT_FILENO; | 16 | int htmlfd = STDOUT_FILENO; |
@@ -169,6 +170,9 @@ int html_include(const char *filename) | |||
169 | size_t len; | 170 | size_t len; |
170 | 171 | ||
171 | if (!(f = fopen(filename, "r"))) | 172 | if (!(f = fopen(filename, "r"))) { |
173 | fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n", | ||
174 | filename, strerror(errno), errno); | ||
172 | return -1; | 175 | return -1; |
176 | } | ||
173 | while((len = fread(buf, 1, 4096, f)) > 0) | 177 | while((len = fread(buf, 1, 4096, f)) > 0) |
174 | write(htmlfd, buf, len); | 178 | write(htmlfd, buf, len); |
diff --git a/ui-commit.c b/ui-commit.c index 12a96fb..1aa5d34 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -12,129 +12,4 @@ | |||
12 | #include "ui-diff.h" | 12 | #include "ui-diff.h" |
13 | 13 | ||
14 | static int files, slots; | ||
15 | static int total_adds, total_rems, max_changes; | ||
16 | static int lines_added, lines_removed; | ||
17 | static char *curr_rev; | ||
18 | |||
19 | static struct fileinfo { | ||
20 | char status; | ||
21 | unsigned char old_sha1[20]; | ||
22 | unsigned char new_sha1[20]; | ||
23 | unsigned short old_mode; | ||
24 | unsigned short new_mode; | ||
25 | char *old_path; | ||
26 | char *new_path; | ||
27 | unsigned int added; | ||
28 | unsigned int removed; | ||
29 | } *items; | ||
30 | |||
31 | |||
32 | void print_fileinfo(struct fileinfo *info) | ||
33 | { | ||
34 | char *class; | ||
35 | |||
36 | switch (info->status) { | ||
37 | case DIFF_STATUS_ADDED: | ||
38 | class = "add"; | ||
39 | break; | ||
40 | case DIFF_STATUS_COPIED: | ||
41 | class = "cpy"; | ||
42 | break; | ||
43 | case DIFF_STATUS_DELETED: | ||
44 | class = "del"; | ||
45 | break; | ||
46 | case DIFF_STATUS_MODIFIED: | ||
47 | class = "upd"; | ||
48 | break; | ||
49 | case DIFF_STATUS_RENAMED: | ||
50 | class = "mov"; | ||
51 | break; | ||
52 | case DIFF_STATUS_TYPE_CHANGED: | ||
53 | class = "typ"; | ||
54 | break; | ||
55 | case DIFF_STATUS_UNKNOWN: | ||
56 | class = "unk"; | ||
57 | break; | ||
58 | case DIFF_STATUS_UNMERGED: | ||
59 | class = "stg"; | ||
60 | break; | ||
61 | default: | ||
62 | die("bug: unhandled diff status %c", info->status); | ||
63 | } | ||
64 | |||
65 | html("<tr>"); | ||
66 | htmlf("<td class='mode'>"); | ||
67 | if (is_null_sha1(info->new_sha1)) { | ||
68 | cgit_print_filemode(info->old_mode); | ||
69 | } else { | ||
70 | cgit_print_filemode(info->new_mode); | ||
71 | } | ||
72 | |||
73 | if (info->old_mode != info->new_mode && | ||
74 | !is_null_sha1(info->old_sha1) && | ||
75 | !is_null_sha1(info->new_sha1)) { | ||
76 | html("<span class='modechange'>["); | ||
77 | cgit_print_filemode(info->old_mode); | ||
78 | html("]</span>"); | ||
79 | } | ||
80 | htmlf("</td><td class='%s'>", class); | ||
81 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev, | ||
82 | NULL, info->new_path); | ||
83 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) | ||
84 | htmlf(" (%s from %s)", | ||
85 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", | ||
86 | info->old_path); | ||
87 | html("</td><td class='right'>"); | ||
88 | htmlf("%d", info->added + info->removed); | ||
89 | html("</td><td class='graph'>"); | ||
90 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); | ||
91 | htmlf("<td class='add' style='width: %.1f%%;'/>", | ||
92 | info->added * 100.0 / max_changes); | ||
93 | htmlf("<td class='rem' style='width: %.1f%%;'/>", | ||
94 | info->removed * 100.0 / max_changes); | ||
95 | htmlf("<td class='none' style='width: %.1f%%;'/>", | ||
96 | (max_changes - info->removed - info->added) * 100.0 / max_changes); | ||
97 | html("</tr></table></td></tr>\n"); | ||
98 | } | ||
99 | |||
100 | void cgit_count_diff_lines(char *line, int len) | ||
101 | { | ||
102 | if (line && (len > 0)) { | ||
103 | if (line[0] == '+') | ||
104 | lines_added++; | ||
105 | else if (line[0] == '-') | ||
106 | lines_removed++; | ||
107 | } | ||
108 | } | ||
109 | |||
110 | void inspect_filepair(struct diff_filepair *pair) | ||
111 | { | ||
112 | files++; | ||
113 | lines_added = 0; | ||
114 | lines_removed = 0; | ||
115 | cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines); | ||
116 | if (files >= slots) { | ||
117 | if (slots == 0) | ||
118 | slots = 4; | ||
119 | else | ||
120 | slots = slots * 2; | ||
121 | items = xrealloc(items, slots * sizeof(struct fileinfo)); | ||
122 | } | ||
123 | items[files-1].status = pair->status; | ||
124 | hashcpy(items[files-1].old_sha1, pair->one->sha1); | ||
125 | hashcpy(items[files-1].new_sha1, pair->two->sha1); | ||
126 | items[files-1].old_mode = pair->one->mode; | ||
127 | items[files-1].new_mode = pair->two->mode; | ||
128 | items[files-1].old_path = xstrdup(pair->one->path); | ||
129 | items[files-1].new_path = xstrdup(pair->two->path); | ||
130 | items[files-1].added = lines_added; | ||
131 | items[files-1].removed = lines_removed; | ||
132 | if (lines_added + lines_removed > max_changes) | ||
133 | max_changes = lines_added + lines_removed; | ||
134 | total_adds += lines_added; | ||
135 | total_rems += lines_removed; | ||
136 | } | ||
137 | |||
138 | |||
139 | void cgit_print_commit(char *hex) | 14 | void cgit_print_commit(char *hex) |
140 | { | 15 | { |
@@ -144,9 +19,7 @@ void cgit_print_commit(char *hex) | |||
144 | unsigned char sha1[20]; | 19 | unsigned char sha1[20]; |
145 | char *tmp; | 20 | char *tmp; |
146 | int i; | ||
147 | 21 | ||
148 | if (!hex) | 22 | if (!hex) |
149 | hex = ctx.qry.head; | 23 | hex = ctx.qry.head; |
150 | curr_rev = hex; | ||
151 | 24 | ||
152 | if (get_sha1(hex, sha1)) { | 25 | if (get_sha1(hex, sha1)) { |
@@ -217,19 +90,8 @@ void cgit_print_commit(char *hex) | |||
217 | html_txt(info->msg); | 90 | html_txt(info->msg); |
218 | html("</div>"); | 91 | html("</div>"); |
219 | if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { | 92 | if (!(commit->parents && commit->parents->next && |
220 | html("<div class='diffstat-header'>Diffstat</div>"); | 93 | commit->parents->next->next)) { |
221 | html("<table summary='diffstat' class='diffstat'>"); | 94 | tmp = sha1_to_hex(commit->parents->item->object.sha1); |
222 | max_changes = 0; | 95 | cgit_print_diff(ctx.qry.sha1, tmp, NULL); |
223 | cgit_diff_commit(commit, inspect_filepair); | ||
224 | for(i = 0; i<files; i++) | ||
225 | print_fileinfo(&items[i]); | ||
226 | html("</table>"); | ||
227 | html("<div class='diffstat-summary'>"); | ||
228 | htmlf("%d files changed, %d insertions, %d deletions", | ||
229 | files, total_adds, total_rems); | ||
230 | html("</div>"); | ||
231 | cgit_print_diff(ctx.qry.sha1, | ||
232 | sha1_to_hex(commit->parents->item->object.sha1), | ||
233 | NULL); | ||
234 | } | 96 | } |
235 | cgit_free_commitinfo(info); | 97 | cgit_free_commitinfo(info); |
@@ -14,4 +14,147 @@ unsigned char old_rev_sha1[20]; | |||
14 | unsigned char new_rev_sha1[20]; | 14 | unsigned char new_rev_sha1[20]; |
15 | 15 | ||
16 | static int files, slots; | ||
17 | static int total_adds, total_rems, max_changes; | ||
18 | static int lines_added, lines_removed; | ||
19 | static char *curr_rev; | ||
20 | |||
21 | static struct fileinfo { | ||
22 | char status; | ||
23 | unsigned char old_sha1[20]; | ||
24 | unsigned char new_sha1[20]; | ||
25 | unsigned short old_mode; | ||
26 | unsigned short new_mode; | ||
27 | char *old_path; | ||
28 | char *new_path; | ||
29 | unsigned int added; | ||
30 | unsigned int removed; | ||
31 | } *items; | ||
32 | |||
33 | |||
34 | static void print_fileinfo(struct fileinfo *info) | ||
35 | { | ||
36 | char *class; | ||
37 | |||
38 | switch (info->status) { | ||
39 | case DIFF_STATUS_ADDED: | ||
40 | class = "add"; | ||
41 | break; | ||
42 | case DIFF_STATUS_COPIED: | ||
43 | class = "cpy"; | ||
44 | break; | ||
45 | case DIFF_STATUS_DELETED: | ||
46 | class = "del"; | ||
47 | break; | ||
48 | case DIFF_STATUS_MODIFIED: | ||
49 | class = "upd"; | ||
50 | break; | ||
51 | case DIFF_STATUS_RENAMED: | ||
52 | class = "mov"; | ||
53 | break; | ||
54 | case DIFF_STATUS_TYPE_CHANGED: | ||
55 | class = "typ"; | ||
56 | break; | ||
57 | case DIFF_STATUS_UNKNOWN: | ||
58 | class = "unk"; | ||
59 | break; | ||
60 | case DIFF_STATUS_UNMERGED: | ||
61 | class = "stg"; | ||
62 | break; | ||
63 | default: | ||
64 | die("bug: unhandled diff status %c", info->status); | ||
65 | } | ||
66 | |||
67 | html("<tr>"); | ||
68 | htmlf("<td class='mode'>"); | ||
69 | if (is_null_sha1(info->new_sha1)) { | ||
70 | cgit_print_filemode(info->old_mode); | ||
71 | } else { | ||
72 | cgit_print_filemode(info->new_mode); | ||
73 | } | ||
74 | |||
75 | if (info->old_mode != info->new_mode && | ||
76 | !is_null_sha1(info->old_sha1) && | ||
77 | !is_null_sha1(info->new_sha1)) { | ||
78 | html("<span class='modechange'>["); | ||
79 | cgit_print_filemode(info->old_mode); | ||
80 | html("]</span>"); | ||
81 | } | ||
82 | htmlf("</td><td class='%s'>", class); | ||
83 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev, | ||
84 | NULL, info->new_path); | ||
85 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) | ||
86 | htmlf(" (%s from %s)", | ||
87 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", | ||
88 | info->old_path); | ||
89 | html("</td><td class='right'>"); | ||
90 | htmlf("%d", info->added + info->removed); | ||
91 | html("</td><td class='graph'>"); | ||
92 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); | ||
93 | htmlf("<td class='add' style='width: %.1f%%;'/>", | ||
94 | info->added * 100.0 / max_changes); | ||
95 | htmlf("<td class='rem' style='width: %.1f%%;'/>", | ||
96 | info->removed * 100.0 / max_changes); | ||
97 | htmlf("<td class='none' style='width: %.1f%%;'/>", | ||
98 | (max_changes - info->removed - info->added) * 100.0 / max_changes); | ||
99 | html("</tr></table></td></tr>\n"); | ||
100 | } | ||
101 | |||
102 | static void count_diff_lines(char *line, int len) | ||
103 | { | ||
104 | if (line && (len > 0)) { | ||
105 | if (line[0] == '+') | ||
106 | lines_added++; | ||
107 | else if (line[0] == '-') | ||
108 | lines_removed++; | ||
109 | } | ||
110 | } | ||
111 | |||
112 | static void inspect_filepair(struct diff_filepair *pair) | ||
113 | { | ||
114 | files++; | ||
115 | lines_added = 0; | ||
116 | lines_removed = 0; | ||
117 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines); | ||
118 | if (files >= slots) { | ||
119 | if (slots == 0) | ||
120 | slots = 4; | ||
121 | else | ||
122 | slots = slots * 2; | ||
123 | items = xrealloc(items, slots * sizeof(struct fileinfo)); | ||
124 | } | ||
125 | items[files-1].status = pair->status; | ||
126 | hashcpy(items[files-1].old_sha1, pair->one->sha1); | ||
127 | hashcpy(items[files-1].new_sha1, pair->two->sha1); | ||
128 | items[files-1].old_mode = pair->one->mode; | ||
129 | items[files-1].new_mode = pair->two->mode; | ||
130 | items[files-1].old_path = xstrdup(pair->one->path); | ||
131 | items[files-1].new_path = xstrdup(pair->two->path); | ||
132 | items[files-1].added = lines_added; | ||
133 | items[files-1].removed = lines_removed; | ||
134 | if (lines_added + lines_removed > max_changes) | ||
135 | max_changes = lines_added + lines_removed; | ||
136 | total_adds += lines_added; | ||
137 | total_rems += lines_removed; | ||
138 | } | ||
139 | |||
140 | void cgit_print_diffstat(const unsigned char *old_sha1, | ||
141 | const unsigned char *new_sha1) | ||
142 | { | ||
143 | int i; | ||
144 | |||
145 | html("<div class='diffstat-header'>Diffstat</div>"); | ||
146 | html("<table summary='diffstat' class='diffstat'>"); | ||
147 | max_changes = 0; | ||
148 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); | ||
149 | for(i = 0; i<files; i++) | ||
150 | print_fileinfo(&items[i]); | ||
151 | html("</table>"); | ||
152 | html("<div class='diffstat-summary'>"); | ||
153 | htmlf("%d files changed, %d insertions, %d deletions", | ||
154 | files, total_adds, total_rems); | ||
155 | html("</div>"); | ||
156 | } | ||
157 | |||
158 | |||
16 | /* | 159 | /* |
17 | * print a single line returned from xdiff | 160 | * print a single line returned from xdiff |
@@ -116,10 +259,4 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi | |||
116 | return; | 259 | return; |
117 | } | 260 | } |
118 | if (type != OBJ_COMMIT) { | ||
119 | cgit_print_error(fmt("Unhandled object type: %s", | ||
120 | typename(type))); | ||
121 | return; | ||
122 | } | ||
123 | |||
124 | commit = lookup_commit_reference(new_rev_sha1); | 261 | commit = lookup_commit_reference(new_rev_sha1); |
125 | if (!commit || parse_commit(commit)) | 262 | if (!commit || parse_commit(commit)) |
@@ -143,4 +280,6 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi | |||
143 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); | 280 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
144 | } | 281 | } |
282 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1); | ||
283 | |||
145 | html("<table summary='diff' class='diff'>"); | 284 | html("<table summary='diff' class='diff'>"); |
146 | html("<tr><td>"); | 285 | html("<tr><td>"); |
@@ -2,4 +2,7 @@ | |||
2 | #define UI_DIFF_H | 2 | #define UI_DIFF_H |
3 | 3 | ||
4 | extern void cgit_print_diffstat(const unsigned char *old_sha1, | ||
5 | const unsigned char *new_sha1); | ||
6 | |||
4 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, | 7 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, |
5 | const char *prefix); | 8 | const char *prefix); |
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) | |||
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>" |
@@ -91,4 +85,7 @@ void cgit_print_repolist() | |||
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++) { |
@@ -140,2 +137,8 @@ void cgit_print_repolist() | |||
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 | |||
@@ -3,4 +3,5 @@ | |||
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 | |||
@@ -115,4 +115,47 @@ char *cgit_currurl() | |||
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) |
@@ -511,5 +554,8 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
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"); |
@@ -529,4 +575,8 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
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='"); |
@@ -547,7 +597,7 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
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='"); |
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 @@ | |||
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); |
@@ -30,2 +25,11 @@ void cgit_print_summary() | |||
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 | |||
@@ -3,4 +3,5 @@ | |||
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 */ |