Reintroduce the branch switcher

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

2 files changed, 17 insertions, 0 deletions

diff --git a/cgit.css b/cgit.css
index 67cf48e..80680c9 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,194 +1,204 @@
 body, table {
 	padding: 0em;
 	margin: 0em;
 }
 
 body {
 	font-family: sans;
 	font-size: 10pt;
 	color: #333;
 	background: white;
 	padding: 4px;
 }
 
 a {
 	color: blue;
 	text-decoration: none;
 }
 
 a:hover {
 	text-decoration: underline;
 }
 
 table {
       border-collapse: collapse;
 }
 
 table#header {
 	width: 100%;
 	margin-bottom: 1em;
 }
 
 table#header td.logo {
 	width: 96px;
 }
 
 table#header td.main {
 	font-size: 200%;
 }
 
 table#header td.sub {
 	color: #777;
 	border-top: solid 1px #ccc;
 }
 
 table.tabs {
 	border-bottom: solid 2px #ccc;
 	border-collapse: collapse;
 	margin-top: 2em;
 	margin-bottom: 1em;
 	width: 100%;
 }
 
 table.tabs td {
 	padding: 0px 0.5em;
+	vertical-align: bottom;
 }
 
 table.tabs td a {
 	padding: 2px 1em;
 	color: #007;
 }
 
 table.tabs td a.active {
 	color: #000;
 	background-color: #ccc;
 }
 
+table.tabs td.branch {
+	text-align: right;
+}
+
+table.tabs td.branch form {
+	padding-bottom: 2px;
+	font-size: 90%;
+}
+
 div.content {
 	margin: 0px;
 	padding: 1em;
 }
 
 
 table.list {
 	width: 100%;
 	border: none;
 	border-collapse: collapse;
 }
 
 table.list tr {
 	background: white;
 }
 
 table.list tr:hover {
 	background: #eee;
 }
 
 table.list tr.nohover:hover {
 	background: white;
 }
 
 table.list th {
 	font-weight: normal;
 	border-bottom: solid 1px #ccc;
 	padding: 0.1em 0.5em 0.1em 0.5em;
 	vertical-align: baseline;
 }
 
 table.list td {
 	border: none;
 	padding: 0.1em 0.5em 0.1em 0.5em;
 }
 
 table.list td a {
 	color: black;
 }
 
 img {
 	border: none;
 }
 
 input#switch-btn {
 	margin: 2px 0px 0px 0px;
 }
 
 td#sidebar input.txt {
 	width: 100%;
 	margin: 2px 0px 0px 0px;
 }
 
 table#grid {
 	margin: 0px;
 }
 
 td#content {
 	vertical-align: top;
 	padding: 1em 2em 1em 1em;
 	border: none;
 }
 
 div#summary {
 	vertical-align: top;
 	margin-bottom: 1em;
 }
 
 table#downloads {
 	float: right;
 	border-collapse: collapse;
 	border: solid 1px #777;
 	margin-left: 0.5em;
 	margin-bottom: 0.5em;
 }
 
 table#downloads th {
 	background-color: #ccc;
 }
 
 div#blob {
 	border: solid 1px black;
 }
 
 div.error {
 	color: red;
 	font-weight: bold;
 	margin: 1em 2em;
 }
 
 a.ls-blob, a.ls-dir, a.ls-mod {
 	font-family: monospace;
 }
 
 td.ls-size {
 	text-align: right;
 }
 
 td.ls-size {
 	font-family: monospace;
 }
 
 td.ls-mode {
 	font-family: monospace;
 }
 
 table.blob {
 	margin-top: 0.5em;
 	border-top: solid 1px black;
 }
 
 table.blob td.no {
 	border-right: solid 1px black;
 	color: black;
 	background-color: #eee;
 	text-align: right;
 }
 
 table.blob td.no a {
 	color: black;
 }
 
 table.blob td.no a:hover {
 	color: black;
 	text-decoration: none;
 }
 
 table.blob td.txt {
diff --git a/ui-shared.c b/ui-shared.c
index 03d147f..73e3d4c 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -393,168 +393,175 @@ void cgit_print_docend()
 }
 
 int print_branch_option(const char *refname, const unsigned char *sha1,
 			int flags, void *cb_data)
 {
 	char *name = (char *)refname;
 	html_option(name, name, ctx.qry.head);
 	return 0;
 }
 
 int print_archive_ref(const char *refname, const unsigned char *sha1,
 		       int flags, void *cb_data)
 {
 	struct tag *tag;
 	struct taginfo *info;
 	struct object *obj;
 	char buf[256], *url;
 	unsigned char fileid[20];
 	int *header = (int *)cb_data;
 
 	if (prefixcmp(refname, "refs/archives"))
 		return 0;
 	strncpy(buf, refname+14, sizeof(buf));
 	obj = parse_object(sha1);
 	if (!obj)
 		return 1;
 	if (obj->type == OBJ_TAG) {
 		tag = lookup_tag(sha1);
 		if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
 			return 0;
 		hashcpy(fileid, tag->tagged->sha1);
 	} else if (obj->type != OBJ_BLOB) {
 		return 0;
 	} else {
 		hashcpy(fileid, sha1);
 	}
 	if (!*header) {
 		html("<h1>download</h1>\n");
 		*header = 1;
 	}
 	url = cgit_pageurl(ctx.qry.repo, "blob",
 			   fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
 			       buf));
 	html_link_open(url, NULL, "menu");
 	html_txt(strlpart(buf, 20));
 	html_link_close();
 	return 0;
 }
 
 void add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
 	char *url;
 
 	if (!ctx.cfg.virtual_root) {
 		url = fmt("%s/%s", ctx.qry.repo, page);
 		if (ctx.qry.path)
 			url = fmt("%s/%s", url, ctx.qry.path);
 		html_hidden("url", url);
 	}
 
 	if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
 		html_hidden("h", ctx.qry.head);
 
 	if (ctx.qry.sha1)
 		html_hidden("id", ctx.qry.sha1);
 	if (ctx.qry.sha2)
 		html_hidden("id2", ctx.qry.sha2);
 
 	if (incl_search) {
 		if (ctx.qry.grep)
 			html_hidden("qt", ctx.qry.grep);
 		if (ctx.qry.search)
 			html_hidden("q", ctx.qry.search);
 	}
 }
 
 char *hc(struct cgit_cmd *cmd, const char *page)
 {
 	return (strcmp(cmd->name, page) ? NULL : "active");
 }
 
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
 	struct cgit_cmd *cmd = cgit_get_cmd(ctx);
 
 	html("<table id='header'>\n");
 	html("<tr>\n");
 	html("<td class='logo' rowspan='2'><a href='");
 	if (ctx->cfg.logo_link)
 		html_attr(ctx->cfg.logo_link);
 	else
 		html_attr(cgit_rooturl());
 	html("'><img src='");
 	html_attr(ctx->cfg.logo);
 	html("'/></a></td>\n");
 	html("<td class='main'>");
 	if (ctx->repo) {
 		html("<a href='");
 		html_attr(cgit_rooturl());
 		html("'>index</a> / ");
 		html_txt(ctx->repo->name);
 	} else
 		html_txt(ctx->cfg.root_title);
 	html("</td></tr>\n");
 	html("<tr><td class='sub'>");
 	if (ctx->repo)
 		html_txt(ctx->repo->desc);
 	else
 		html_txt(ctx->cfg.index_info);
 	html("</td></tr>\n");
 	html("</table>\n");
 
 	html("<table class='tabs'><tr><td>\n");
 	if (ctx->repo) {
 		reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
 			    ctx->qry.head, NULL, NULL);
 		cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
 			       ctx->qry.sha1, NULL);
 		cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
 			      NULL, NULL, 0, NULL, NULL);
 		cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
 			       ctx->qry.sha1, NULL);
 		cgit_commit_link("commit", NULL, hc(cmd, "commit"),
 				 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);
+		html("</td><td class='branch'>");
+		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> ");
+		html("<input type='submit' name='' value='switch'/>");
 	} else {
 		html("<a class='active' href='");
 		html_attr(cgit_rooturl());
 		html("'>index</a>\n");
 	}
 	html("</td></tr></table>\n");
 	html("<div class='content'>");
 }
 
 void cgit_print_filemode(unsigned short mode)
 {
 	if (S_ISDIR(mode))
 		html("d");
 	else if (S_ISLNK(mode))
 		html("l");
 	else if (S_ISGITLINK(mode))
 		html("m");
 	else
 		html("-");
 	html_fileperm(mode >> 6);
 	html_fileperm(mode >> 3);
 	html_fileperm(mode);
 }
 
 void cgit_print_snapshot_links(const char *repo, const char *head,
 			       const char *hex, int snapshots)
 {
 	const struct cgit_snapshot_format* f;
     	char *filename;
 
 	for (f = cgit_snapshot_formats; f->suffix; f++) {
 		if (!(snapshots & f->bit))
 			continue;
 		filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
 			       f->suffix);
 		cgit_snapshot_link(filename, NULL, NULL, (char *)head,
 				   (char *)hex, filename);
 		html("<br/>");
 	}
 }