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
@@ -28,4 +28,5 @@ static int cgit_prepare_cache(struct cacheitem *item) | |||
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; |
@@ -33,4 +34,5 @@ static int cgit_prepare_cache(struct cacheitem *item) | |||
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) |
@@ -97,2 +97,10 @@ td#header { | |||
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 { |
@@ -118,2 +126,3 @@ td#crumb a { | |||
118 | background-color: #666; | 126 | background-color: #666; |
127 | padding: 0em 0.5em 0em 0.5em; | ||
119 | } | 128 | } |
@@ -121,4 +130,5 @@ td#crumb a { | |||
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 | } |
@@ -363,5 +373,5 @@ 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; |
@@ -372,3 +382,4 @@ a.button:hover { | |||
372 | text-decoration: none; | 382 | text-decoration: none; |
373 | background-color: #eee; | 383 | color: #333; |
384 | background-color: #ccc; | ||
374 | } | 385 | } |
@@ -120,2 +120,3 @@ 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; |
@@ -160,2 +161,3 @@ extern int chk_positive(int result, char *msg); | |||
160 | extern int hextoint(char c); | 161 | extern int hextoint(char c); |
162 | extern char *trim_end(const char *str, char c); | ||
161 | 163 | ||
@@ -206,3 +208,3 @@ extern void cgit_tree_link(char *name, char *title, char *class, char *head, | |||
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, |
@@ -14,2 +14,6 @@ | |||
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 |
@@ -170,3 +170,3 @@ void cgit_parse_url(const char *url) | |||
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 | } |
@@ -30,2 +30,3 @@ 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; |
@@ -150,2 +151,4 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
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")) |
@@ -229,3 +232,3 @@ void cgit_querystring_cb(const char *name, const char *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")) { |
@@ -258,2 +261,24 @@ int hextoint(char c) | |||
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, |
@@ -115,13 +115,11 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, i | |||
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 | } |
diff --git a/ui-repolist.c b/ui-repolist.c index 2018dab..4c86543 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -46,5 +46,8 @@ 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); |
@@ -54,3 +57,4 @@ void cgit_print_repolist(struct cacheitem *item) | |||
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); |
@@ -62,4 +66,6 @@ void cgit_print_repolist(struct cacheitem *item) | |||
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 | ||
@@ -71,3 +77,4 @@ void cgit_print_repolist(struct cacheitem *item) | |||
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); |
@@ -87,9 +94,13 @@ void cgit_print_repolist(struct cacheitem *item) | |||
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 | } |
diff --git a/ui-shared.c b/ui-shared.c index 110c696..d4376ce 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -113,6 +113,8 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
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 { |
@@ -123,6 +125,8 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
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 = "&"; |
@@ -161,5 +165,21 @@ void cgit_tree_link(char *name, char *title, char *class, char *head, | |||
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 | } |
@@ -281,5 +301,7 @@ void cgit_print_pageheader(char *title, int show_search) | |||
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='"); |
@@ -289,7 +311,24 @@ void cgit_print_pageheader(char *title, int show_search) | |||
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 | } |
diff --git a/ui-summary.c b/ui-summary.c index 03dd078..b4bc6d8 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -29,3 +29,3 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | |||
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>"); |
@@ -94,4 +94,4 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
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"); |