]> 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
Minor fixup in tree-view css
[ps-cgit] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c
index 7c69f60f80a5a8dd495b73497132693297496a81..73e3d4cc81f2216bc2c9edaa495057ab8b0e6034 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -7,6 +7,8 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"
+#include "cmd.h"
+#include "html.h"
 
 const char cgit_doctype[] =
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
 
 const char cgit_doctype[] =
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
@@ -25,14 +27,6 @@ static char *http_date(time_t t)
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
-static long ttl_seconds(long ttl)
-{
-       if (ttl<0)
-               return 60 * 60 * 24 * 365;
-       else
-               return ttl * 60;
-}
-
 void cgit_print_error(char *msg)
 {
        html("<div class='error'>");
 void cgit_print_error(char *msg)
 {
        html("<div class='error'>");
@@ -42,16 +36,16 @@ void cgit_print_error(char *msg)
 
 char *cgit_rooturl()
 {
 
 char *cgit_rooturl()
 {
-       if (cgit_virtual_root)
-               return fmt("%s/", cgit_virtual_root);
+       if (ctx.cfg.virtual_root)
+               return fmt("%s/", ctx.cfg.virtual_root);
        else
        else
-               return cgit_script_name;
+               return ctx.cfg.script_name;
 }
 
 char *cgit_repourl(const char *reponame)
 {
 }
 
 char *cgit_repourl(const char *reponame)
 {
-       if (cgit_virtual_root) {
-               return fmt("%s/%s/", cgit_virtual_root, reponame);
+       if (ctx.cfg.virtual_root) {
+               return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
        } else {
                return fmt("?r=%s", reponame);
        }
        } else {
                return fmt("?r=%s", reponame);
        }
@@ -63,8 +57,8 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
        char *tmp;
        char *delim;
 
        char *tmp;
        char *delim;
 
-       if (cgit_virtual_root) {
-               tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame,
+       if (ctx.cfg.virtual_root) {
+               tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
                          pagename, (filename ? filename:""));
                delim = "?";
        } else {
                          pagename, (filename ? filename:""));
                delim = "?";
        } else {
@@ -110,14 +104,14 @@ const char *cgit_repobasename(const char *reponame)
 
 char *cgit_currurl()
 {
 
 char *cgit_currurl()
 {
-       if (!cgit_virtual_root)
-               return cgit_script_name;
-       else if (cgit_query_page)
-               return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
-       else if (cgit_query_repo)
-               return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
+       if (!ctx.cfg.virtual_root)
+               return ctx.cfg.script_name;
+       else if (ctx.qry.page)
+               return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
+       else if (ctx.qry.repo)
+               return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
        else
        else
-               return fmt("%s/", cgit_virtual_root);
+               return fmt("%s/", ctx.cfg.virtual_root);
 }
 
 static char *repolink(char *title, char *class, char *page, char *head,
 }
 
 static char *repolink(char *title, char *class, char *page, char *head,
@@ -137,12 +131,12 @@ static char *repolink(char *title, char *class, char *page, char *head,
                html("'");
        }
        html(" href='");
                html("'");
        }
        html(" href='");
-       if (cgit_virtual_root) {
-               html_attr(cgit_virtual_root);
-               if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/')
+       if (ctx.cfg.virtual_root) {
+               html_attr(ctx.cfg.virtual_root);
+               if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                        html("/");
                        html("/");
-               html_attr(cgit_repo->url);
-               if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+               html_attr(ctx.repo->url);
+               if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                        html(page);
                        html("/");
                if (page) {
                        html(page);
@@ -151,10 +145,10 @@ static char *repolink(char *title, char *class, char *page, char *head,
                                html_attr(path);
                }
        } else {
                                html_attr(path);
                }
        } else {
-               html(cgit_script_name);
+               html(ctx.cfg.script_name);
                html("?url=");
                html("?url=");
-               html_attr(cgit_repo->url);
-               if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+               html_attr(ctx.repo->url);
+               if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                        html(page);
                        html("/");
                if (page) {
                        html(page);
@@ -164,7 +158,7 @@ static char *repolink(char *title, char *class, char *page, char *head,
                }
                delim = "&amp;";
        }
                }
                delim = "&amp;";
        }
-       if (head && strcmp(head, cgit_repo->defbranch)) {
+       if (head && strcmp(head, ctx.repo->defbranch)) {
                html(delim);
                html("h=");
                html_attr(head);
                html(delim);
                html("h=");
                html_attr(head);
@@ -179,7 +173,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
        char *delim;
 
        delim = repolink(title, class, page, head, path);
        char *delim;
 
        delim = repolink(title, class, page, head, path);
-       if (rev && strcmp(rev, cgit_query_head)) {
+       if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_attr(rev);
                html(delim);
                html("id=");
                html_attr(rev);
@@ -201,7 +195,7 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
        char *delim;
 
        delim = repolink(title, class, "log", head, path);
        char *delim;
 
        delim = repolink(title, class, "log", head, path);
-       if (rev && strcmp(rev, cgit_query_head)) {
+       if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_attr(rev);
                html(delim);
                html("id=");
                html_attr(rev);
@@ -229,11 +223,11 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 void cgit_commit_link(char *name, char *title, char *class, char *head,
                      char *rev)
 {
 void cgit_commit_link(char *name, char *title, char *class, char *head,
                      char *rev)
 {
-       if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
-               name[cgit_max_msg_len] = '\0';
-               name[cgit_max_msg_len - 1] = '.';
-               name[cgit_max_msg_len - 2] = '.';
-               name[cgit_max_msg_len - 3] = '.';
+       if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
+               name[ctx.cfg.max_msg_len] = '\0';
+               name[ctx.cfg.max_msg_len - 1] = '.';
+               name[ctx.cfg.max_msg_len - 2] = '.';
+               name[ctx.cfg.max_msg_len - 3] = '.';
        }
        reporevlink("commit", name, title, class, head, rev, NULL);
 }
        }
        reporevlink("commit", name, title, class, head, rev, NULL);
 }
@@ -256,7 +250,7 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
        char *delim;
 
        delim = repolink(title, class, "diff", head, path);
        char *delim;
 
        delim = repolink(title, class, "diff", head, path);
-       if (new_rev && strcmp(new_rev, cgit_query_head)) {
+       if (new_rev && strcmp(new_rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_attr(new_rev);
                html(delim);
                html("id=");
                html_attr(new_rev);
@@ -272,13 +266,19 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
        html("</a>");
 }
 
        html("</a>");
 }
 
+void cgit_patch_link(char *name, char *title, char *class, char *head,
+                    char *rev)
+{
+       reporevlink("patch", name, title, class, head, rev, NULL);
+}
+
 void cgit_object_link(struct object *obj)
 {
        char *page, *arg, *url;
 
        if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
 void cgit_object_link(struct object *obj)
 {
        char *page, *arg, *url;
 
        if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
-                                cgit_query_head, sha1_to_hex(obj->sha1));
+                                ctx.qry.head, sha1_to_hex(obj->sha1));
                return;
        } else if (obj->type == OBJ_TREE) {
                page = "tree";
                return;
        } else if (obj->type == OBJ_TREE) {
                page = "tree";
@@ -291,7 +291,7 @@ void cgit_object_link(struct object *obj)
                arg = "id";
        }
 
                arg = "id";
        }
 
-       url = cgit_pageurl(cgit_query_repo, page,
+       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),
                           fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
        html_link_open(url, NULL, NULL);
        htmlf("%s %s", typename(obj->type),
@@ -304,6 +304,8 @@ void cgit_print_date(time_t secs, char *format)
        char buf[64];
        struct tm *time;
 
        char buf[64];
        struct tm *time;
 
+       if (!secs)
+               return;
        time = gmtime(&secs);
        strftime(buf, sizeof(buf)-1, format, time);
        html_txt(buf);
        time = gmtime(&secs);
        strftime(buf, sizeof(buf)-1, format, time);
        html_txt(buf);
@@ -313,6 +315,8 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 {
        time_t now, secs;
 
 {
        time_t now, secs;
 
+       if (!t)
+               return;
        time(&now);
        secs = now - t;
 
        time(&now);
        secs = now - t;
 
@@ -350,22 +354,34 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
              secs * 1.0 / TM_YEAR);
 }
 
              secs * 1.0 / TM_YEAR);
 }
 
-void cgit_print_docstart(char *title, struct cacheitem *item)
+void cgit_print_http_headers(struct cgit_context *ctx)
 {
 {
-       html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
-       htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
-       htmlf("Expires: %s\n", http_date(item->st.st_mtime +
-                                        ttl_seconds(item->ttl)));
+       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");
        html("\n");
+}
+
+void cgit_print_docstart(struct cgit_context *ctx)
+{
        html(cgit_doctype);
        html(cgit_doctype);
-       html("<html>\n");
+       html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
        html("<title>");
        html("<head>\n");
        html("<title>");
-       html_txt(title);
+       html_txt(ctx->page.title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        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("<link rel='stylesheet' type='text/css' href='");
-       html_attr(cgit_css);
+       html_attr(ctx->cfg.css);
        html("'/>\n");
        html("</head>\n");
        html("<body>\n");
        html("'/>\n");
        html("</head>\n");
        html("<body>\n");
@@ -373,14 +389,14 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
 
 void cgit_print_docend()
 {
 
 void cgit_print_docend()
 {
-       html("</td>\n</tr>\n<table>\n</body>\n</html>\n");
+       html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
 }
 
 int print_branch_option(const char *refname, const unsigned char *sha1,
                        int flags, void *cb_data)
 {
        char *name = (char *)refname;
 }
 
 int print_branch_option(const char *refname, const unsigned char *sha1,
                        int flags, void *cb_data)
 {
        char *name = (char *)refname;
-       html_option(name, name, cgit_query_head);
+       html_option(name, name, ctx.qry.head);
        return 0;
 }
 
        return 0;
 }
 
@@ -411,10 +427,10 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
                hashcpy(fileid, sha1);
        }
        if (!*header) {
                hashcpy(fileid, sha1);
        }
        if (!*header) {
-               html("<p><h1>download</h1>");
+               html("<h1>download</h1>\n");
                *header = 1;
        }
                *header = 1;
        }
-       url = cgit_pageurl(cgit_query_repo, "blob",
+       url = cgit_pageurl(ctx.qry.repo, "blob",
                           fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
                               buf));
        html_link_open(url, NULL, "menu");
                           fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
                               buf));
        html_link_open(url, NULL, "menu");
@@ -427,111 +443,125 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
        char *url;
 
 {
        char *url;
 
-       if (!cgit_virtual_root) {
-               url = fmt("%s/%s", cgit_query_repo, page);
-               if (cgit_query_path)
-                       url = fmt("%s/%s", url, cgit_query_path);
+       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);
        }
 
                html_hidden("url", url);
        }
 
-       if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
-               html_hidden("h", cgit_query_head);
+       if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
+               html_hidden("h", ctx.qry.head);
 
 
-       if (cgit_query_sha1)
-               html_hidden("id", cgit_query_sha1);
-       if (cgit_query_sha2)
-               html_hidden("id2", cgit_query_sha2);
+       if (ctx.qry.sha1)
+               html_hidden("id", ctx.qry.sha1);
+       if (ctx.qry.sha2)
+               html_hidden("id2", ctx.qry.sha2);
 
        if (incl_search) {
 
        if (incl_search) {
-               if (cgit_query_grep)
-                       html_hidden("qt", cgit_query_grep);
-               if (cgit_query_search)
-                       html_hidden("q", cgit_query_search);
+               if (ctx.qry.grep)
+                       html_hidden("qt", ctx.qry.grep);
+               if (ctx.qry.search)
+                       html_hidden("q", ctx.qry.search);
        }
 }
 
        }
 }
 
-void cgit_print_pageheader(char *title, int show_search)
+char *hc(struct cgit_cmd *cmd, const char *page)
 {
 {
-       static const char *default_info = "This is cgit, a fast webinterface for git repositories";
-       int header = 0;
-
-       html("<div id='sidebar'>\n");
-       html("<a href='");
-       html_attr(cgit_rooturl());
-       htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n",
-             cgit_logo);
-       html("<div class='infobox'>");
-       if (cgit_query_repo) {
-               html("<h1>");
-               html_txt(strrpart(cgit_repo->name, 20));
-               html("</h1>\n");
-               html_txt(cgit_repo->desc);
-               if (cgit_repo->owner) {
-                       html("<p>\n<h1>owner</h1>\n");
-                       html_txt(cgit_repo->owner);
-               }
-               html("<p>\n<h1>navigate</h1>\n");
-               reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,
-                           NULL, NULL);
-               cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL,
-                             0, NULL, NULL);
-               cgit_tree_link("tree", NULL, "menu", cgit_query_head,
-                              cgit_query_sha1, NULL);
-               cgit_commit_link("commit", NULL, "menu", cgit_query_head,
-                             cgit_query_sha1);
-               cgit_diff_link("diff", NULL, "menu", cgit_query_head,
-                              cgit_query_sha1, cgit_query_sha2, NULL);
-
-               for_each_ref(print_archive_ref, &header);
-
-               html("<p>\n<h1>branch</h1>\n");
+       return (strcmp(cmd->name, page) ? NULL : "active");
+}
+
+void cgit_print_pageheader(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='");
+       if (ctx->cfg.logo_link)
+               html_attr(ctx->cfg.logo_link);
+       else
+               html_attr(cgit_rooturl());
+       html("'><img src='");
+       html_attr(ctx->cfg.logo);
+       html("'/></a></td>\n");
+       html("<td class='main'>");
+       if (ctx->repo) {
+               html("<a href='");
+               html_attr(cgit_rooturl());
+               html("'>index</a> / ");
+               html_txt(ctx->repo->name);
+       } else
+               html_txt(ctx->cfg.root_title);
+       html("</td></tr>\n");
+       html("<tr><td class='sub'>");
+       if (ctx->repo)
+               html_txt(ctx->repo->desc);
+       else
+               html_txt(ctx->cfg.index_info);
+       html("</td></tr>\n");
+       html("</table>\n");
+
+       html("<table class='tabs'><tr><td>\n");
+       if (ctx->repo) {
+               reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
+                           ctx->qry.head, NULL, NULL);
+               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);
+               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_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
+                               ctx->qry.sha1);
+               html("</td><td class='branch'>");
                html("<form method='get' action=''>\n");
                html("<form method='get' action=''>\n");
-               add_hidden_formfields(0, 1, cgit_query_page);
-               html("<table class='grid'><tr><td id='branch-dropdown-cell'>");
+               add_hidden_formfields(0, 1, ctx->qry.page);
                html("<select name='h' onchange='this.form.submit();'>\n");
                html("<select name='h' onchange='this.form.submit();'>\n");
-               for_each_branch_ref(print_branch_option, cgit_query_head);
-               html("</select>\n");
-               html("</td><td>");
-               html("<noscript><input type='submit' id='switch-btn' value='..'></noscript>\n");
-               html("</td></tr></table>");
-               html("</form>\n");
-
-               html("<p>\n<h1>search</h1>\n");
-               html("<form method='get' action='");
-               if (cgit_virtual_root)
-                       html_attr(cgit_fileurl(cgit_query_repo, "log",
-                                              cgit_query_path, NULL));
-               html("'>\n");
-               add_hidden_formfields(1, 0, "log");
-               html("<select name='qt'>\n");
-               html_option("grep", "log msg", cgit_query_grep);
-               html_option("author", "author", cgit_query_grep);
-               html_option("committer", "committer", cgit_query_grep);
-               html("</select>\n");
-               html("<input class='txt' type='text' name='q' value='");
-               html_attr(cgit_query_search);
-               html("'/>\n");
-               html("</form>\n");
+               for_each_branch_ref(print_branch_option, ctx->qry.head);
+               html("</select> ");
+               html("<input type='submit' name='' value='switch'/>");
        } else {
        } else {
-               if (!cgit_index_info || html_include(cgit_index_info))
-                       html(default_info);
+               html("<a class='active' href='");
+               html_attr(cgit_rooturl());
+               html("'>index</a>\n");
        }
        }
-
-       html("</div>\n");
-
-       html("</div>\n<table class='grid'><tr><td id='content'>\n");
+       html("</td></tr></table>\n");
+       html("<div class='content'>");
 }
 
 }
 
-
-void cgit_print_snapshot_start(const char *mimetype, const char *filename,
-                              struct cacheitem *item)
+void cgit_print_filemode(unsigned short mode)
 {
 {
-       htmlf("Content-Type: %s\n", mimetype);
-       htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
-       htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
-       htmlf("Expires: %s\n", http_date(item->st.st_mtime +
-                                        ttl_seconds(item->ttl)));
-       html("\n");
+       if (S_ISDIR(mode))
+               html("d");
+       else if (S_ISLNK(mode))
+               html("l");
+       else if (S_ISGITLINK(mode))
+               html("m");
+       else
+               html("-");
+       html_fileperm(mode >> 6);
+       html_fileperm(mode >> 3);
+       html_fileperm(mode);
 }
 
 }
 
-/* vim:set sw=8: */
+void cgit_print_snapshot_links(const char *repo, const char *head,
+                              const char *hex, int snapshots)
+{
+       const struct cgit_snapshot_format* f;
+       char *filename;
+
+       for (f = cgit_snapshot_formats; f->suffix; f++) {
+               if (!(snapshots & f->bit))
+                       continue;
+               filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
+                              f->suffix);
+               cgit_snapshot_link(filename, NULL, NULL, (char *)head,
+                                  (char *)hex, filename);
+               html("<br/>");
+       }
+}
Unnamed repository; edit this file 'description' to name the repository.