summaryrefslogtreecommitdiffabout
authorMatthew Metnetsky <mimetnet@vidu.us>2009-06-30 01:27:51 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-18 11:13:51 (UTC)
commit6421dc38db02eff8d3ada93e87a2f7e5292af131 (patch) (side-by-side diff)
tree90828ea6f44b6d59f29b2e589a5552ba50a0aa5d
parent435a1da8d1c43bff2f2ccd5649ea8510eec0b2af (diff)
downloadcgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.zip
cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.tar.gz
cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.tar.bz2
ui-shared: don't print header <img/> if there isn't a logo defined
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-shared.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c
index de77bbf..40060ba 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -590,56 +590,59 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
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");
+
+ if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
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("' 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 {