X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/536b0541fcfea2169e4df33043cd9ff14c657bce..905dbaef5aa33ea11d385b82de0188fee73dd655:/ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 6253a90..d08ede9 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -114,6 +114,49 @@ char *cgit_currurl()
 		return fmt("%s/", ctx.cfg.virtual_root);
 }
 
+static void site_url(char *page, char *search)
+{
+	char *delim = "?";
+
+	if (ctx.cfg.virtual_root) {
+		html_attr(ctx.cfg.virtual_root);
+		if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
+			html("/");
+	} else
+		html(ctx.cfg.script_name);
+
+	if (page) {
+		htmlf("?p=%s", page);
+		delim = "&";
+	}
+	if (search) {
+		html(delim);
+		html("q=");
+		html_attr(search);
+	}
+}
+
+static void site_link(char *page, char *name, char *title, char *class,
+		       char *search)
+{
+	html("<a");
+	if (title) {
+		html(" title='");
+		html_attr(title);
+		html("'");
+	}
+	if (class) {
+		html(" class='");
+		html_attr(class);
+		html("'");
+	}
+	html(" href='");
+	site_url(page, search);
+	html("'>");
+	html_txt(name);
+	html("</a>");
+}
+
 static char *repolink(char *title, char *class, char *page, char *head,
 		      char *path)
 {
@@ -484,15 +527,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 		html_attr(cgit_rooturl());
 	html("'><img src='");
 	html_attr(ctx->cfg.logo);
-	html("'/></a></td>\n");
+	html("' alt='cgit logo'/></a></td>\n");
 
 	html("<td class='main'>");
 	if (ctx->repo) {
-/*
-		html("<a href='");
-		html_attr(cgit_rooturl());
-		html("'>index</a> : ");
-*/
 		reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
 			    ctx->qry.head, NULL, NULL);
 		html(" : ");
@@ -507,25 +545,20 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 		html("</form>");
 	} else
 		html_txt(ctx->cfg.root_title);
-	html("</td>\n");
+	html("</td></tr>\n");
 
 	html("<tr><td class='sub'");
 	if (ctx->repo) {
 		html(" colspan='2'>");
 		html_txt(ctx->repo->desc);
-	}
-/*
-	else if (ctx->cfg.root_subtitle)
-		html_txt(ctx->cfg.root_subtitle);
-*/
-	else {
+	} else {
 		html(">");
-		html_txt("a fast webinterface for the git dscm");
+		if (ctx->cfg.root_desc)
+			html_txt(ctx->cfg.root_desc);
+		else if (ctx->cfg.index_info)
+			html_include(ctx->cfg.index_info);
 	}
-	html("</td></tr>\n");
-
-	html("</tr>\n");
-	html("</table>\n");
+	html("</td></tr></table>\n");
 
 	html("<table class='tabs'><tr><td>\n");
 	if (ctx->repo) {
@@ -541,8 +574,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 				 ctx->qry.head, ctx->qry.sha1);
 		cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
 			       ctx->qry.sha1, ctx->qry.sha2, NULL);
-		cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
-				ctx->qry.sha1);
+		if (ctx->repo->readme)
+			reporevlink("about", "about", NULL,
+				    hc(cmd, "about"), ctx->qry.head, NULL,
+				    NULL);
 		html("</td><td class='form'>");
 		html("<form class='right' method='get' action='");
 		if (ctx->cfg.virtual_root)
@@ -561,9 +596,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 		html("<input type='submit' value='search'/>\n");
 		html("</form>\n");
 	} else {
-		html("<a class='active' href='");
-		html_attr(cgit_rooturl());
-		html("'>index</a>\n");
+		site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL);
+		if (ctx->cfg.root_readme)
+			site_link("about", "about", NULL, hc(cmd, "about"), NULL);
 		html("</td><td class='form'>");
 		html("<form method='get' action='");
 		html_attr(cgit_rooturl());