summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-05-03 10:44:20 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-05-04 15:30:02 (UTC)
commit17890d0058c1555133c8767ceb123e809e6971ab (patch) (unidiff)
treee20eac18444fd75f6e25f03b6622245ca848d0d6
parentaa3c4486b41b8b13d0f52477f033837fc8bb9524 (diff)
downloadcgit-17890d0058c1555133c8767ceb123e809e6971ab.zip
cgit-17890d0058c1555133c8767ceb123e809e6971ab.tar.gz
cgit-17890d0058c1555133c8767ceb123e809e6971ab.tar.bz2
Add link to index page from repo header, remove page name
This makes it more obvious how to get back to the index, especially when the config option `logo-link` is used. And the page name displayed in the header provided no extra information. It only consumed space and deserved to die. While at it, make sure that the different parts of the header doesn't wrap when horizontal space is limited. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.css3
-rw-r--r--ui-shared.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/cgit.css b/cgit.css
index fac5f85..a37d218 100644
--- a/cgit.css
+++ b/cgit.css
@@ -23,43 +23,45 @@ a:hover {
23table { 23table {
24 border-collapse: collapse; 24 border-collapse: collapse;
25} 25}
26 26
27table#header { 27table#header {
28 width: 100%; 28 width: 100%;
29 margin-bottom: 1em; 29 margin-bottom: 1em;
30} 30}
31 31
32table#header td.logo { 32table#header td.logo {
33 width: 96px; 33 width: 96px;
34} 34}
35 35
36table#header td.main { 36table#header td.main {
37 font-size: 250%; 37 font-size: 250%;
38 padding-left: 10px; 38 padding-left: 10px;
39 white-space: nowrap;
39} 40}
40 41
41table#header td.main a { 42table#header td.main a {
42 color: #000; 43 color: #000;
43} 44}
44 45
45table#header td.form { 46table#header td.form {
46 text-align: right; 47 text-align: right;
47 vertical-align: bottom; 48 vertical-align: bottom;
48 padding-right: 1em; 49 padding-right: 1em;
49 padding-bottom: 2px; 50 padding-bottom: 2px;
51 white-space: nowrap;
50} 52}
51 53
52table#header td.form form, 54table#header td.form form,
53table#header td.form input, 55table#header td.form input,
54table#header td.form select { 56table#header td.form select {
55 font-size: 90%; 57 font-size: 90%;
56} 58}
57 59
58table#header td.sub { 60table#header td.sub {
59 color: #777; 61 color: #777;
60 border-top: solid 1px #ccc; 62 border-top: solid 1px #ccc;
61 padding-left: 10px; 63 padding-left: 10px;
62} 64}
63 65
64table.tabs { 66table.tabs {
65 /* border-bottom: solid 2px #ccc; */ 67 /* border-bottom: solid 2px #ccc; */
@@ -79,32 +81,33 @@ table.tabs td a {
79 color: #777; 81 color: #777;
80 font-size: 110%; 82 font-size: 110%;
81} 83}
82 84
83table.tabs td a.active { 85table.tabs td a.active {
84 color: #000; 86 color: #000;
85 background-color: #ccc; 87 background-color: #ccc;
86} 88}
87 89
88table.tabs td.form { 90table.tabs td.form {
89 text-align: right; 91 text-align: right;
90} 92}
91 93
92table.tabs td.form form { 94table.tabs td.form form {
93 padding-bottom: 2px; 95 padding-bottom: 2px;
94 font-size: 90%; 96 font-size: 90%;
97 white-space: nowrap;
95} 98}
96 99
97table.tabs td.form input, 100table.tabs td.form input,
98table.tabs td.form select { 101table.tabs td.form select {
99 font-size: 90%; 102 font-size: 90%;
100} 103}
101 104
102div.content { 105div.content {
103 margin: 0px; 106 margin: 0px;
104 padding: 2em; 107 padding: 2em;
105 border-top: solid 3px #ccc; 108 border-top: solid 3px #ccc;
106 border-bottom: solid 3px #ccc; 109 border-bottom: solid 3px #ccc;
107} 110}
108 111
109 112
110table.list { 113table.list {
diff --git a/ui-shared.c b/ui-shared.c
index 44269a7..cd98387 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -532,36 +532,36 @@ void cgit_print_pageheader(struct cgit_context *ctx)
532{ 532{
533 struct cgit_cmd *cmd = cgit_get_cmd(ctx); 533 struct cgit_cmd *cmd = cgit_get_cmd(ctx);
534 534
535 html("<table id='header'>\n"); 535 html("<table id='header'>\n");
536 html("<tr>\n"); 536 html("<tr>\n");
537 html("<td class='logo' rowspan='2'><a href='"); 537 html("<td class='logo' rowspan='2'><a href='");
538 if (ctx->cfg.logo_link) 538 if (ctx->cfg.logo_link)
539 html_attr(ctx->cfg.logo_link); 539 html_attr(ctx->cfg.logo_link);
540 else 540 else
541 html_attr(cgit_rooturl()); 541 html_attr(cgit_rooturl());
542 html("'><img src='"); 542 html("'><img src='");
543 html_attr(ctx->cfg.logo); 543 html_attr(ctx->cfg.logo);
544 html("' alt='cgit logo'/></a></td>\n"); 544 html("' alt='cgit logo'/></a></td>\n");
545 545
546 html("<td class='main'>"); 546 html("<td class='main'>");
547 if (ctx->repo) { 547 if (ctx->repo) {
548 cgit_index_link("index", NULL, NULL, NULL, 0);
549 html(" : ");
548 reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"), 550 reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
549 ctx->qry.head, NULL, NULL); 551 ctx->qry.head, NULL, NULL);
550 html(" : ");
551 html_txt(ctx->qry.page);
552 html("</td><td class='form'>"); 552 html("</td><td class='form'>");
553 html("<form method='get' action=''>\n"); 553 html("<form method='get' action=''>\n");
554 add_hidden_formfields(0, 1, ctx->qry.page); 554 add_hidden_formfields(0, 1, ctx->qry.page);
555 html("<select name='h' onchange='this.form.submit();'>\n"); 555 html("<select name='h' onchange='this.form.submit();'>\n");
556 for_each_branch_ref(print_branch_option, ctx->qry.head); 556 for_each_branch_ref(print_branch_option, ctx->qry.head);
557 html("</select> "); 557 html("</select> ");
558 html("<input type='submit' name='' value='switch'/>"); 558 html("<input type='submit' name='' value='switch'/>");
559 html("</form>"); 559 html("</form>");
560 } else 560 } else
561 html_txt(ctx->cfg.root_title); 561 html_txt(ctx->cfg.root_title);
562 html("</td></tr>\n"); 562 html("</td></tr>\n");
563 563
564 html("<tr><td class='sub'"); 564 html("<tr><td class='sub'");
565 if (ctx->repo) { 565 if (ctx->repo) {
566 html(" colspan='2'>"); 566 html(" colspan='2'>");
567 html_txt(ctx->repo->desc); 567 html_txt(ctx->repo->desc);