ui-shared: don't print header <img/> if there isn't a logo defined

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
author: Matthew Metnetsky <mimetnet@vidu.us> 2009-06-30 01:27:51 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2009-08-18 11:13:51 (UTC)
commit: 6421dc38db02eff8d3ada93e87a2f7e5292af131 (patch) (unidiff)
tree: 90828ea6f44b6d59f29b2e589a5552ba50a0aa5d
parent: 435a1da8d1c43bff2f2ccd5649ea8510eec0b2af (diff)
download: cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.zip
cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.tar.gz
cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.tar.bz2
1 files changed, 11 insertions, 8 deletions
diff --git a/ui-shared.c b/ui-shared.c
index de77bbf..40060ba 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -422,318 +422,321 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
        if (secs > max_relative && max_relative >= 0) {
                cgit_print_date(t, format, ctx.cfg.local_time);
                return;
        }
        if (secs < TM_HOUR * 2) {
                htmlf("<span class='age-mins'>%.0f min.</span>",
                      secs * 1.0 / TM_MIN);
                return;
        }
        if (secs < TM_DAY * 2) {
                htmlf("<span class='age-hours'>%.0f hours</span>",
                      secs * 1.0 / TM_HOUR);
                return;
        }
        if (secs < TM_WEEK * 2) {
                htmlf("<span class='age-days'>%.0f days</span>",
                      secs * 1.0 / TM_DAY);
                return;
        }
        if (secs < TM_MONTH * 2) {
                htmlf("<span class='age-weeks'>%.0f weeks</span>",
                      secs * 1.0 / TM_WEEK);
                return;
        }
        if (secs < TM_YEAR * 2) {
                htmlf("<span class='age-months'>%.0f months</span>",
                      secs * 1.0 / TM_MONTH);
                return;
        }
        htmlf("<span class='age-years'>%.0f years</span>",
              secs * 1.0 / TM_YEAR);
 }
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
        if (ctx->page.mimetype && ctx->page.charset)
                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                      ctx->page.charset);
        else if (ctx->page.mimetype)
                htmlf("Content-Type: %s\n", ctx->page.mimetype);
        if (ctx->page.size)
                htmlf("Content-Length: %ld\n", ctx->page.size);
        if (ctx->page.filename)
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                      ctx->page.filename);
        htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
        htmlf("Expires: %s\n", http_date(ctx->page.expires));
        html("\n");
 }
 void cgit_print_docstart(struct cgit_context *ctx)
 {
        char *host = cgit_hosturl();
        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");
        if (ctx->cfg.favicon) {
                html("<link rel='shortcut icon' href='");
                html_attr(ctx->cfg.favicon);
                html("'/>\n");
        }
        if (host && ctx->repo) {
                html("<link rel='alternate' title='Atom feed' href='http://");
                html_attr(cgit_hosturl());
                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
                                       fmt("h=%s", ctx->qry.head)));
                html("' type='application/atom+xml'/>");
        }
        html("</head>\n");
        html("<body>\n");
        if (ctx->cfg.header)
                html_include(ctx->cfg.header);
 }
 void cgit_print_docend()
 {
        html("</div>");
        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {
                htmlf("<div class='footer'>generated  by cgit %s at ",
                        cgit_version);
                cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                html("</div>\n");
        }
        html("</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);
        if (!obj)
                return 1;
        if (obj->type == OBJ_TAG) {
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                        return 0;
                hashcpy(fileid, tag->tagged->sha1);
        } else if (obj->type != OBJ_BLOB) {
                return 0;
        } else {
                hashcpy(fileid, sha1);
        }
        if (!*header) {
                html("<h1>download</h1>\n");
                *header = 1;
        }
        url = cgit_pageurl(ctx.qry.repo, "blob",
                           fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
                               buf));
        html_link_open(url, NULL, "menu");
        html_txt(strlpart(buf, 20));
        html_link_close();
        return 0;
 }
 void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
        char *url;
        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 && ctx.qry.head && ctx.repo->defbranch &&
            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 (ctx.qry.showmsg)
                html_hidden("showmsg", "1");
        if (incl_search) {
                if (ctx.qry.grep)
                        html_hidden("qt", ctx.qry.grep);
                if (ctx.qry.search)
                        html_hidden("q", ctx.qry.search);
        }
 }
 const char *fallback_cmd = "repolist";
 char *hc(struct cgit_cmd *cmd, const char *page)
 {
        return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
 }
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
        struct cgit_cmd *cmd = cgit_get_cmd(ctx);
        if (!cmd && ctx->repo)
                fallback_cmd = "summary";
        html("<table id='header'>\n");
        html("<tr>\n");
-        html("<td class='logo' rowspan='2'><a href='");
-        if (ctx->cfg.logo_link)
+        if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
-                html_attr(ctx->cfg.logo_link);
+                html("<td class='logo' rowspan='2'><a href='");
-        else
+                if (ctx->cfg.logo_link)
-                html_attr(cgit_rooturl());
+                        html_attr(ctx->cfg.logo_link);
-        html("'><img src='");
+                else
-        html_attr(ctx->cfg.logo);
+                        html_attr(cgit_rooturl());
-        html("' alt='cgit logo'/></a></td>\n");
+                html("'><img src='");
+                html_attr(ctx->cfg.logo);
+                html("' alt='cgit logo'/></a></td>\n");
+        }
        html("<td class='main'>");
        if (ctx->repo) {
                cgit_index_link("index", NULL, NULL, NULL, 0);
                html(" : ");
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                cgit_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("<tr><td class='sub'>");
        if (ctx->repo) {
                html_txt(ctx->repo->desc);
                html("</td><td class='sub right'>");
                html_txt(ctx->repo->owner);
        } else {
                if (ctx->cfg.root_desc)
                        html_txt(ctx->cfg.root_desc);
                else if (ctx->cfg.index_info)
                        html_include(ctx->cfg.index_info);
        }
        html("</td></tr></table>\n");
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
                cgit_summary_link("summary", NULL, hc(cmd, "summary"),
                                  ctx->qry.head);
                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, ctx->qry.showmsg);
                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);
                if (ctx->repo->max_stats)
                        cgit_stats_link("stats", NULL, hc(cmd, "stats"),
                                        ctx->qry.head, NULL);
                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,
                                    hc(cmd, "about"), ctx->qry.head, NULL,
                                    NULL);
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
                if (ctx->cfg.virtual_root)
                        html_url_path(cgit_fileurl(ctx->qry.repo, "log",
                                                   ctx->qry.path, NULL));
                html("'>\n");
                cgit_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='10' name='q' value='");
                html_attr(ctx->qry.search);
                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {
                site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
                if (ctx->cfg.root_readme)
                        site_link("about", "about", NULL, hc(cmd, "about"),
                                  NULL, 0);
                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("<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++) {
                if (!(snapshots & f->bit))
                        continue;
                filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
                               f->suffix);
                cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                html("<br/>");
        }
 }
author	Matthew Metnetsky <mimetnet@vidu.us>	2009-06-30 01:27:51 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2009-08-18 11:13:51 (UTC)
commit	6421dc38db02eff8d3ada93e87a2f7e5292af131 (patch) (unidiff)
tree	90828ea6f44b6d59f29b2e589a5552ba50a0aa5d
parent	435a1da8d1c43bff2f2ccd5649ea8510eec0b2af (diff)
download	cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.zip cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.tar.gz cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.tar.bz2

diff --git a/ui-shared.c b/ui-shared.c index de77bbf..40060ba 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -422,318 +422,321 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
422		422
423	if (secs > max_relative && max_relative >= 0) {	423	if (secs > max_relative && max_relative >= 0) {
424	cgit_print_date(t, format, ctx.cfg.local_time);	424	cgit_print_date(t, format, ctx.cfg.local_time);
425	return;	425	return;
426	}	426	}
427		427
428	if (secs < TM_HOUR * 2) {	428	if (secs < TM_HOUR * 2) {
429	htmlf("<span class='age-mins'>%.0f min.</span>",	429	htmlf("<span class='age-mins'>%.0f min.</span>",
430	secs * 1.0 / TM_MIN);	430	secs * 1.0 / TM_MIN);
431	return;	431	return;
432	}	432	}
433	if (secs < TM_DAY * 2) {	433	if (secs < TM_DAY * 2) {
434	htmlf("<span class='age-hours'>%.0f hours</span>",	434	htmlf("<span class='age-hours'>%.0f hours</span>",
435	secs * 1.0 / TM_HOUR);	435	secs * 1.0 / TM_HOUR);
436	return;	436	return;
437	}	437	}
438	if (secs < TM_WEEK * 2) {	438	if (secs < TM_WEEK * 2) {
439	htmlf("<span class='age-days'>%.0f days</span>",	439	htmlf("<span class='age-days'>%.0f days</span>",
440	secs * 1.0 / TM_DAY);	440	secs * 1.0 / TM_DAY);
441	return;	441	return;
442	}	442	}
443	if (secs < TM_MONTH * 2) {	443	if (secs < TM_MONTH * 2) {
444	htmlf("<span class='age-weeks'>%.0f weeks</span>",	444	htmlf("<span class='age-weeks'>%.0f weeks</span>",
445	secs * 1.0 / TM_WEEK);	445	secs * 1.0 / TM_WEEK);
446	return;	446	return;
447	}	447	}
448	if (secs < TM_YEAR * 2) {	448	if (secs < TM_YEAR * 2) {
449	htmlf("<span class='age-months'>%.0f months</span>",	449	htmlf("<span class='age-months'>%.0f months</span>",
450	secs * 1.0 / TM_MONTH);	450	secs * 1.0 / TM_MONTH);
451	return;	451	return;
452	}	452	}
453	htmlf("<span class='age-years'>%.0f years</span>",	453	htmlf("<span class='age-years'>%.0f years</span>",
454	secs * 1.0 / TM_YEAR);	454	secs * 1.0 / TM_YEAR);
455	}	455	}
456		456
457	void cgit_print_http_headers(struct cgit_context *ctx)	457	void cgit_print_http_headers(struct cgit_context *ctx)
458	{	458	{
459	if (ctx->page.mimetype && ctx->page.charset)	459	if (ctx->page.mimetype && ctx->page.charset)
460	htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,	460	htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
461	ctx->page.charset);	461	ctx->page.charset);
462	else if (ctx->page.mimetype)	462	else if (ctx->page.mimetype)
463	htmlf("Content-Type: %s\n", ctx->page.mimetype);	463	htmlf("Content-Type: %s\n", ctx->page.mimetype);
464	if (ctx->page.size)	464	if (ctx->page.size)
465	htmlf("Content-Length: %ld\n", ctx->page.size);	465	htmlf("Content-Length: %ld\n", ctx->page.size);
466	if (ctx->page.filename)	466	if (ctx->page.filename)
467	htmlf("Content-Disposition: inline; filename=\"%s\"\n",	467	htmlf("Content-Disposition: inline; filename=\"%s\"\n",
468	ctx->page.filename);	468	ctx->page.filename);
469	htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));	469	htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
470	htmlf("Expires: %s\n", http_date(ctx->page.expires));	470	htmlf("Expires: %s\n", http_date(ctx->page.expires));
471	html("\n");	471	html("\n");
472	}	472	}
473		473
474	void cgit_print_docstart(struct cgit_context *ctx)	474	void cgit_print_docstart(struct cgit_context *ctx)
475	{	475	{
476	char *host = cgit_hosturl();	476	char *host = cgit_hosturl();
477	html(cgit_doctype);	477	html(cgit_doctype);
478	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");	478	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
479	html("<head>\n");	479	html("<head>\n");
480	html("<title>");	480	html("<title>");
481	html_txt(ctx->page.title);	481	html_txt(ctx->page.title);
482	html("</title>\n");	482	html("</title>\n");
483	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);	483	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
484	if (ctx->cfg.robots && *ctx->cfg.robots)	484	if (ctx->cfg.robots && *ctx->cfg.robots)
485	htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);	485	htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
486	html("<link rel='stylesheet' type='text/css' href='");	486	html("<link rel='stylesheet' type='text/css' href='");
487	html_attr(ctx->cfg.css);	487	html_attr(ctx->cfg.css);
488	html("'/>\n");	488	html("'/>\n");
489	if (ctx->cfg.favicon) {	489	if (ctx->cfg.favicon) {
490	html("<link rel='shortcut icon' href='");	490	html("<link rel='shortcut icon' href='");
491	html_attr(ctx->cfg.favicon);	491	html_attr(ctx->cfg.favicon);
492	html("'/>\n");	492	html("'/>\n");
493	}	493	}
494	if (host && ctx->repo) {	494	if (host && ctx->repo) {
495	html("<link rel='alternate' title='Atom feed' href='http://");	495	html("<link rel='alternate' title='Atom feed' href='http://");
496	html_attr(cgit_hosturl());	496	html_attr(cgit_hosturl());
497	html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,	497	html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
498	fmt("h=%s", ctx->qry.head)));	498	fmt("h=%s", ctx->qry.head)));
499	html("' type='application/atom+xml'/>");	499	html("' type='application/atom+xml'/>");
500	}	500	}
501	html("</head>\n");	501	html("</head>\n");
502	html("<body>\n");	502	html("<body>\n");
503	if (ctx->cfg.header)	503	if (ctx->cfg.header)
504	html_include(ctx->cfg.header);	504	html_include(ctx->cfg.header);
505	}	505	}
506		506
507	void cgit_print_docend()	507	void cgit_print_docend()
508	{	508	{
509	html("</div>");	509	html("</div>");
510	if (ctx.cfg.footer)	510	if (ctx.cfg.footer)
511	html_include(ctx.cfg.footer);	511	html_include(ctx.cfg.footer);
512	else {	512	else {
513	htmlf("<div class='footer'>generated by cgit %s at ",	513	htmlf("<div class='footer'>generated by cgit %s at ",
514	cgit_version);	514	cgit_version);
515	cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);	515	cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
516	html("</div>\n");	516	html("</div>\n");
517	}	517	}
518	html("</body>\n</html>\n");	518	html("</body>\n</html>\n");
519	}	519	}
520		520
521	int print_branch_option(const char refname, const unsigned char sha1,	521	int print_branch_option(const char refname, const unsigned char sha1,
522	int flags, void *cb_data)	522	int flags, void *cb_data)
523	{	523	{
524	char name = (char )refname;	524	char name = (char )refname;
525	html_option(name, name, ctx.qry.head);	525	html_option(name, name, ctx.qry.head);
526	return 0;	526	return 0;
527	}	527	}
528		528
529	int print_archive_ref(const char refname, const unsigned char sha1,	529	int print_archive_ref(const char refname, const unsigned char sha1,
530	int flags, void *cb_data)	530	int flags, void *cb_data)
531	{	531	{
532	struct tag *tag;	532	struct tag *tag;
533	struct taginfo *info;	533	struct taginfo *info;
534	struct object *obj;	534	struct object *obj;
535	char buf[256], *url;	535	char buf[256], *url;
536	unsigned char fileid[20];	536	unsigned char fileid[20];
537	int header = (int )cb_data;	537	int header = (int )cb_data;
538		538
539	if (prefixcmp(refname, "refs/archives"))	539	if (prefixcmp(refname, "refs/archives"))
540	return 0;	540	return 0;
541	strncpy(buf, refname+14, sizeof(buf));	541	strncpy(buf, refname+14, sizeof(buf));
542	obj = parse_object(sha1);	542	obj = parse_object(sha1);
543	if (!obj)	543	if (!obj)
544	return 1;	544	return 1;
545	if (obj->type == OBJ_TAG) {	545	if (obj->type == OBJ_TAG) {
546	tag = lookup_tag(sha1);	546	tag = lookup_tag(sha1);
547	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))	547	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))
548	return 0;	548	return 0;
549	hashcpy(fileid, tag->tagged->sha1);	549	hashcpy(fileid, tag->tagged->sha1);
550	} else if (obj->type != OBJ_BLOB) {	550	} else if (obj->type != OBJ_BLOB) {
551	return 0;	551	return 0;
552	} else {	552	} else {
553	hashcpy(fileid, sha1);	553	hashcpy(fileid, sha1);
554	}	554	}
555	if (!*header) {	555	if (!*header) {
556	html("<h1>download</h1>\n");	556	html("<h1>download</h1>\n");
557	*header = 1;	557	*header = 1;
558	}	558	}
559	url = cgit_pageurl(ctx.qry.repo, "blob",	559	url = cgit_pageurl(ctx.qry.repo, "blob",
560	fmt("id=%s&path=%s", sha1_to_hex(fileid),	560	fmt("id=%s&path=%s", sha1_to_hex(fileid),
561	buf));	561	buf));
562	html_link_open(url, NULL, "menu");	562	html_link_open(url, NULL, "menu");
563	html_txt(strlpart(buf, 20));	563	html_txt(strlpart(buf, 20));
564	html_link_close();	564	html_link_close();
565	return 0;	565	return 0;
566	}	566	}
567		567
568	void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)	568	void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
569	{	569	{
570	char *url;	570	char *url;
571		571
572	if (!ctx.cfg.virtual_root) {	572	if (!ctx.cfg.virtual_root) {
573	url = fmt("%s/%s", ctx.qry.repo, page);	573	url = fmt("%s/%s", ctx.qry.repo, page);
574	if (ctx.qry.path)	574	if (ctx.qry.path)
575	url = fmt("%s/%s", url, ctx.qry.path);	575	url = fmt("%s/%s", url, ctx.qry.path);
576	html_hidden("url", url);	576	html_hidden("url", url);
577	}	577	}
578		578
579	if (incl_head && ctx.qry.head && ctx.repo->defbranch &&	579	if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
580	strcmp(ctx.qry.head, ctx.repo->defbranch))	580	strcmp(ctx.qry.head, ctx.repo->defbranch))
581	html_hidden("h", ctx.qry.head);	581	html_hidden("h", ctx.qry.head);
582		582
583	if (ctx.qry.sha1)	583	if (ctx.qry.sha1)
584	html_hidden("id", ctx.qry.sha1);	584	html_hidden("id", ctx.qry.sha1);
585	if (ctx.qry.sha2)	585	if (ctx.qry.sha2)
586	html_hidden("id2", ctx.qry.sha2);	586	html_hidden("id2", ctx.qry.sha2);
587	if (ctx.qry.showmsg)	587	if (ctx.qry.showmsg)
588	html_hidden("showmsg", "1");	588	html_hidden("showmsg", "1");
589		589
590	if (incl_search) {	590	if (incl_search) {
591	if (ctx.qry.grep)	591	if (ctx.qry.grep)
592	html_hidden("qt", ctx.qry.grep);	592	html_hidden("qt", ctx.qry.grep);
593	if (ctx.qry.search)	593	if (ctx.qry.search)
594	html_hidden("q", ctx.qry.search);	594	html_hidden("q", ctx.qry.search);
595	}	595	}
596	}	596	}
597		597
598	const char *fallback_cmd = "repolist";	598	const char *fallback_cmd = "repolist";
599		599
600	char hc(struct cgit_cmd cmd, const char *page)	600	char hc(struct cgit_cmd cmd, const char *page)
601	{	601	{
602	return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");	602	return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
603	}	603	}
604		604
605	void cgit_print_pageheader(struct cgit_context *ctx)	605	void cgit_print_pageheader(struct cgit_context *ctx)
606	{	606	{
607	struct cgit_cmd *cmd = cgit_get_cmd(ctx);	607	struct cgit_cmd *cmd = cgit_get_cmd(ctx);
608		608
609	if (!cmd && ctx->repo)	609	if (!cmd && ctx->repo)
610	fallback_cmd = "summary";	610	fallback_cmd = "summary";
611		611
612	html("<table id='header'>\n");	612	html("<table id='header'>\n");
613	html("<tr>\n");	613	html("<tr>\n");
614	html("<td class='logo' rowspan='2'><a href='");	614
615	if (ctx->cfg.logo_link)	615	if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
616	html_attr(ctx->cfg.logo_link);	616	html("<td class='logo' rowspan='2'><a href='");
617	else	617	if (ctx->cfg.logo_link)
618	html_attr(cgit_rooturl());	618	html_attr(ctx->cfg.logo_link);
619	html("'><img src='");	619	else
620	html_attr(ctx->cfg.logo);	620	html_attr(cgit_rooturl());
621	html("' alt='cgit logo'/></a></td>\n");	621	html("'><img src='");
		622	html_attr(ctx->cfg.logo);
		623	html("' alt='cgit logo'/></a></td>\n");
		624	}
622		625
623	html("<td class='main'>");	626	html("<td class='main'>");
624	if (ctx->repo) {	627	if (ctx->repo) {
625	cgit_index_link("index", NULL, NULL, NULL, 0);	628	cgit_index_link("index", NULL, NULL, NULL, 0);
626	html(" : ");	629	html(" : ");
627	cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);	630	cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
628	html("</td><td class='form'>");	631	html("</td><td class='form'>");
629	html("<form method='get' action=''>\n");	632	html("<form method='get' action=''>\n");
630	cgit_add_hidden_formfields(0, 1, ctx->qry.page);	633	cgit_add_hidden_formfields(0, 1, ctx->qry.page);
631	html("<select name='h' onchange='this.form.submit();'>\n");	634	html("<select name='h' onchange='this.form.submit();'>\n");
632	for_each_branch_ref(print_branch_option, ctx->qry.head);	635	for_each_branch_ref(print_branch_option, ctx->qry.head);
633	html("</select> ");	636	html("</select> ");
634	html("<input type='submit' name='' value='switch'/>");	637	html("<input type='submit' name='' value='switch'/>");
635	html("</form>");	638	html("</form>");
636	} else	639	} else
637	html_txt(ctx->cfg.root_title);	640	html_txt(ctx->cfg.root_title);
638	html("</td></tr>\n");	641	html("</td></tr>\n");
639		642
640	html("<tr><td class='sub'>");	643	html("<tr><td class='sub'>");
641	if (ctx->repo) {	644	if (ctx->repo) {
642	html_txt(ctx->repo->desc);	645	html_txt(ctx->repo->desc);
643	html("</td><td class='sub right'>");	646	html("</td><td class='sub right'>");
644	html_txt(ctx->repo->owner);	647	html_txt(ctx->repo->owner);
645	} else {	648	} else {
646	if (ctx->cfg.root_desc)	649	if (ctx->cfg.root_desc)
647	html_txt(ctx->cfg.root_desc);	650	html_txt(ctx->cfg.root_desc);
648	else if (ctx->cfg.index_info)	651	else if (ctx->cfg.index_info)
649	html_include(ctx->cfg.index_info);	652	html_include(ctx->cfg.index_info);
650	}	653	}
651	html("</td></tr></table>\n");	654	html("</td></tr></table>\n");
652		655
653	html("<table class='tabs'><tr><td>\n");	656	html("<table class='tabs'><tr><td>\n");
654	if (ctx->repo) {	657	if (ctx->repo) {
655	cgit_summary_link("summary", NULL, hc(cmd, "summary"),	658	cgit_summary_link("summary", NULL, hc(cmd, "summary"),
656	ctx->qry.head);	659	ctx->qry.head);
657	cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,	660	cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
658	ctx->qry.sha1, NULL);	661	ctx->qry.sha1, NULL);
659	cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,	662	cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
660	NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);	663	NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
661	cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,	664	cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
662	ctx->qry.sha1, NULL);	665	ctx->qry.sha1, NULL);
663	cgit_commit_link("commit", NULL, hc(cmd, "commit"),	666	cgit_commit_link("commit", NULL, hc(cmd, "commit"),
664	ctx->qry.head, ctx->qry.sha1);	667	ctx->qry.head, ctx->qry.sha1);
665	cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,	668	cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
666	ctx->qry.sha1, ctx->qry.sha2, NULL);	669	ctx->qry.sha1, ctx->qry.sha2, NULL);
667	if (ctx->repo->max_stats)	670	if (ctx->repo->max_stats)
668	cgit_stats_link("stats", NULL, hc(cmd, "stats"),	671	cgit_stats_link("stats", NULL, hc(cmd, "stats"),
669	ctx->qry.head, NULL);	672	ctx->qry.head, NULL);
670	if (ctx->repo->readme)	673	if (ctx->repo->readme)
671	reporevlink("about", "about", NULL,	674	reporevlink("about", "about", NULL,
672	hc(cmd, "about"), ctx->qry.head, NULL,	675	hc(cmd, "about"), ctx->qry.head, NULL,
673	NULL);	676	NULL);
674	html("</td><td class='form'>");	677	html("</td><td class='form'>");
675	html("<form class='right' method='get' action='");	678	html("<form class='right' method='get' action='");
676	if (ctx->cfg.virtual_root)	679	if (ctx->cfg.virtual_root)
677	html_url_path(cgit_fileurl(ctx->qry.repo, "log",	680	html_url_path(cgit_fileurl(ctx->qry.repo, "log",
678	ctx->qry.path, NULL));	681	ctx->qry.path, NULL));
679	html("'>\n");	682	html("'>\n");
680	cgit_add_hidden_formfields(1, 0, "log");	683	cgit_add_hidden_formfields(1, 0, "log");
681	html("<select name='qt'>\n");	684	html("<select name='qt'>\n");
682	html_option("grep", "log msg", ctx->qry.grep);	685	html_option("grep", "log msg", ctx->qry.grep);
683	html_option("author", "author", ctx->qry.grep);	686	html_option("author", "author", ctx->qry.grep);
684	html_option("committer", "committer", ctx->qry.grep);	687	html_option("committer", "committer", ctx->qry.grep);
685	html("</select>\n");	688	html("</select>\n");
686	html("<input class='txt' type='text' size='10' name='q' value='");	689	html("<input class='txt' type='text' size='10' name='q' value='");
687	html_attr(ctx->qry.search);	690	html_attr(ctx->qry.search);
688	html("'/>\n");	691	html("'/>\n");
689	html("<input type='submit' value='search'/>\n");	692	html("<input type='submit' value='search'/>\n");
690	html("</form>\n");	693	html("</form>\n");
691	} else {	694	} else {
692	site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);	695	site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
693	if (ctx->cfg.root_readme)	696	if (ctx->cfg.root_readme)
694	site_link("about", "about", NULL, hc(cmd, "about"),	697	site_link("about", "about", NULL, hc(cmd, "about"),
695	NULL, 0);	698	NULL, 0);
696	html("</td><td class='form'>");	699	html("</td><td class='form'>");
697	html("<form method='get' action='");	700	html("<form method='get' action='");
698	html_attr(cgit_rooturl());	701	html_attr(cgit_rooturl());
699	html("'>\n");	702	html("'>\n");
700	html("<input type='text' name='q' size='10' value='");	703	html("<input type='text' name='q' size='10' value='");
701	html_attr(ctx->qry.search);	704	html_attr(ctx->qry.search);
702	html("'/>\n");	705	html("'/>\n");
703	html("<input type='submit' value='search'/>\n");	706	html("<input type='submit' value='search'/>\n");
704	html("</form>");	707	html("</form>");
705	}	708	}
706	html("</td></tr></table>\n");	709	html("</td></tr></table>\n");
707	html("<div class='content'>");	710	html("<div class='content'>");
708	}	711	}
709		712
710	void cgit_print_filemode(unsigned short mode)	713	void cgit_print_filemode(unsigned short mode)
711	{	714	{
712	if (S_ISDIR(mode))	715	if (S_ISDIR(mode))
713	html("d");	716	html("d");
714	else if (S_ISLNK(mode))	717	else if (S_ISLNK(mode))
715	html("l");	718	html("l");
716	else if (S_ISGITLINK(mode))	719	else if (S_ISGITLINK(mode))
717	html("m");	720	html("m");
718	else	721	else
719	html("-");	722	html("-");
720	html_fileperm(mode >> 6);	723	html_fileperm(mode >> 6);
721	html_fileperm(mode >> 3);	724	html_fileperm(mode >> 3);
722	html_fileperm(mode);	725	html_fileperm(mode);
723	}	726	}
724		727
725	void cgit_print_snapshot_links(const char repo, const char head,	728	void cgit_print_snapshot_links(const char repo, const char head,
726	const char *hex, int snapshots)	729	const char *hex, int snapshots)
727	{	730	{
728	const struct cgit_snapshot_format* f;	731	const struct cgit_snapshot_format* f;
729	char *filename;	732	char *filename;
730		733
731	for (f = cgit_snapshot_formats; f->suffix; f++) {	734	for (f = cgit_snapshot_formats; f->suffix; f++) {
732	if (!(snapshots & f->bit))	735	if (!(snapshots & f->bit))
733	continue;	736	continue;
734	filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,	737	filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
735	f->suffix);	738	f->suffix);
736	cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);	739	cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
737	html("<br/>");	740	html("<br/>");
738	}	741	}
739	}	742	}