From f135569b2be3fb1816f802f9a162b3743b735d1c Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 12 Apr 2008 15:53:31 +0200
Subject: [PATCH] Replace sidebar/logo

This replaces the sidebar with a more 'common' header layout and also
updates the logo.

Not quite finished yet, though.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
 cgit.css    | 163 ++++++++++++++++++++--------------------------------
 cgit.png    | Bin 5406 -> 1840 bytes
 ui-shared.c | 125 ++++++++++++++--------------------------
 3 files changed, 105 insertions(+), 183 deletions(-)

diff --git a/cgit.css b/cgit.css
index 17c2712..67cf48e 100644
--- a/cgit.css
+++ b/cgit.css
@@ -11,41 +11,67 @@ body {
 	padding: 4px;
 }
 
-table {
-      border-collapse: collapse;
-}
-
-h2 {
-	font-size: 120%;
-	font-weight: bold;
-	margin-top: 0em;
-	margin-bottom: 0.25em;
-}
-
-h3 {
-	margin-top: 0em;
-	font-size: 100%;
-	font-weight: normal;
-}
-
-h4 {
-	margin-top: 1.5em;
-	margin-bottom: 0.1em;
-	font-size: 100%;
-	font-weight: bold;
-}
-
 a {
-	color: #600;
+	color: blue;
 	text-decoration: none;
 }
 
 a:hover {
-	background-color: #ddd;
-	text-decoration: none;
+	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;
+}
+
+table.tabs td a {
+	padding: 2px 1em;
+	color: #007;
+}
+
+table.tabs td a.active {
+	color: #000;
+	background-color: #ccc;
+}
+
+div.content {
+	margin: 0px;
+	padding: 1em;
+}
+
+
 table.list {
+	width: 100%;
 	border: none;
 	border-collapse: collapse;
 }
@@ -55,7 +81,7 @@ table.list tr {
 }
 
 table.list tr:hover {
-	background: #f8f8f8;
+	background: #eee;
 }
 
 table.list tr.nohover:hover {
@@ -63,8 +89,8 @@ table.list tr.nohover:hover {
 }
 
 table.list th {
-	font-weight: bold;
-	border-bottom: solid 1px #777;
+	font-weight: normal;
+	border-bottom: solid 1px #ccc;
 	padding: 0.1em 0.5em 0.1em 0.5em;
 	vertical-align: baseline;
 }
@@ -74,81 +100,14 @@ table.list td {
 	padding: 0.1em 0.5em 0.1em 0.5em;
 }
 
+table.list td a {
+	color: black;
+}
+
 img {
 	border: none;
 }
 
-table#layout {
-	border-collapse: collapse;
-	border: none;
-	margin: 0px;
-}
-
-td#sidebar {
-	vertical-align: top;
-	width: 162px;
-	padding: 0px 0px 0px 0px;
-	margin: 0px;
-}
-
-td#sidebar table {
-	border-collapse: separate;
-	border-spacing: 0px;
-	margin: 0px;
-	padding: 0px;
-	background-color: #ccc;
-}
-
-td#sidebar table.sidebar td.sidebar {
-	padding: 4px;
-	border-top: solid 1px #eee;
-	border-left: solid 1px #eee;
-	border-right: solid 1px #aaa;
-	border-bottom: solid 1px #aaa;
-}
-
-div#logo {
-	margin: 0px;
-	padding: 4px 0px 4px 0px;
-	text-align: center;
-	background-color: #ccc;
-	border-top: solid 1px #eee;
-	border-left: solid 1px #eee;
-	border-right: solid 1px #aaa;
-	border-bottom: solid 1px #aaa;
-}
-
-td#sidebar h1 {
-	font-size: 10pt;
-	font-weight: bold;
-	margin: 8px 0px 0px 0px;
-}
-
-td#sidebar h1.first {
-	margin-top: 0px;
-}
-
-td#sidebar a.menu {
-	display: block;
-	background-color: #ccc;
-	padding: 0.1em 0.5em;
-	text-decoration: none;
-}
-
-td#sidebar a.menu:hover {
-	background-color: #bbb;
-	text-decoration: none;
-}
-
-td#sidebar select {
-	width: 100%;
-	margin: 2px 0px 0px 0px;
-}
-
-td#sidebar form {
-	text-align: right;
-}
-
 input#switch-btn {
 	margin: 2px 0px 0px 0px;
 }
@@ -357,7 +316,7 @@ table.diff td {
 table.diff td div.head {
 	font-weight: bold;
 	margin-top: 1em;
-	background-color: #eee;
+	color: black;
 }
 
 table.diff td div.hunk {
diff --git a/cgit.png b/cgit.png
index 22f7e954354eca7d22057aa53fef49cc568932b6..d7f70bc45593279bd88856b0fc318031660019a7 100644
GIT binary patch
delta 1814
zcmV+x2kH2pDzFYNiBL{Q4GJ0x0000DNk~Le0001B0000$2nGNE0Od4t4gdfE0drDE
zLIAGL9O;oEFn`zt2@?|rEZrm~0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}
zP*;Ht7XSbTi%CR5RCwC$TU$&MSs4D>PU(fxmX@WE;4L7i$St5t3B(nm5K&`P5{*$~
zeAPtblP@I3nD}6PF+6BuLcm0H6*j0KqQLIr>I%ky8h;3000j#bYD;OM*VzXZY-hxl
z>1BoUC4HE`GxMK0-<kjXx8cz=O@kn8;FBpJ1T1P$KihzR=kYv_g$f0B7>(o&ARq(~
z0tg5JKOJ}^4j^98qV}SQ2_ky{A%K7oKnNfp1duquCm6fCG1}aWPo14G_w`|VWCRYQ
z5pJ6ew13O>`KA;FDk=(;Oa^gW92BXkkgr{f_|j6ySFH-E8|i(1Fi^%Jl=7K?_t&nW
z=gb+Ho<HX_SVej|)|8hcVb?A~fG;M<X|>{?ojdV(&mPW`4*;g_Zamt(8|_=S!Zkfj
z_JALq@bBKe7_O@exMJO%J9xNb2i$f$Nkx1QgMZc4_)uTZ`d>s$4Ai-~P-bQ#Lal~S
zp#Wbf1OU)37n~Lg>;?lYZ{A?6y&aRUUo-A8+SG*C6%|N6emrOoxW2mD<M_$`{T{~x
zsTA24FaAF_;l`8{O!oD8+FYd)8RySq*}i??M@0CnX#CM5bR0emb5D;akt!9o^!Gz3
zmwyLk4+!-2Au~aSjt<7;^C$`%T3WE;&>_Dj9{|)^EjB!OfC!b!LvA-1Fmm@U*#j8n
zp}CnMODHQtbXL~9l}X~`k#zJZQ`i0bgaB`R>g;65G@CYYRv5o!3scwAr-T4+ux*;k
z%uLP-6=`V<neF38LV!1>M@ASjX+i>Lg?|Ex1bmUma~~KRBW|cS93~U1>lp~_A_3Ts
z-vGD6;d!D+1YQWjdP2Zgc!dYvW`iI^sfd{vfUN%T5<ox*AOsK)0v0a;q=PZk1bBHp
zZW26&HWKCwg&x%^x7`k!rUT-R)+rQlPE2@^UFLR&=81VcMvUVRTJrMX_-5=pK7SvZ
zySoEVfKZ`eB*|=gJ;WLfr{||>8qUc{&q2s!AzN_*u^6tYsoC*->E!Sg#_n#oESA}Y
z>StZVXA>l1ndqsZA<h$EA0G$2R=e9~3mpMcsmHO?YW3^-Z^;7yL1bib2#8v_k|F!_
z>>1|?V9Wi7vM}#mk%QZfDV@%zYk#M7I>zD=snx+DAUZpnAqzz5aJaTMtec)JF_CFj
zd|X&;Z8_4VOM^oITlH(Wt`6gmAJ1Evv8xLMRaIdnASxw=Asf7M#iwiE*VHg%^3>Ge
z5TIJW9<t<Q#_Rf5aWVQYU-rvv&~7(|Zr;S-B_&~ZXMfqak#%BUUAQo3tba35S&2cG
z#S@dC&&?^Dt1V@qstO$k53<|Rm>8(FT101MAws1BC6~|k1v#B?TCK3@^)UDLLf_T~
z+vw<=1M#)Jk84|r(_+D`xHyI<_Vw+ED=C32DG5|m6r2_dEdBi$y>|~L7FSac8HsHl
zKKR^H<2L~S(7t^;bhmB=eSc+!iU0t3QC^Oo)2BI)Ir+p1WSlz}+*CwvO%39=ZCg;$
z=jxLu5nEWu=^oKJIY>QqD)_k|N-9NueLa4?dKFQtS94Y<U$X`Ri6pE92qY5Z-@c8c
zBS-uWqy!QPRvtTs-`d(haf|_cGC^#fjIN;prmilSU%kS#P6vn42!EH&Hsd4nC<;_$
zB=}-6#2O8h85vNdr9o3%3}t#c{!l7Ci~f8*%6yDS1KnC^863oLZ7uYztuXiY!fr6Y
z@#TI3sT2`vHKa?HK%Sb4nEZUimzE+zsSI3ZBpe@VdlMj#NU+n-h;*SKEcF0y&V>P7
zQ9m2zY)`L`jrGWt@P8=^+x2=*2`IPI38&fYA>*3hTd;2cUnGLdVww3lOeUCKzT~9P
z(%;WW2g_LUPJ{pe;<z}5Z0N>~faikP@=k;R05Jsx4B4BC3RvfvmbSiohu*Vi8S>bo
zB0>Ng*jmXQCKLWFEc81yt!r$=1Fd$(#rrn=SLNg^S_0;DLw{+SMoVrk3{ReXHyTuH
zwTN84{PQ<rU)vXH8m_4+*bN4l`}&}7ZH0AUfb|~hDl4)4JNc$XPXO@wQ>E5|f}m8b
zG{wazXlz{6ZI3^U161qQp`f85;B{NgrcKaZzrN^uPJIf*Vhang`Naz?J8%HJFDd8w
zB67tFWM8_3f?uX4PHEglV}iV4HySb0(15Xr4`J@@#pK(!a869XIXO97q~Y<v7Yaei
z<q&H$kR>J}Iy)P&MMY5O<&jQnE(8#S!2}Ty0v0U(14$Q&noZ_>U;qFB07*qoM6N<$
Ef>t>&GXMYp

literal 5406
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

diff --git a/ui-shared.c b/ui-shared.c
index aa65988..7287956 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
+#include "cmd.h"
 #include "html.h"
 
 const char cgit_doctype[] =
@@ -465,97 +466,59 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
 	}
 }
 
+char *hc(struct cgit_cmd *cmd, const char *page)
+{
+	return (strcmp(cmd->name, page) ? NULL : "active");
+}
+
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
-	static const char *default_info = "This is cgit, a fast webinterface for git repositories";
-	int header = 0;
-	char *url;
+	struct cgit_cmd *cmd = cgit_get_cmd(ctx);
 
-	html("<table id='layout' summary=''>\n");
-	html("<tr><td id='sidebar'>\n");
-	html("<table class='sidebar' cellspacing='0' summary=''>\n");
-	html("<tr><td class='sidebar'>\n<a href='");
+	html("<table id='header'>\n");
+	html("<tr>\n");
+	html("<td class='logo' rowspan='2'><a href='");
 	html_attr(cgit_rooturl());
-	htmlf("'><img src='%s' alt='cgit'/></a>\n",
-	      ctx->cfg.logo);
-	html("</td></tr>\n<tr><td class='sidebar'>\n");
-	if (ctx->repo) {
-		html("<h1 class='first'>");
-		html_txt(strrpart(ctx->repo->name, 20));
-		html("</h1>\n");
+	html("'><img src='");
+	html_attr(ctx->cfg.logo);
+	html("'/></a></td>\n");
+	html("<td class='main'>");
+	if (ctx->repo)
+		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);
-		if (ctx->repo->owner) {
-			html("<h1>owner</h1>\n");
-			html_txt(ctx->repo->owner);
-		}
-		html("<h1>navigate</h1>\n");
-		reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head,
-			    NULL, NULL);
-		cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL,
-			      0, NULL, NULL);
-		cgit_tree_link("tree", NULL, "menu", ctx->qry.head,
+	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_commit_link("commit", NULL, "menu", ctx->qry.head,
-			      ctx->qry.sha1);
-		cgit_diff_link("diff", NULL, "menu", ctx->qry.head,
+		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, "menu", ctx->qry.head,
+		cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
 				ctx->qry.sha1);
-
-		for_each_ref(print_archive_ref, &header);
-
-		if (ctx->repo->clone_url || ctx->cfg.clone_prefix) {
-			html("<h1>clone</h1>\n");
-			if (ctx->repo->clone_url)
-				url = ctx->repo->clone_url;
-			else
-				url = fmt("%s%s", ctx->cfg.clone_prefix,
-					  ctx->repo->url);
-			html("<a class='menu' href='");
-			html_attr(url);
-			html("' title='");
-			html_attr(url);
-			html("'>\n");
-			html_txt(strrpart(url, 20));
-			html("</a>\n");
-		}
-
-		html("<h1>branch</h1>\n");
-		html("<form method='get' action=''>\n");
-		add_hidden_formfields(0, 1, ctx->qry.page);
-//		html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
-		html("<select name='h' onchange='this.form.submit();'>\n");
-		for_each_branch_ref(print_branch_option, ctx->qry.head);
-		html("</select>\n");
-//		html("</td><td>");
-		html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
-//		html("</td></tr></table>");
-		html("</form>\n");
-
-		html("<h1>search</h1>\n");
-		html("<form method='get' action='");
-		if (ctx->cfg.virtual_root)
-			html_attr(cgit_fileurl(ctx->qry.repo, "log",
-					       ctx->qry.path, NULL));
-		html("'>\n");
-		add_hidden_formfields(1, 0, "log");
-		html("<select name='qt'>\n");
-		html_option("grep", "log msg", ctx->qry.grep);
-		html_option("author", "author", ctx->qry.grep);
-		html_option("committer", "committer", ctx->qry.grep);
-		html("</select>\n");
-		html("<input class='txt' type='text' name='q' value='");
-		html_attr(ctx->qry.search);
-		html("'/>\n");
-		html("</form>\n");
 	} else {
-		if (!ctx->cfg.index_info || html_include(ctx->cfg.index_info))
-			html(default_info);
+		html("<a class='active' href='");
+		html_attr(cgit_rooturl());
+		html("'>index</a>\n");
 	}
-
-	html("</td></tr></table></td>\n");
-
-	html("<td id='content'>\n");
+	html("</td></tr></table>\n");
+	html("<div class='content'>");
 }
 
 void cgit_print_filemode(unsigned short mode)