1 files changed, 10 insertions, 4 deletions
diff --git a/ui-shared.c b/ui-shared.c
index cd98387..8a00099 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -382,132 +382,138 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
        if (secs < TM_HOUR * 2) {
                htmlf("<span class='age-mins'>%.0f min.</span>",
                      secs * 1.0 / TM_MIN);
                return;
        }
        if (secs < TM_DAY * 2) {
                htmlf("<span class='age-hours'>%.0f hours</span>",
                      secs * 1.0 / TM_HOUR);
                return;
        }
        if (secs < TM_WEEK * 2) {
                htmlf("<span class='age-days'>%.0f days</span>",
                      secs * 1.0 / TM_DAY);
                return;
        }
        if (secs < TM_MONTH * 2) {
                htmlf("<span class='age-weeks'>%.0f weeks</span>",
                      secs * 1.0 / TM_WEEK);
                return;
        }
        if (secs < TM_YEAR * 2) {
                htmlf("<span class='age-months'>%.0f months</span>",
                      secs * 1.0 / TM_MONTH);
                return;
        }
        htmlf("<span class='age-years'>%.0f years</span>",
              secs * 1.0 / TM_YEAR);
 }
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
        if (ctx->page.mimetype && ctx->page.charset)
                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                      ctx->page.charset);
        else if (ctx->page.mimetype)
                htmlf("Content-Type: %s\n", ctx->page.mimetype);
        if (ctx->page.filename)
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                      ctx->page.filename);
        htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
        htmlf("Expires: %s\n", http_date(ctx->page.expires));
        html("\n");
 }
 void cgit_print_docstart(struct cgit_context *ctx)
 {
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
        html("<title>");
        html_txt(ctx->page.title);
        html("</title>\n");
        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");
        html("</head>\n");
        html("<body>\n");
 }
 void cgit_print_docend()
 {
-        html("</div><div class='footer'>generated ");
+        html("</div>");
-        cgit_print_date(time(NULL), FMT_LONGDATE);
+        if (ctx.cfg.footer)
-        htmlf(" by cgit %s", cgit_version);
+                html_include(ctx.cfg.footer);
-        html("</div>\n</body>\n</html>\n");
+        else {
+                html("<div class='footer'>generated ");
+                cgit_print_date(time(NULL), FMT_LONGDATE);
+                htmlf(" by cgit %s", cgit_version);
+                html("</div>\n");
+        }
+        html("</body>\n</html>\n");
 }
 int print_branch_option(const char *refname, const unsigned char *sha1,
                        int flags, void *cb_data)
 {
        char *name = (char *)refname;
        html_option(name, name, ctx.qry.head);
        return 0;
 }
 int print_archive_ref(const char *refname, const unsigned char *sha1,
                       int flags, void *cb_data)
 {
        struct tag *tag;
        struct taginfo *info;
        struct object *obj;
        char buf[256], *url;
        unsigned char fileid[20];
        int *header = (int *)cb_data;
        if (prefixcmp(refname, "refs/archives"))
                return 0;
        strncpy(buf, refname+14, sizeof(buf));
        obj = parse_object(sha1);
        if (!obj)
                return 1;
        if (obj->type == OBJ_TAG) {
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                        return 0;
                hashcpy(fileid, tag->tagged->sha1);
        } else if (obj->type != OBJ_BLOB) {
                return 0;
        } else {
                hashcpy(fileid, sha1);
        }
        if (!*header) {
                html("<h1>download</h1>\n");
                *header = 1;
        }
        url = cgit_pageurl(ctx.qry.repo, "blob",
                           fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
                               buf));
        html_link_open(url, NULL, "menu");
        html_txt(strlpart(buf, 20));
        html_link_close();
        return 0;
 }
 void add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
        char *url;
        if (!ctx.cfg.virtual_root) {
                url = fmt("%s/%s", ctx.qry.repo, page);
                if (ctx.qry.path)
                        url = fmt("%s/%s", url, ctx.qry.path);
                html_hidden("url", url);
        }
        if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
                html_hidden("h", ctx.qry.head);
        if (ctx.qry.sha1)