Makefile: another take on git dependency rules

[ps-cgit] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c

index 8a00099fdf10bc9871742c6eb561ab450c83a2b6..4280a70432b0a3f7869f0a6ddfa132df0af829c7 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -437,6 +437,11 @@ void cgit_print_docstart(struct cgit_context *ctx)
         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");
+       }
         html("</head>\n");
         html("<body>\n");
  }
@@ -513,7 +518,8 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
                 html_hidden("url", url);
         }
  
-       if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
+       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)
@@ -567,12 +573,12 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 html_txt(ctx->cfg.root_title);
         html("</td></tr>\n");
  
-       html("<tr><td class='sub'");
+       html("<tr><td class='sub'>");
         if (ctx->repo) {
-               html(" colspan='2'>");
                 html_txt(ctx->repo->desc);
+               html("</td><td class='sub right'>");
+               html_txt(ctx->repo->owner);
         } else {
-               html(">");
                 if (ctx->cfg.root_desc)
                         html_txt(ctx->cfg.root_desc);
                 else if (ctx->cfg.index_info)