1 files changed, 44 insertions, 81 deletions
diff --git a/ui-shared.c b/ui-shared.c
index aa65988..7287956 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");
@@ -444,139 +445,101 @@ 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";
+        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='");
        html_attr(cgit_rooturl());
-        htmlf("'><img src='%s' alt='cgit'/></a>\n",
+        html("'><img src='");
-              ctx->cfg.logo);
+        html_attr(ctx->cfg.logo);
-        html("</td></tr>\n<tr><td class='sidebar'>\n");
+        html("'/></a></td>\n");
-        if (ctx->repo) {
+        html("<td class='main'>");
-                html("<h1 class='first'>");
+        if (ctx->repo)
-                html_txt(strrpart(ctx->repo->name, 20));
+                html_txt(ctx->repo->name);
-                html("</h1>\n");
+        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) {
+        else
-                        html("<h1>owner</h1>\n");
+                html_txt(ctx->cfg.index_info);
-                        html_txt(ctx->repo->owner);
+        html("</td></tr>\n");
-                }
+        html("</table>\n");
-                html("<h1>navigate</h1>\n");
-                reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head,
+        html("<table class='tabs'><tr><td>\n");
-                            NULL, NULL);
+        if (ctx->repo) {
-                cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL,
+                reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
-                              0, NULL, NULL);
+                            ctx->qry.head, NULL, NULL);
-                cgit_tree_link("tree", NULL, "menu", ctx->qry.head,
+                cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
-                cgit_commit_link("commit", NULL, "menu", ctx->qry.head,
+                cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
-                              ctx->qry.sha1);
+                              NULL, NULL, 0, NULL, NULL);
-                cgit_diff_link("diff", NULL, "menu", ctx->qry.head,
+                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("<a class='active' href='");
-                        html(default_info);
+                html_attr(cgit_rooturl());
+                html("'>index</a>\n");
        }
+        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)
 {
        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++) {

diff --git a/ui-shared.c b/ui-shared.c index aa65988..7287956 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -1,33 +1,34 @@
1	/* ui-shared.c: common web output functions	1	/* ui-shared.c: common web output functions
2	*	2	*
3	* Copyright (C) 2006 Lars Hjemli	3	* Copyright (C) 2006 Lars Hjemli
4	*	4	*
5	* Licensed under GNU General Public License v2	5	* Licensed under GNU General Public License v2
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"
14	" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";	15	" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
15		16
16	static char *http_date(time_t t)	17	static char *http_date(time_t t)
17	{	18	{
18	static char day[][4] =	19	static char day[][4] =
19	{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};	20	{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
20	static char month[][4] =	21	static char month[][4] =
21	{"Jan", "Feb", "Mar", "Apr", "May", "Jun",	22	{"Jan", "Feb", "Mar", "Apr", "May", "Jun",
22	"Jul", "Aug", "Sep", "Oct", "Now", "Dec"};	23	"Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
23	struct tm *tm = gmtime(&t);	24	struct tm *tm = gmtime(&t);
24	return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],	25	return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
25	tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,	26	tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
26	tm->tm_hour, tm->tm_min, tm->tm_sec);	27	tm->tm_hour, tm->tm_min, tm->tm_sec);
27	}	28	}
28		29
29	void cgit_print_error(char *msg)	30	void cgit_print_error(char *msg)
30	{	31	{
31	html("<div class='error'>");	32	html("<div class='error'>");
32	html_txt(msg);	33	html_txt(msg);
33	html("</div>\n");	34	html("</div>\n");
@@ -444,139 +445,101 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
444		445
445	if (!ctx.cfg.virtual_root) {	446	if (!ctx.cfg.virtual_root) {
446	url = fmt("%s/%s", ctx.qry.repo, page);	447	url = fmt("%s/%s", ctx.qry.repo, page);
447	if (ctx.qry.path)	448	if (ctx.qry.path)
448	url = fmt("%s/%s", url, ctx.qry.path);	449	url = fmt("%s/%s", url, ctx.qry.path);
449	html_hidden("url", url);	450	html_hidden("url", url);
450	}	451	}
451		452
452	if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))	453	if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
453	html_hidden("h", ctx.qry.head);	454	html_hidden("h", ctx.qry.head);
454		455
455	if (ctx.qry.sha1)	456	if (ctx.qry.sha1)
456	html_hidden("id", ctx.qry.sha1);	457	html_hidden("id", ctx.qry.sha1);
457	if (ctx.qry.sha2)	458	if (ctx.qry.sha2)
458	html_hidden("id2", ctx.qry.sha2);	459	html_hidden("id2", ctx.qry.sha2);
459		460
460	if (incl_search) {	461	if (incl_search) {
461	if (ctx.qry.grep)	462	if (ctx.qry.grep)
462	html_hidden("qt", ctx.qry.grep);	463	html_hidden("qt", ctx.qry.grep);
463	if (ctx.qry.search)	464	if (ctx.qry.search)
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='");
478	html_attr(cgit_rooturl());	481	html_attr(cgit_rooturl());
479	htmlf("'><img src='%s' alt='cgit'/></a>\n",	482	html("'><img src='");
480	ctx->cfg.logo);	483	html_attr(ctx->cfg.logo);
481	html("</td></tr>\n<tr><td class='sidebar'>\n");	484	html("'/></a></td>\n");
482	if (ctx->repo) {	485	html("<td class='main'>");
483	html("<h1 class='first'>");	486	if (ctx->repo)
484	html_txt(strrpart(ctx->repo->name, 20));	487	html_txt(ctx->repo->name);
485	html("</h1>\n");	488	else
		489	html_txt(ctx->cfg.root_title);
		490	html("</td></tr>\n");
		491	html("<tr><td class='sub'>");
		492	if (ctx->repo)
486	html_txt(ctx->repo->desc);	493	html_txt(ctx->repo->desc);
487	if (ctx->repo->owner) {	494	else
488	html("<h1>owner</h1>\n");	495	html_txt(ctx->cfg.index_info);
489	html_txt(ctx->repo->owner);	496	html("</td></tr>\n");
490	}	497	html("</table>\n");
491	html("<h1>navigate</h1>\n");	498
492	reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head,	499	html("<table class='tabs'><tr><td>\n");
493	NULL, NULL);	500	if (ctx->repo) {
494	cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL,	501	reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
495	0, NULL, NULL);	502	ctx->qry.head, NULL, NULL);
496	cgit_tree_link("tree", NULL, "menu", ctx->qry.head,	503	cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
497	ctx->qry.sha1, NULL);	504	ctx->qry.sha1, NULL);
498	cgit_commit_link("commit", NULL, "menu", ctx->qry.head,	505	cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
499	ctx->qry.sha1);	506	NULL, NULL, 0, NULL, NULL);
500	cgit_diff_link("diff", NULL, "menu", ctx->qry.head,	507	cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
		508	ctx->qry.sha1, NULL);
		509	cgit_commit_link("commit", NULL, hc(cmd, "commit"),
		510	ctx->qry.head, ctx->qry.sha1);
		511	cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
501	ctx->qry.sha1, ctx->qry.sha2, NULL);	512	ctx->qry.sha1, ctx->qry.sha2, NULL);
502	cgit_patch_link("patch", NULL, "menu", ctx->qry.head,	513	cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
503	ctx->qry.sha1);	514	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
523	html("<h1>branch</h1>\n");
524	html("<form method='get' action=''>\n");
525	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");
528	for_each_branch_ref(print_branch_option, ctx->qry.head);
529	html("</select>\n");
530	// html("</td><td>");
531	html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
532	// html("</td></tr></table>");
533	html("</form>\n");
534
535	html("<h1>search</h1>\n");
536	html("<form method='get' action='");
537	if (ctx->cfg.virtual_root)
538	html_attr(cgit_fileurl(ctx->qry.repo, "log",
539	ctx->qry.path, NULL));
540	html("'>\n");
541	add_hidden_formfields(1, 0, "log");
542	html("<select name='qt'>\n");
543	html_option("grep", "log msg", ctx->qry.grep);
544	html_option("author", "author", ctx->qry.grep);
545	html_option("committer", "committer", ctx->qry.grep);
546	html("</select>\n");
547	html("<input class='txt' type='text' name='q' value='");
548	html_attr(ctx->qry.search);
549	html("'/>\n");
550	html("</form>\n");
551	} else {	515	} else {
552	if (!ctx->cfg.index_info \|\| html_include(ctx->cfg.index_info))	516	html("<a class='active' href='");
553	html(default_info);	517	html_attr(cgit_rooturl());
		518	html("'>index</a>\n");
554	}	519	}
555		520	html("</td></tr></table>\n");
556	html("</td></tr></table></td>\n");	521	html("<div class='content'>");
557
558	html("<td id='content'>\n");
559	}	522	}
560		523
561	void cgit_print_filemode(unsigned short mode)	524	void cgit_print_filemode(unsigned short mode)
562	{	525	{
563	if (S_ISDIR(mode))	526	if (S_ISDIR(mode))
564	html("d");	527	html("d");
565	else if (S_ISLNK(mode))	528	else if (S_ISLNK(mode))
566	html("l");	529	html("l");
567	else if (S_ISGITLINK(mode))	530	else if (S_ISGITLINK(mode))
568	html("m");	531	html("m");
569	else	532	else
570	html("-");	533	html("-");
571	html_fileperm(mode >> 6);	534	html_fileperm(mode >> 6);
572	html_fileperm(mode >> 3);	535	html_fileperm(mode >> 3);
573	html_fileperm(mode);	536	html_fileperm(mode);
574	}	537	}
575		538
576	void cgit_print_snapshot_links(const char repo, const char head,	539	void cgit_print_snapshot_links(const char repo, const char head,
577	const char *hex, int snapshots)	540	const char *hex, int snapshots)
578	{	541	{
579	const struct cgit_snapshot_format* f;	542	const struct cgit_snapshot_format* f;
580	char *filename;	543	char *filename;
581		544
582	for (f = cgit_snapshot_formats; f->suffix; f++) {	545	for (f = cgit_snapshot_formats; f->suffix; f++) {