1 files changed, 16 insertions, 55 deletions

diff --git a/ui-shared.c b/ui-shared.c
index d4376ce..110c696 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -111,24 +111,20 @@ static char *repolink(char *title, char *class, char *page, char *head,
 		html_attr(cgit_repo->url);
 		if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
 			html("/");
-		if (page) {
-			html(page);
-			html("/");
-			if (path)
-				html_attr(path);
-		}
+		html(page);
+		html("/");
+		if (path)
+			html_attr(path);
 	} else {
 		html(cgit_script_name);
 		html("?url=");
 		html_attr(cgit_repo->url);
 		if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
 			html("/");
-		if (page) {
-			html(page);
-			html("/");
-			if (path)
-				html_attr(path);
-		}
+		html(page);
+		html("/");
+		if (path)
+			html_attr(path);
 		delim = "&";
 	}
 	if (head && strcmp(head, cgit_repo->defbranch)) {
@@ -163,25 +159,9 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
-		   char *rev, char *path, int ofs)
+		   char *rev, char *path)
 {
-	char *delim;
-
-	delim = repolink(title, class, "log", head, path);
-	if (rev && strcmp(rev, cgit_query_head)) {
-		html(delim);
-		html("id=");
-		html_attr(rev);
-		delim = "&";
-	}
-	if (ofs > 0) {
-		html(delim);
-		html("ofs=");
-		htmlf("%d", ofs);
-	}
-	html("'>");
-	html_txt(name);
-	html("</a>");
+	reporevlink("log", name, title, class, head, rev, path);
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,
@@ -299,38 +279,19 @@ void cgit_print_docend()
 void cgit_print_pageheader(char *title, int show_search)
 {
 	html("<table id='layout'>");
-	html("<tr><td id='header'><a href='");
-	html_attr(cgit_rooturl());
-	html("'>");
-	html_txt(cgit_root_title);
-	html("</a></td><td id='logo'>");
+	html("<tr><td id='header'>");
+	html(cgit_root_title);
+	html("</td><td id='logo'>");
 	html("<a href='");
 	html_attr(cgit_logo_link);
 	htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo);
 	html("</td></tr>");
 	html("<tr><td id='crumb'>");
+	htmlf("<a href='%s'>root</a>", cgit_rooturl());
 	if (cgit_query_repo) {
+		htmlf(" : <a href='%s'>", cgit_repourl(cgit_repo->url));
 		html_txt(cgit_repo->name);
-		html(" (");
-		html_txt(cgit_query_head);
-		html(") : &nbsp;");
-		reporevlink(NULL, "summary", NULL, NULL, cgit_query_head,
-			    NULL, NULL);
-		html(" ");
-		cgit_log_link("log", NULL, NULL, cgit_query_head,
-			      cgit_query_sha1, cgit_query_path, 0);
-		html(" ");
-		cgit_tree_link("tree", NULL, NULL, cgit_query_head,
-			       cgit_query_sha1, NULL);
-		html(" ");
-		cgit_commit_link("commit", NULL, NULL, cgit_query_head,
-			      cgit_query_sha1);
-		html(" ");
-		cgit_diff_link("diff", NULL, NULL, cgit_query_head,
-			       cgit_query_sha1, cgit_query_sha2,
-			       cgit_query_path);
-	} else {
-		html_txt("Index of repositories");
+		htmlf("</a> : %s", title);
 	}
 	html("</td>");
 	html("<td id='search'>");