Merge branch 'lh/layout'

* lh/layout: Make repository search case insensitive Remove 'patch' link from tab, add to commit view Implement minimal freetext search in the repolist More layout fixes Minor fixup in tree-view css Reintroduce the branch switcher Add fixed link to index page from repo header Include diff in commit view Replace sidebar/logo
author: Lars Hjemli <hjemli@gmail.com> 2008-04-13 10:48:44 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2008-04-13 10:48:44 (UTC)
commit: 76ba6287bfb533baca7285b107b5d975581d449d (patch) (side-by-side diff)
tree: 22445a77f5b87280ec980f9b4da5a511f1f27faf /ui-shared.c
parent: 4a842288260a0b0c4a3d4032d441f7fd2afee699 (diff)
parent: 28d781f34b2c2d4c2b994ef3953d1cf37d8f28f0 (diff)
download: cgit-76ba6287bfb533baca7285b107b5d975581d449d.zip
cgit-76ba6287bfb533baca7285b107b5d975581d449d.tar.gz
cgit-76ba6287bfb533baca7285b107b5d975581d449d.tar.bz2
1 files changed, 86 insertions, 68 deletions
diff --git a/ui-shared.c b/ui-shared.c
index aa65988..bb08c4a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,33 +1,34 @@
 /* ui-shared.c: common web output functions
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
+#include "cmd.h"
 #include "html.h"
 
 const char cgit_doctype[] =
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
 "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
 
 static char *http_date(time_t t)
 {
 	static char day[][4] =
 		{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
 	static char month[][4] =
 		{"Jan", "Feb", "Mar", "Apr", "May", "Jun",
 		 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
 	struct tm *tm = gmtime(&t);
 	return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
 		   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
 		   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
 void cgit_print_error(char *msg)
 {
 	html("<div class='error'>");
 	html_txt(msg);
 	html("</div>\n");
@@ -367,49 +368,49 @@ void cgit_print_http_headers(struct cgit_context *ctx)
 	htmlf("Expires: %s\n", http_date(ctx->page.expires));
 	html("\n");
 }
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {
 	html(cgit_doctype);
 	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
 	html("<head>\n");
 	html("<title>");
 	html_txt(ctx->page.title);
 	html("</title>\n");
 	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
 	if (ctx->cfg.robots && *ctx->cfg.robots)
 		htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
 	html("<link rel='stylesheet' type='text/css' href='");
 	html_attr(ctx->cfg.css);
 	html("'/>\n");
 	html("</head>\n");
 	html("<body>\n");
 }
 
 void cgit_print_docend()
 {
-	html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
+	html("</div>\n</body>\n</html>\n");
 }
 
 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);
@@ -444,139 +445,156 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
 
 	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)
 {
-	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_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_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,
-			       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,
-			       ctx->qry.sha1, ctx->qry.sha2, NULL);
-		cgit_patch_link("patch", NULL, "menu", 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("<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("<h1>branch</h1>\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(" : ");
+		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("<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("</select> ");
+		html("<input type='submit' name='' value='switch'/>");
+		html("</form>");
+	} else
+		html_txt(ctx->cfg.root_title);
+	html("</td>\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 {
+		html(">");
+		html_txt("a fast webinterface for the git dscm");
+	}
+	html("</td></tr>\n");
 
-		html("<h1>search</h1>\n");
-		html("<form method='get' action='");
+	html("</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);
+		html("</td><td class='form'>");
+		html("<form class='right' 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("<input class='txt' type='text' size='10' name='q' value='");
 		html_attr(ctx->qry.search);
 		html("'/>\n");
+		html("<input type='submit' value='search'/>\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><td class='form'>");
+		html("<form method='get' action='");
+		html_attr(cgit_rooturl());
+		html("'>\n");
+		html("<input type='text' name='q' size='10' value='");
+		html_attr(ctx->qry.search);
+		html("'/>\n");
+		html("<input type='submit' value='search'/>\n");
+		html("</form>");
 	}
-
-	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)
 {
 	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++) {
author	Lars Hjemli <hjemli@gmail.com>	2008-04-13 10:48:44 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2008-04-13 10:48:44 (UTC)
commit	76ba6287bfb533baca7285b107b5d975581d449d (patch) (side-by-side diff)
tree	22445a77f5b87280ec980f9b4da5a511f1f27faf /ui-shared.c
parent	4a842288260a0b0c4a3d4032d441f7fd2afee699 (diff)
parent	28d781f34b2c2d4c2b994ef3953d1cf37d8f28f0 (diff)
download	cgit-76ba6287bfb533baca7285b107b5d975581d449d.zip cgit-76ba6287bfb533baca7285b107b5d975581d449d.tar.gz cgit-76ba6287bfb533baca7285b107b5d975581d449d.tar.bz2