-rw-r--r-- | ui-shared.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ui-shared.c b/ui-shared.c index fba1ba6..4f28512 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -348,48 +348,54 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
348 | 348 | ||
349 | delim = repolink(title, class, "diff", head, path); | 349 | delim = repolink(title, class, "diff", head, path); |
350 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 350 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { |
351 | html(delim); | 351 | html(delim); |
352 | html("id="); | 352 | html("id="); |
353 | html_url_arg(new_rev); | 353 | html_url_arg(new_rev); |
354 | delim = "&"; | 354 | delim = "&"; |
355 | } | 355 | } |
356 | if (old_rev) { | 356 | if (old_rev) { |
357 | html(delim); | 357 | html(delim); |
358 | html("id2="); | 358 | html("id2="); |
359 | html_url_arg(old_rev); | 359 | html_url_arg(old_rev); |
360 | } | 360 | } |
361 | html("'>"); | 361 | html("'>"); |
362 | html_txt(name); | 362 | html_txt(name); |
363 | html("</a>"); | 363 | html("</a>"); |
364 | } | 364 | } |
365 | 365 | ||
366 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 366 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
367 | char *rev) | 367 | char *rev) |
368 | { | 368 | { |
369 | reporevlink("patch", name, title, class, head, rev, NULL); | 369 | reporevlink("patch", name, title, class, head, rev, NULL); |
370 | } | 370 | } |
371 | 371 | ||
372 | void cgit_stats_link(char *name, char *title, char *class, char *head, | ||
373 | char *path) | ||
374 | { | ||
375 | reporevlink("stats", name, title, class, head, NULL, path); | ||
376 | } | ||
377 | |||
372 | void cgit_object_link(struct object *obj) | 378 | void cgit_object_link(struct object *obj) |
373 | { | 379 | { |
374 | char *page, *shortrev, *fullrev, *name; | 380 | char *page, *shortrev, *fullrev, *name; |
375 | 381 | ||
376 | fullrev = sha1_to_hex(obj->sha1); | 382 | fullrev = sha1_to_hex(obj->sha1); |
377 | shortrev = xstrdup(fullrev); | 383 | shortrev = xstrdup(fullrev); |
378 | shortrev[10] = '\0'; | 384 | shortrev[10] = '\0'; |
379 | if (obj->type == OBJ_COMMIT) { | 385 | if (obj->type == OBJ_COMMIT) { |
380 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, | 386 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
381 | ctx.qry.head, fullrev); | 387 | ctx.qry.head, fullrev); |
382 | return; | 388 | return; |
383 | } else if (obj->type == OBJ_TREE) | 389 | } else if (obj->type == OBJ_TREE) |
384 | page = "tree"; | 390 | page = "tree"; |
385 | else if (obj->type == OBJ_TAG) | 391 | else if (obj->type == OBJ_TAG) |
386 | page = "tag"; | 392 | page = "tag"; |
387 | else | 393 | else |
388 | page = "blob"; | 394 | page = "blob"; |
389 | name = fmt("%s %s...", typename(obj->type), shortrev); | 395 | name = fmt("%s %s...", typename(obj->type), shortrev); |
390 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); | 396 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
391 | } | 397 | } |
392 | 398 | ||
393 | void cgit_print_date(time_t secs, char *format, int local_time) | 399 | void cgit_print_date(time_t secs, char *format, int local_time) |
394 | { | 400 | { |
395 | char buf[64]; | 401 | char buf[64]; |
@@ -536,49 +542,49 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
536 | return 1; | 542 | return 1; |
537 | if (obj->type == OBJ_TAG) { | 543 | if (obj->type == OBJ_TAG) { |
538 | tag = lookup_tag(sha1); | 544 | tag = lookup_tag(sha1); |
539 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 545 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
540 | return 0; | 546 | return 0; |
541 | hashcpy(fileid, tag->tagged->sha1); | 547 | hashcpy(fileid, tag->tagged->sha1); |
542 | } else if (obj->type != OBJ_BLOB) { | 548 | } else if (obj->type != OBJ_BLOB) { |
543 | return 0; | 549 | return 0; |
544 | } else { | 550 | } else { |
545 | hashcpy(fileid, sha1); | 551 | hashcpy(fileid, sha1); |
546 | } | 552 | } |
547 | if (!*header) { | 553 | if (!*header) { |
548 | html("<h1>download</h1>\n"); | 554 | html("<h1>download</h1>\n"); |
549 | *header = 1; | 555 | *header = 1; |
550 | } | 556 | } |
551 | url = cgit_pageurl(ctx.qry.repo, "blob", | 557 | url = cgit_pageurl(ctx.qry.repo, "blob", |
552 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 558 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
553 | buf)); | 559 | buf)); |
554 | html_link_open(url, NULL, "menu"); | 560 | html_link_open(url, NULL, "menu"); |
555 | html_txt(strlpart(buf, 20)); | 561 | html_txt(strlpart(buf, 20)); |
556 | html_link_close(); | 562 | html_link_close(); |
557 | return 0; | 563 | return 0; |
558 | } | 564 | } |
559 | 565 | ||
560 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 566 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) |
561 | { | 567 | { |
562 | char *url; | 568 | char *url; |
563 | 569 | ||
564 | if (!ctx.cfg.virtual_root) { | 570 | if (!ctx.cfg.virtual_root) { |
565 | url = fmt("%s/%s", ctx.qry.repo, page); | 571 | url = fmt("%s/%s", ctx.qry.repo, page); |
566 | if (ctx.qry.path) | 572 | if (ctx.qry.path) |
567 | url = fmt("%s/%s", url, ctx.qry.path); | 573 | url = fmt("%s/%s", url, ctx.qry.path); |
568 | html_hidden("url", url); | 574 | html_hidden("url", url); |
569 | } | 575 | } |
570 | 576 | ||
571 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 577 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
572 | strcmp(ctx.qry.head, ctx.repo->defbranch)) | 578 | strcmp(ctx.qry.head, ctx.repo->defbranch)) |
573 | html_hidden("h", ctx.qry.head); | 579 | html_hidden("h", ctx.qry.head); |
574 | 580 | ||
575 | if (ctx.qry.sha1) | 581 | if (ctx.qry.sha1) |
576 | html_hidden("id", ctx.qry.sha1); | 582 | html_hidden("id", ctx.qry.sha1); |
577 | if (ctx.qry.sha2) | 583 | if (ctx.qry.sha2) |
578 | html_hidden("id2", ctx.qry.sha2); | 584 | html_hidden("id2", ctx.qry.sha2); |
579 | if (ctx.qry.showmsg) | 585 | if (ctx.qry.showmsg) |
580 | html_hidden("showmsg", "1"); | 586 | html_hidden("showmsg", "1"); |
581 | 587 | ||
582 | if (incl_search) { | 588 | if (incl_search) { |
583 | if (ctx.qry.grep) | 589 | if (ctx.qry.grep) |
584 | html_hidden("qt", ctx.qry.grep); | 590 | html_hidden("qt", ctx.qry.grep); |
@@ -598,96 +604,99 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
598 | { | 604 | { |
599 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 605 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
600 | 606 | ||
601 | if (!cmd && ctx->repo) | 607 | if (!cmd && ctx->repo) |
602 | fallback_cmd = "summary"; | 608 | fallback_cmd = "summary"; |
603 | 609 | ||
604 | html("<table id='header'>\n"); | 610 | html("<table id='header'>\n"); |
605 | html("<tr>\n"); | 611 | html("<tr>\n"); |
606 | html("<td class='logo' rowspan='2'><a href='"); | 612 | html("<td class='logo' rowspan='2'><a href='"); |
607 | if (ctx->cfg.logo_link) | 613 | if (ctx->cfg.logo_link) |
608 | html_attr(ctx->cfg.logo_link); | 614 | html_attr(ctx->cfg.logo_link); |
609 | else | 615 | else |
610 | html_attr(cgit_rooturl()); | 616 | html_attr(cgit_rooturl()); |
611 | html("'><img src='"); | 617 | html("'><img src='"); |
612 | html_attr(ctx->cfg.logo); | 618 | html_attr(ctx->cfg.logo); |
613 | html("' alt='cgit logo'/></a></td>\n"); | 619 | html("' alt='cgit logo'/></a></td>\n"); |
614 | 620 | ||
615 | html("<td class='main'>"); | 621 | html("<td class='main'>"); |
616 | if (ctx->repo) { | 622 | if (ctx->repo) { |
617 | cgit_index_link("index", NULL, NULL, NULL, 0); | 623 | cgit_index_link("index", NULL, NULL, NULL, 0); |
618 | html(" : "); | 624 | html(" : "); |
619 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); | 625 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); |
620 | html("</td><td class='form'>"); | 626 | html("</td><td class='form'>"); |
621 | html("<form method='get' action=''>\n"); | 627 | html("<form method='get' action=''>\n"); |
622 | add_hidden_formfields(0, 1, ctx->qry.page); | 628 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); |
623 | html("<select name='h' onchange='this.form.submit();'>\n"); | 629 | html("<select name='h' onchange='this.form.submit();'>\n"); |
624 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 630 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
625 | html("</select> "); | 631 | html("</select> "); |
626 | html("<input type='submit' name='' value='switch'/>"); | 632 | html("<input type='submit' name='' value='switch'/>"); |
627 | html("</form>"); | 633 | html("</form>"); |
628 | } else | 634 | } else |
629 | html_txt(ctx->cfg.root_title); | 635 | html_txt(ctx->cfg.root_title); |
630 | html("</td></tr>\n"); | 636 | html("</td></tr>\n"); |
631 | 637 | ||
632 | html("<tr><td class='sub'>"); | 638 | html("<tr><td class='sub'>"); |
633 | if (ctx->repo) { | 639 | if (ctx->repo) { |
634 | html_txt(ctx->repo->desc); | 640 | html_txt(ctx->repo->desc); |
635 | html("</td><td class='sub right'>"); | 641 | html("</td><td class='sub right'>"); |
636 | html_txt(ctx->repo->owner); | 642 | html_txt(ctx->repo->owner); |
637 | } else { | 643 | } else { |
638 | if (ctx->cfg.root_desc) | 644 | if (ctx->cfg.root_desc) |
639 | html_txt(ctx->cfg.root_desc); | 645 | html_txt(ctx->cfg.root_desc); |
640 | else if (ctx->cfg.index_info) | 646 | else if (ctx->cfg.index_info) |
641 | html_include(ctx->cfg.index_info); | 647 | html_include(ctx->cfg.index_info); |
642 | } | 648 | } |
643 | html("</td></tr></table>\n"); | 649 | html("</td></tr></table>\n"); |
644 | 650 | ||
645 | html("<table class='tabs'><tr><td>\n"); | 651 | html("<table class='tabs'><tr><td>\n"); |
646 | if (ctx->repo) { | 652 | if (ctx->repo) { |
647 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 653 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
648 | ctx->qry.head); | 654 | ctx->qry.head); |
649 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 655 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
650 | ctx->qry.sha1, NULL); | 656 | ctx->qry.sha1, NULL); |
651 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 657 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
652 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 658 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
653 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 659 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
654 | ctx->qry.sha1, NULL); | 660 | ctx->qry.sha1, NULL); |
655 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 661 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
656 | ctx->qry.head, ctx->qry.sha1); | 662 | ctx->qry.head, ctx->qry.sha1); |
657 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 663 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
658 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 664 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
665 | if (ctx->repo->max_stats) | ||
666 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), | ||
667 | ctx->qry.head, NULL); | ||
659 | if (ctx->repo->readme) | 668 | if (ctx->repo->readme) |
660 | reporevlink("about", "about", NULL, | 669 | reporevlink("about", "about", NULL, |
661 | hc(cmd, "about"), ctx->qry.head, NULL, | 670 | hc(cmd, "about"), ctx->qry.head, NULL, |
662 | NULL); | 671 | NULL); |
663 | html("</td><td class='form'>"); | 672 | html("</td><td class='form'>"); |
664 | html("<form class='right' method='get' action='"); | 673 | html("<form class='right' method='get' action='"); |
665 | if (ctx->cfg.virtual_root) | 674 | if (ctx->cfg.virtual_root) |
666 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 675 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
667 | ctx->qry.path, NULL)); | 676 | ctx->qry.path, NULL)); |
668 | html("'>\n"); | 677 | html("'>\n"); |
669 | add_hidden_formfields(1, 0, "log"); | 678 | cgit_add_hidden_formfields(1, 0, "log"); |
670 | html("<select name='qt'>\n"); | 679 | html("<select name='qt'>\n"); |
671 | html_option("grep", "log msg", ctx->qry.grep); | 680 | html_option("grep", "log msg", ctx->qry.grep); |
672 | html_option("author", "author", ctx->qry.grep); | 681 | html_option("author", "author", ctx->qry.grep); |
673 | html_option("committer", "committer", ctx->qry.grep); | 682 | html_option("committer", "committer", ctx->qry.grep); |
674 | html("</select>\n"); | 683 | html("</select>\n"); |
675 | html("<input class='txt' type='text' size='10' name='q' value='"); | 684 | html("<input class='txt' type='text' size='10' name='q' value='"); |
676 | html_attr(ctx->qry.search); | 685 | html_attr(ctx->qry.search); |
677 | html("'/>\n"); | 686 | html("'/>\n"); |
678 | html("<input type='submit' value='search'/>\n"); | 687 | html("<input type='submit' value='search'/>\n"); |
679 | html("</form>\n"); | 688 | html("</form>\n"); |
680 | } else { | 689 | } else { |
681 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 690 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |
682 | if (ctx->cfg.root_readme) | 691 | if (ctx->cfg.root_readme) |
683 | site_link("about", "about", NULL, hc(cmd, "about"), | 692 | site_link("about", "about", NULL, hc(cmd, "about"), |
684 | NULL, 0); | 693 | NULL, 0); |
685 | html("</td><td class='form'>"); | 694 | html("</td><td class='form'>"); |
686 | html("<form method='get' action='"); | 695 | html("<form method='get' action='"); |
687 | html_attr(cgit_rooturl()); | 696 | html_attr(cgit_rooturl()); |
688 | html("'>\n"); | 697 | html("'>\n"); |
689 | html("<input type='text' name='q' size='10' value='"); | 698 | html("<input type='text' name='q' size='10' value='"); |
690 | html_attr(ctx->qry.search); | 699 | html_attr(ctx->qry.search); |
691 | html("'/>\n"); | 700 | html("'/>\n"); |
692 | html("<input type='submit' value='search'/>\n"); | 701 | html("<input type='submit' value='search'/>\n"); |
693 | html("</form>"); | 702 | html("</form>"); |