ui-shared: Preserve path limit in "tab bar" links

When using the "tab bar" in the pageheader to navigate between pages, any path limit in effect on the current page is forgotten in the link to the target page, even if the target page can interpret and use the path limit constructively. Instead, preserve the current page's path limit in the "tab bar" links to other pages, where the path limit is useful to the target page. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
author: Johan Herland <johan@herland.net> 2010-06-09 23:09:36 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2010-06-19 08:40:24 (UTC)
commit: 7fdff2460440c09d13fc76af3b75e85434e6f563 (patch) (unidiff)
tree: 2285bf24286d5ec6046a13b18599e0e00e63111d
parent: 685872b770be2af643d00365d5358e46687f7385 (diff)
download: cgit-7fdff2460440c09d13fc76af3b75e85434e6f563.zip
cgit-7fdff2460440c09d13fc76af3b75e85434e6f563.tar.gz
cgit-7fdff2460440c09d13fc76af3b75e85434e6f563.tar.bz2
1 files changed, 6 insertions, 5 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 372b9e7..e991799 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -601,283 +601,284 @@ void cgit_print_docstart(struct cgit_context *ctx)
                html_include(ctx->cfg.head_include);
        html("</head>\n");
        html("<body>\n");
        if (ctx->cfg.header)
                html_include(ctx->cfg.header);
 }
 void cgit_print_docend()
 {
        html("</div> <!-- class=content -->\n");
        if (ctx.cfg.embedded) {
                html("</div> <!-- id=cgit -->\n");
                if (ctx.cfg.footer)
                        html_include(ctx.cfg.footer);
                return;
        }
        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("</div> <!-- id=cgit -->\n");
        html("</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 cgit_add_hidden_formfields(int incl_head, int incl_search,
                                const char *page)
 {
        char *url;
        if (!ctx.cfg.virtual_root) {
                url = fmt("%s/%s", ctx.qry.repo, page);
                if (ctx.qry.vpath)
                        url = fmt("%s/%s", url, ctx.qry.vpath);
                html_hidden("url", url);
        }
        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("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)
                        html_hidden("qt", ctx.qry.grep);
                if (ctx.qry.search)
                        html_hidden("q", ctx.qry.search);
        }
 }
 static const char *hc(struct cgit_context *ctx, const char *page)
 {
        return strcmp(ctx->qry.page, page) ? NULL : "active";
 }
 static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
 {
        char *old_path = ctx->qry.path;
        char *p = path, *q, *end = path + strlen(path);
        ctx->qry.path = NULL;
        cgit_self_link("root", NULL, NULL, ctx);
        ctx->qry.path = p = path;
        while (p < end) {
                if (!(q = strchr(p, '/')))
                        q = end;
                *q = '\0';
                html_txt("/");
                cgit_self_link(p, NULL, NULL, ctx);
                if (q < end)
                        *q = '/';
                p = q + 1;
        }
        ctx->qry.path = old_path;
 }
 static void print_header(struct cgit_context *ctx)
 {
        html("<table id='header'>\n");
        html("<tr>\n");
        if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
                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) {
                cgit_index_link("index", NULL, NULL, NULL, 0);
                html(" : ");
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                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("<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_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);
        }
        html("</td></tr></table>\n");
 }
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
        html("<div id='cgit'>");
        if (!ctx->cfg.noheader)
                print_header(ctx);
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
                cgit_summary_link("summary", NULL, hc(ctx, "summary"),
                                  ctx->qry.head);
                cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
-                              NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
+                              NULL, ctx->qry.vpath, 0, NULL, NULL,
+                              ctx->qry.showmsg);
                cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
-                               ctx->qry.sha1, NULL);
+                               ctx->qry.sha1, ctx->qry.vpath);
                cgit_commit_link("commit", NULL, hc(ctx, "commit"),
-                                 ctx->qry.head, ctx->qry.sha1, NULL, 0);
+                                 ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0);
                cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
-                               ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
+                               ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0);
                if (ctx->repo->max_stats)
                        cgit_stats_link("stats", NULL, hc(ctx, "stats"),
-                                        ctx->qry.head, NULL);
+                                        ctx->qry.head, ctx->qry.vpath);
                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,
                                    hc(ctx, "about"), ctx->qry.head, NULL,
                                    NULL);
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
                if (ctx->cfg.virtual_root)
                        html_url_path(cgit_fileurl(ctx->qry.repo, "log",
                                                   ctx->qry.vpath, NULL));
                html("'>\n");
                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_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 {
                site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
                if (ctx->cfg.root_readme)
                        site_link("about", "about", NULL, hc(ctx, "about"),
                                  NULL, 0);
                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");
        if (ctx->qry.vpath) {
                html("<div class='path'>");
                html("path: ");
                cgit_print_path_crumbs(ctx, ctx->qry.vpath);
                html("</div>");
        }
        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 *prefix;
            char *filename;
        unsigned char sha1[20];
        if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
            (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
                hex++;
        prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));
        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(snapshots & f->bit))
                        continue;
                filename = fmt("%s%s", prefix, f->suffix);
                cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                html("<br/>");
        }
 }
author	Johan Herland <johan@herland.net>	2010-06-09 23:09:36 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2010-06-19 08:40:24 (UTC)
commit	7fdff2460440c09d13fc76af3b75e85434e6f563 (patch) (unidiff)
tree	2285bf24286d5ec6046a13b18599e0e00e63111d
parent	685872b770be2af643d00365d5358e46687f7385 (diff)
download	cgit-7fdff2460440c09d13fc76af3b75e85434e6f563.zip cgit-7fdff2460440c09d13fc76af3b75e85434e6f563.tar.gz cgit-7fdff2460440c09d13fc76af3b75e85434e6f563.tar.bz2