-rw-r--r-- | ui-shared.c | 5 | ||||
-rw-r--r-- | ui-shared.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index 2eddd2d..ee3f6fe 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -196,128 +196,133 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
196 | html("<a"); | 196 | html("<a"); |
197 | if (title) { | 197 | if (title) { |
198 | html(" title='"); | 198 | html(" title='"); |
199 | html_attr(title); | 199 | html_attr(title); |
200 | html("'"); | 200 | html("'"); |
201 | } | 201 | } |
202 | if (class) { | 202 | if (class) { |
203 | html(" class='"); | 203 | html(" class='"); |
204 | html_attr(class); | 204 | html_attr(class); |
205 | html("'"); | 205 | html("'"); |
206 | } | 206 | } |
207 | html(" href='"); | 207 | html(" href='"); |
208 | if (ctx.cfg.virtual_root) { | 208 | if (ctx.cfg.virtual_root) { |
209 | html_url_path(ctx.cfg.virtual_root); | 209 | html_url_path(ctx.cfg.virtual_root); |
210 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') | 210 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') |
211 | html("/"); | 211 | html("/"); |
212 | html_url_path(ctx.repo->url); | 212 | html_url_path(ctx.repo->url); |
213 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 213 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
214 | html("/"); | 214 | html("/"); |
215 | if (page) { | 215 | if (page) { |
216 | html_url_path(page); | 216 | html_url_path(page); |
217 | html("/"); | 217 | html("/"); |
218 | if (path) | 218 | if (path) |
219 | html_url_path(path); | 219 | html_url_path(path); |
220 | } | 220 | } |
221 | } else { | 221 | } else { |
222 | html(ctx.cfg.script_name); | 222 | html(ctx.cfg.script_name); |
223 | html("?url="); | 223 | html("?url="); |
224 | html_url_arg(ctx.repo->url); | 224 | html_url_arg(ctx.repo->url); |
225 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 225 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
226 | html("/"); | 226 | html("/"); |
227 | if (page) { | 227 | if (page) { |
228 | html_url_arg(page); | 228 | html_url_arg(page); |
229 | html("/"); | 229 | html("/"); |
230 | if (path) | 230 | if (path) |
231 | html_url_arg(path); | 231 | html_url_arg(path); |
232 | } | 232 | } |
233 | delim = "&"; | 233 | delim = "&"; |
234 | } | 234 | } |
235 | if (head && strcmp(head, ctx.repo->defbranch)) { | 235 | if (head && strcmp(head, ctx.repo->defbranch)) { |
236 | html(delim); | 236 | html(delim); |
237 | html("h="); | 237 | html("h="); |
238 | html_url_arg(head); | 238 | html_url_arg(head); |
239 | delim = "&"; | 239 | delim = "&"; |
240 | } | 240 | } |
241 | return fmt("%s", delim); | 241 | return fmt("%s", delim); |
242 | } | 242 | } |
243 | 243 | ||
244 | static void reporevlink(char *page, char *name, char *title, char *class, | 244 | static void reporevlink(char *page, char *name, char *title, char *class, |
245 | char *head, char *rev, char *path) | 245 | char *head, char *rev, char *path) |
246 | { | 246 | { |
247 | char *delim; | 247 | char *delim; |
248 | 248 | ||
249 | delim = repolink(title, class, page, head, path); | 249 | delim = repolink(title, class, page, head, path); |
250 | if (rev && strcmp(rev, ctx.qry.head)) { | 250 | if (rev && strcmp(rev, ctx.qry.head)) { |
251 | html(delim); | 251 | html(delim); |
252 | html("id="); | 252 | html("id="); |
253 | html_url_arg(rev); | 253 | html_url_arg(rev); |
254 | } | 254 | } |
255 | html("'>"); | 255 | html("'>"); |
256 | html_txt(name); | 256 | html_txt(name); |
257 | html("</a>"); | 257 | html("</a>"); |
258 | } | 258 | } |
259 | 259 | ||
260 | void cgit_summary_link(char *name, char *title, char *class, char *head) | ||
261 | { | ||
262 | reporevlink(NULL, name, title, class, head, NULL, NULL); | ||
263 | } | ||
264 | |||
260 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 265 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
261 | char *rev, char *path) | 266 | char *rev, char *path) |
262 | { | 267 | { |
263 | reporevlink("tree", name, title, class, head, rev, path); | 268 | reporevlink("tree", name, title, class, head, rev, path); |
264 | } | 269 | } |
265 | 270 | ||
266 | void cgit_plain_link(char *name, char *title, char *class, char *head, | 271 | void cgit_plain_link(char *name, char *title, char *class, char *head, |
267 | char *rev, char *path) | 272 | char *rev, char *path) |
268 | { | 273 | { |
269 | reporevlink("plain", name, title, class, head, rev, path); | 274 | reporevlink("plain", name, title, class, head, rev, path); |
270 | } | 275 | } |
271 | 276 | ||
272 | void cgit_log_link(char *name, char *title, char *class, char *head, | 277 | void cgit_log_link(char *name, char *title, char *class, char *head, |
273 | char *rev, char *path, int ofs, char *grep, char *pattern) | 278 | char *rev, char *path, int ofs, char *grep, char *pattern) |
274 | { | 279 | { |
275 | char *delim; | 280 | char *delim; |
276 | 281 | ||
277 | delim = repolink(title, class, "log", head, path); | 282 | delim = repolink(title, class, "log", head, path); |
278 | if (rev && strcmp(rev, ctx.qry.head)) { | 283 | if (rev && strcmp(rev, ctx.qry.head)) { |
279 | html(delim); | 284 | html(delim); |
280 | html("id="); | 285 | html("id="); |
281 | html_url_arg(rev); | 286 | html_url_arg(rev); |
282 | delim = "&"; | 287 | delim = "&"; |
283 | } | 288 | } |
284 | if (grep && pattern) { | 289 | if (grep && pattern) { |
285 | html(delim); | 290 | html(delim); |
286 | html("qt="); | 291 | html("qt="); |
287 | html_url_arg(grep); | 292 | html_url_arg(grep); |
288 | delim = "&"; | 293 | delim = "&"; |
289 | html(delim); | 294 | html(delim); |
290 | html("q="); | 295 | html("q="); |
291 | html_url_arg(pattern); | 296 | html_url_arg(pattern); |
292 | } | 297 | } |
293 | if (ofs > 0) { | 298 | if (ofs > 0) { |
294 | html(delim); | 299 | html(delim); |
295 | html("ofs="); | 300 | html("ofs="); |
296 | htmlf("%d", ofs); | 301 | htmlf("%d", ofs); |
297 | } | 302 | } |
298 | html("'>"); | 303 | html("'>"); |
299 | html_txt(name); | 304 | html_txt(name); |
300 | html("</a>"); | 305 | html("</a>"); |
301 | } | 306 | } |
302 | 307 | ||
303 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 308 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
304 | char *rev) | 309 | char *rev) |
305 | { | 310 | { |
306 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 311 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
307 | name[ctx.cfg.max_msg_len] = '\0'; | 312 | name[ctx.cfg.max_msg_len] = '\0'; |
308 | name[ctx.cfg.max_msg_len - 1] = '.'; | 313 | name[ctx.cfg.max_msg_len - 1] = '.'; |
309 | name[ctx.cfg.max_msg_len - 2] = '.'; | 314 | name[ctx.cfg.max_msg_len - 2] = '.'; |
310 | name[ctx.cfg.max_msg_len - 3] = '.'; | 315 | name[ctx.cfg.max_msg_len - 3] = '.'; |
311 | } | 316 | } |
312 | reporevlink("commit", name, title, class, head, rev, NULL); | 317 | reporevlink("commit", name, title, class, head, rev, NULL); |
313 | } | 318 | } |
314 | 319 | ||
315 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 320 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
316 | char *rev, char *path) | 321 | char *rev, char *path) |
317 | { | 322 | { |
318 | reporevlink("refs", name, title, class, head, rev, path); | 323 | reporevlink("refs", name, title, class, head, rev, path); |
319 | } | 324 | } |
320 | 325 | ||
321 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 326 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
322 | char *rev, char *archivename) | 327 | char *rev, char *archivename) |
323 | { | 328 | { |
diff --git a/ui-shared.h b/ui-shared.h index 747f092..0cd5ed1 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -1,43 +1,44 @@ | |||
1 | #ifndef UI_SHARED_H | 1 | #ifndef UI_SHARED_H |
2 | #define UI_SHARED_H | 2 | #define UI_SHARED_H |
3 | 3 | ||
4 | extern char *cgit_hosturl(); | 4 | extern char *cgit_hosturl(); |
5 | extern char *cgit_repourl(const char *reponame); | 5 | extern char *cgit_repourl(const char *reponame); |
6 | extern char *cgit_fileurl(const char *reponame, const char *pagename, | 6 | extern char *cgit_fileurl(const char *reponame, const char *pagename, |
7 | const char *filename, const char *query); | 7 | const char *filename, const char *query); |
8 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 8 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
9 | const char *query); | 9 | const char *query); |
10 | 10 | ||
11 | extern void cgit_index_link(char *name, char *title, char *class, | 11 | extern void cgit_index_link(char *name, char *title, char *class, |
12 | char *pattern, int ofs); | 12 | char *pattern, int ofs); |
13 | extern void cgit_summary_link(char *name, char *title, char *class, char *head); | ||
13 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 14 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
14 | char *rev, char *path); | 15 | char *rev, char *path); |
15 | extern void cgit_plain_link(char *name, char *title, char *class, char *head, | 16 | extern void cgit_plain_link(char *name, char *title, char *class, char *head, |
16 | char *rev, char *path); | 17 | char *rev, char *path); |
17 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 18 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
18 | char *rev, char *path, int ofs, char *grep, | 19 | char *rev, char *path, int ofs, char *grep, |
19 | char *pattern); | 20 | char *pattern); |
20 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 21 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
21 | char *rev); | 22 | char *rev); |
22 | extern void cgit_patch_link(char *name, char *title, char *class, char *head, | 23 | extern void cgit_patch_link(char *name, char *title, char *class, char *head, |
23 | char *rev); | 24 | char *rev); |
24 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, | 25 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, |
25 | char *rev, char *path); | 26 | char *rev, char *path); |
26 | extern void cgit_snapshot_link(char *name, char *title, char *class, | 27 | extern void cgit_snapshot_link(char *name, char *title, char *class, |
27 | char *head, char *rev, char *archivename); | 28 | char *head, char *rev, char *archivename); |
28 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 29 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
29 | char *new_rev, char *old_rev, char *path); | 30 | char *new_rev, char *old_rev, char *path); |
30 | extern void cgit_object_link(struct object *obj); | 31 | extern void cgit_object_link(struct object *obj); |
31 | 32 | ||
32 | extern void cgit_print_error(char *msg); | 33 | extern void cgit_print_error(char *msg); |
33 | extern void cgit_print_date(time_t secs, char *format, int local_time); | 34 | extern void cgit_print_date(time_t secs, char *format, int local_time); |
34 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); | 35 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
35 | extern void cgit_print_http_headers(struct cgit_context *ctx); | 36 | extern void cgit_print_http_headers(struct cgit_context *ctx); |
36 | extern void cgit_print_docstart(struct cgit_context *ctx); | 37 | extern void cgit_print_docstart(struct cgit_context *ctx); |
37 | extern void cgit_print_docend(); | 38 | extern void cgit_print_docend(); |
38 | extern void cgit_print_pageheader(struct cgit_context *ctx); | 39 | extern void cgit_print_pageheader(struct cgit_context *ctx); |
39 | extern void cgit_print_filemode(unsigned short mode); | 40 | extern void cgit_print_filemode(unsigned short mode); |
40 | extern void cgit_print_snapshot_links(const char *repo, const char *head, | 41 | extern void cgit_print_snapshot_links(const char *repo, const char *head, |
41 | const char *hex, int snapshots); | 42 | const char *hex, int snapshots); |
42 | 43 | ||
43 | #endif /* UI_SHARED_H */ | 44 | #endif /* UI_SHARED_H */ |