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>

diff --git a/cgit.css b/cgit.css
index fac5f855fdcd129dd1a001b3ca8ce96a36f0a4d9..a37d21816cdbe213e1efb6b084ecece66aa4f0f3 100644 (file)
--- a/cgit.css
+++ b/cgit.css
@@ -36,6 +36,7 @@ table#header td.logo {
 table#header td.main {
        font-size: 250%;
        padding-left: 10px;
+       white-space: nowrap;
 }
 
 table#header td.main a {
@@ -47,6 +48,7 @@ table#header td.form {
        vertical-align: bottom;
        padding-right: 1em;
        padding-bottom: 2px;
+       white-space: nowrap;
 }
 
 table#header td.form form,
@@ -92,6 +94,7 @@ table.tabs td.form {
 table.tabs td.form form {
        padding-bottom: 2px;
        font-size: 90%;
+       white-space: nowrap;
 }
 
 table.tabs td.form input,

diff --git a/ui-shared.c b/ui-shared.c
index 44269a7677cff9b5d24b14b3b54d90defe573e63..cd9838732be5f5f34e2c3fba3c4ac900486333dc 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -545,10 +545,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 
        html("<td class='main'>");
        if (ctx->repo) {
+               cgit_index_link("index", NULL, NULL, NULL, 0);
+               html(" : ");
                reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
                            ctx->qry.head, NULL, NULL);
-               html(" : ");
-               html_txt(ctx->qry.page);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                add_hidden_formfields(0, 1, ctx->qry.page);