-rw-r--r-- | ui-shared.c | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/ui-shared.c b/ui-shared.c index 3a9e67b..08ea003 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -272,163 +272,185 @@ void cgit_tree_link(char *name, char *title, char *class, char *head, | |||
272 | { | 272 | { |
273 | reporevlink("tree", name, title, class, head, rev, path); | 273 | reporevlink("tree", name, title, class, head, rev, path); |
274 | } | 274 | } |
275 | 275 | ||
276 | void cgit_plain_link(char *name, char *title, char *class, char *head, | 276 | void cgit_plain_link(char *name, char *title, char *class, char *head, |
277 | char *rev, char *path) | 277 | char *rev, char *path) |
278 | { | 278 | { |
279 | reporevlink("plain", name, title, class, head, rev, path); | 279 | reporevlink("plain", name, title, class, head, rev, path); |
280 | } | 280 | } |
281 | 281 | ||
282 | void cgit_log_link(char *name, char *title, char *class, char *head, | 282 | void cgit_log_link(char *name, char *title, char *class, char *head, |
283 | char *rev, char *path, int ofs, char *grep, char *pattern, | 283 | char *rev, char *path, int ofs, char *grep, char *pattern, |
284 | int showmsg) | 284 | int showmsg) |
285 | { | 285 | { |
286 | char *delim; | 286 | char *delim; |
287 | 287 | ||
288 | delim = repolink(title, class, "log", head, path); | 288 | delim = repolink(title, class, "log", head, path); |
289 | if (rev && strcmp(rev, ctx.qry.head)) { | 289 | if (rev && strcmp(rev, ctx.qry.head)) { |
290 | html(delim); | 290 | html(delim); |
291 | html("id="); | 291 | html("id="); |
292 | html_url_arg(rev); | 292 | html_url_arg(rev); |
293 | delim = "&"; | 293 | delim = "&"; |
294 | } | 294 | } |
295 | if (grep && pattern) { | 295 | if (grep && pattern) { |
296 | html(delim); | 296 | html(delim); |
297 | html("qt="); | 297 | html("qt="); |
298 | html_url_arg(grep); | 298 | html_url_arg(grep); |
299 | delim = "&"; | 299 | delim = "&"; |
300 | html(delim); | 300 | html(delim); |
301 | html("q="); | 301 | html("q="); |
302 | html_url_arg(pattern); | 302 | html_url_arg(pattern); |
303 | } | 303 | } |
304 | if (ofs > 0) { | 304 | if (ofs > 0) { |
305 | html(delim); | 305 | html(delim); |
306 | html("ofs="); | 306 | html("ofs="); |
307 | htmlf("%d", ofs); | 307 | htmlf("%d", ofs); |
308 | delim = "&"; | 308 | delim = "&"; |
309 | } | 309 | } |
310 | if (showmsg) { | 310 | if (showmsg) { |
311 | html(delim); | 311 | html(delim); |
312 | html("showmsg=1"); | 312 | html("showmsg=1"); |
313 | } | 313 | } |
314 | html("'>"); | 314 | html("'>"); |
315 | html_txt(name); | 315 | html_txt(name); |
316 | html("</a>"); | 316 | html("</a>"); |
317 | } | 317 | } |
318 | 318 | ||
319 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 319 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
320 | char *rev) | 320 | char *rev, int toggle_ssdiff) |
321 | { | 321 | { |
322 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 322 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
323 | name[ctx.cfg.max_msg_len] = '\0'; | 323 | name[ctx.cfg.max_msg_len] = '\0'; |
324 | name[ctx.cfg.max_msg_len - 1] = '.'; | 324 | name[ctx.cfg.max_msg_len - 1] = '.'; |
325 | name[ctx.cfg.max_msg_len - 2] = '.'; | 325 | name[ctx.cfg.max_msg_len - 2] = '.'; |
326 | name[ctx.cfg.max_msg_len - 3] = '.'; | 326 | name[ctx.cfg.max_msg_len - 3] = '.'; |
327 | } | 327 | } |
328 | reporevlink("commit", name, title, class, head, rev, NULL); | 328 | |
329 | char *delim; | ||
330 | |||
331 | delim = repolink(title, class, "commit", head, NULL); | ||
332 | if (rev && strcmp(rev, ctx.qry.head)) { | ||
333 | html(delim); | ||
334 | html("id="); | ||
335 | html_url_arg(rev); | ||
336 | delim = "&"; | ||
337 | } | ||
338 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { | ||
339 | html(delim); | ||
340 | html("ss=1"); | ||
341 | } | ||
342 | html("'>"); | ||
343 | html_txt(name); | ||
344 | html("</a>"); | ||
329 | } | 345 | } |
330 | 346 | ||
331 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 347 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
332 | char *rev, char *path) | 348 | char *rev, char *path) |
333 | { | 349 | { |
334 | reporevlink("refs", name, title, class, head, rev, path); | 350 | reporevlink("refs", name, title, class, head, rev, path); |
335 | } | 351 | } |
336 | 352 | ||
337 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 353 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
338 | char *rev, char *archivename) | 354 | char *rev, char *archivename) |
339 | { | 355 | { |
340 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 356 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
341 | } | 357 | } |
342 | 358 | ||
343 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 359 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
344 | char *new_rev, char *old_rev, char *path) | 360 | char *new_rev, char *old_rev, char *path, |
361 | int toggle_ssdiff) | ||
345 | { | 362 | { |
346 | char *delim; | 363 | char *delim; |
347 | 364 | ||
348 | delim = repolink(title, class, "diff", head, path); | 365 | delim = repolink(title, class, "diff", head, path); |
349 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 366 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { |
350 | html(delim); | 367 | html(delim); |
351 | html("id="); | 368 | html("id="); |
352 | html_url_arg(new_rev); | 369 | html_url_arg(new_rev); |
353 | delim = "&"; | 370 | delim = "&"; |
354 | } | 371 | } |
355 | if (old_rev) { | 372 | if (old_rev) { |
356 | html(delim); | 373 | html(delim); |
357 | html("id2="); | 374 | html("id2="); |
358 | html_url_arg(old_rev); | 375 | html_url_arg(old_rev); |
376 | delim = "&"; | ||
377 | } | ||
378 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { | ||
379 | html(delim); | ||
380 | html("ss=1"); | ||
359 | } | 381 | } |
360 | html("'>"); | 382 | html("'>"); |
361 | html_txt(name); | 383 | html_txt(name); |
362 | html("</a>"); | 384 | html("</a>"); |
363 | } | 385 | } |
364 | 386 | ||
365 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 387 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
366 | char *rev) | 388 | char *rev) |
367 | { | 389 | { |
368 | reporevlink("patch", name, title, class, head, rev, NULL); | 390 | reporevlink("patch", name, title, class, head, rev, NULL); |
369 | } | 391 | } |
370 | 392 | ||
371 | void cgit_stats_link(char *name, char *title, char *class, char *head, | 393 | void cgit_stats_link(char *name, char *title, char *class, char *head, |
372 | char *path) | 394 | char *path) |
373 | { | 395 | { |
374 | reporevlink("stats", name, title, class, head, NULL, path); | 396 | reporevlink("stats", name, title, class, head, NULL, path); |
375 | } | 397 | } |
376 | 398 | ||
377 | void cgit_object_link(struct object *obj) | 399 | void cgit_object_link(struct object *obj) |
378 | { | 400 | { |
379 | char *page, *shortrev, *fullrev, *name; | 401 | char *page, *shortrev, *fullrev, *name; |
380 | 402 | ||
381 | fullrev = sha1_to_hex(obj->sha1); | 403 | fullrev = sha1_to_hex(obj->sha1); |
382 | shortrev = xstrdup(fullrev); | 404 | shortrev = xstrdup(fullrev); |
383 | shortrev[10] = '\0'; | 405 | shortrev[10] = '\0'; |
384 | if (obj->type == OBJ_COMMIT) { | 406 | if (obj->type == OBJ_COMMIT) { |
385 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, | 407 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
386 | ctx.qry.head, fullrev); | 408 | ctx.qry.head, fullrev, 0); |
387 | return; | 409 | return; |
388 | } else if (obj->type == OBJ_TREE) | 410 | } else if (obj->type == OBJ_TREE) |
389 | page = "tree"; | 411 | page = "tree"; |
390 | else if (obj->type == OBJ_TAG) | 412 | else if (obj->type == OBJ_TAG) |
391 | page = "tag"; | 413 | page = "tag"; |
392 | else | 414 | else |
393 | page = "blob"; | 415 | page = "blob"; |
394 | name = fmt("%s %s...", typename(obj->type), shortrev); | 416 | name = fmt("%s %s...", typename(obj->type), shortrev); |
395 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); | 417 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
396 | } | 418 | } |
397 | 419 | ||
398 | void cgit_print_date(time_t secs, char *format, int local_time) | 420 | void cgit_print_date(time_t secs, char *format, int local_time) |
399 | { | 421 | { |
400 | char buf[64]; | 422 | char buf[64]; |
401 | struct tm *time; | 423 | struct tm *time; |
402 | 424 | ||
403 | if (!secs) | 425 | if (!secs) |
404 | return; | 426 | return; |
405 | if(local_time) | 427 | if(local_time) |
406 | time = localtime(&secs); | 428 | time = localtime(&secs); |
407 | else | 429 | else |
408 | time = gmtime(&secs); | 430 | time = gmtime(&secs); |
409 | strftime(buf, sizeof(buf)-1, format, time); | 431 | strftime(buf, sizeof(buf)-1, format, time); |
410 | html_txt(buf); | 432 | html_txt(buf); |
411 | } | 433 | } |
412 | 434 | ||
413 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 435 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
414 | { | 436 | { |
415 | time_t now, secs; | 437 | time_t now, secs; |
416 | 438 | ||
417 | if (!t) | 439 | if (!t) |
418 | return; | 440 | return; |
419 | time(&now); | 441 | time(&now); |
420 | secs = now - t; | 442 | secs = now - t; |
421 | 443 | ||
422 | if (secs > max_relative && max_relative >= 0) { | 444 | if (secs > max_relative && max_relative >= 0) { |
423 | cgit_print_date(t, format, ctx.cfg.local_time); | 445 | cgit_print_date(t, format, ctx.cfg.local_time); |
424 | return; | 446 | return; |
425 | } | 447 | } |
426 | 448 | ||
427 | if (secs < TM_HOUR * 2) { | 449 | if (secs < TM_HOUR * 2) { |
428 | htmlf("<span class='age-mins'>%.0f min.</span>", | 450 | htmlf("<span class='age-mins'>%.0f min.</span>", |
429 | secs * 1.0 / TM_MIN); | 451 | secs * 1.0 / TM_MIN); |
430 | return; | 452 | return; |
431 | } | 453 | } |
432 | if (secs < TM_DAY * 2) { | 454 | if (secs < TM_DAY * 2) { |
433 | htmlf("<span class='age-hours'>%.0f hours</span>", | 455 | htmlf("<span class='age-hours'>%.0f hours</span>", |
434 | secs * 1.0 / TM_HOUR); | 456 | secs * 1.0 / TM_HOUR); |
@@ -650,99 +672,99 @@ static void print_header(struct cgit_context *ctx) | |||
650 | html("</td><td class='form'>"); | 672 | html("</td><td class='form'>"); |
651 | html("<form method='get' action=''>\n"); | 673 | html("<form method='get' action=''>\n"); |
652 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); | 674 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); |
653 | html("<select name='h' onchange='this.form.submit();'>\n"); | 675 | html("<select name='h' onchange='this.form.submit();'>\n"); |
654 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 676 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
655 | html("</select> "); | 677 | html("</select> "); |
656 | html("<input type='submit' name='' value='switch'/>"); | 678 | html("<input type='submit' name='' value='switch'/>"); |
657 | html("</form>"); | 679 | html("</form>"); |
658 | } else | 680 | } else |
659 | html_txt(ctx->cfg.root_title); | 681 | html_txt(ctx->cfg.root_title); |
660 | html("</td></tr>\n"); | 682 | html("</td></tr>\n"); |
661 | 683 | ||
662 | html("<tr><td class='sub'>"); | 684 | html("<tr><td class='sub'>"); |
663 | if (ctx->repo) { | 685 | if (ctx->repo) { |
664 | html_txt(ctx->repo->desc); | 686 | html_txt(ctx->repo->desc); |
665 | html("</td><td class='sub right'>"); | 687 | html("</td><td class='sub right'>"); |
666 | html_txt(ctx->repo->owner); | 688 | html_txt(ctx->repo->owner); |
667 | } else { | 689 | } else { |
668 | if (ctx->cfg.root_desc) | 690 | if (ctx->cfg.root_desc) |
669 | html_txt(ctx->cfg.root_desc); | 691 | html_txt(ctx->cfg.root_desc); |
670 | else if (ctx->cfg.index_info) | 692 | else if (ctx->cfg.index_info) |
671 | html_include(ctx->cfg.index_info); | 693 | html_include(ctx->cfg.index_info); |
672 | } | 694 | } |
673 | html("</td></tr></table>\n"); | 695 | html("</td></tr></table>\n"); |
674 | } | 696 | } |
675 | 697 | ||
676 | void cgit_print_pageheader(struct cgit_context *ctx) | 698 | void cgit_print_pageheader(struct cgit_context *ctx) |
677 | { | 699 | { |
678 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 700 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
679 | 701 | ||
680 | if (!cmd && ctx->repo) | 702 | if (!cmd && ctx->repo) |
681 | fallback_cmd = "summary"; | 703 | fallback_cmd = "summary"; |
682 | 704 | ||
683 | html("<div id='cgit'>"); | 705 | html("<div id='cgit'>"); |
684 | if (!ctx->cfg.noheader) | 706 | if (!ctx->cfg.noheader) |
685 | print_header(ctx); | 707 | print_header(ctx); |
686 | 708 | ||
687 | html("<table class='tabs'><tr><td>\n"); | 709 | html("<table class='tabs'><tr><td>\n"); |
688 | if (ctx->repo) { | 710 | if (ctx->repo) { |
689 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 711 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
690 | ctx->qry.head); | 712 | ctx->qry.head); |
691 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 713 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
692 | ctx->qry.sha1, NULL); | 714 | ctx->qry.sha1, NULL); |
693 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 715 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
694 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 716 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
695 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 717 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
696 | ctx->qry.sha1, NULL); | 718 | ctx->qry.sha1, NULL); |
697 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 719 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
698 | ctx->qry.head, ctx->qry.sha1); | 720 | ctx->qry.head, ctx->qry.sha1, 0); |
699 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 721 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
700 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 722 | ctx->qry.sha1, ctx->qry.sha2, NULL, 0); |
701 | if (ctx->repo->max_stats) | 723 | if (ctx->repo->max_stats) |
702 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), | 724 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), |
703 | ctx->qry.head, NULL); | 725 | ctx->qry.head, NULL); |
704 | if (ctx->repo->readme) | 726 | if (ctx->repo->readme) |
705 | reporevlink("about", "about", NULL, | 727 | reporevlink("about", "about", NULL, |
706 | hc(cmd, "about"), ctx->qry.head, NULL, | 728 | hc(cmd, "about"), ctx->qry.head, NULL, |
707 | NULL); | 729 | NULL); |
708 | html("</td><td class='form'>"); | 730 | html("</td><td class='form'>"); |
709 | html("<form class='right' method='get' action='"); | 731 | html("<form class='right' method='get' action='"); |
710 | if (ctx->cfg.virtual_root) | 732 | if (ctx->cfg.virtual_root) |
711 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 733 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
712 | ctx->qry.path, NULL)); | 734 | ctx->qry.path, NULL)); |
713 | html("'>\n"); | 735 | html("'>\n"); |
714 | cgit_add_hidden_formfields(1, 0, "log"); | 736 | cgit_add_hidden_formfields(1, 0, "log"); |
715 | html("<select name='qt'>\n"); | 737 | html("<select name='qt'>\n"); |
716 | html_option("grep", "log msg", ctx->qry.grep); | 738 | html_option("grep", "log msg", ctx->qry.grep); |
717 | html_option("author", "author", ctx->qry.grep); | 739 | html_option("author", "author", ctx->qry.grep); |
718 | html_option("committer", "committer", ctx->qry.grep); | 740 | html_option("committer", "committer", ctx->qry.grep); |
719 | html("</select>\n"); | 741 | html("</select>\n"); |
720 | html("<input class='txt' type='text' size='10' name='q' value='"); | 742 | html("<input class='txt' type='text' size='10' name='q' value='"); |
721 | html_attr(ctx->qry.search); | 743 | html_attr(ctx->qry.search); |
722 | html("'/>\n"); | 744 | html("'/>\n"); |
723 | html("<input type='submit' value='search'/>\n"); | 745 | html("<input type='submit' value='search'/>\n"); |
724 | html("</form>\n"); | 746 | html("</form>\n"); |
725 | } else { | 747 | } else { |
726 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 748 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |
727 | if (ctx->cfg.root_readme) | 749 | if (ctx->cfg.root_readme) |
728 | site_link("about", "about", NULL, hc(cmd, "about"), | 750 | site_link("about", "about", NULL, hc(cmd, "about"), |
729 | NULL, 0); | 751 | NULL, 0); |
730 | html("</td><td class='form'>"); | 752 | html("</td><td class='form'>"); |
731 | html("<form method='get' action='"); | 753 | html("<form method='get' action='"); |
732 | html_attr(cgit_rooturl()); | 754 | html_attr(cgit_rooturl()); |
733 | html("'>\n"); | 755 | html("'>\n"); |
734 | html("<input type='text' name='q' size='10' value='"); | 756 | html("<input type='text' name='q' size='10' value='"); |
735 | html_attr(ctx->qry.search); | 757 | html_attr(ctx->qry.search); |
736 | html("'/>\n"); | 758 | html("'/>\n"); |
737 | html("<input type='submit' value='search'/>\n"); | 759 | html("<input type='submit' value='search'/>\n"); |
738 | html("</form>"); | 760 | html("</form>"); |
739 | } | 761 | } |
740 | html("</td></tr></table>\n"); | 762 | html("</td></tr></table>\n"); |
741 | html("<div class='content'>"); | 763 | html("<div class='content'>"); |
742 | } | 764 | } |
743 | 765 | ||
744 | void cgit_print_filemode(unsigned short mode) | 766 | void cgit_print_filemode(unsigned short mode) |
745 | { | 767 | { |
746 | if (S_ISDIR(mode)) | 768 | if (S_ISDIR(mode)) |
747 | html("d"); | 769 | html("d"); |
748 | else if (S_ISLNK(mode)) | 770 | else if (S_ISLNK(mode)) |