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) (unidiff)
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
@@ -6,8 +6,9 @@
 *   (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"
@@ -387,9 +388,9 @@ void cgit_print_docstart(struct cgit_context *ctx)
 }
 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)
@@ -464,77 +465,85 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
                        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";
+        struct cgit_cmd *cmd = cgit_get_cmd(ctx);
-        int header = 0;
-        char *url;
-        html("<table id='layout' summary=''>\n");
+        html("<table id='header'>\n");
-        html("<tr><td id='sidebar'>\n");
+        html("<tr>\n");
-        html("<table class='sidebar' cellspacing='0' summary=''>\n");
+        html("<td class='logo' rowspan='2'><a href='");
-        html("<tr><td class='sidebar'>\n<a href='");
+        if (ctx->cfg.logo_link)
-        html_attr(cgit_rooturl());
+                html_attr(ctx->cfg.logo_link);
-        htmlf("'><img src='%s' alt='cgit'/></a>\n",
+        else
-              ctx->cfg.logo);
+                html_attr(cgit_rooturl());
-        html("</td></tr>\n<tr><td class='sidebar'>\n");
+        html("'><img src='");
-        if (ctx->repo) {
+        html_attr(ctx->cfg.logo);
-                html("<h1 class='first'>");
+        html("'/></a></td>\n");
-                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("<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("</select> ");
-        //      html("</td><td>");
+                html("<input type='submit' name='' value='switch'/>");
-                html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
+                html("</form>");
-        //      html("</td></tr></table>");
+        } else
-                html("</form>\n");
+                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("</tr>\n");
-                html("<form method='get' action='");
+        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");
@@ -543,20 +552,29 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                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("<a class='active' href='");
-                        html(default_info);
+                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>\n");
-        html("</td></tr></table></td>\n");
+        html("<div class='content'>");
-        html("<td id='content'>\n");
 }
 void cgit_print_filemode(unsigned short mode)
 {
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) (unidiff)
tree	22445a77f5b87280ec980f9b4da5a511f1f27faf /ui-shared.c
parent	4a842288260a0b0c4a3d4032d441f7fd2afee699 (diff)
parent	28d781f34b2c2d4c2b994ef3953d1cf37d8f28f0 (diff)
download	cgit-76ba6287bfb533baca7285b107b5d975581d449d.zip cgit-76ba6287bfb533baca7285b107b5d975581d449d.tar.gz cgit-76ba6287bfb533baca7285b107b5d975581d449d.tar.bz2

diff --git a/ui-shared.c b/ui-shared.c index aa65988..bb08c4a 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -6,8 +6,9 @@
6	* (see COPYING for full license text)	6	* (see COPYING for full license text)
7	*/	7	*/
8		8
9	#include "cgit.h"	9	#include "cgit.h"
		10	#include "cmd.h"
10	#include "html.h"	11	#include "html.h"
11		12
12	const char cgit_doctype[] =	13	const char cgit_doctype[] =
13	"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"	14	"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
@@ -387,9 +388,9 @@ void cgit_print_docstart(struct cgit_context *ctx)
387	}	388	}
388		389
389	void cgit_print_docend()	390	void cgit_print_docend()
390	{	391	{
391	html("</td>\n</tr>\n</table>\n</body>\n</html>\n");	392	html("</div>\n</body>\n</html>\n");
392	}	393	}
393		394
394	int print_branch_option(const char refname, const unsigned char sha1,	395	int print_branch_option(const char refname, const unsigned char sha1,
395	int flags, void *cb_data)	396	int flags, void *cb_data)
@@ -464,77 +465,85 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
464	html_hidden("q", ctx.qry.search);	465	html_hidden("q", ctx.qry.search);
465	}	466	}
466	}	467	}
467		468
		469	char hc(struct cgit_cmd cmd, const char *page)
		470	{
		471	return (strcmp(cmd->name, page) ? NULL : "active");
		472	}
		473
468	void cgit_print_pageheader(struct cgit_context *ctx)	474	void cgit_print_pageheader(struct cgit_context *ctx)
469	{	475	{
470	static const char *default_info = "This is cgit, a fast webinterface for git repositories";	476	struct cgit_cmd *cmd = cgit_get_cmd(ctx);
471	int header = 0;
472	char *url;
473		477
474	html("<table id='layout' summary=''>\n");	478	html("<table id='header'>\n");
475	html("<tr><td id='sidebar'>\n");	479	html("<tr>\n");
476	html("<table class='sidebar' cellspacing='0' summary=''>\n");	480	html("<td class='logo' rowspan='2'><a href='");
477	html("<tr><td class='sidebar'>\n<a href='");	481	if (ctx->cfg.logo_link)
478	html_attr(cgit_rooturl());	482	html_attr(ctx->cfg.logo_link);
479	htmlf("'><img src='%s' alt='cgit'/></a>\n",	483	else
480	ctx->cfg.logo);	484	html_attr(cgit_rooturl());
481	html("</td></tr>\n<tr><td class='sidebar'>\n");	485	html("'><img src='");
482	if (ctx->repo) {	486	html_attr(ctx->cfg.logo);
483	html("<h1 class='first'>");	487	html("'/></a></td>\n");
484	html_txt(strrpart(ctx->repo->name, 20));
485	html("</h1>\n");
486	html_txt(ctx->repo->desc);
487	if (ctx->repo->owner) {
488	html("<h1>owner</h1>\n");
489	html_txt(ctx->repo->owner);
490	}
491	html("<h1>navigate</h1>\n");
492	reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head,
493	NULL, NULL);
494	cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL,
495	0, NULL, NULL);
496	cgit_tree_link("tree", NULL, "menu", ctx->qry.head,
497	ctx->qry.sha1, NULL);
498	cgit_commit_link("commit", NULL, "menu", ctx->qry.head,
499	ctx->qry.sha1);
500	cgit_diff_link("diff", NULL, "menu", ctx->qry.head,
501	ctx->qry.sha1, ctx->qry.sha2, NULL);
502	cgit_patch_link("patch", NULL, "menu", ctx->qry.head,
503	ctx->qry.sha1);
504
505	for_each_ref(print_archive_ref, &header);
506
507	if (ctx->repo->clone_url \|\| ctx->cfg.clone_prefix) {
508	html("<h1>clone</h1>\n");
509	if (ctx->repo->clone_url)
510	url = ctx->repo->clone_url;
511	else
512	url = fmt("%s%s", ctx->cfg.clone_prefix,
513	ctx->repo->url);
514	html("<a class='menu' href='");
515	html_attr(url);
516	html("' title='");
517	html_attr(url);
518	html("'>\n");
519	html_txt(strrpart(url, 20));
520	html("</a>\n");
521	}
522		488
523	html("<h1>branch</h1>\n");	489	html("<td class='main'>");
		490	if (ctx->repo) {
		491	/*
		492	html("<a href='");
		493	html_attr(cgit_rooturl());
		494	html("'>index</a> : ");
		495	*/
		496	reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
		497	ctx->qry.head, NULL, NULL);
		498	html(" : ");
		499	html_txt(ctx->qry.page);
		500	html("</td><td class='form'>");
524	html("<form method='get' action=''>\n");	501	html("<form method='get' action=''>\n");
525	add_hidden_formfields(0, 1, ctx->qry.page);	502	add_hidden_formfields(0, 1, ctx->qry.page);
526	// html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
527	html("<select name='h' onchange='this.form.submit();'>\n");	503	html("<select name='h' onchange='this.form.submit();'>\n");
528	for_each_branch_ref(print_branch_option, ctx->qry.head);	504	for_each_branch_ref(print_branch_option, ctx->qry.head);
529	html("</select>\n");	505	html("</select> ");
530	// html("</td><td>");	506	html("<input type='submit' name='' value='switch'/>");
531	html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");	507	html("</form>");
532	// html("</td></tr></table>");	508	} else
533	html("</form>\n");	509	html_txt(ctx->cfg.root_title);
		510	html("</td>\n");
		511
		512	html("<tr><td class='sub'");
		513	if (ctx->repo) {
		514	html(" colspan='2'>");
		515	html_txt(ctx->repo->desc);
		516	}
		517	/*
		518	else if (ctx->cfg.root_subtitle)
		519	html_txt(ctx->cfg.root_subtitle);
		520	*/
		521	else {
		522	html(">");
		523	html_txt("a fast webinterface for the git dscm");
		524	}
		525	html("</td></tr>\n");
534		526
535	html("<h1>search</h1>\n");	527	html("</tr>\n");
536	html("<form method='get' action='");	528	html("</table>\n");
		529
		530	html("<table class='tabs'><tr><td>\n");
		531	if (ctx->repo) {
		532	reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
		533	ctx->qry.head, NULL, NULL);
		534	cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
		535	ctx->qry.sha1, NULL);
		536	cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
		537	NULL, NULL, 0, NULL, NULL);
		538	cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
		539	ctx->qry.sha1, NULL);
		540	cgit_commit_link("commit", NULL, hc(cmd, "commit"),
		541	ctx->qry.head, ctx->qry.sha1);
		542	cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
		543	ctx->qry.sha1, ctx->qry.sha2, NULL);
		544	html("</td><td class='form'>");
		545	html("<form class='right' method='get' action='");
537	if (ctx->cfg.virtual_root)	546	if (ctx->cfg.virtual_root)
538	html_attr(cgit_fileurl(ctx->qry.repo, "log",	547	html_attr(cgit_fileurl(ctx->qry.repo, "log",
539	ctx->qry.path, NULL));	548	ctx->qry.path, NULL));
540	html("'>\n");	549	html("'>\n");
@@ -543,20 +552,29 @@ void cgit_print_pageheader(struct cgit_context *ctx)
543	html_option("grep", "log msg", ctx->qry.grep);	552	html_option("grep", "log msg", ctx->qry.grep);
544	html_option("author", "author", ctx->qry.grep);	553	html_option("author", "author", ctx->qry.grep);
545	html_option("committer", "committer", ctx->qry.grep);	554	html_option("committer", "committer", ctx->qry.grep);
546	html("</select>\n");	555	html("</select>\n");
547	html("<input class='txt' type='text' name='q' value='");	556	html("<input class='txt' type='text' size='10' name='q' value='");
548	html_attr(ctx->qry.search);	557	html_attr(ctx->qry.search);
549	html("'/>\n");	558	html("'/>\n");
		559	html("<input type='submit' value='search'/>\n");
550	html("</form>\n");	560	html("</form>\n");
551	} else {	561	} else {
552	if (!ctx->cfg.index_info \|\| html_include(ctx->cfg.index_info))	562	html("<a class='active' href='");
553	html(default_info);	563	html_attr(cgit_rooturl());
		564	html("'>index</a>\n");
		565	html("</td><td class='form'>");
		566	html("<form method='get' action='");
		567	html_attr(cgit_rooturl());
		568	html("'>\n");
		569	html("<input type='text' name='q' size='10' value='");
		570	html_attr(ctx->qry.search);
		571	html("'/>\n");
		572	html("<input type='submit' value='search'/>\n");
		573	html("</form>");
554	}	574	}
555		575	html("</td></tr></table>\n");
556	html("</td></tr></table></td>\n");	576	html("<div class='content'>");
557
558	html("<td id='content'>\n");
559	}	577	}
560		578
561	void cgit_print_filemode(unsigned short mode)	579	void cgit_print_filemode(unsigned short mode)
562	{	580	{