Add support for 'noheader' option

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

index 4f2851273418dc9a81c4af942660e4923a149f5e..5e03a7a52ef7697f039b684f2fc1779fecbb9270 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -456,6 +456,9 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
  
  void cgit_print_http_headers(struct cgit_context *ctx)
  {
+       if (ctx->cfg.embedded)
+               return;
+
         if (ctx->page.mimetype && ctx->page.charset)
                 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                       ctx->page.charset);
@@ -473,6 +476,9 @@ void cgit_print_http_headers(struct cgit_context *ctx)
  
  void cgit_print_docstart(struct cgit_context *ctx)
  {
+       if (ctx->cfg.embedded)
+               return;
+
         char *host = cgit_hosturl();
         html(cgit_doctype);
         html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
@@ -500,6 +506,8 @@ void cgit_print_docstart(struct cgit_context *ctx)
         }
         html("</head>\n");
         html("<body>\n");
+       if (ctx->cfg.header)
+               html_include(ctx->cfg.header);
  }
  
  void cgit_print_docend()
@@ -513,6 +521,9 @@ void cgit_print_docend()
                 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                 html("</div>\n");
         }
+       html("</div>");
+       if (ctx.cfg.embedded)
+               return;
         html("</body>\n</html>\n");
  }
  
@@ -600,13 +611,8 @@ 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)
+static void print_header(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='");
@@ -647,6 +653,18 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                         html_include(ctx->cfg.index_info);
         }
         html("</td></tr></table>\n");
+}
+
+void cgit_print_pageheader(struct cgit_context *ctx)
+{
+       struct cgit_cmd *cmd = cgit_get_cmd(ctx);
+
+       if (!cmd && ctx->repo)
+               fallback_cmd = "summary";
+
+       html("<div id='cgit'>");
+       if (!ctx->cfg.noheader)
+               print_header(ctx);
  
         html("<table class='tabs'><tr><td>\n");
         if (ctx->repo) {