author | Lars Hjemli <hjemli@gmail.com> | 2007-06-29 18:32:08 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-29 18:32:08 (UTC) |
commit | 16a3d2779ccd56bf7954d98da547247d8796544b (patch) (unidiff) | |
tree | 86d2ed41adc3de842c7518d614ea49ca0200e4d2 | |
parent | f69250358a74efa5d7d9c562b2cdd80fad1430f1 (diff) | |
parent | 103940fe6b0914dc42b8b033d1d328f38135ca5f (diff) | |
download | cgit-16a3d2779ccd56bf7954d98da547247d8796544b.zip cgit-16a3d2779ccd56bf7954d98da547247d8796544b.tar.gz cgit-16a3d2779ccd56bf7954d98da547247d8796544b.tar.bz2 |
Merge branch 'lh/menu'
* lh/menu:
Add ofs argument to cgit_log_link and use it in ui-log.c
Add trim_end() and use it to remove trailing slashes from repo paths
Do not include current path in the "tree" menu link
Add setting to enable/disable extra links on index page
Change S/L/T to summary/log/tree
Change "files" to "tree"
Include querystring as part of cached filename for repo summary page
Add more menuitems on repo pages
-rw-r--r-- | cgit.c | 10 | ||||
-rw-r--r-- | cgit.css | 23 | ||||
-rw-r--r-- | cgit.h | 4 | ||||
-rw-r--r-- | cgitrc | 4 | ||||
-rw-r--r-- | parsing.c | 2 | ||||
-rw-r--r-- | shared.c | 27 | ||||
-rw-r--r-- | ui-log.c | 16 | ||||
-rw-r--r-- | ui-repolist.c | 35 | ||||
-rw-r--r-- | ui-shared.c | 71 | ||||
-rw-r--r-- | ui-summary.c | 2 | ||||
-rw-r--r-- | ui-tree.c | 4 |
11 files changed, 145 insertions, 53 deletions
@@ -21,23 +21,25 @@ static int cgit_prepare_cache(struct cacheitem *item) | |||
21 | 21 | ||
22 | if (!cgit_repo) { | 22 | if (!cgit_repo) { |
23 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); | 23 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
24 | item->ttl = cgit_cache_root_ttl; | 24 | item->ttl = cgit_cache_root_ttl; |
25 | return 1; | 25 | return 1; |
26 | } | 26 | } |
27 | 27 | ||
28 | if (!cgit_cmd) { | 28 | if (!cgit_cmd) { |
29 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, | 29 | item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root, |
30 | cache_safe_filename(cgit_repo->url))); | 30 | cache_safe_filename(cgit_repo->url), |
31 | cache_safe_filename(cgit_querystring))); | ||
31 | item->ttl = cgit_cache_repo_ttl; | 32 | item->ttl = cgit_cache_repo_ttl; |
32 | } else { | 33 | } else { |
33 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, | 34 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, |
34 | cache_safe_filename(cgit_repo->url), cgit_query_page, | 35 | cache_safe_filename(cgit_repo->url), |
35 | cache_safe_filename(cgit_querystring))); | 36 | cgit_query_page, |
37 | cache_safe_filename(cgit_querystring))); | ||
36 | if (cgit_query_has_symref) | 38 | if (cgit_query_has_symref) |
37 | item->ttl = cgit_cache_dynamic_ttl; | 39 | item->ttl = cgit_cache_dynamic_ttl; |
38 | else if (cgit_query_has_sha1) | 40 | else if (cgit_query_has_sha1) |
39 | item->ttl = cgit_cache_static_ttl; | 41 | item->ttl = cgit_cache_static_ttl; |
40 | else | 42 | else |
41 | item->ttl = cgit_cache_repo_ttl; | 43 | item->ttl = cgit_cache_repo_ttl; |
42 | } | 44 | } |
43 | return 1; | 45 | return 1; |
@@ -90,16 +90,24 @@ td#header, td#logo { | |||
90 | 90 | ||
91 | td#header { | 91 | td#header { |
92 | font-size: 150%; | 92 | font-size: 150%; |
93 | font-weight: bold; | 93 | font-weight: bold; |
94 | padding: 0.2em 0.5em; | 94 | padding: 0.2em 0.5em; |
95 | vertical-align: text-bottom; | 95 | vertical-align: text-bottom; |
96 | } | 96 | } |
97 | 97 | ||
98 | td#header a { | ||
99 | color: #666; | ||
100 | } | ||
101 | |||
102 | td#header a:hoved { | ||
103 | text-decoration: underline; | ||
104 | } | ||
105 | |||
98 | td#logo { | 106 | td#logo { |
99 | text-align: right; | 107 | text-align: right; |
100 | vertical-align: middle; | 108 | vertical-align: middle; |
101 | padding-right: 0.5em; | 109 | padding-right: 0.5em; |
102 | } | 110 | } |
103 | 111 | ||
104 | td#crumb, td#search { | 112 | td#crumb, td#search { |
105 | color: #ccc; | 113 | color: #ccc; |
@@ -111,21 +119,23 @@ td#crumb, td#search { | |||
111 | 119 | ||
112 | td#crumb { | 120 | td#crumb { |
113 | font-weight: bold; | 121 | font-weight: bold; |
114 | } | 122 | } |
115 | 123 | ||
116 | td#crumb a { | 124 | td#crumb a { |
117 | color: #ccc; | 125 | color: #ccc; |
118 | background-color: #666; | 126 | background-color: #666; |
127 | padding: 0em 0.5em 0em 0.5em; | ||
119 | } | 128 | } |
120 | 129 | ||
121 | td#crumb a:hover { | 130 | td#crumb a:hover { |
122 | color: #eee; | 131 | color: #666; |
123 | background-color: #666; | 132 | background-color: #ccc; |
133 | text-decoration: none; | ||
124 | } | 134 | } |
125 | 135 | ||
126 | td#search { | 136 | td#search { |
127 | text-align: right; | 137 | text-align: right; |
128 | vertical-align: middle; | 138 | vertical-align: middle; |
129 | padding-right: 0.5em; | 139 | padding-right: 0.5em; |
130 | } | 140 | } |
131 | 141 | ||
@@ -356,26 +366,27 @@ table.diff td div.del { | |||
356 | 366 | ||
357 | table.list td.repogroup { | 367 | table.list td.repogroup { |
358 | font-style: italic; | 368 | font-style: italic; |
359 | color: #888; | 369 | color: #888; |
360 | } | 370 | } |
361 | 371 | ||
362 | a.button { | 372 | a.button { |
363 | font-size: 80%; | 373 | font-size: 80%; |
364 | color: #333; | 374 | color: #aaa; |
365 | background-color: #ccc; | 375 | background-color: #eee; |
366 | border: solid 1px #999; | 376 | border: solid 1px #aaa; |
367 | padding: 0em 0.5em; | 377 | padding: 0em 0.5em; |
368 | margin: 0.1em 0.25em; | 378 | margin: 0.1em 0.25em; |
369 | } | 379 | } |
370 | 380 | ||
371 | a.button:hover { | 381 | a.button:hover { |
372 | text-decoration: none; | 382 | text-decoration: none; |
373 | background-color: #eee; | 383 | color: #333; |
384 | background-color: #ccc; | ||
374 | } | 385 | } |
375 | 386 | ||
376 | a.primary { | 387 | a.primary { |
377 | font-size: 100%; | 388 | font-size: 100%; |
378 | } | 389 | } |
379 | 390 | ||
380 | a.secondary { | 391 | a.secondary { |
381 | font-size: 90%; | 392 | font-size: 90%; |
@@ -113,16 +113,17 @@ extern char *cgit_module_link; | |||
113 | extern char *cgit_agefile; | 113 | extern char *cgit_agefile; |
114 | extern char *cgit_virtual_root; | 114 | extern char *cgit_virtual_root; |
115 | extern char *cgit_script_name; | 115 | extern char *cgit_script_name; |
116 | extern char *cgit_cache_root; | 116 | extern char *cgit_cache_root; |
117 | extern char *cgit_repo_group; | 117 | extern char *cgit_repo_group; |
118 | 118 | ||
119 | extern int cgit_nocache; | 119 | extern int cgit_nocache; |
120 | extern int cgit_snapshots; | 120 | extern int cgit_snapshots; |
121 | extern int cgit_enable_index_links; | ||
121 | extern int cgit_enable_log_filecount; | 122 | extern int cgit_enable_log_filecount; |
122 | extern int cgit_enable_log_linecount; | 123 | extern int cgit_enable_log_linecount; |
123 | extern int cgit_max_lock_attempts; | 124 | extern int cgit_max_lock_attempts; |
124 | extern int cgit_cache_root_ttl; | 125 | extern int cgit_cache_root_ttl; |
125 | extern int cgit_cache_repo_ttl; | 126 | extern int cgit_cache_repo_ttl; |
126 | extern int cgit_cache_dynamic_ttl; | 127 | extern int cgit_cache_dynamic_ttl; |
127 | extern int cgit_cache_static_ttl; | 128 | extern int cgit_cache_static_ttl; |
128 | extern int cgit_cache_max_create_time; | 129 | extern int cgit_cache_max_create_time; |
@@ -153,16 +154,17 @@ extern struct repoinfo *cgit_get_repoinfo(const char *url); | |||
153 | extern void cgit_global_config_cb(const char *name, const char *value); | 154 | extern void cgit_global_config_cb(const char *name, const char *value); |
154 | extern void cgit_repo_config_cb(const char *name, const char *value); | 155 | extern void cgit_repo_config_cb(const char *name, const char *value); |
155 | extern void cgit_querystring_cb(const char *name, const char *value); | 156 | extern void cgit_querystring_cb(const char *name, const char *value); |
156 | 157 | ||
157 | extern int chk_zero(int result, char *msg); | 158 | extern int chk_zero(int result, char *msg); |
158 | extern int chk_positive(int result, char *msg); | 159 | extern int chk_positive(int result, char *msg); |
159 | 160 | ||
160 | extern int hextoint(char c); | 161 | extern int hextoint(char c); |
162 | extern char *trim_end(const char *str, char c); | ||
161 | 163 | ||
162 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 164 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
163 | 165 | ||
164 | extern int cgit_diff_files(const unsigned char *old_sha1, | 166 | extern int cgit_diff_files(const unsigned char *old_sha1, |
165 | const unsigned char *new_sha1, | 167 | const unsigned char *new_sha1, |
166 | linediff_fn fn); | 168 | linediff_fn fn); |
167 | 169 | ||
168 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 170 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
@@ -199,17 +201,17 @@ extern int cache_expired(struct cacheitem *item); | |||
199 | 201 | ||
200 | extern char *cgit_repourl(const char *reponame); | 202 | extern char *cgit_repourl(const char *reponame); |
201 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 203 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
202 | const char *query); | 204 | const char *query); |
203 | 205 | ||
204 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 206 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
205 | char *rev, char *path); | 207 | char *rev, char *path); |
206 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 208 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
207 | char *rev, char *path); | 209 | char *rev, char *path, int ofs); |
208 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 210 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
209 | char *rev); | 211 | char *rev); |
210 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 212 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
211 | char *new_rev, char *old_rev, char *path); | 213 | char *new_rev, char *old_rev, char *path); |
212 | 214 | ||
213 | extern void cgit_print_error(char *msg); | 215 | extern void cgit_print_error(char *msg); |
214 | extern void cgit_print_date(time_t secs, char *format); | 216 | extern void cgit_print_date(time_t secs, char *format); |
215 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); | 217 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
@@ -7,16 +7,20 @@ | |||
7 | ## usefull for testing. | 7 | ## usefull for testing. |
8 | #nocache=0 | 8 | #nocache=0 |
9 | 9 | ||
10 | 10 | ||
11 | ## Enable/disable snapshots by default. This can be overridden per repo | 11 | ## Enable/disable snapshots by default. This can be overridden per repo |
12 | #snapshots=0 | 12 | #snapshots=0 |
13 | 13 | ||
14 | 14 | ||
15 | ## Enable/disable extra links to summary/log/tree per repo on index page | ||
16 | #enable-index-links=0 | ||
17 | |||
18 | |||
15 | ## Enable/disable display of 'number of files changed' in log view | 19 | ## Enable/disable display of 'number of files changed' in log view |
16 | #enable-log-filecount=0 | 20 | #enable-log-filecount=0 |
17 | 21 | ||
18 | 22 | ||
19 | ## Enable/disable display of 'number of lines changed' in log view | 23 | ## Enable/disable display of 'number of lines changed' in log view |
20 | #enable-log-linecount=0 | 24 | #enable-log-linecount=0 |
21 | 25 | ||
22 | 26 | ||
@@ -163,17 +163,17 @@ void cgit_parse_url(const char *url) | |||
163 | continue; | 163 | continue; |
164 | } | 164 | } |
165 | 165 | ||
166 | cgit_query_repo = cgit_repo->url; | 166 | cgit_query_repo = cgit_repo->url; |
167 | p = strchr(cmd + 1, '/'); | 167 | p = strchr(cmd + 1, '/'); |
168 | if (p) { | 168 | if (p) { |
169 | p[0] = '\0'; | 169 | p[0] = '\0'; |
170 | if (p[1]) | 170 | if (p[1]) |
171 | cgit_query_path = xstrdup(p + 1); | 171 | cgit_query_path = trim_end(p + 1, '/'); |
172 | } | 172 | } |
173 | cgit_cmd = cgit_get_cmd_index(cmd + 1); | 173 | cgit_cmd = cgit_get_cmd_index(cmd + 1); |
174 | cgit_query_page = xstrdup(cmd + 1); | 174 | cgit_query_page = xstrdup(cmd + 1); |
175 | return; | 175 | return; |
176 | } | 176 | } |
177 | } | 177 | } |
178 | 178 | ||
179 | char *substr(const char *head, const char *tail) | 179 | char *substr(const char *head, const char *tail) |
@@ -23,16 +23,17 @@ char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | |||
23 | char *cgit_agefile = "info/web/last-modified"; | 23 | char *cgit_agefile = "info/web/last-modified"; |
24 | char *cgit_virtual_root = NULL; | 24 | char *cgit_virtual_root = NULL; |
25 | char *cgit_script_name = CGIT_SCRIPT_NAME; | 25 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
26 | char *cgit_cache_root = "/var/cache/cgit"; | 26 | char *cgit_cache_root = "/var/cache/cgit"; |
27 | char *cgit_repo_group = NULL; | 27 | char *cgit_repo_group = NULL; |
28 | 28 | ||
29 | int cgit_nocache = 0; | 29 | int cgit_nocache = 0; |
30 | int cgit_snapshots = 0; | 30 | int cgit_snapshots = 0; |
31 | int cgit_enable_index_links = 0; | ||
31 | int cgit_enable_log_filecount = 0; | 32 | int cgit_enable_log_filecount = 0; |
32 | int cgit_enable_log_linecount = 0; | 33 | int cgit_enable_log_linecount = 0; |
33 | int cgit_max_lock_attempts = 5; | 34 | int cgit_max_lock_attempts = 5; |
34 | int cgit_cache_root_ttl = 5; | 35 | int cgit_cache_root_ttl = 5; |
35 | int cgit_cache_repo_ttl = 5; | 36 | int cgit_cache_repo_ttl = 5; |
36 | int cgit_cache_dynamic_ttl = 5; | 37 | int cgit_cache_dynamic_ttl = 5; |
37 | int cgit_cache_static_ttl = -1; | 38 | int cgit_cache_static_ttl = -1; |
38 | int cgit_cache_max_create_time = 5; | 39 | int cgit_cache_max_create_time = 5; |
@@ -143,16 +144,18 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
143 | else if (!strcmp(name, "module-link")) | 144 | else if (!strcmp(name, "module-link")) |
144 | cgit_module_link = xstrdup(value); | 145 | cgit_module_link = xstrdup(value); |
145 | else if (!strcmp(name, "virtual-root")) | 146 | else if (!strcmp(name, "virtual-root")) |
146 | cgit_virtual_root = xstrdup(value); | 147 | cgit_virtual_root = xstrdup(value); |
147 | else if (!strcmp(name, "nocache")) | 148 | else if (!strcmp(name, "nocache")) |
148 | cgit_nocache = atoi(value); | 149 | cgit_nocache = atoi(value); |
149 | else if (!strcmp(name, "snapshots")) | 150 | else if (!strcmp(name, "snapshots")) |
150 | cgit_snapshots = atoi(value); | 151 | cgit_snapshots = atoi(value); |
152 | else if (!strcmp(name, "enable-index-links")) | ||
153 | cgit_enable_index_links = atoi(value); | ||
151 | else if (!strcmp(name, "enable-log-filecount")) | 154 | else if (!strcmp(name, "enable-log-filecount")) |
152 | cgit_enable_log_filecount = atoi(value); | 155 | cgit_enable_log_filecount = atoi(value); |
153 | else if (!strcmp(name, "enable-log-linecount")) | 156 | else if (!strcmp(name, "enable-log-linecount")) |
154 | cgit_enable_log_linecount = atoi(value); | 157 | cgit_enable_log_linecount = atoi(value); |
155 | else if (!strcmp(name, "cache-root")) | 158 | else if (!strcmp(name, "cache-root")) |
156 | cgit_cache_root = xstrdup(value); | 159 | cgit_cache_root = xstrdup(value); |
157 | else if (!strcmp(name, "cache-root-ttl")) | 160 | else if (!strcmp(name, "cache-root-ttl")) |
158 | cgit_cache_root_ttl = atoi(value); | 161 | cgit_cache_root_ttl = atoi(value); |
@@ -222,17 +225,17 @@ void cgit_querystring_cb(const char *name, const char *value) | |||
222 | cgit_query_sha1 = xstrdup(value); | 225 | cgit_query_sha1 = xstrdup(value); |
223 | cgit_query_has_sha1 = 1; | 226 | cgit_query_has_sha1 = 1; |
224 | } else if (!strcmp(name, "id2")) { | 227 | } else if (!strcmp(name, "id2")) { |
225 | cgit_query_sha2 = xstrdup(value); | 228 | cgit_query_sha2 = xstrdup(value); |
226 | cgit_query_has_sha1 = 1; | 229 | cgit_query_has_sha1 = 1; |
227 | } else if (!strcmp(name, "ofs")) { | 230 | } else if (!strcmp(name, "ofs")) { |
228 | cgit_query_ofs = atoi(value); | 231 | cgit_query_ofs = atoi(value); |
229 | } else if (!strcmp(name, "path")) { | 232 | } else if (!strcmp(name, "path")) { |
230 | cgit_query_path = xstrdup(value); | 233 | cgit_query_path = trim_end(value, '/'); |
231 | } else if (!strcmp(name, "name")) { | 234 | } else if (!strcmp(name, "name")) { |
232 | cgit_query_name = xstrdup(value); | 235 | cgit_query_name = xstrdup(value); |
233 | } | 236 | } |
234 | } | 237 | } |
235 | 238 | ||
236 | void *cgit_free_commitinfo(struct commitinfo *info) | 239 | void *cgit_free_commitinfo(struct commitinfo *info) |
237 | { | 240 | { |
238 | free(info->author); | 241 | free(info->author); |
@@ -251,16 +254,38 @@ int hextoint(char c) | |||
251 | else if (c >= 'A' && c <= 'F') | 254 | else if (c >= 'A' && c <= 'F') |
252 | return 10 + c - 'A'; | 255 | return 10 + c - 'A'; |
253 | else if (c >= '0' && c <= '9') | 256 | else if (c >= '0' && c <= '9') |
254 | return c - '0'; | 257 | return c - '0'; |
255 | else | 258 | else |
256 | return -1; | 259 | return -1; |
257 | } | 260 | } |
258 | 261 | ||
262 | char *trim_end(const char *str, char c) | ||
263 | { | ||
264 | int len; | ||
265 | char *s, *t; | ||
266 | |||
267 | if (str == NULL) | ||
268 | return NULL; | ||
269 | t = (char *)str; | ||
270 | len = strlen(t); | ||
271 | while(len > 0 && t[len - 1] == c) | ||
272 | len--; | ||
273 | |||
274 | if (len == 0) | ||
275 | return NULL; | ||
276 | |||
277 | c = t[len]; | ||
278 | t[len] = '\0'; | ||
279 | s = xstrdup(t); | ||
280 | t[len] = c; | ||
281 | return s; | ||
282 | } | ||
283 | |||
259 | void cgit_diff_tree_cb(struct diff_queue_struct *q, | 284 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
260 | struct diff_options *options, void *data) | 285 | struct diff_options *options, void *data) |
261 | { | 286 | { |
262 | int i; | 287 | int i; |
263 | 288 | ||
264 | for (i = 0; i < q->nr; i++) { | 289 | for (i = 0; i < q->nr; i++) { |
265 | if (q->queue[i]->status == 'U') | 290 | if (q->queue[i]->status == 'U') |
266 | continue; | 291 | continue; |
@@ -108,23 +108,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, i | |||
108 | free_commit_list(commit->parents); | 108 | free_commit_list(commit->parents); |
109 | commit->parents = NULL; | 109 | commit->parents = NULL; |
110 | } | 110 | } |
111 | html("</table>\n"); | 111 | html("</table>\n"); |
112 | 112 | ||
113 | if (pager) { | 113 | if (pager) { |
114 | html("<div class='pager'>"); | 114 | html("<div class='pager'>"); |
115 | if (ofs > 0) { | 115 | if (ofs > 0) { |
116 | html(" <a href='"); | 116 | cgit_log_link("[prev]", NULL, NULL, cgit_query_head, |
117 | html(cgit_pageurl(cgit_query_repo, cgit_query_page, | 117 | cgit_query_sha1, cgit_query_path, |
118 | fmt("h=%s&ofs=%d", tip, ofs-cnt))); | 118 | ofs - cnt); |
119 | html("'>[prev]</a> "); | 119 | html(" "); |
120 | } | 120 | } |
121 | |||
122 | if ((commit = get_revision(&rev)) != NULL) { | 121 | if ((commit = get_revision(&rev)) != NULL) { |
123 | html(" <a href='"); | 122 | cgit_log_link("[next]", NULL, NULL, cgit_query_head, |
124 | html(cgit_pageurl(cgit_query_repo, "log", | 123 | cgit_query_sha1, cgit_query_path, |
125 | fmt("h=%s&ofs=%d", tip, ofs+cnt))); | 124 | ofs + cnt); |
126 | html("'>[next]</a> "); | ||
127 | } | 125 | } |
128 | html("</div>"); | 126 | html("</div>"); |
129 | } | 127 | } |
130 | } | 128 | } |
diff --git a/ui-repolist.c b/ui-repolist.c index 2018dab..4c86543 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -39,60 +39,71 @@ static void print_modtime(struct repoinfo *repo) | |||
39 | path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); | 39 | path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); |
40 | if (stat(path, &s) != 0) | 40 | if (stat(path, &s) != 0) |
41 | return; | 41 | return; |
42 | cgit_print_age(s.st_mtime, -1, NULL); | 42 | cgit_print_age(s.st_mtime, -1, NULL); |
43 | } | 43 | } |
44 | 44 | ||
45 | void cgit_print_repolist(struct cacheitem *item) | 45 | void cgit_print_repolist(struct cacheitem *item) |
46 | { | 46 | { |
47 | int i; | 47 | int i, columns = 4; |
48 | char *last_group = NULL; | 48 | char *last_group = NULL; |
49 | 49 | ||
50 | if (cgit_enable_index_links) | ||
51 | columns++; | ||
52 | |||
50 | cgit_print_docstart(cgit_root_title, item); | 53 | cgit_print_docstart(cgit_root_title, item); |
51 | cgit_print_pageheader(cgit_root_title, 0); | 54 | cgit_print_pageheader(cgit_root_title, 0); |
52 | 55 | ||
53 | html("<table class='list nowrap'>"); | 56 | html("<table class='list nowrap'>"); |
54 | if (cgit_index_header) { | 57 | if (cgit_index_header) { |
55 | html("<tr class='nohover'><td colspan='5' class='include-block'>"); | 58 | htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", |
59 | columns); | ||
56 | html_include(cgit_index_header); | 60 | html_include(cgit_index_header); |
57 | html("</td></tr>"); | 61 | html("</td></tr>"); |
58 | } | 62 | } |
59 | html("<tr class='nohover'>" | 63 | html("<tr class='nohover'>" |
60 | "<th class='left'>Name</th>" | 64 | "<th class='left'>Name</th>" |
61 | "<th class='left'>Description</th>" | 65 | "<th class='left'>Description</th>" |
62 | "<th class='left'>Owner</th>" | 66 | "<th class='left'>Owner</th>" |
63 | "<th class='left'>Idle</th>" | 67 | "<th class='left'>Idle</th>"); |
64 | "<th>Links</th></tr>\n"); | 68 | if (cgit_enable_index_links) |
69 | html("<th>Links</th>"); | ||
70 | html("</tr>\n"); | ||
65 | 71 | ||
66 | for (i=0; i<cgit_repolist.count; i++) { | 72 | for (i=0; i<cgit_repolist.count; i++) { |
67 | cgit_repo = &cgit_repolist.repos[i]; | 73 | cgit_repo = &cgit_repolist.repos[i]; |
68 | if ((last_group == NULL && cgit_repo->group != NULL) || | 74 | if ((last_group == NULL && cgit_repo->group != NULL) || |
69 | (last_group != NULL && cgit_repo->group == NULL) || | 75 | (last_group != NULL && cgit_repo->group == NULL) || |
70 | (last_group != NULL && cgit_repo->group != NULL && | 76 | (last_group != NULL && cgit_repo->group != NULL && |
71 | strcmp(cgit_repo->group, last_group))) { | 77 | strcmp(cgit_repo->group, last_group))) { |
72 | html("<tr class='nohover'><td colspan='4' class='repogroup'>"); | 78 | htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", |
79 | columns); | ||
73 | html_txt(cgit_repo->group); | 80 | html_txt(cgit_repo->group); |
74 | html("</td></tr>"); | 81 | html("</td></tr>"); |
75 | last_group = cgit_repo->group; | 82 | last_group = cgit_repo->group; |
76 | } | 83 | } |
77 | htmlf("<tr><td class='%s'>", | 84 | htmlf("<tr><td class='%s'>", |
78 | cgit_repo->group ? "sublevel-repo" : "toplevel-repo"); | 85 | cgit_repo->group ? "sublevel-repo" : "toplevel-repo"); |
79 | html_link_open(cgit_repourl(cgit_repo->url), NULL, NULL); | 86 | html_link_open(cgit_repourl(cgit_repo->url), NULL, NULL); |
80 | html_txt(cgit_repo->name); | 87 | html_txt(cgit_repo->name); |
81 | html_link_close(); | 88 | html_link_close(); |
82 | html("</td><td>"); | 89 | html("</td><td>"); |
83 | html_ntxt(cgit_max_repodesc_len, cgit_repo->desc); | 90 | html_ntxt(cgit_max_repodesc_len, cgit_repo->desc); |
84 | html("</td><td>"); | 91 | html("</td><td>"); |
85 | html_txt(cgit_repo->owner); | 92 | html_txt(cgit_repo->owner); |
86 | html("</td><td>"); | 93 | html("</td><td>"); |
87 | print_modtime(cgit_repo); | 94 | print_modtime(cgit_repo); |
88 | html("</td><td>"); | 95 | html("</td>"); |
89 | html_link_open(cgit_repourl(cgit_repo->url), | 96 | if (cgit_enable_index_links) { |
90 | "Summary", "button"); | 97 | html("<td>"); |
91 | html("S</a>"); | 98 | html_link_open(cgit_repourl(cgit_repo->url), |
92 | cgit_log_link("L", "Log", "button", NULL, NULL, NULL); | 99 | NULL, "button"); |
93 | cgit_tree_link("F", "Files", "button", NULL, NULL, NULL); | 100 | html("summary</a>"); |
94 | html("</td></tr>\n"); | 101 | cgit_log_link("log", NULL, "button", NULL, NULL, NULL, 0); |
102 | cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); | ||
103 | html("</td>"); | ||
104 | } | ||
105 | html("</tr>\n"); | ||
95 | } | 106 | } |
96 | html("</table>"); | 107 | html("</table>"); |
97 | cgit_print_docend(); | 108 | cgit_print_docend(); |
98 | } | 109 | } |
diff --git a/ui-shared.c b/ui-shared.c index 110c696..d4376ce 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -106,30 +106,34 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
106 | html(" href='"); | 106 | html(" href='"); |
107 | if (cgit_virtual_root) { | 107 | if (cgit_virtual_root) { |
108 | html_attr(cgit_virtual_root); | 108 | html_attr(cgit_virtual_root); |
109 | if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/') | 109 | if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/') |
110 | html("/"); | 110 | html("/"); |
111 | html_attr(cgit_repo->url); | 111 | html_attr(cgit_repo->url); |
112 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') | 112 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') |
113 | html("/"); | 113 | html("/"); |
114 | html(page); | 114 | if (page) { |
115 | html("/"); | 115 | html(page); |
116 | if (path) | 116 | html("/"); |
117 | html_attr(path); | 117 | if (path) |
118 | html_attr(path); | ||
119 | } | ||
118 | } else { | 120 | } else { |
119 | html(cgit_script_name); | 121 | html(cgit_script_name); |
120 | html("?url="); | 122 | html("?url="); |
121 | html_attr(cgit_repo->url); | 123 | html_attr(cgit_repo->url); |
122 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') | 124 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') |
123 | html("/"); | 125 | html("/"); |
124 | html(page); | 126 | if (page) { |
125 | html("/"); | 127 | html(page); |
126 | if (path) | 128 | html("/"); |
127 | html_attr(path); | 129 | if (path) |
130 | html_attr(path); | ||
131 | } | ||
128 | delim = "&"; | 132 | delim = "&"; |
129 | } | 133 | } |
130 | if (head && strcmp(head, cgit_repo->defbranch)) { | 134 | if (head && strcmp(head, cgit_repo->defbranch)) { |
131 | html(delim); | 135 | html(delim); |
132 | html("h="); | 136 | html("h="); |
133 | html_attr(head); | 137 | html_attr(head); |
134 | delim = "&"; | 138 | delim = "&"; |
135 | } | 139 | } |
@@ -154,19 +158,35 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
154 | 158 | ||
155 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 159 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
156 | char *rev, char *path) | 160 | char *rev, char *path) |
157 | { | 161 | { |
158 | reporevlink("tree", name, title, class, head, rev, path); | 162 | reporevlink("tree", name, title, class, head, rev, path); |
159 | } | 163 | } |
160 | 164 | ||
161 | void cgit_log_link(char *name, char *title, char *class, char *head, | 165 | void cgit_log_link(char *name, char *title, char *class, char *head, |
162 | char *rev, char *path) | 166 | char *rev, char *path, int ofs) |
163 | { | 167 | { |
164 | reporevlink("log", name, title, class, head, rev, path); | 168 | char *delim; |
169 | |||
170 | delim = repolink(title, class, "log", head, path); | ||
171 | if (rev && strcmp(rev, cgit_query_head)) { | ||
172 | html(delim); | ||
173 | html("id="); | ||
174 | html_attr(rev); | ||
175 | delim = "&"; | ||
176 | } | ||
177 | if (ofs > 0) { | ||
178 | html(delim); | ||
179 | html("ofs="); | ||
180 | htmlf("%d", ofs); | ||
181 | } | ||
182 | html("'>"); | ||
183 | html_txt(name); | ||
184 | html("</a>"); | ||
165 | } | 185 | } |
166 | 186 | ||
167 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 187 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
168 | char *rev) | 188 | char *rev) |
169 | { | 189 | { |
170 | if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { | 190 | if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { |
171 | name[cgit_max_msg_len] = '\0'; | 191 | name[cgit_max_msg_len] = '\0'; |
172 | name[cgit_max_msg_len - 1] = '.'; | 192 | name[cgit_max_msg_len - 1] = '.'; |
@@ -274,29 +294,48 @@ void cgit_print_docend() | |||
274 | { | 294 | { |
275 | html("</td></tr></table>"); | 295 | html("</td></tr></table>"); |
276 | html("</body>\n</html>\n"); | 296 | html("</body>\n</html>\n"); |
277 | } | 297 | } |
278 | 298 | ||
279 | void cgit_print_pageheader(char *title, int show_search) | 299 | void cgit_print_pageheader(char *title, int show_search) |
280 | { | 300 | { |
281 | html("<table id='layout'>"); | 301 | html("<table id='layout'>"); |
282 | html("<tr><td id='header'>"); | 302 | html("<tr><td id='header'><a href='"); |
283 | html(cgit_root_title); | 303 | html_attr(cgit_rooturl()); |
284 | html("</td><td id='logo'>"); | 304 | html("'>"); |
305 | html_txt(cgit_root_title); | ||
306 | html("</a></td><td id='logo'>"); | ||
285 | html("<a href='"); | 307 | html("<a href='"); |
286 | html_attr(cgit_logo_link); | 308 | html_attr(cgit_logo_link); |
287 | htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo); | 309 | htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo); |
288 | html("</td></tr>"); | 310 | html("</td></tr>"); |
289 | html("<tr><td id='crumb'>"); | 311 | html("<tr><td id='crumb'>"); |
290 | htmlf("<a href='%s'>root</a>", cgit_rooturl()); | ||
291 | if (cgit_query_repo) { | 312 | if (cgit_query_repo) { |
292 | htmlf(" : <a href='%s'>", cgit_repourl(cgit_repo->url)); | ||
293 | html_txt(cgit_repo->name); | 313 | html_txt(cgit_repo->name); |
294 | htmlf("</a> : %s", title); | 314 | html(" ("); |
315 | html_txt(cgit_query_head); | ||
316 | html(") : "); | ||
317 | reporevlink(NULL, "summary", NULL, NULL, cgit_query_head, | ||
318 | NULL, NULL); | ||
319 | html(" "); | ||
320 | cgit_log_link("log", NULL, NULL, cgit_query_head, | ||
321 | cgit_query_sha1, cgit_query_path, 0); | ||
322 | html(" "); | ||
323 | cgit_tree_link("tree", NULL, NULL, cgit_query_head, | ||
324 | cgit_query_sha1, NULL); | ||
325 | html(" "); | ||
326 | cgit_commit_link("commit", NULL, NULL, cgit_query_head, | ||
327 | cgit_query_sha1); | ||
328 | html(" "); | ||
329 | cgit_diff_link("diff", NULL, NULL, cgit_query_head, | ||
330 | cgit_query_sha1, cgit_query_sha2, | ||
331 | cgit_query_path); | ||
332 | } else { | ||
333 | html_txt("Index of repositories"); | ||
295 | } | 334 | } |
296 | html("</td>"); | 335 | html("</td>"); |
297 | html("<td id='search'>"); | 336 | html("<td id='search'>"); |
298 | if (show_search) { | 337 | if (show_search) { |
299 | html("<form method='get' action='"); | 338 | html("<form method='get' action='"); |
300 | html_attr(cgit_currurl()); | 339 | html_attr(cgit_currurl()); |
301 | html("'>"); | 340 | html("'>"); |
302 | if (!cgit_virtual_root) { | 341 | if (!cgit_virtual_root) { |
diff --git a/ui-summary.c b/ui-summary.c index 03dd078..b4bc6d8 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -22,17 +22,17 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | |||
22 | strncpy(buf, refname, sizeof(buf)); | 22 | strncpy(buf, refname, sizeof(buf)); |
23 | commit = lookup_commit(sha1); | 23 | commit = lookup_commit(sha1); |
24 | // object is not really parsed at this point, because of some fallout | 24 | // object is not really parsed at this point, because of some fallout |
25 | // from previous calls to git functions in cgit_print_log() | 25 | // from previous calls to git functions in cgit_print_log() |
26 | commit->object.parsed = 0; | 26 | commit->object.parsed = 0; |
27 | if (commit && !parse_commit(commit)){ | 27 | if (commit && !parse_commit(commit)){ |
28 | info = cgit_parse_commit(commit); | 28 | info = cgit_parse_commit(commit); |
29 | html("<tr><td>"); | 29 | html("<tr><td>"); |
30 | cgit_log_link(ref, NULL, NULL, ref, NULL, NULL); | 30 | cgit_log_link(ref, NULL, NULL, ref, NULL, NULL, 0); |
31 | html("</td><td>"); | 31 | html("</td><td>"); |
32 | cgit_print_age(commit->date, -1, NULL); | 32 | cgit_print_age(commit->date, -1, NULL); |
33 | html("</td><td>"); | 33 | html("</td><td>"); |
34 | html_txt(info->author); | 34 | html_txt(info->author); |
35 | html("</td><td>"); | 35 | html("</td><td>"); |
36 | cgit_commit_link(info->subject, NULL, NULL, ref, NULL); | 36 | cgit_commit_link(info->subject, NULL, NULL, ref, NULL); |
37 | html("</td></tr>\n"); | 37 | html("</td></tr>\n"); |
38 | cgit_free_commitinfo(info); | 38 | cgit_free_commitinfo(info); |
@@ -87,18 +87,18 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
87 | curr_rev, fullpath); | 87 | curr_rev, fullpath); |
88 | } else { | 88 | } else { |
89 | cgit_tree_link(name, NULL, "ls-blob", cgit_query_head, | 89 | cgit_tree_link(name, NULL, "ls-blob", cgit_query_head, |
90 | curr_rev, fullpath); | 90 | curr_rev, fullpath); |
91 | } | 91 | } |
92 | htmlf("</td><td class='ls-size'>%li</td>", size); | 92 | htmlf("</td><td class='ls-size'>%li</td>", size); |
93 | 93 | ||
94 | html("<td>"); | 94 | html("<td>"); |
95 | cgit_log_link("L", "Log", "button", cgit_query_head, curr_rev, | 95 | cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev, |
96 | fullpath); | 96 | fullpath, 0); |
97 | html("</td></tr>\n"); | 97 | html("</td></tr>\n"); |
98 | free(name); | 98 | free(name); |
99 | return 0; | 99 | return 0; |
100 | } | 100 | } |
101 | 101 | ||
102 | static void ls_head() | 102 | static void ls_head() |
103 | { | 103 | { |
104 | html("<table class='list'>\n"); | 104 | html("<table class='list'>\n"); |