-rw-r--r-- | ui-shared.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/ui-shared.c b/ui-shared.c index 95dfeb4..4f28512 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -360,24 +360,30 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
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) |
@@ -548,25 +554,25 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
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)) |
@@ -578,52 +584,57 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
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); |
585 | if (ctx.qry.search) | 591 | if (ctx.qry.search) |
586 | html_hidden("q", ctx.qry.search); | 592 | html_hidden("q", ctx.qry.search); |
587 | } | 593 | } |
588 | } | 594 | } |
589 | 595 | ||
596 | const char *fallback_cmd = "repolist"; | ||
597 | |||
590 | char *hc(struct cgit_cmd *cmd, const char *page) | 598 | char *hc(struct cgit_cmd *cmd, const char *page) |
591 | { | 599 | { |
592 | return (strcmp(cmd->name, page) ? NULL : "active"); | 600 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); |
593 | } | 601 | } |
594 | 602 | ||
595 | void cgit_print_pageheader(struct cgit_context *ctx) | 603 | void cgit_print_pageheader(struct cgit_context *ctx) |
596 | { | 604 | { |
597 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 605 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
598 | 606 | ||
607 | if (!cmd && ctx->repo) | ||
608 | fallback_cmd = "summary"; | ||
609 | |||
599 | html("<table id='header'>\n"); | 610 | html("<table id='header'>\n"); |
600 | html("<tr>\n"); | 611 | html("<tr>\n"); |
601 | html("<td class='logo' rowspan='2'><a href='"); | 612 | html("<td class='logo' rowspan='2'><a href='"); |
602 | if (ctx->cfg.logo_link) | 613 | if (ctx->cfg.logo_link) |
603 | html_attr(ctx->cfg.logo_link); | 614 | html_attr(ctx->cfg.logo_link); |
604 | else | 615 | else |
605 | html_attr(cgit_rooturl()); | 616 | html_attr(cgit_rooturl()); |
606 | html("'><img src='"); | 617 | html("'><img src='"); |
607 | html_attr(ctx->cfg.logo); | 618 | html_attr(ctx->cfg.logo); |
608 | html("' alt='cgit logo'/></a></td>\n"); | 619 | html("' alt='cgit logo'/></a></td>\n"); |
609 | 620 | ||
610 | html("<td class='main'>"); | 621 | html("<td class='main'>"); |
611 | if (ctx->repo) { | 622 | if (ctx->repo) { |
612 | cgit_index_link("index", NULL, NULL, NULL, 0); | 623 | cgit_index_link("index", NULL, NULL, NULL, 0); |
613 | html(" : "); | 624 | html(" : "); |
614 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); | 625 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); |
615 | html("</td><td class='form'>"); | 626 | html("</td><td class='form'>"); |
616 | html("<form method='get' action=''>\n"); | 627 | html("<form method='get' action=''>\n"); |
617 | add_hidden_formfields(0, 1, ctx->qry.page); | 628 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); |
618 | html("<select name='h' onchange='this.form.submit();'>\n"); | 629 | html("<select name='h' onchange='this.form.submit();'>\n"); |
619 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 630 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
620 | html("</select> "); | 631 | html("</select> "); |
621 | html("<input type='submit' name='' value='switch'/>"); | 632 | html("<input type='submit' name='' value='switch'/>"); |
622 | html("</form>"); | 633 | html("</form>"); |
623 | } else | 634 | } else |
624 | html_txt(ctx->cfg.root_title); | 635 | html_txt(ctx->cfg.root_title); |
625 | html("</td></tr>\n"); | 636 | html("</td></tr>\n"); |
626 | 637 | ||
627 | html("<tr><td class='sub'>"); | 638 | html("<tr><td class='sub'>"); |
628 | if (ctx->repo) { | 639 | if (ctx->repo) { |
629 | html_txt(ctx->repo->desc); | 640 | html_txt(ctx->repo->desc); |
@@ -642,35 +653,38 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
642 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 653 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
643 | ctx->qry.head); | 654 | ctx->qry.head); |
644 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 655 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
645 | ctx->qry.sha1, NULL); | 656 | ctx->qry.sha1, NULL); |
646 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 657 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
647 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 658 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
648 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 659 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
649 | ctx->qry.sha1, NULL); | 660 | ctx->qry.sha1, NULL); |
650 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 661 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
651 | ctx->qry.head, ctx->qry.sha1); | 662 | ctx->qry.head, ctx->qry.sha1); |
652 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 663 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
653 | 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); | ||
654 | if (ctx->repo->readme) | 668 | if (ctx->repo->readme) |
655 | reporevlink("about", "about", NULL, | 669 | reporevlink("about", "about", NULL, |
656 | hc(cmd, "about"), ctx->qry.head, NULL, | 670 | hc(cmd, "about"), ctx->qry.head, NULL, |
657 | NULL); | 671 | NULL); |
658 | html("</td><td class='form'>"); | 672 | html("</td><td class='form'>"); |
659 | html("<form class='right' method='get' action='"); | 673 | html("<form class='right' method='get' action='"); |
660 | if (ctx->cfg.virtual_root) | 674 | if (ctx->cfg.virtual_root) |
661 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 675 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
662 | ctx->qry.path, NULL)); | 676 | ctx->qry.path, NULL)); |
663 | html("'>\n"); | 677 | html("'>\n"); |
664 | add_hidden_formfields(1, 0, "log"); | 678 | cgit_add_hidden_formfields(1, 0, "log"); |
665 | html("<select name='qt'>\n"); | 679 | html("<select name='qt'>\n"); |
666 | html_option("grep", "log msg", ctx->qry.grep); | 680 | html_option("grep", "log msg", ctx->qry.grep); |
667 | html_option("author", "author", ctx->qry.grep); | 681 | html_option("author", "author", ctx->qry.grep); |
668 | html_option("committer", "committer", ctx->qry.grep); | 682 | html_option("committer", "committer", ctx->qry.grep); |
669 | html("</select>\n"); | 683 | html("</select>\n"); |
670 | html("<input class='txt' type='text' size='10' name='q' value='"); | 684 | html("<input class='txt' type='text' size='10' name='q' value='"); |
671 | html_attr(ctx->qry.search); | 685 | html_attr(ctx->qry.search); |
672 | html("'/>\n"); | 686 | html("'/>\n"); |
673 | html("<input type='submit' value='search'/>\n"); | 687 | html("<input type='submit' value='search'/>\n"); |
674 | html("</form>\n"); | 688 | html("</form>\n"); |
675 | } else { | 689 | } else { |
676 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 690 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |