]> git.cameronkatri.com Git - cgit.git/blobdiff - ui-shared.c
git.ckatri.com / cgit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Introduce html.h
[cgit.git] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c
index a03661ac987d72d799e8e5cdfb94a19ac8864f8b..2eff79d63bee6bd6f55dacc609879f61f59c603a 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.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"
@@ -42,16 +43,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);
        }
@@ -60,19 +61,21 @@ char *cgit_repourl(const char *reponame)
 char *cgit_fileurl(const char *reponame, const char *pagename,
                   const char *filename, const char *query)
 {
 char *cgit_fileurl(const char *reponame, const char *pagename,
                   const char *filename, const char *query)
 {
-       if (cgit_virtual_root) {
-               if (query)
-                       return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame,
-                                  pagename, filename?filename:"", query);
-               else
-                       return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
-                                  pagename);
+       char *tmp;
+       char *delim;
+
+       if (ctx.cfg.virtual_root) {
+               tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
+                         pagename, (filename ? filename:""));
+               delim = "?";
        } else {
        } else {
-               if (query)
-                       return fmt("?r=%s&amp;p=%s&amp;%s", reponame, pagename, query);
-               else
-                       return fmt("?r=%s&amp;p=%s", reponame, pagename);
+               tmp = fmt("?url=%s/%s/%s", reponame, pagename,
+                         (filename ? filename : ""));
+               delim = "&";
        }
        }
+       if (query)
+               tmp = fmt("%s%s%s", tmp, delim, query);
+       return tmp;
 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename,
 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename,
@@ -108,14 +111,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,
@@ -135,12 +138,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);
@@ -149,10 +152,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);
@@ -162,7 +165,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);
@@ -177,7 +180,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);
@@ -199,7 +202,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);
@@ -227,11 +230,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);
 }
@@ -254,7 +257,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);
@@ -270,13 +273,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";
@@ -289,7 +298,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),
@@ -302,6 +311,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);
@@ -311,6 +322,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,20 +363,22 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
 
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
-       html("Content-Type: text/html; charset=utf-8\n");
+       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)));
        html("\n");
        html(cgit_doctype);
        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");
        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_txt(title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        html("<head>\n");
        html("<title>");
        html_txt(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("<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");
@@ -371,14 +386,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;
 }
 
@@ -409,10 +424,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");
@@ -421,28 +436,30 @@ 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)
+void add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
 {
-       if (!cgit_virtual_root) {
-               if (cgit_query_repo)
-                       html_hidden("r", cgit_query_repo);
-               if (cgit_query_page)
-                       html_hidden("p", cgit_query_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(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);
        }
 }
 
        }
 }
 
@@ -450,67 +467,93 @@ void cgit_print_pageheader(char *title, int show_search)
 {
        static const char *default_info = "This is cgit, a fast webinterface for git repositories";
        int header = 0;
 {
        static const char *default_info = "This is cgit, a fast webinterface for git repositories";
        int header = 0;
+       char *url;
 
 
-       html("<div id='sidebar'>\n");
-       html("<a href='");
+       html("<table id='layout' summary=''>\n");
+       html("<tr><td id='sidebar'>\n");
+       html("<table class='sidebar' cellspacing='0' summary=''>\n");
+       html("<tr><td class='sidebar'>\n<a href='");
        html_attr(cgit_rooturl());
        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));
+       htmlf("'><img src='%s' alt='cgit'/></a>\n",
+             ctx.cfg.logo);
+       html("</td></tr>\n<tr><td class='sidebar'>\n");
+       if (ctx.repo) {
+               html("<h1 class='first'>");
+               html_txt(strrpart(ctx.repo->name, 20));
                html("</h1>\n");
                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_txt(ctx.repo->desc);
+               if (ctx.repo->owner) {
+                       html("<h1>owner</h1>\n");
+                       html_txt(ctx.repo->owner);
                }
                }
-               html("<p>\n<h1>navigate</h1>\n");
-               reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,
+               html("<h1>navigate</h1>\n");
+               reporevlink(NULL, "summary", NULL, "menu", ctx.qry.head,
                            NULL, NULL);
                            NULL, NULL);
-               cgit_log_link("log", NULL, "menu", cgit_query_head,
-                             cgit_query_sha1, cgit_query_path, 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,
-                              cgit_query_path);
+               cgit_log_link("log", NULL, "menu", ctx.qry.head, NULL, NULL,
+                             0, NULL, NULL);
+               cgit_tree_link("tree", NULL, "menu", ctx.qry.head,
+                              ctx.qry.sha1, NULL);
+               cgit_commit_link("commit", NULL, "menu", ctx.qry.head,
+                             ctx.qry.sha1);
+               cgit_diff_link("diff", NULL, "menu", ctx.qry.head,
+                              ctx.qry.sha1, ctx.qry.sha2, NULL);
+               cgit_patch_link("patch", NULL, "menu", ctx.qry.head,
+                               ctx.qry.sha1);
 
                for_each_ref(print_archive_ref, &header);
 
 
                for_each_ref(print_archive_ref, &header);
 
-               html("<p>\n<h1>branch</h1>\n");
+               if (ctx.repo->clone_url || ctx.cfg.clone_prefix) {
+                       html("<h1>clone</h1>\n");
+                       if (ctx.repo->clone_url)
+                               url = ctx.repo->clone_url;
+                       else
+                               url = fmt("%s%s", ctx.cfg.clone_prefix,
+                                         ctx.repo->url);
+                       html("<a class='menu' href='");
+                       html_attr(url);
+                       html("' title='");
+                       html_attr(url);
+                       html("'>\n");
+                       html_txt(strrpart(url, 20));
+                       html("</a>\n");
+               }
+
+               html("<h1>branch</h1>\n");
                html("<form method='get' action=''>\n");
                html("<form method='get' action=''>\n");
-               add_hidden_formfields(0, 1);
+               add_hidden_formfields(0, 1, ctx.qry.page);
+//             html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
                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);
+               for_each_branch_ref(print_branch_option, ctx.qry.head);
                html("</select>\n");
                html("</select>\n");
+//             html("</td><td>");
+               html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
+//             html("</td></tr></table>");
                html("</form>\n");
 
                html("</form>\n");
 
-               html("<p>\n<h1>search</h1>\n");
+               html("<h1>search</h1>\n");
                html("<form method='get' action='");
                html("<form method='get' action='");
-               html_attr(cgit_pageurl(cgit_query_repo, "log", NULL));
+               if (ctx.cfg.virtual_root)
+                       html_attr(cgit_fileurl(ctx.qry.repo, "log",
+                                              ctx.qry.path, NULL));
                html("'>\n");
                html("'>\n");
-               add_hidden_formfields(1, 0);
+               add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
                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_option("grep", "log msg", ctx.qry.grep);
+               html_option("author", "author", ctx.qry.grep);
+               html_option("committer", "committer", ctx.qry.grep);
                html("</select>\n");
                html("<input class='txt' type='text' name='q' value='");
                html("</select>\n");
                html("<input class='txt' type='text' name='q' value='");
-               html_attr(cgit_query_search);
+               html_attr(ctx.qry.search);
                html("'/>\n");
                html("</form>\n");
        } else {
                html("'/>\n");
                html("</form>\n");
        } else {
-               if (!cgit_index_info || html_include(cgit_index_info))
+               if (!ctx.cfg.index_info || html_include(ctx.cfg.index_info))
                        html(default_info);
        }
 
                        html(default_info);
        }
 
-       html("</div>\n");
+       html("</td></tr></table></td>\n");
 
 
-       html("</div>\n<table class='grid'><tr><td id='content'>\n");
+       html("<td id='content'>\n");
 }
 
 
 }
 
 
@@ -525,4 +568,19 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename,
        html("\n");
 }
 
        html("\n");
 }
 
+void cgit_print_filemode(unsigned short mode)
+{
+       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: */
 /* vim:set sw=8: */
A hyperfast web frontend for git repositories written in C.