]> gitweb.ps.run Git - ps-cgit/commitdiff
projects / ps-cgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 681fdc4)
Merge branch 'ml/head-include'
authorLars Hjemli <hjemli@gmail.com>
Sat, 25 Jul 2009 10:04:08 +0000 (12:04 +0200)
committerLars Hjemli <hjemli@gmail.com>
Sat, 25 Jul 2009 10:04:08 +0000 (12:04 +0200)
cgit.c patch | blob | history
cgit.h patch | blob | history
cgitrc.5.txt patch | blob | history
ui-shared.c patch | blob | history

diff --git a/cgit.c b/cgit.c
index ae2025709a05b4f888e9fc090005c5a1a9ed10be..513ea125bb196a065a4b1cc24f24cae0f571de52 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -31,6 +31,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.favicon = xstrdup(value);
        else if (!strcmp(name, "footer"))
                ctx.cfg.footer = xstrdup(value);
+       else if (!strcmp(name, "head-include"))
+               ctx.cfg.head_include = xstrdup(value);
        else if (!strcmp(name, "header"))
                ctx.cfg.header = xstrdup(value);
        else if (!strcmp(name, "logo"))
diff --git a/cgit.h b/cgit.h
index 07a277a3e727b93b64623d4fa366ac3131486bdd..78b30bace9327dc310dd646fa1ad86bdecd64ce6 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -136,6 +136,7 @@ struct cgit_config {
        char *css;
        char *favicon;
        char *footer;
+       char *head_include;
        char *header;
        char *index_header;
        char *index_info;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 7879f75efc6b9be86659207e44d88c5d1b07eddf..683f3b54853cd398c2159886ebc51dab22eb92a3 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -84,6 +84,10 @@ footer::
        verbatim at the bottom of all pages (i.e. it replaces the standard
        "generated by..." message. Default value: none.
 
+head-include::
+       The content of the file specified with this option will be included
+       verbatim in the html HEAD section on all pages. Default value: none.
+
 header::
        The content of the file specified with this option will be included
        verbatim at the top of all pages. Default value: none.
diff --git a/ui-shared.c b/ui-shared.c
index 10be3c057dab494ad9782220374d0df258247cf0..66d5b8220de122d69a8398119592f09114c83731 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -516,8 +516,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)
Unnamed repository; edit this file 'description' to name the repository.