ui-log.c: handle lightweight tags when printing commit decorations

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 538dddaed6edcfb1f6e29917a6b8021ba8e00186..cf065116cfdd19da8c63f0ae2324c55f9f546cac 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -455,7 +455,7 @@ 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)
+       if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
                return;
 
        if (ctx->page.status)
@@ -481,8 +481,11 @@ void cgit_print_http_headers(struct cgit_context *ctx)
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {
-       if (ctx->cfg.embedded)
+       if (ctx->cfg.embedded) {
+               if (ctx->cfg.header)
+                       html_include(ctx->cfg.header);
                return;
+       }
 
        char *host = cgit_hosturl();
        html(cgit_doctype);
@@ -520,7 +523,13 @@ void cgit_print_docstart(struct cgit_context *ctx)
 
 void cgit_print_docend()
 {
-       html("</div>");
+       html("</div> <!-- class=content -->\n");
+       if (ctx.cfg.embedded) {
+               html("</div> <!-- id=cgit -->\n");
+               if (ctx.cfg.footer)
+                       html_include(ctx.cfg.footer);
+               return;
+       }
        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {
@@ -529,9 +538,7 @@ 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("</div> <!-- id=cgit -->\n");
        html("</body>\n</html>\n");
 }