Add support for repo.commit-filter and repo.source-filter

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

index 29036d0a92ba45643e7db53af2671113fcbff7be..015c52b6c044f2a280ca7259c68c6d6f5040711b 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -467,6 +467,11 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
  
  void cgit_print_http_headers(struct cgit_context *ctx)
  {
+       const char *method = getenv("REQUEST_METHOD");
+
+       if (ctx->cfg.embedded)
+               return;
+
         if (ctx->page.status)
                 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
         if (ctx->page.mimetype && ctx->page.charset)
@@ -481,11 +486,18 @@ void cgit_print_http_headers(struct cgit_context *ctx)
                       ctx->page.filename);
         htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
         htmlf("Expires: %s\n", http_date(ctx->page.expires));
+       if (ctx->page.etag)
+               htmlf("ETag: \"%s\"\n", ctx->page.etag);
         html("\n");
+       if (method && !strcmp(method, "HEAD"))
+               exit(0);
  }
  
  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");
@@ -510,8 +522,10 @@ void cgit_print_docstart(struct cgit_context *ctx)
                 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("' type='application/atom+xml'/>\n");
         }
+       if (ctx->cfg.head_include)
+               html_include(ctx->cfg.head_include);
         html("</head>\n");
         html("<body>\n");
         if (ctx->cfg.header)
@@ -529,6 +543,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");
  }
  
@@ -616,13 +633,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='");
@@ -663,6 +675,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) {