author | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 21:00:25 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 21:00:25 (UTC) |
commit | 31665579c2779669c0cc56b8eb63f162b7e165df (patch) (unidiff) | |
tree | b1d7ed4cd04699d3f978950e09c1218944926175 /ui-shared.c | |
parent | 372b4041bd117cf073082559e1f0160d75f57374 (diff) | |
parent | eb14609dc46461728a065c0a243b338fc32fd762 (diff) | |
download | cgit-31665579c2779669c0cc56b8eb63f162b7e165df.zip cgit-31665579c2779669c0cc56b8eb63f162b7e165df.tar.gz cgit-31665579c2779669c0cc56b8eb63f162b7e165df.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | ui-shared.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index 95dfeb4..fba1ba6 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -494,201 +494,206 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
494 | } | 494 | } |
495 | html("</head>\n"); | 495 | html("</head>\n"); |
496 | html("<body>\n"); | 496 | html("<body>\n"); |
497 | } | 497 | } |
498 | 498 | ||
499 | void cgit_print_docend() | 499 | void cgit_print_docend() |
500 | { | 500 | { |
501 | html("</div>"); | 501 | html("</div>"); |
502 | if (ctx.cfg.footer) | 502 | if (ctx.cfg.footer) |
503 | html_include(ctx.cfg.footer); | 503 | html_include(ctx.cfg.footer); |
504 | else { | 504 | else { |
505 | htmlf("<div class='footer'>generated by cgit %s at ", | 505 | htmlf("<div class='footer'>generated by cgit %s at ", |
506 | cgit_version); | 506 | cgit_version); |
507 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 507 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
508 | html("</div>\n"); | 508 | html("</div>\n"); |
509 | } | 509 | } |
510 | html("</body>\n</html>\n"); | 510 | html("</body>\n</html>\n"); |
511 | } | 511 | } |
512 | 512 | ||
513 | int print_branch_option(const char *refname, const unsigned char *sha1, | 513 | int print_branch_option(const char *refname, const unsigned char *sha1, |
514 | int flags, void *cb_data) | 514 | int flags, void *cb_data) |
515 | { | 515 | { |
516 | char *name = (char *)refname; | 516 | char *name = (char *)refname; |
517 | html_option(name, name, ctx.qry.head); | 517 | html_option(name, name, ctx.qry.head); |
518 | return 0; | 518 | return 0; |
519 | } | 519 | } |
520 | 520 | ||
521 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 521 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
522 | int flags, void *cb_data) | 522 | int flags, void *cb_data) |
523 | { | 523 | { |
524 | struct tag *tag; | 524 | struct tag *tag; |
525 | struct taginfo *info; | 525 | struct taginfo *info; |
526 | struct object *obj; | 526 | struct object *obj; |
527 | char buf[256], *url; | 527 | char buf[256], *url; |
528 | unsigned char fileid[20]; | 528 | unsigned char fileid[20]; |
529 | int *header = (int *)cb_data; | 529 | int *header = (int *)cb_data; |
530 | 530 | ||
531 | if (prefixcmp(refname, "refs/archives")) | 531 | if (prefixcmp(refname, "refs/archives")) |
532 | return 0; | 532 | return 0; |
533 | strncpy(buf, refname+14, sizeof(buf)); | 533 | strncpy(buf, refname+14, sizeof(buf)); |
534 | obj = parse_object(sha1); | 534 | obj = parse_object(sha1); |
535 | if (!obj) | 535 | if (!obj) |
536 | return 1; | 536 | return 1; |
537 | if (obj->type == OBJ_TAG) { | 537 | if (obj->type == OBJ_TAG) { |
538 | tag = lookup_tag(sha1); | 538 | tag = lookup_tag(sha1); |
539 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 539 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
540 | return 0; | 540 | return 0; |
541 | hashcpy(fileid, tag->tagged->sha1); | 541 | hashcpy(fileid, tag->tagged->sha1); |
542 | } else if (obj->type != OBJ_BLOB) { | 542 | } else if (obj->type != OBJ_BLOB) { |
543 | return 0; | 543 | return 0; |
544 | } else { | 544 | } else { |
545 | hashcpy(fileid, sha1); | 545 | hashcpy(fileid, sha1); |
546 | } | 546 | } |
547 | if (!*header) { | 547 | if (!*header) { |
548 | html("<h1>download</h1>\n"); | 548 | html("<h1>download</h1>\n"); |
549 | *header = 1; | 549 | *header = 1; |
550 | } | 550 | } |
551 | url = cgit_pageurl(ctx.qry.repo, "blob", | 551 | url = cgit_pageurl(ctx.qry.repo, "blob", |
552 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 552 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
553 | buf)); | 553 | buf)); |
554 | html_link_open(url, NULL, "menu"); | 554 | html_link_open(url, NULL, "menu"); |
555 | html_txt(strlpart(buf, 20)); | 555 | html_txt(strlpart(buf, 20)); |
556 | html_link_close(); | 556 | html_link_close(); |
557 | return 0; | 557 | return 0; |
558 | } | 558 | } |
559 | 559 | ||
560 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 560 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
561 | { | 561 | { |
562 | char *url; | 562 | char *url; |
563 | 563 | ||
564 | if (!ctx.cfg.virtual_root) { | 564 | if (!ctx.cfg.virtual_root) { |
565 | url = fmt("%s/%s", ctx.qry.repo, page); | 565 | url = fmt("%s/%s", ctx.qry.repo, page); |
566 | if (ctx.qry.path) | 566 | if (ctx.qry.path) |
567 | url = fmt("%s/%s", url, ctx.qry.path); | 567 | url = fmt("%s/%s", url, ctx.qry.path); |
568 | html_hidden("url", url); | 568 | html_hidden("url", url); |
569 | } | 569 | } |
570 | 570 | ||
571 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 571 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
572 | strcmp(ctx.qry.head, ctx.repo->defbranch)) | 572 | strcmp(ctx.qry.head, ctx.repo->defbranch)) |
573 | html_hidden("h", ctx.qry.head); | 573 | html_hidden("h", ctx.qry.head); |
574 | 574 | ||
575 | if (ctx.qry.sha1) | 575 | if (ctx.qry.sha1) |
576 | html_hidden("id", ctx.qry.sha1); | 576 | html_hidden("id", ctx.qry.sha1); |
577 | if (ctx.qry.sha2) | 577 | if (ctx.qry.sha2) |
578 | html_hidden("id2", ctx.qry.sha2); | 578 | html_hidden("id2", ctx.qry.sha2); |
579 | if (ctx.qry.showmsg) | 579 | if (ctx.qry.showmsg) |
580 | html_hidden("showmsg", "1"); | 580 | html_hidden("showmsg", "1"); |
581 | 581 | ||
582 | if (incl_search) { | 582 | if (incl_search) { |
583 | if (ctx.qry.grep) | 583 | if (ctx.qry.grep) |
584 | html_hidden("qt", ctx.qry.grep); | 584 | html_hidden("qt", ctx.qry.grep); |
585 | if (ctx.qry.search) | 585 | if (ctx.qry.search) |
586 | html_hidden("q", ctx.qry.search); | 586 | html_hidden("q", ctx.qry.search); |
587 | } | 587 | } |
588 | } | 588 | } |
589 | 589 | ||
590 | const char *fallback_cmd = "repolist"; | ||
591 | |||
590 | char *hc(struct cgit_cmd *cmd, const char *page) | 592 | char *hc(struct cgit_cmd *cmd, const char *page) |
591 | { | 593 | { |
592 | return (strcmp(cmd->name, page) ? NULL : "active"); | 594 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); |
593 | } | 595 | } |
594 | 596 | ||
595 | void cgit_print_pageheader(struct cgit_context *ctx) | 597 | void cgit_print_pageheader(struct cgit_context *ctx) |
596 | { | 598 | { |
597 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 599 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
598 | 600 | ||
601 | if (!cmd && ctx->repo) | ||
602 | fallback_cmd = "summary"; | ||
603 | |||
599 | html("<table id='header'>\n"); | 604 | html("<table id='header'>\n"); |
600 | html("<tr>\n"); | 605 | html("<tr>\n"); |
601 | html("<td class='logo' rowspan='2'><a href='"); | 606 | html("<td class='logo' rowspan='2'><a href='"); |
602 | if (ctx->cfg.logo_link) | 607 | if (ctx->cfg.logo_link) |
603 | html_attr(ctx->cfg.logo_link); | 608 | html_attr(ctx->cfg.logo_link); |
604 | else | 609 | else |
605 | html_attr(cgit_rooturl()); | 610 | html_attr(cgit_rooturl()); |
606 | html("'><img src='"); | 611 | html("'><img src='"); |
607 | html_attr(ctx->cfg.logo); | 612 | html_attr(ctx->cfg.logo); |
608 | html("' alt='cgit logo'/></a></td>\n"); | 613 | html("' alt='cgit logo'/></a></td>\n"); |
609 | 614 | ||
610 | html("<td class='main'>"); | 615 | html("<td class='main'>"); |
611 | if (ctx->repo) { | 616 | if (ctx->repo) { |
612 | cgit_index_link("index", NULL, NULL, NULL, 0); | 617 | cgit_index_link("index", NULL, NULL, NULL, 0); |
613 | html(" : "); | 618 | html(" : "); |
614 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); | 619 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); |
615 | html("</td><td class='form'>"); | 620 | html("</td><td class='form'>"); |
616 | html("<form method='get' action=''>\n"); | 621 | html("<form method='get' action=''>\n"); |
617 | add_hidden_formfields(0, 1, ctx->qry.page); | 622 | add_hidden_formfields(0, 1, ctx->qry.page); |
618 | html("<select name='h' onchange='this.form.submit();'>\n"); | 623 | html("<select name='h' onchange='this.form.submit();'>\n"); |
619 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 624 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
620 | html("</select> "); | 625 | html("</select> "); |
621 | html("<input type='submit' name='' value='switch'/>"); | 626 | html("<input type='submit' name='' value='switch'/>"); |
622 | html("</form>"); | 627 | html("</form>"); |
623 | } else | 628 | } else |
624 | html_txt(ctx->cfg.root_title); | 629 | html_txt(ctx->cfg.root_title); |
625 | html("</td></tr>\n"); | 630 | html("</td></tr>\n"); |
626 | 631 | ||
627 | html("<tr><td class='sub'>"); | 632 | html("<tr><td class='sub'>"); |
628 | if (ctx->repo) { | 633 | if (ctx->repo) { |
629 | html_txt(ctx->repo->desc); | 634 | html_txt(ctx->repo->desc); |
630 | html("</td><td class='sub right'>"); | 635 | html("</td><td class='sub right'>"); |
631 | html_txt(ctx->repo->owner); | 636 | html_txt(ctx->repo->owner); |
632 | } else { | 637 | } else { |
633 | if (ctx->cfg.root_desc) | 638 | if (ctx->cfg.root_desc) |
634 | html_txt(ctx->cfg.root_desc); | 639 | html_txt(ctx->cfg.root_desc); |
635 | else if (ctx->cfg.index_info) | 640 | else if (ctx->cfg.index_info) |
636 | html_include(ctx->cfg.index_info); | 641 | html_include(ctx->cfg.index_info); |
637 | } | 642 | } |
638 | html("</td></tr></table>\n"); | 643 | html("</td></tr></table>\n"); |
639 | 644 | ||
640 | html("<table class='tabs'><tr><td>\n"); | 645 | html("<table class='tabs'><tr><td>\n"); |
641 | if (ctx->repo) { | 646 | if (ctx->repo) { |
642 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 647 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
643 | ctx->qry.head); | 648 | ctx->qry.head); |
644 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 649 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
645 | ctx->qry.sha1, NULL); | 650 | ctx->qry.sha1, NULL); |
646 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 651 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
647 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 652 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
648 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 653 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
649 | ctx->qry.sha1, NULL); | 654 | ctx->qry.sha1, NULL); |
650 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 655 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
651 | ctx->qry.head, ctx->qry.sha1); | 656 | ctx->qry.head, ctx->qry.sha1); |
652 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 657 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
653 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 658 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
654 | if (ctx->repo->readme) | 659 | if (ctx->repo->readme) |
655 | reporevlink("about", "about", NULL, | 660 | reporevlink("about", "about", NULL, |
656 | hc(cmd, "about"), ctx->qry.head, NULL, | 661 | hc(cmd, "about"), ctx->qry.head, NULL, |
657 | NULL); | 662 | NULL); |
658 | html("</td><td class='form'>"); | 663 | html("</td><td class='form'>"); |
659 | html("<form class='right' method='get' action='"); | 664 | html("<form class='right' method='get' action='"); |
660 | if (ctx->cfg.virtual_root) | 665 | if (ctx->cfg.virtual_root) |
661 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 666 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
662 | ctx->qry.path, NULL)); | 667 | ctx->qry.path, NULL)); |
663 | html("'>\n"); | 668 | html("'>\n"); |
664 | add_hidden_formfields(1, 0, "log"); | 669 | add_hidden_formfields(1, 0, "log"); |
665 | html("<select name='qt'>\n"); | 670 | html("<select name='qt'>\n"); |
666 | html_option("grep", "log msg", ctx->qry.grep); | 671 | html_option("grep", "log msg", ctx->qry.grep); |
667 | html_option("author", "author", ctx->qry.grep); | 672 | html_option("author", "author", ctx->qry.grep); |
668 | html_option("committer", "committer", ctx->qry.grep); | 673 | html_option("committer", "committer", ctx->qry.grep); |
669 | html("</select>\n"); | 674 | html("</select>\n"); |
670 | html("<input class='txt' type='text' size='10' name='q' value='"); | 675 | html("<input class='txt' type='text' size='10' name='q' value='"); |
671 | html_attr(ctx->qry.search); | 676 | html_attr(ctx->qry.search); |
672 | html("'/>\n"); | 677 | html("'/>\n"); |
673 | html("<input type='submit' value='search'/>\n"); | 678 | html("<input type='submit' value='search'/>\n"); |
674 | html("</form>\n"); | 679 | html("</form>\n"); |
675 | } else { | 680 | } else { |
676 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 681 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |
677 | if (ctx->cfg.root_readme) | 682 | if (ctx->cfg.root_readme) |
678 | site_link("about", "about", NULL, hc(cmd, "about"), | 683 | site_link("about", "about", NULL, hc(cmd, "about"), |
679 | NULL, 0); | 684 | NULL, 0); |
680 | html("</td><td class='form'>"); | 685 | html("</td><td class='form'>"); |
681 | html("<form method='get' action='"); | 686 | html("<form method='get' action='"); |
682 | html_attr(cgit_rooturl()); | 687 | html_attr(cgit_rooturl()); |
683 | html("'>\n"); | 688 | html("'>\n"); |
684 | html("<input type='text' name='q' size='10' value='"); | 689 | html("<input type='text' name='q' size='10' value='"); |
685 | html_attr(ctx->qry.search); | 690 | html_attr(ctx->qry.search); |
686 | html("'/>\n"); | 691 | html("'/>\n"); |
687 | html("<input type='submit' value='search'/>\n"); | 692 | html("<input type='submit' value='search'/>\n"); |
688 | html("</form>"); | 693 | html("</form>"); |
689 | } | 694 | } |
690 | html("</td></tr></table>\n"); | 695 | html("</td></tr></table>\n"); |
691 | html("<div class='content'>"); | 696 | html("<div class='content'>"); |
692 | } | 697 | } |
693 | 698 | ||
694 | void cgit_print_filemode(unsigned short mode) | 699 | void cgit_print_filemode(unsigned short mode) |