author | Lars Hjemli <hjemli@gmail.com> | 2007-11-03 10:23:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-11-03 10:23:47 (UTC) |
commit | cda7194e300277fbad73595c70ecece02d772190 (patch) (unidiff) | |
tree | 00ad3148122d869a178b536989f17afacc422b47 | |
parent | 68cf9b4f853177544a5d1c7b4a9eea4d2f5749d5 (diff) | |
download | cgit-cda7194e300277fbad73595c70ecece02d772190.zip cgit-cda7194e300277fbad73595c70ecece02d772190.tar.gz cgit-cda7194e300277fbad73595c70ecece02d772190.tar.bz2 |
Don't include current path in menu links
The menu-links are a lot more predictable this way.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui-shared.c b/ui-shared.c index 88dd6b8..f9f02bc 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -453,56 +453,55 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
453 | void cgit_print_pageheader(char *title, int show_search) | 453 | void cgit_print_pageheader(char *title, int show_search) |
454 | { | 454 | { |
455 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; | 455 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; |
456 | int header = 0; | 456 | int header = 0; |
457 | 457 | ||
458 | html("<div id='sidebar'>\n"); | 458 | html("<div id='sidebar'>\n"); |
459 | html("<a href='"); | 459 | html("<a href='"); |
460 | html_attr(cgit_rooturl()); | 460 | html_attr(cgit_rooturl()); |
461 | htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n", | 461 | htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n", |
462 | cgit_logo); | 462 | cgit_logo); |
463 | html("<div class='infobox'>"); | 463 | html("<div class='infobox'>"); |
464 | if (cgit_query_repo) { | 464 | if (cgit_query_repo) { |
465 | html("<h1>"); | 465 | html("<h1>"); |
466 | html_txt(strrpart(cgit_repo->name, 20)); | 466 | html_txt(strrpart(cgit_repo->name, 20)); |
467 | html("</h1>\n"); | 467 | html("</h1>\n"); |
468 | html_txt(cgit_repo->desc); | 468 | html_txt(cgit_repo->desc); |
469 | if (cgit_repo->owner) { | 469 | if (cgit_repo->owner) { |
470 | html("<p>\n<h1>owner</h1>\n"); | 470 | html("<p>\n<h1>owner</h1>\n"); |
471 | html_txt(cgit_repo->owner); | 471 | html_txt(cgit_repo->owner); |
472 | } | 472 | } |
473 | html("<p>\n<h1>navigate</h1>\n"); | 473 | html("<p>\n<h1>navigate</h1>\n"); |
474 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, | 474 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, |
475 | NULL, NULL); | 475 | NULL, NULL); |
476 | cgit_log_link("log", NULL, "menu", cgit_query_head, | 476 | cgit_log_link("log", NULL, "menu", cgit_query_head, |
477 | cgit_query_sha1, cgit_query_path, 0, NULL, NULL); | 477 | cgit_query_sha1, NULL, 0, NULL, NULL); |
478 | cgit_tree_link("tree", NULL, "menu", cgit_query_head, | 478 | cgit_tree_link("tree", NULL, "menu", cgit_query_head, |
479 | cgit_query_sha1, NULL); | 479 | cgit_query_sha1, NULL); |
480 | cgit_commit_link("commit", NULL, "menu", cgit_query_head, | 480 | cgit_commit_link("commit", NULL, "menu", cgit_query_head, |
481 | cgit_query_sha1); | 481 | cgit_query_sha1); |
482 | cgit_diff_link("diff", NULL, "menu", cgit_query_head, | 482 | cgit_diff_link("diff", NULL, "menu", cgit_query_head, |
483 | cgit_query_sha1, cgit_query_sha2, | 483 | cgit_query_sha1, cgit_query_sha2, NULL); |
484 | cgit_query_path); | ||
485 | 484 | ||
486 | for_each_ref(print_archive_ref, &header); | 485 | for_each_ref(print_archive_ref, &header); |
487 | 486 | ||
488 | html("<p>\n<h1>branch</h1>\n"); | 487 | html("<p>\n<h1>branch</h1>\n"); |
489 | html("<form method='get' action=''>\n"); | 488 | html("<form method='get' action=''>\n"); |
490 | add_hidden_formfields(0, 1, cgit_query_page); | 489 | add_hidden_formfields(0, 1, cgit_query_page); |
491 | html("<select name='h' onchange='this.form.submit();'>\n"); | 490 | html("<select name='h' onchange='this.form.submit();'>\n"); |
492 | for_each_branch_ref(print_branch_option, cgit_query_head); | 491 | for_each_branch_ref(print_branch_option, cgit_query_head); |
493 | html("</select>\n"); | 492 | html("</select>\n"); |
494 | html("</form>\n"); | 493 | html("</form>\n"); |
495 | 494 | ||
496 | html("<p>\n<h1>search</h1>\n"); | 495 | html("<p>\n<h1>search</h1>\n"); |
497 | html("<form method='get' action='"); | 496 | html("<form method='get' action='"); |
498 | if (cgit_virtual_root) | 497 | if (cgit_virtual_root) |
499 | html_attr(cgit_fileurl(cgit_query_repo, "log", | 498 | html_attr(cgit_fileurl(cgit_query_repo, "log", |
500 | cgit_query_path, NULL)); | 499 | cgit_query_path, NULL)); |
501 | html("'>\n"); | 500 | html("'>\n"); |
502 | add_hidden_formfields(1, 0, "log"); | 501 | add_hidden_formfields(1, 0, "log"); |
503 | html("<select name='qt'>\n"); | 502 | html("<select name='qt'>\n"); |
504 | html_option("grep", "log msg", cgit_query_grep); | 503 | html_option("grep", "log msg", cgit_query_grep); |
505 | html_option("author", "author", cgit_query_grep); | 504 | html_option("author", "author", cgit_query_grep); |
506 | html_option("committer", "committer", cgit_query_grep); | 505 | html_option("committer", "committer", cgit_query_grep); |
507 | html("</select>\n"); | 506 | html("</select>\n"); |
508 | html("<input class='txt' type='text' name='q' value='"); | 507 | html("<input class='txt' type='text' name='q' value='"); |