1 files changed, 50 insertions, 15 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 73e3d4c..782caa7 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -376,33 +376,33 @@ void cgit_print_docstart(struct cgit_context *ctx)
        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;
@@ -472,72 +472,107 @@ char *hc(struct cgit_cmd *cmd, const char *page)
 }
 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("'>index</a> : ");
-                html_txt(ctx->repo->name);
+*/
+                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("<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'/>");
+                html("</form>");
        } else
                html_txt(ctx->cfg.root_title);
-        html("</td></tr>\n");
+        html("</td>\n");
-        html("<tr><td class='sub'>");
-        if (ctx->repo)
+        html("<tr><td class='sub'");
+        if (ctx->repo) {
+                html(" colspan='2'>");
                html_txt(ctx->repo->desc);
-        else
+        }
-                html_txt(ctx->cfg.index_info);
+/*
+        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("</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("</td><td class='form'>");
-                html("<form method='get' action=''>\n");
+                html("<form class='right' method='get' action='");
-                add_hidden_formfields(0, 1, ctx->qry.page);
+                if (ctx->cfg.virtual_root)
-                html("<select name='h' onchange='this.form.submit();'>\n");
+                        html_attr(cgit_fileurl(ctx->qry.repo, "log",
-                for_each_branch_ref(print_branch_option, ctx->qry.head);
+                                               ctx->qry.path, NULL));
-                html("</select> ");
+                html("'>\n");
-                html("<input type='submit' name='' value='switch'/>");
+                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' size='8' name='q' value='");
+                html_attr(ctx->qry.search);
+                html("'/>\n");
+                html("<input type='submit' value='search'/>\n");
+                html("</form>\n");
        } 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))

diff --git a/ui-shared.c b/ui-shared.c index 73e3d4c..782caa7 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -376,33 +376,33 @@ void cgit_print_docstart(struct cgit_context *ctx)
376	html("<head>\n");	376	html("<head>\n");
377	html("<title>");	377	html("<title>");
378	html_txt(ctx->page.title);	378	html_txt(ctx->page.title);
379	html("</title>\n");	379	html("</title>\n");
380	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);	380	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
381	if (ctx->cfg.robots && *ctx->cfg.robots)	381	if (ctx->cfg.robots && *ctx->cfg.robots)
382	htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);	382	htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
383	html("<link rel='stylesheet' type='text/css' href='");	383	html("<link rel='stylesheet' type='text/css' href='");
384	html_attr(ctx->cfg.css);	384	html_attr(ctx->cfg.css);
385	html("'/>\n");	385	html("'/>\n");
386	html("</head>\n");	386	html("</head>\n");
387	html("<body>\n");	387	html("<body>\n");
388	}	388	}
389		389
390	void cgit_print_docend()	390	void cgit_print_docend()
391	{	391	{
392	html("</td>\n</tr>\n</table>\n</body>\n</html>\n");	392	html("</div>\n</body>\n</html>\n");
393	}	393	}
394		394
395	int print_branch_option(const char refname, const unsigned char sha1,	395	int print_branch_option(const char refname, const unsigned char sha1,
396	int flags, void *cb_data)	396	int flags, void *cb_data)
397	{	397	{
398	char name = (char )refname;	398	char name = (char )refname;
399	html_option(name, name, ctx.qry.head);	399	html_option(name, name, ctx.qry.head);
400	return 0;	400	return 0;
401	}	401	}
402		402
403	int print_archive_ref(const char refname, const unsigned char sha1,	403	int print_archive_ref(const char refname, const unsigned char sha1,
404	int flags, void *cb_data)	404	int flags, void *cb_data)
405	{	405	{
406	struct tag *tag;	406	struct tag *tag;
407	struct taginfo *info;	407	struct taginfo *info;
408	struct object *obj;	408	struct object *obj;
@@ -472,72 +472,107 @@ char hc(struct cgit_cmd cmd, const char *page)
472	}	472	}
473		473
474	void cgit_print_pageheader(struct cgit_context *ctx)	474	void cgit_print_pageheader(struct cgit_context *ctx)
475	{	475	{
476	struct cgit_cmd *cmd = cgit_get_cmd(ctx);	476	struct cgit_cmd *cmd = cgit_get_cmd(ctx);
477		477
478	html("<table id='header'>\n");	478	html("<table id='header'>\n");
479	html("<tr>\n");	479	html("<tr>\n");
480	html("<td class='logo' rowspan='2'><a href='");	480	html("<td class='logo' rowspan='2'><a href='");
481	if (ctx->cfg.logo_link)	481	if (ctx->cfg.logo_link)
482	html_attr(ctx->cfg.logo_link);	482	html_attr(ctx->cfg.logo_link);
483	else	483	else
484	html_attr(cgit_rooturl());	484	html_attr(cgit_rooturl());
485	html("'><img src='");	485	html("'><img src='");
486	html_attr(ctx->cfg.logo);	486	html_attr(ctx->cfg.logo);
487	html("'/></a></td>\n");	487	html("'/></a></td>\n");
		488
488	html("<td class='main'>");	489	html("<td class='main'>");
489	if (ctx->repo) {	490	if (ctx->repo) {
		491	/*
490	html("<a href='");	492	html("<a href='");
491	html_attr(cgit_rooturl());	493	html_attr(cgit_rooturl());
492	html("'>index</a> / ");	494	html("'>index</a> : ");
493	html_txt(ctx->repo->name);	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'>");
		501	html("<form method='get' action=''>\n");
		502	add_hidden_formfields(0, 1, ctx->qry.page);
		503	html("<select name='h' onchange='this.form.submit();'>\n");
		504	for_each_branch_ref(print_branch_option, ctx->qry.head);
		505	html("</select> ");
		506	html("<input type='submit' name='' value='switch'/>");
		507	html("</form>");
494	} else	508	} else
495	html_txt(ctx->cfg.root_title);	509	html_txt(ctx->cfg.root_title);
496	html("</td></tr>\n");	510	html("</td>\n");
497	html("<tr><td class='sub'>");	511
498	if (ctx->repo)	512	html("<tr><td class='sub'");
		513	if (ctx->repo) {
		514	html(" colspan='2'>");
499	html_txt(ctx->repo->desc);	515	html_txt(ctx->repo->desc);
500	else	516	}
501	html_txt(ctx->cfg.index_info);	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	}
502	html("</td></tr>\n");	525	html("</td></tr>\n");
		526
		527	html("</tr>\n");
503	html("</table>\n");	528	html("</table>\n");
504		529
505	html("<table class='tabs'><tr><td>\n");	530	html("<table class='tabs'><tr><td>\n");
506	if (ctx->repo) {	531	if (ctx->repo) {
507	reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),	532	reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
508	ctx->qry.head, NULL, NULL);	533	ctx->qry.head, NULL, NULL);
509	cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,	534	cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
510	ctx->qry.sha1, NULL);	535	ctx->qry.sha1, NULL);
511	cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,	536	cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
512	NULL, NULL, 0, NULL, NULL);	537	NULL, NULL, 0, NULL, NULL);
513	cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,	538	cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
514	ctx->qry.sha1, NULL);	539	ctx->qry.sha1, NULL);
515	cgit_commit_link("commit", NULL, hc(cmd, "commit"),	540	cgit_commit_link("commit", NULL, hc(cmd, "commit"),
516	ctx->qry.head, ctx->qry.sha1);	541	ctx->qry.head, ctx->qry.sha1);
517	cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,	542	cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
518	ctx->qry.sha1, ctx->qry.sha2, NULL);	543	ctx->qry.sha1, ctx->qry.sha2, NULL);
519	cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,	544	cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
520	ctx->qry.sha1);	545	ctx->qry.sha1);
521	html("</td><td class='branch'>");	546	html("</td><td class='form'>");
522	html("<form method='get' action=''>\n");	547	html("<form class='right' method='get' action='");
523	add_hidden_formfields(0, 1, ctx->qry.page);	548	if (ctx->cfg.virtual_root)
524	html("<select name='h' onchange='this.form.submit();'>\n");	549	html_attr(cgit_fileurl(ctx->qry.repo, "log",
525	for_each_branch_ref(print_branch_option, ctx->qry.head);	550	ctx->qry.path, NULL));
526	html("</select> ");	551	html("'>\n");
527	html("<input type='submit' name='' value='switch'/>");	552	add_hidden_formfields(1, 0, "log");
		553	html("<select name='qt'>\n");
		554	html_option("grep", "log msg", ctx->qry.grep);
		555	html_option("author", "author", ctx->qry.grep);
		556	html_option("committer", "committer", ctx->qry.grep);
		557	html("</select>\n");
		558	html("<input class='txt' type='text' size='8' name='q' value='");
		559	html_attr(ctx->qry.search);
		560	html("'/>\n");
		561	html("<input type='submit' value='search'/>\n");
		562	html("</form>\n");
528	} else {	563	} else {
529	html("<a class='active' href='");	564	html("<a class='active' href='");
530	html_attr(cgit_rooturl());	565	html_attr(cgit_rooturl());
531	html("'>index</a>\n");	566	html("'>index</a>\n");
532	}	567	}
533	html("</td></tr></table>\n");	568	html("</td></tr></table>\n");
534	html("<div class='content'>");	569	html("<div class='content'>");
535	}	570	}
536		571
537	void cgit_print_filemode(unsigned short mode)	572	void cgit_print_filemode(unsigned short mode)
538	{	573	{
539	if (S_ISDIR(mode))	574	if (S_ISDIR(mode))
540	html("d");	575	html("d");
541	else if (S_ISLNK(mode))	576	else if (S_ISLNK(mode))
542	html("l");	577	html("l");
543	else if (S_ISGITLINK(mode))	578	else if (S_ISGITLINK(mode))