config: make empty js= omit script tag

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index f880c4e52498b21ccc2b0e71137ef6ea8dc610ec..baea6f2c84e9f168df4e29983e9593b1b2cf888a 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -673,7 +673,7 @@ const struct date_mode *cgit_date_mode(enum date_mode_type type)
 static void print_rel_date(time_t t, int tz, double value,
        const char *class, const char *suffix)
 {
-       htmlf("<span class='%s' title='", class);
+       htmlf("<span class='%s' data-ut='%" PRIu64 "' title='", class, (uint64_t)t);
        html_attr(show_date(t, tz, cgit_date_mode(DATE_ISO8601)));
        htmlf("'>%.0f %s</span>", value, suffix);
 }
@@ -768,6 +768,38 @@ static void print_rel_vcs_link(const char *url)
        html(" Git repository'/>\n");
 }
 
+static int emit_css_link(struct string_list_item *s, void *arg)
+{
+       /* Do not emit anything if css= is specified. */
+       if (s && *s->string == '\0')
+               return 0;
+
+       html("<link rel='stylesheet' type='text/css' href='");
+       if (s)
+               html_attr(s->string);
+       else
+               html_attr((const char *)arg);
+       html("'/>\n");
+
+       return 0;
+}
+
+static int emit_js_link(struct string_list_item *s, void *arg)
+{
+       /* Do not emit anything if js= is specified. */
+       if (s && *s->string == '\0')
+               return 0;
+
+       html("<script type='text/javascript' src='");
+       if (s)
+               html_attr(s->string);
+       else
+               html_attr((const char *)arg);
+       html("'></script>\n");
+
+       return 0;
+}
+
 void cgit_print_docstart(void)
 {
        char *host = cgit_hosturl();
@@ -787,9 +819,17 @@ void cgit_print_docstart(void)
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        if (ctx.cfg.robots && *ctx.cfg.robots)
                htmlf("<meta name='robots' content='%s'/>\n", ctx.cfg.robots);
-       html("<link rel='stylesheet' type='text/css' href='");
-       html_attr(ctx.cfg.css);
-       html("'/>\n");
+
+       if (ctx.cfg.css.items)
+               for_each_string_list(&ctx.cfg.css, emit_css_link, NULL);
+       else
+               emit_css_link(NULL, "/cgit.css");
+
+       if (ctx.cfg.js.items)
+               for_each_string_list(&ctx.cfg.js, emit_js_link, NULL);
+       else
+               emit_js_link(NULL, "/cgit.js");
+
        if (ctx.cfg.favicon) {
                html("<link rel='shortcut icon' href='");
                html_attr(ctx.cfg.favicon);
@@ -1016,7 +1056,13 @@ static void print_header(void)
        if (ctx.repo) {
                html_txt(ctx.repo->desc);
                html("</td><td class='sub right'>");
-               html_txt(ctx.repo->owner);
+               if (ctx.repo->owner_filter) {
+                       cgit_open_filter(ctx.repo->owner_filter);
+                       html_txt(ctx.repo->owner);
+                       cgit_close_filter(ctx.repo->owner_filter);
+               } else {
+                       html_txt(ctx.repo->owner);
+               }
        } else {
                if (ctx.cfg.root_desc)
                        html_txt(ctx.cfg.root_desc);