]> gitweb.ps.run Git - ps-cgit/blobdiff - ui-shared.c
projects / ps-cgit / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ui-summary: enable arbitrary paths below repo.readme
[ps-cgit] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c
index 9319881de108132650bc026bd90f3548162bdbd7..015c52b6c044f2a280ca7259c68c6d6f5040711b 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -34,6 +34,17 @@ void cgit_print_error(char *msg)
        html("</div>\n");
 }
 
        html("</div>\n");
 }
 
+char *cgit_httpscheme()
+{
+       char *https;
+
+       https = getenv("HTTPS");
+       if (https != NULL && strcmp(https, "on") == 0)
+               return "https://";
+       else
+               return "http://";
+}
+
 char *cgit_hosturl()
 {
        char *host, *port;
 char *cgit_hosturl()
 {
        char *host, *port;
@@ -281,7 +292,8 @@ void cgit_plain_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
-                  char *rev, char *path, int ofs, char *grep, char *pattern)
+                  char *rev, char *path, int ofs, char *grep, char *pattern,
+                  int showmsg)
 {
        char *delim;
 
 {
        char *delim;
 
@@ -305,6 +317,11 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);
+               delim = "&";
+       }
+       if (showmsg) {
+               html(delim);
+               html("showmsg=1");
        }
        html("'>");
        html_txt(name);
        }
        html("'>");
        html_txt(name);
@@ -363,6 +380,12 @@ void cgit_patch_link(char *name, char *title, char *class, char *head,
        reporevlink("patch", name, title, class, head, rev, NULL);
 }
 
        reporevlink("patch", name, title, class, head, rev, NULL);
 }
 
+void cgit_stats_link(char *name, char *title, char *class, char *head,
+                    char *path)
+{
+       reporevlink("stats", name, title, class, head, NULL, path);
+}
+
 void cgit_object_link(struct object *obj)
 {
        char *page, *shortrev, *fullrev, *name;
 void cgit_object_link(struct object *obj)
 {
        char *page, *shortrev, *fullrev, *name;
@@ -444,6 +467,13 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
 
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
+       const char *method = getenv("REQUEST_METHOD");
+
+       if (ctx->cfg.embedded)
+               return;
+
+       if (ctx->page.status)
+               htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
        if (ctx->page.mimetype && ctx->page.charset)
                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                      ctx->page.charset);
        if (ctx->page.mimetype && ctx->page.charset)
                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                      ctx->page.charset);
@@ -456,11 +486,18 @@ void cgit_print_http_headers(struct cgit_context *ctx)
                      ctx->page.filename);
        htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
        htmlf("Expires: %s\n", http_date(ctx->page.expires));
                      ctx->page.filename);
        htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
        htmlf("Expires: %s\n", http_date(ctx->page.expires));
+       if (ctx->page.etag)
+               htmlf("ETag: \"%s\"\n", ctx->page.etag);
        html("\n");
        html("\n");
+       if (method && !strcmp(method, "HEAD"))
+               exit(0);
 }
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {
 }
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {
+       if (ctx->cfg.embedded)
+               return;
+
        char *host = cgit_hosturl();
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        char *host = cgit_hosturl();
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
@@ -480,14 +517,19 @@ void cgit_print_docstart(struct cgit_context *ctx)
                html("'/>\n");
        }
        if (host && ctx->repo) {
                html("'/>\n");
        }
        if (host && ctx->repo) {
-               html("<link rel='alternate' title='Atom feed' href='http://");
+               html("<link rel='alternate' title='Atom feed' href='");
+               html(cgit_httpscheme());
                html_attr(cgit_hosturl());
                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
                                       fmt("h=%s", ctx->qry.head)));
                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");
        html("</head>\n");
        html("<body>\n");
+       if (ctx->cfg.header)
+               html_include(ctx->cfg.header);
 }
 
 void cgit_print_docend()
 }
 
 void cgit_print_docend()
@@ -501,6 +543,9 @@ void cgit_print_docend()
                cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                html("</div>\n");
        }
                cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                html("</div>\n");
        }
+       html("</div>");
+       if (ctx.cfg.embedded)
+               return;
        html("</body>\n</html>\n");
 }
 
        html("</body>\n</html>\n");
 }
 
@@ -551,7 +596,7 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
        return 0;
 }
 
        return 0;
 }
 
-void add_hidden_formfields(int incl_head, int incl_search, char *page)
+void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
        char *url;
 
 {
        char *url;
 
@@ -570,6 +615,8 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);
+       if (ctx.qry.showmsg)
+               html_hidden("showmsg", "1");
 
        if (incl_search) {
                if (ctx.qry.grep)
 
        if (incl_search) {
                if (ctx.qry.grep)
@@ -579,15 +626,15 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
        }
 }
 
        }
 }
 
+const char *fallback_cmd = "repolist";
+
 char *hc(struct cgit_cmd *cmd, const char *page)
 {
 char *hc(struct cgit_cmd *cmd, const char *page)
 {
-       return (strcmp(cmd->name, page) ? NULL : "active");
+       return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
 }
 
 }
 
-void cgit_print_pageheader(struct cgit_context *ctx)
+static void print_header(struct cgit_context *ctx)
 {
 {
-       struct cgit_cmd *cmd = cgit_get_cmd(ctx);
-
        html("<table id='header'>\n");
        html("<tr>\n");
        html("<td class='logo' rowspan='2'><a href='");
        html("<table id='header'>\n");
        html("<tr>\n");
        html("<td class='logo' rowspan='2'><a href='");
@@ -606,7 +653,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                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);
+               cgit_add_hidden_formfields(0, 1, ctx->qry.page);
                html("<select name='h' onchange='this.form.submit();'>\n");
                for_each_branch_ref(print_branch_option, ctx->qry.head);
                html("</select> ");
                html("<select name='h' onchange='this.form.submit();'>\n");
                for_each_branch_ref(print_branch_option, ctx->qry.head);
                html("</select> ");
@@ -628,6 +675,18 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                        html_include(ctx->cfg.index_info);
        }
        html("</td></tr></table>\n");
                        html_include(ctx->cfg.index_info);
        }
        html("</td></tr></table>\n");
+}
+
+void cgit_print_pageheader(struct cgit_context *ctx)
+{
+       struct cgit_cmd *cmd = cgit_get_cmd(ctx);
+
+       if (!cmd && ctx->repo)
+               fallback_cmd = "summary";
+
+       html("<div id='cgit'>");
+       if (!ctx->cfg.noheader)
+               print_header(ctx);
 
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
 
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
@@ -636,13 +695,16 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                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,
-                             NULL, NULL, 0, NULL, NULL);
+                             NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
                cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_commit_link("commit", NULL, hc(cmd, "commit"),
                                 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_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_commit_link("commit", NULL, hc(cmd, "commit"),
                                 ctx->qry.head, ctx->qry.sha1);
                cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
                               ctx->qry.sha1, ctx->qry.sha2, NULL);
+               if (ctx->repo->max_stats)
+                       cgit_stats_link("stats", NULL, hc(cmd, "stats"),
+                                       ctx->qry.head, NULL);
                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,
                                    hc(cmd, "about"), ctx->qry.head, NULL,
                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,
                                    hc(cmd, "about"), ctx->qry.head, NULL,
@@ -653,7 +715,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                        html_url_path(cgit_fileurl(ctx->qry.repo, "log",
                                                   ctx->qry.path, NULL));
                html("'>\n");
                        html_url_path(cgit_fileurl(ctx->qry.repo, "log",
                                                   ctx->qry.path, NULL));
                html("'>\n");
-               add_hidden_formfields(1, 0, "log");
+               cgit_add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
                html_option("grep", "log msg", ctx->qry.grep);
                html_option("author", "author", ctx->qry.grep);
                html("<select name='qt'>\n");
                html_option("grep", "log msg", ctx->qry.grep);
                html_option("author", "author", ctx->qry.grep);
Unnamed repository; edit this file 'description' to name the repository.