Merge branch 'stable'

[cgit.git] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 6253a90dfcf8eb30571001e80ca54deeb996fdb1..224e5f3b2f3da88d89a0ea3034b9182cf7775cd7 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -34,6 +34,26 @@ void cgit_print_error(char *msg)
        html("</div>\n");
 }
 
        html("</div>\n");
 }
 

+char *cgit_hosturl()
+{
+       char *host, *port;
+
+       host = getenv("HTTP_HOST");
+       if (host) {
+               host = xstrdup(host);
+       } else {
+               host = getenv("SERVER_NAME");
+               if (!host)
+                       return NULL;
+               port = getenv("SERVER_PORT");
+               if (port && atoi(port) != 80)
+                       host = xstrdup(fmt("%s:%d", host, atoi(port)));
+               else
+                       host = xstrdup(host);
+       }
+       return host;
+}
+

 char *cgit_rooturl()
 {
        if (ctx.cfg.virtual_root)
 char *cgit_rooturl()
 {
        if (ctx.cfg.virtual_root)


@@ -114,6 +134,60 @@ char *cgit_currurl()
                return fmt("%s/", ctx.cfg.virtual_root);
 }
 
                return fmt("%s/", ctx.cfg.virtual_root);
 }
 

+static void site_url(char *page, char *search, int ofs)
+{
+       char *delim = "?";
+
+       if (ctx.cfg.virtual_root) {
+               html_attr(ctx.cfg.virtual_root);
+               if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
+                       html("/");
+       } else
+               html(ctx.cfg.script_name);
+
+       if (page) {
+               htmlf("?p=%s", page);
+               delim = "&";
+       }
+       if (search) {
+               html(delim);
+               html("q=");
+               html_attr(search);
+               delim = "&";
+       }
+       if (ofs) {
+               html(delim);
+               htmlf("ofs=%d", ofs);
+       }
+}
+
+static void site_link(char *page, char *name, char *title, char *class,
+                     char *search, int ofs)
+{
+       html("<a");
+       if (title) {
+               html(" title='");
+               html_attr(title);
+               html("'");
+       }
+       if (class) {
+               html(" class='");
+               html_attr(class);
+               html("'");
+       }
+       html(" href='");
+       site_url(page, search, ofs);
+       html("'>");
+       html_txt(name);
+       html("</a>");
+}
+
+void cgit_index_link(char *name, char *title, char *class, char *pattern,
+                    int ofs)
+{
+       site_link(NULL, name, title, class, pattern, ofs);
+}
+

 static char *repolink(char *title, char *class, char *page, char *head,
                      char *path)
 {
 static char *repolink(char *title, char *class, char *page, char *head,
                      char *path)
 {


@@ -132,36 +206,36 @@ static char *repolink(char *title, char *class, char *page, char *head,
        }
        html(" href='");
        if (ctx.cfg.virtual_root) {
        }
        html(" href='");
        if (ctx.cfg.virtual_root) {

-               html_attr(ctx.cfg.virtual_root);
+               html_url_path(ctx.cfg.virtual_root);

                if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                        html("/");
                if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                        html("/");

-               html_attr(ctx.repo->url);
+               html_url_path(ctx.repo->url);

                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {

-                       html(page);
+                       html_url_path(page);

                        html("/");
                        if (path)
                        html("/");
                        if (path)

-                               html_attr(path);
+                               html_url_path(path);

                }
        } else {
                html(ctx.cfg.script_name);
                html("?url=");
                }
        } else {
                html(ctx.cfg.script_name);
                html("?url=");

-               html_attr(ctx.repo->url);
+               html_url_arg(ctx.repo->url);

                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {

-                       html(page);
+                       html_url_arg(page);

                        html("/");
                        if (path)
                        html("/");
                        if (path)

-                               html_attr(path);
+                               html_url_arg(path);

                }
                delim = "&amp;";
        }
        if (head && strcmp(head, ctx.repo->defbranch)) {
                html(delim);
                html("h=");
                }
                delim = "&amp;";
        }
        if (head && strcmp(head, ctx.repo->defbranch)) {
                html(delim);
                html("h=");

-               html_attr(head);
+               html_url_arg(head);

                delim = "&amp;";
        }
        return fmt("%s", delim);
                delim = "&amp;";
        }
        return fmt("%s", delim);


@@ -176,19 +250,36 @@ static void reporevlink(char *page, char *name, char *title, char *class,
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");

-               html_attr(rev);
+               html_url_arg(rev);

        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 

+void cgit_summary_link(char *name, char *title, char *class, char *head)
+{
+       reporevlink(NULL, name, title, class, head, NULL, NULL);
+}
+
+void cgit_tag_link(char *name, char *title, char *class, char *head,
+                  char *rev)
+{
+       reporevlink("tag", name, title, class, head, rev, NULL);
+}
+

 void cgit_tree_link(char *name, char *title, char *class, char *head,
                    char *rev, char *path)
 {
        reporevlink("tree", name, title, class, head, rev, path);
 }
 
 void cgit_tree_link(char *name, char *title, char *class, char *head,
                    char *rev, char *path)
 {
        reporevlink("tree", name, title, class, head, rev, path);
 }
 

+void cgit_plain_link(char *name, char *title, char *class, char *head,
+                    char *rev, char *path)
+{
+       reporevlink("plain", name, title, class, head, rev, path);
+}
+

 void cgit_log_link(char *name, char *title, char *class, char *head,
                   char *rev, char *path, int ofs, char *grep, char *pattern)
 {
 void cgit_log_link(char *name, char *title, char *class, char *head,
                   char *rev, char *path, int ofs, char *grep, char *pattern)
 {


@@ -198,17 +289,17 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");

-               html_attr(rev);
+               html_url_arg(rev);

                delim = "&";
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
                delim = "&";
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");

-               html_attr(grep);
+               html_url_arg(grep);

                delim = "&";
                html(delim);
                html("q=");
                delim = "&";
                html(delim);
                html("q=");

-               html_attr(pattern);
+               html_url_arg(pattern);

        }
        if (ofs > 0) {
                html(delim);
        }
        if (ofs > 0) {
                html(delim);


@@ -253,13 +344,13 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
        if (new_rev && strcmp(new_rev, ctx.qry.head)) {
                html(delim);
                html("id=");
        if (new_rev && strcmp(new_rev, ctx.qry.head)) {
                html(delim);
                html("id=");

-               html_attr(new_rev);
+               html_url_arg(new_rev);

                delim = "&amp;";
        }
        if (old_rev) {
                html(delim);
                html("id2=");
                delim = "&amp;";
        }
        if (old_rev) {
                html(delim);
                html("id2=");

-               html_attr(old_rev);
+               html_url_arg(old_rev);

        }
        html("'>");
        html_txt(name);
        }
        html("'>");
        html_txt(name);


@@ -274,39 +365,34 @@ void cgit_patch_link(char *name, char *title, char *class, char *head,
 
 void cgit_object_link(struct object *obj)
 {
 
 void cgit_object_link(struct object *obj)
 {

-       char *page, *arg, *url;
+       char *page, *rev, *name;

 
        if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
                                 ctx.qry.head, sha1_to_hex(obj->sha1));
                return;
 
        if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
                                 ctx.qry.head, sha1_to_hex(obj->sha1));
                return;

-       } else if (obj->type == OBJ_TREE) {
+       } else if (obj->type == OBJ_TREE)

                page = "tree";
                page = "tree";

-               arg = "id";
-       } else if (obj->type == OBJ_TAG) {
+       else if (obj->type == OBJ_TAG)

                page = "tag";
                page = "tag";

-               arg = "id";
-       } else {
+       else

                page = "blob";
                page = "blob";

-               arg = "id";
-       }
-
-       url = cgit_pageurl(ctx.qry.repo, page,
-                          fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
-       html_link_open(url, NULL, NULL);
-       htmlf("%s %s", typename(obj->type),
-             sha1_to_hex(obj->sha1));
-       html_link_close();
+       rev = sha1_to_hex(obj->sha1);
+       name = fmt("%s %s", typename(obj->type), rev);
+       reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL);

 }
 
 }
 

-void cgit_print_date(time_t secs, char *format)
+void cgit_print_date(time_t secs, char *format, int local_time)

 {
        char buf[64];
        struct tm *time;
 
        if (!secs)
                return;
 {
        char buf[64];
        struct tm *time;
 
        if (!secs)
                return;

-       time = gmtime(&secs);
+       if(local_time)
+               time = localtime(&secs);
+       else
+               time = gmtime(&secs);

        strftime(buf, sizeof(buf)-1, format, time);
        html_txt(buf);
 }
        strftime(buf, sizeof(buf)-1, format, time);
        html_txt(buf);
 }


@@ -321,7 +407,7 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
        secs = now - t;
 
        if (secs > max_relative && max_relative >= 0) {
        secs = now - t;
 
        if (secs > max_relative && max_relative >= 0) {

-               cgit_print_date(t, format);
+               cgit_print_date(t, format, ctx.cfg.local_time);

                return;
        }
 
                return;
        }
 


@@ -361,6 +447,8 @@ void cgit_print_http_headers(struct cgit_context *ctx)
                      ctx->page.charset);
        else if (ctx->page.mimetype)
                htmlf("Content-Type: %s\n", ctx->page.mimetype);
                      ctx->page.charset);
        else if (ctx->page.mimetype)
                htmlf("Content-Type: %s\n", ctx->page.mimetype);

+       if (ctx->page.size)
+               htmlf("Content-Length: %ld\n", ctx->page.size);

        if (ctx->page.filename)
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                      ctx->page.filename);
        if (ctx->page.filename)
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                      ctx->page.filename);


@@ -371,6 +459,7 @@ void cgit_print_http_headers(struct cgit_context *ctx)
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {

+       char *host = cgit_hosturl();

        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");


@@ -383,13 +472,34 @@ void cgit_print_docstart(struct cgit_context *ctx)
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(ctx->cfg.css);
        html("'/>\n");
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(ctx->cfg.css);
        html("'/>\n");

+       if (ctx->cfg.favicon) {
+               html("<link rel='shortcut icon' href='");
+               html_attr(ctx->cfg.favicon);
+               html("'/>\n");
+       }
+       if (host && ctx->repo) {
+               html("<link rel='alternate' title='Atom feed' href='http://");
+               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("</head>\n");
        html("<body>\n");
 }
 
 void cgit_print_docend()
 {
        html("</head>\n");
        html("<body>\n");
 }
 
 void cgit_print_docend()
 {

-       html("</div>\n</body>\n</html>\n");
+       html("</div>");
+       if (ctx.cfg.footer)
+               html_include(ctx.cfg.footer);
+       else {
+               htmlf("<div class='footer'>generated  by cgit %s at ",
+                       cgit_version);
+               cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
+               html("</div>\n");
+       }
+       html("</body>\n</html>\n");

 }
 
 int print_branch_option(const char *refname, const unsigned char *sha1,
 }
 
 int print_branch_option(const char *refname, const unsigned char *sha1,


@@ -450,7 +560,8 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
                html_hidden("url", url);
        }
 
                html_hidden("url", url);
        }
 

-       if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
+       if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
+           strcmp(ctx.qry.head, ctx.repo->defbranch))

                html_hidden("h", ctx.qry.head);
 
        if (ctx.qry.sha1)
                html_hidden("h", ctx.qry.head);
 
        if (ctx.qry.sha1)


@@ -484,19 +595,13 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html_attr(cgit_rooturl());
        html("'><img src='");
        html_attr(ctx->cfg.logo);
                html_attr(cgit_rooturl());
        html("'><img src='");
        html_attr(ctx->cfg.logo);

-       html("'/></a></td>\n");
+       html("' alt='cgit logo'/></a></td>\n");

 
        html("<td class='main'>");
        if (ctx->repo) {
 
        html("<td class='main'>");
        if (ctx->repo) {

-/*
-               html("<a href='");
-               html_attr(cgit_rooturl());
-               html("'>index</a> : ");
-*/
-               reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
-                           ctx->qry.head, NULL, NULL);
+               cgit_index_link("index", NULL, NULL, NULL, 0);

                html(" : ");
                html(" : ");

-               html_txt(ctx->qry.page);
+               cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);

                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                add_hidden_formfields(0, 1, ctx->qry.page);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                add_hidden_formfields(0, 1, ctx->qry.page);


@@ -507,30 +612,25 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html("</form>");
        } else
                html_txt(ctx->cfg.root_title);
                html("</form>");
        } else
                html_txt(ctx->cfg.root_title);

-       html("</td>\n");
+       html("</td></tr>\n");

 
 

-       html("<tr><td class='sub'");
+       html("<tr><td class='sub'>");

        if (ctx->repo) {
        if (ctx->repo) {

-               html(" colspan='2'>");

                html_txt(ctx->repo->desc);
                html_txt(ctx->repo->desc);

+               html("</td><td class='sub right'>");
+               html_txt(ctx->repo->owner);
+       } else {
+               if (ctx->cfg.root_desc)
+                       html_txt(ctx->cfg.root_desc);
+               else if (ctx->cfg.index_info)
+                       html_include(ctx->cfg.index_info);

        }
        }

-/*
-       else if (ctx->cfg.root_subtitle)
-               html_txt(ctx->cfg.root_subtitle);
-*/
-       else {
-               html(">");
-               html_txt("a fast webinterface for the git dscm");
-       }
-       html("</td></tr>\n");
-
-       html("</tr>\n");
-       html("</table>\n");
+       html("</td></tr></table>\n");

 
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
 
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {

-               reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
-                           ctx->qry.head, NULL, NULL);
+               cgit_summary_link("summary", NULL, hc(cmd, "summary"),
+                                 ctx->qry.head);

                cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
                cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,


@@ -541,13 +641,15 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                                 ctx->qry.head, ctx->qry.sha1);
                cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
                               ctx->qry.sha1, ctx->qry.sha2, NULL);
                                 ctx->qry.head, ctx->qry.sha1);
                cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
                               ctx->qry.sha1, ctx->qry.sha2, NULL);

-               cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
-                               ctx->qry.sha1);
+               if (ctx->repo->readme)
+                       reporevlink("about", "about", NULL,
+                                   hc(cmd, "about"), ctx->qry.head, NULL,
+                                   NULL);

                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
                if (ctx->cfg.virtual_root)
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
                if (ctx->cfg.virtual_root)

-                       html_attr(cgit_fileurl(ctx->qry.repo, "log",
-                                              ctx->qry.path, NULL));
+                       html_url_path(cgit_fileurl(ctx->qry.repo, "log",
+                                                  ctx->qry.path, NULL));

                html("'>\n");
                add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
                html("'>\n");
                add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");


@@ -561,9 +663,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {

-               html("<a class='active' href='");
-               html_attr(cgit_rooturl());
-               html("'>index</a>\n");
+               site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
+               if (ctx->cfg.root_readme)
+                       site_link("about", "about", NULL, hc(cmd, "about"),
+                                 NULL, 0);

                html("</td><td class='form'>");
                html("<form method='get' action='");
                html_attr(cgit_rooturl());
                html("</td><td class='form'>");
                html("<form method='get' action='");
                html_attr(cgit_rooturl());