Be prepared for empty repositories

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

index 44269a7677cff9b5d24b14b3b54d90defe573e63..4280a70432b0a3f7869f0a6ddfa132df0af829c7 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -437,16 +437,27 @@ 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");
  }
  
  void cgit_print_docend()
  {
-       html("</div><div class='footer'>generated ");
-       cgit_print_date(time(NULL), FMT_LONGDATE);
-       htmlf(" by cgit %s", cgit_version);
-       html("</div>\n</body>\n</html>\n");
+       html("</div>");
+       if (ctx.cfg.footer)
+               html_include(ctx.cfg.footer);
+       else {
+               html("<div class='footer'>generated ");
+               cgit_print_date(time(NULL), FMT_LONGDATE);
+               htmlf(" by cgit %s", cgit_version);
+               html("</div>\n");
+       }
+       html("</body>\n</html>\n");
  }
  
  int print_branch_option(const char *refname, const unsigned char *sha1,
@@ -507,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)
@@ -545,10 +557,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
  
         html("<td class='main'>");
         if (ctx->repo) {
+               cgit_index_link("index", NULL, NULL, NULL, 0);
+               html(" : ");
                 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);
@@ -561,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)