Merge branch 'lh/about'

* lh/about: Add 'about site' and 'about repo' pages Prepare for 'about site' page / add 'root-readme' option to cgitrc Make it possible for a single cmd to work both with and without a repo Re-enable 'index-info' and add support for 'root-desc' in cgitrc Move included header-file out of repolist table Prepare for 'about repo' page
author: Lars Hjemli <hjemli@gmail.com> 2008-04-28 23:13:08 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2008-04-28 23:13:08 (UTC)
commit: 905dbaef5aa33ea11d385b82de0188fee73dd655 (patch) (unidiff)
tree: 34712da2eef917be04b2acc5585612b65c1e49cc /ui-shared.c
parent: d188ed4f2905e6d10abd26c45572a0d48eb53969 (diff)
parent: 71adba1f1678914063fc109cf3805afde2c68f75 (diff)
download: cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.zip
cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.tar.gz
cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.tar.bz2
1 files changed, 54 insertions, 4 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 8a804c2..d08ede9 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,244 +1,287 @@
 /* ui-shared.c: common web output functions
 *
 * Copyright (C) 2006 Lars Hjemli
 *
 * Licensed under GNU General Public License v2
 *   (see COPYING for full license text)
 */
 #include "cgit.h"
 #include "cmd.h"
 #include "html.h"
 const char cgit_doctype[] =
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
 "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
 static char *http_date(time_t t)
 {
        static char day[][4] =
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
        struct tm *tm = gmtime(&t);
        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
                   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 void cgit_print_error(char *msg)
 {
        html("<div class='error'>");
        html_txt(msg);
        html("</div>\n");
 }
 char *cgit_rooturl()
 {
        if (ctx.cfg.virtual_root)
                return fmt("%s/", ctx.cfg.virtual_root);
        else
                return ctx.cfg.script_name;
 }
 char *cgit_repourl(const char *reponame)
 {
        if (ctx.cfg.virtual_root) {
                return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
        } else {
                return fmt("?r=%s", reponame);
        }
 }
 char *cgit_fileurl(const char *reponame, const char *pagename,
                   const char *filename, const char *query)
 {
        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 {
                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,
                   const char *query)
 {
        return cgit_fileurl(reponame,pagename,0,query);
 }
 const char *cgit_repobasename(const char *reponame)
 {
        /* I assume we don't need to store more than one repo basename */
        static char rvbuf[1024];
        int p;
        const char *rv;
        strncpy(rvbuf,reponame,sizeof(rvbuf));
        if(rvbuf[sizeof(rvbuf)-1])
                die("cgit_repobasename: truncated repository name '%s'", reponame);
        p = strlen(rvbuf)-1;
        /* strip trailing slashes */
        while(p && rvbuf[p]=='/') rvbuf[p--]=0;
        /* strip trailing .git */
        if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
                p -= 3; rvbuf[p--] = 0;
        }
        /* strip more trailing slashes if any */
        while( p && rvbuf[p]=='/') rvbuf[p--]=0;
        /* find last slash in the remaining string */
        rv = strrchr(rvbuf,'/');
        if(rv)
                return ++rv;
        return rvbuf;
 }
 char *cgit_currurl()
 {
        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
                return fmt("%s/", ctx.cfg.virtual_root);
 }
+static void site_url(char *page, char *search)
+{
+        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);
+        }
+}
+static void site_link(char *page, char *name, char *title, char *class,
+                       char *search)
+{
+        html("<a");
+        if (title) {
+                html(" title='");
+                html_attr(title);
+                html("'");
+        }
+        if (class) {
+                html(" class='");
+                html_attr(class);
+                html("'");
+        }
+        html(" href='");
+        site_url(page, search);
+        html("'>");
+        html_txt(name);
+        html("</a>");
+}
 static char *repolink(char *title, char *class, char *page, char *head,
                      char *path)
 {
        char *delim = "?";
        html("<a");
        if (title) {
                html(" title='");
                html_attr(title);
                html("'");
        }
        if (class) {
                html(" class='");
                html_attr(class);
                html("'");
        }
        html(" href='");
        if (ctx.cfg.virtual_root) {
                html_attr(ctx.cfg.virtual_root);
                if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                        html("/");
                html_attr(ctx.repo->url);
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                        html(page);
                        html("/");
                        if (path)
                                html_attr(path);
                }
        } else {
                html(ctx.cfg.script_name);
                html("?url=");
                html_attr(ctx.repo->url);
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                        html(page);
                        html("/");
                        if (path)
                                html_attr(path);
                }
                delim = "&amp;";
        }
        if (head && strcmp(head, ctx.repo->defbranch)) {
                html(delim);
                html("h=");
                html_attr(head);
                delim = "&amp;";
        }
        return fmt("%s", delim);
 }
 static void reporevlink(char *page, char *name, char *title, char *class,
                        char *head, char *rev, char *path)
 {
        char *delim;
        delim = repolink(title, class, page, head, path);
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_attr(rev);
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 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_log_link(char *name, char *title, char *class, char *head,
                   char *rev, char *path, int ofs, char *grep, char *pattern)
 {
        char *delim;
        delim = repolink(title, class, "log", head, path);
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_attr(rev);
                delim = "&";
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
                html_attr(grep);
                delim = "&";
                html(delim);
                html("q=");
                html_attr(pattern);
        }
        if (ofs > 0) {
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 void cgit_commit_link(char *name, char *title, char *class, char *head,
                      char *rev)
 {
        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);
 }
 void cgit_refs_link(char *name, char *title, char *class, char *head,
                    char *rev, char *path)
 {
        reporevlink("refs", name, title, class, head, rev, path);
 }
 void cgit_snapshot_link(char *name, char *title, char *class, char *head,
                        char *rev, char *archivename)
 {
        reporevlink("snapshot", name, title, class, head, rev, archivename);
@@ -385,212 +428,219 @@ void cgit_print_docstart(struct cgit_context *ctx)
        html("'/>\n");
        html("</head>\n");
        html("<body>\n");
 }
 void cgit_print_docend()
 {
        html("</div>\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;
        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)
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);
        if (incl_search) {
                if (ctx.qry.grep)
                        html_hidden("qt", ctx.qry.grep);
                if (ctx.qry.search)
                        html_hidden("q", ctx.qry.search);
        }
 }
 char *hc(struct cgit_cmd *cmd, const char *page)
 {
        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("' alt='cgit logo'/></a></td>\n");
        html("<td class='main'>");
        if (ctx->repo) {
                reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
                            ctx->qry.head, NULL, NULL);
                html(" : ");
                html_txt(ctx->qry.page);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                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("<input type='submit' name='' value='switch'/>");
                html("</form>");
        } else
                html_txt(ctx->cfg.root_title);
        html("</td></tr>\n");
        html("<tr><td class='sub'");
        if (ctx->repo) {
                html(" colspan='2'>");
                html_txt(ctx->repo->desc);
        } else {
                html(">");
-                html_txt("a fast webinterface for the git dscm");
+                if (ctx->cfg.root_desc)
+                        html_txt(ctx->cfg.root_desc);
+                else if (ctx->cfg.index_info)
+                        html_include(ctx->cfg.index_info);
        }
        html("</td></tr></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);
+                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_attr(cgit_fileurl(ctx->qry.repo, "log",
                                               ctx->qry.path, NULL));
                html("'>\n");
                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_option("committer", "committer", ctx->qry.grep);
                html("</select>\n");
                html("<input class='txt' type='text' size='10' name='q' value='");
                html_attr(ctx->qry.search);
                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {
-                html("<a class='active' href='");
+                site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL);
-                html_attr(cgit_rooturl());
+                if (ctx->cfg.root_readme)
-                html("'>index</a>\n");
+                        site_link("about", "about", NULL, hc(cmd, "about"), NULL);
                html("</td><td class='form'>");
                html("<form method='get' action='");
                html_attr(cgit_rooturl());
                html("'>\n");
                html("<input type='text' name='q' size='10' value='");
                html_attr(ctx->qry.search);
                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>");
        }
        html("</td></tr></table>\n");
        html("<div class='content'>");
 }
 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);
 }
 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/>");
        }
 }
author	Lars Hjemli <hjemli@gmail.com>	2008-04-28 23:13:08 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2008-04-28 23:13:08 (UTC)
commit	905dbaef5aa33ea11d385b82de0188fee73dd655 (patch) (unidiff)
tree	34712da2eef917be04b2acc5585612b65c1e49cc /ui-shared.c
parent	d188ed4f2905e6d10abd26c45572a0d48eb53969 (diff)
parent	71adba1f1678914063fc109cf3805afde2c68f75 (diff)
download	cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.zip cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.tar.gz cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.tar.bz2