-rw-r--r-- | ui-shared.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ui-shared.c b/ui-shared.c index 224e5f3..dc39e64 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -252,88 +252,94 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
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) | 260 | void cgit_summary_link(char *name, char *title, char *class, char *head) |
261 | { | 261 | { |
262 | reporevlink(NULL, name, title, class, head, NULL, NULL); | 262 | reporevlink(NULL, name, title, class, head, NULL, NULL); |
263 | } | 263 | } |
264 | 264 | ||
265 | void cgit_tag_link(char *name, char *title, char *class, char *head, | 265 | void cgit_tag_link(char *name, char *title, char *class, char *head, |
266 | char *rev) | 266 | char *rev) |
267 | { | 267 | { |
268 | reporevlink("tag", name, title, class, head, rev, NULL); | 268 | reporevlink("tag", name, title, class, head, rev, NULL); |
269 | } | 269 | } |
270 | 270 | ||
271 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 271 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
272 | char *rev, char *path) | 272 | char *rev, char *path) |
273 | { | 273 | { |
274 | reporevlink("tree", name, title, class, head, rev, path); | 274 | reporevlink("tree", name, title, class, head, rev, path); |
275 | } | 275 | } |
276 | 276 | ||
277 | void cgit_plain_link(char *name, char *title, char *class, char *head, | 277 | void cgit_plain_link(char *name, char *title, char *class, char *head, |
278 | char *rev, char *path) | 278 | char *rev, char *path) |
279 | { | 279 | { |
280 | reporevlink("plain", name, title, class, head, rev, path); | 280 | reporevlink("plain", name, title, class, head, rev, path); |
281 | } | 281 | } |
282 | 282 | ||
283 | void cgit_log_link(char *name, char *title, char *class, char *head, | 283 | void cgit_log_link(char *name, char *title, char *class, char *head, |
284 | char *rev, char *path, int ofs, char *grep, char *pattern) | 284 | char *rev, char *path, int ofs, char *grep, char *pattern, |
285 | int showmsg) | ||
285 | { | 286 | { |
286 | char *delim; | 287 | char *delim; |
287 | 288 | ||
288 | delim = repolink(title, class, "log", head, path); | 289 | delim = repolink(title, class, "log", head, path); |
289 | if (rev && strcmp(rev, ctx.qry.head)) { | 290 | if (rev && strcmp(rev, ctx.qry.head)) { |
290 | html(delim); | 291 | html(delim); |
291 | html("id="); | 292 | html("id="); |
292 | html_url_arg(rev); | 293 | html_url_arg(rev); |
293 | delim = "&"; | 294 | delim = "&"; |
294 | } | 295 | } |
295 | if (grep && pattern) { | 296 | if (grep && pattern) { |
296 | html(delim); | 297 | html(delim); |
297 | html("qt="); | 298 | html("qt="); |
298 | html_url_arg(grep); | 299 | html_url_arg(grep); |
299 | delim = "&"; | 300 | delim = "&"; |
300 | html(delim); | 301 | html(delim); |
301 | html("q="); | 302 | html("q="); |
302 | html_url_arg(pattern); | 303 | html_url_arg(pattern); |
303 | } | 304 | } |
304 | if (ofs > 0) { | 305 | if (ofs > 0) { |
305 | html(delim); | 306 | html(delim); |
306 | html("ofs="); | 307 | html("ofs="); |
307 | htmlf("%d", ofs); | 308 | htmlf("%d", ofs); |
309 | delim = "&"; | ||
310 | } | ||
311 | if (showmsg) { | ||
312 | html(delim); | ||
313 | html("showmsg=1"); | ||
308 | } | 314 | } |
309 | html("'>"); | 315 | html("'>"); |
310 | html_txt(name); | 316 | html_txt(name); |
311 | html("</a>"); | 317 | html("</a>"); |
312 | } | 318 | } |
313 | 319 | ||
314 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 320 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
315 | char *rev) | 321 | char *rev) |
316 | { | 322 | { |
317 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 323 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
318 | name[ctx.cfg.max_msg_len] = '\0'; | 324 | name[ctx.cfg.max_msg_len] = '\0'; |
319 | name[ctx.cfg.max_msg_len - 1] = '.'; | 325 | name[ctx.cfg.max_msg_len - 1] = '.'; |
320 | name[ctx.cfg.max_msg_len - 2] = '.'; | 326 | name[ctx.cfg.max_msg_len - 2] = '.'; |
321 | name[ctx.cfg.max_msg_len - 3] = '.'; | 327 | name[ctx.cfg.max_msg_len - 3] = '.'; |
322 | } | 328 | } |
323 | reporevlink("commit", name, title, class, head, rev, NULL); | 329 | reporevlink("commit", name, title, class, head, rev, NULL); |
324 | } | 330 | } |
325 | 331 | ||
326 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 332 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
327 | char *rev, char *path) | 333 | char *rev, char *path) |
328 | { | 334 | { |
329 | reporevlink("refs", name, title, class, head, rev, path); | 335 | reporevlink("refs", name, title, class, head, rev, path); |
330 | } | 336 | } |
331 | 337 | ||
332 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 338 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
333 | char *rev, char *archivename) | 339 | char *rev, char *archivename) |
334 | { | 340 | { |
335 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 341 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
336 | } | 342 | } |
337 | 343 | ||
338 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 344 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
339 | char *new_rev, char *old_rev, char *path) | 345 | char *new_rev, char *old_rev, char *path) |
@@ -539,64 +545,66 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
539 | if (!*header) { | 545 | if (!*header) { |
540 | html("<h1>download</h1>\n"); | 546 | html("<h1>download</h1>\n"); |
541 | *header = 1; | 547 | *header = 1; |
542 | } | 548 | } |
543 | url = cgit_pageurl(ctx.qry.repo, "blob", | 549 | url = cgit_pageurl(ctx.qry.repo, "blob", |
544 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 550 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
545 | buf)); | 551 | buf)); |
546 | html_link_open(url, NULL, "menu"); | 552 | html_link_open(url, NULL, "menu"); |
547 | html_txt(strlpart(buf, 20)); | 553 | html_txt(strlpart(buf, 20)); |
548 | html_link_close(); | 554 | html_link_close(); |
549 | return 0; | 555 | return 0; |
550 | } | 556 | } |
551 | 557 | ||
552 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 558 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
553 | { | 559 | { |
554 | char *url; | 560 | char *url; |
555 | 561 | ||
556 | if (!ctx.cfg.virtual_root) { | 562 | if (!ctx.cfg.virtual_root) { |
557 | url = fmt("%s/%s", ctx.qry.repo, page); | 563 | url = fmt("%s/%s", ctx.qry.repo, page); |
558 | if (ctx.qry.path) | 564 | if (ctx.qry.path) |
559 | url = fmt("%s/%s", url, ctx.qry.path); | 565 | url = fmt("%s/%s", url, ctx.qry.path); |
560 | html_hidden("url", url); | 566 | html_hidden("url", url); |
561 | } | 567 | } |
562 | 568 | ||
563 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 569 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
564 | strcmp(ctx.qry.head, ctx.repo->defbranch)) | 570 | strcmp(ctx.qry.head, ctx.repo->defbranch)) |
565 | html_hidden("h", ctx.qry.head); | 571 | html_hidden("h", ctx.qry.head); |
566 | 572 | ||
567 | if (ctx.qry.sha1) | 573 | if (ctx.qry.sha1) |
568 | html_hidden("id", ctx.qry.sha1); | 574 | html_hidden("id", ctx.qry.sha1); |
569 | if (ctx.qry.sha2) | 575 | if (ctx.qry.sha2) |
570 | html_hidden("id2", ctx.qry.sha2); | 576 | html_hidden("id2", ctx.qry.sha2); |
577 | if (ctx.qry.showmsg) | ||
578 | html_hidden("showmsg", "1"); | ||
571 | 579 | ||
572 | if (incl_search) { | 580 | if (incl_search) { |
573 | if (ctx.qry.grep) | 581 | if (ctx.qry.grep) |
574 | html_hidden("qt", ctx.qry.grep); | 582 | html_hidden("qt", ctx.qry.grep); |
575 | if (ctx.qry.search) | 583 | if (ctx.qry.search) |
576 | html_hidden("q", ctx.qry.search); | 584 | html_hidden("q", ctx.qry.search); |
577 | } | 585 | } |
578 | } | 586 | } |
579 | 587 | ||
580 | char *hc(struct cgit_cmd *cmd, const char *page) | 588 | char *hc(struct cgit_cmd *cmd, const char *page) |
581 | { | 589 | { |
582 | return (strcmp(cmd->name, page) ? NULL : "active"); | 590 | return (strcmp(cmd->name, page) ? NULL : "active"); |
583 | } | 591 | } |
584 | 592 | ||
585 | void cgit_print_pageheader(struct cgit_context *ctx) | 593 | void cgit_print_pageheader(struct cgit_context *ctx) |
586 | { | 594 | { |
587 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 595 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
588 | 596 | ||
589 | html("<table id='header'>\n"); | 597 | html("<table id='header'>\n"); |
590 | html("<tr>\n"); | 598 | html("<tr>\n"); |
591 | html("<td class='logo' rowspan='2'><a href='"); | 599 | html("<td class='logo' rowspan='2'><a href='"); |
592 | if (ctx->cfg.logo_link) | 600 | if (ctx->cfg.logo_link) |
593 | html_attr(ctx->cfg.logo_link); | 601 | html_attr(ctx->cfg.logo_link); |
594 | else | 602 | else |
595 | html_attr(cgit_rooturl()); | 603 | html_attr(cgit_rooturl()); |
596 | html("'><img src='"); | 604 | html("'><img src='"); |
597 | html_attr(ctx->cfg.logo); | 605 | html_attr(ctx->cfg.logo); |
598 | html("' alt='cgit logo'/></a></td>\n"); | 606 | html("' alt='cgit logo'/></a></td>\n"); |
599 | 607 | ||
600 | html("<td class='main'>"); | 608 | html("<td class='main'>"); |
601 | if (ctx->repo) { | 609 | if (ctx->repo) { |
602 | cgit_index_link("index", NULL, NULL, NULL, 0); | 610 | cgit_index_link("index", NULL, NULL, NULL, 0); |
@@ -605,65 +613,65 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
605 | html("</td><td class='form'>"); | 613 | html("</td><td class='form'>"); |
606 | html("<form method='get' action=''>\n"); | 614 | html("<form method='get' action=''>\n"); |
607 | add_hidden_formfields(0, 1, ctx->qry.page); | 615 | add_hidden_formfields(0, 1, ctx->qry.page); |
608 | html("<select name='h' onchange='this.form.submit();'>\n"); | 616 | html("<select name='h' onchange='this.form.submit();'>\n"); |
609 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 617 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
610 | html("</select> "); | 618 | html("</select> "); |
611 | html("<input type='submit' name='' value='switch'/>"); | 619 | html("<input type='submit' name='' value='switch'/>"); |
612 | html("</form>"); | 620 | html("</form>"); |
613 | } else | 621 | } else |
614 | html_txt(ctx->cfg.root_title); | 622 | html_txt(ctx->cfg.root_title); |
615 | html("</td></tr>\n"); | 623 | html("</td></tr>\n"); |
616 | 624 | ||
617 | html("<tr><td class='sub'>"); | 625 | html("<tr><td class='sub'>"); |
618 | if (ctx->repo) { | 626 | if (ctx->repo) { |
619 | html_txt(ctx->repo->desc); | 627 | html_txt(ctx->repo->desc); |
620 | html("</td><td class='sub right'>"); | 628 | html("</td><td class='sub right'>"); |
621 | html_txt(ctx->repo->owner); | 629 | html_txt(ctx->repo->owner); |
622 | } else { | 630 | } else { |
623 | if (ctx->cfg.root_desc) | 631 | if (ctx->cfg.root_desc) |
624 | html_txt(ctx->cfg.root_desc); | 632 | html_txt(ctx->cfg.root_desc); |
625 | else if (ctx->cfg.index_info) | 633 | else if (ctx->cfg.index_info) |
626 | html_include(ctx->cfg.index_info); | 634 | html_include(ctx->cfg.index_info); |
627 | } | 635 | } |
628 | html("</td></tr></table>\n"); | 636 | html("</td></tr></table>\n"); |
629 | 637 | ||
630 | html("<table class='tabs'><tr><td>\n"); | 638 | html("<table class='tabs'><tr><td>\n"); |
631 | if (ctx->repo) { | 639 | if (ctx->repo) { |
632 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 640 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
633 | ctx->qry.head); | 641 | ctx->qry.head); |
634 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 642 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
635 | ctx->qry.sha1, NULL); | 643 | ctx->qry.sha1, NULL); |
636 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 644 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
637 | NULL, NULL, 0, NULL, NULL); | 645 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
638 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 646 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
639 | ctx->qry.sha1, NULL); | 647 | ctx->qry.sha1, NULL); |
640 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 648 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
641 | ctx->qry.head, ctx->qry.sha1); | 649 | ctx->qry.head, ctx->qry.sha1); |
642 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 650 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
643 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 651 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
644 | if (ctx->repo->readme) | 652 | if (ctx->repo->readme) |
645 | reporevlink("about", "about", NULL, | 653 | reporevlink("about", "about", NULL, |
646 | hc(cmd, "about"), ctx->qry.head, NULL, | 654 | hc(cmd, "about"), ctx->qry.head, NULL, |
647 | NULL); | 655 | NULL); |
648 | html("</td><td class='form'>"); | 656 | html("</td><td class='form'>"); |
649 | html("<form class='right' method='get' action='"); | 657 | html("<form class='right' method='get' action='"); |
650 | if (ctx->cfg.virtual_root) | 658 | if (ctx->cfg.virtual_root) |
651 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 659 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
652 | ctx->qry.path, NULL)); | 660 | ctx->qry.path, NULL)); |
653 | html("'>\n"); | 661 | html("'>\n"); |
654 | add_hidden_formfields(1, 0, "log"); | 662 | add_hidden_formfields(1, 0, "log"); |
655 | html("<select name='qt'>\n"); | 663 | html("<select name='qt'>\n"); |
656 | html_option("grep", "log msg", ctx->qry.grep); | 664 | html_option("grep", "log msg", ctx->qry.grep); |
657 | html_option("author", "author", ctx->qry.grep); | 665 | html_option("author", "author", ctx->qry.grep); |
658 | html_option("committer", "committer", ctx->qry.grep); | 666 | html_option("committer", "committer", ctx->qry.grep); |
659 | html("</select>\n"); | 667 | html("</select>\n"); |
660 | html("<input class='txt' type='text' size='10' name='q' value='"); | 668 | html("<input class='txt' type='text' size='10' name='q' value='"); |
661 | html_attr(ctx->qry.search); | 669 | html_attr(ctx->qry.search); |
662 | html("'/>\n"); | 670 | html("'/>\n"); |
663 | html("<input type='submit' value='search'/>\n"); | 671 | html("<input type='submit' value='search'/>\n"); |
664 | html("</form>\n"); | 672 | html("</form>\n"); |
665 | } else { | 673 | } else { |
666 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 674 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |
667 | if (ctx->cfg.root_readme) | 675 | if (ctx->cfg.root_readme) |
668 | site_link("about", "about", NULL, hc(cmd, "about"), | 676 | site_link("about", "about", NULL, hc(cmd, "about"), |
669 | NULL, 0); | 677 | NULL, 0); |