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>

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
@@ -33,23 +33,25 @@ table#header td.logo {
 	width: 96px;
 }
 
 table#header td.main {
 	font-size: 250%;
 	padding-left: 10px;
+	white-space: nowrap;
 }
 
 table#header td.main a {
 	color: #000;
 }
 
 table#header td.form {
 	text-align: right;
 	vertical-align: bottom;
 	padding-right: 1em;
 	padding-bottom: 2px;
+	white-space: nowrap;
 }
 
 table#header td.form form,
 table#header td.form input,
 table#header td.form select {
 	font-size: 90%;
@@ -89,12 +91,13 @@ table.tabs td.form {
 	text-align: right;
 }
 
 table.tabs td.form form {
 	padding-bottom: 2px;
 	font-size: 90%;
+	white-space: nowrap;
 }
 
 table.tabs td.form input,
 table.tabs td.form select {
 	font-size: 90%;
 }
diff --git a/ui-shared.c b/ui-shared.c
index 44269a7..cd98387 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -542,16 +542,16 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 	html("'><img src='");
 	html_attr(ctx->cfg.logo);
 	html("' alt='cgit logo'/></a></td>\n");
 
 	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);
 		html("<select name='h' onchange='this.form.submit();'>\n");
 		for_each_branch_ref(print_branch_option, ctx->qry.head);
 		html("</select> ");