2 files changed, 14 insertions, 0 deletions
diff --git a/cgit.css b/cgit.css
index 0cb894a..563f8e1 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,296 +1,304 @@
 body, table, form {
        padding: 0em;
        margin: 0em;
 }
 body {
        font-family: sans-serif;
        font-size: 10pt;
        color: #333;
        background: white;
        padding: 4px;
 }
 a {
        color: blue;
        text-decoration: none;
 }
 a:hover {
        text-decoration: underline;
 }
 table {
      border-collapse: collapse;
 }
 table#header {
        width: 100%;
        margin-bottom: 1em;
 }
 table#header td.logo {
        width: 96px;
 }
 table#header td.main {
        font-size: 250%;
        padding-left: 10px;
        white-space: nowrap;
 }
 table#header td.main a {
        color: #000;
 }
 table#header td.form {
        text-align: right;
        vertical-align: bottom;
        padding-right: 1em;
        padding-bottom: 2px;
        white-space: nowrap;
 }
 table#header td.form form,
 table#header td.form input,
 table#header td.form select {
        font-size: 90%;
 }
 table#header td.sub {
        color: #777;
        border-top: solid 1px #ccc;
        padding-left: 10px;
 }
 table.tabs {
        /* border-bottom: solid 2px #ccc; */
        border-collapse: collapse;
        margin-top: 2em;
        margin-bottom: 0px;
        width: 100%;
 }
 table.tabs td {
        padding: 0px 1em;
        vertical-align: bottom;
 }
 table.tabs td a {
        padding: 2px 0.75em;
        color: #777;
        font-size: 110%;
 }
 table.tabs td a.active {
        color: #000;
        background-color: #ccc;
 }
 table.tabs td.form {
        text-align: right;
 }
 table.tabs td.form form {
        padding-bottom: 2px;
        font-size: 90%;
        white-space: nowrap;
 }
 table.tabs td.form input,
 table.tabs td.form select {
        font-size: 90%;
 }
+div.path {
+        margin: 0px;
+        padding: 5px 2em 2px 2em;
+        color: #000;
+        background-color: #ccc;
+        font-weight: bold;
+}
 div.content {
        margin: 0px;
        padding: 2em;
        border-top: solid 3px #ccc;
        border-bottom: solid 3px #ccc;
 }
 table.list {
        width: 100%;
        border: none;
        border-collapse: collapse;
 }
 table.list tr {
        background: white;
 }
 table.list tr.logheader {
        background: #eee;
 }
 table.list tr:hover {
        background: #eee;
 }
 table.list tr.nohover:hover {
        background: white;
 }
 table.list th {
        font-weight: bold;
        /* color: #888;
        border-top: dashed 1px #888;
        border-bottom: dashed 1px #888;
        */
        padding: 0.1em 0.5em 0.05em 0.5em;
        vertical-align: baseline;
 }
 table.list td {
        border: none;
        padding: 0.1em 0.5em 0.1em 0.5em;
 }
 table.list td.logsubject {
        font-family: monospace;
        font-weight: bold;
 }
 table.list td.logmsg {
        font-family: monospace;
        white-space: pre;
        padding: 1em 0.5em 2em 0.5em;
 }
 table.list td a {
        color: black;
 }
 table.list td a.ls-dir {
        font-weight: bold;
        color: #00f;
 }
 table.list td a:hover {
        color: #00f;
 }
 img {
        border: none;
 }
 input#switch-btn {
        margin: 2px 0px 0px 0px;
 }
 td#sidebar input.txt {
        width: 100%;
        margin: 2px 0px 0px 0px;
 }
 table#grid {
        margin: 0px;
 }
 td#content {
        vertical-align: top;
        padding: 1em 2em 1em 1em;
        border: none;
 }
 div#summary {
        vertical-align: top;
        margin-bottom: 1em;
 }
 table#downloads {
        float: right;
        border-collapse: collapse;
        border: solid 1px #777;
        margin-left: 0.5em;
        margin-bottom: 0.5em;
 }
 table#downloads th {
        background-color: #ccc;
 }
 div#blob {
        border: solid 1px black;
 }
 div.error {
        color: red;
        font-weight: bold;
        margin: 1em 2em;
 }
 a.ls-blob, a.ls-dir, a.ls-mod {
        font-family: monospace;
 }
 td.ls-size {
        text-align: right;
        font-family: monospace;
        width: 10em;
 }
 td.ls-mode {
        font-family: monospace;
        width: 10em;
 }
 table.blob {
        margin-top: 0.5em;
        border-top: solid 1px black;
 }
 table.blob td.lines {
        margin: 0; padding: 0 0 0 0.5em;
        vertical-align: top;
        color: black;
 }
 table.blob td.linenumbers {
        margin: 0; padding: 0 0.5em 0 0.5em;
        vertical-align: top;
        text-align: right;
        border-right: 1px solid gray;
 }
 table.blob pre {
        padding: 0; margin: 0;
 }
 table.blob a.no {
        color: gray;
        text-align: right;
        text-decoration: none;
 }
 table.blob a.no a:hover {
        color: black;
 }
 table.bin-blob {
        margin-top: 0.5em;
        border: solid 1px black;
 }
 table.bin-blob th {
        font-family: monospace;
        white-space: pre;
        border: solid 1px #777;
        padding: 0.5em 1em;
 }
 table.bin-blob td {
        font-family: monospace;
        white-space: pre;
        border-left: solid 1px #777;
        padding: 0em 1em;
 }
 table.nowrap td {
        white-space: nowrap;
 }
 table.commit-info {
        border-collapse: collapse;
        margin-top: 1.5em;
diff --git a/ui-shared.c b/ui-shared.c
index 3d5030b..bc14e70 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -568,230 +568,236 @@ void cgit_print_docend()
 }
 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 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);
                cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_commit_link("commit", NULL, hc(ctx, "commit"),
                                 ctx->qry.head, ctx->qry.sha1, 0);
                cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
                               ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
                if (ctx->repo->max_stats)
                        cgit_stats_link("stats", NULL, hc(ctx, "stats"),
                                        ctx->qry.head, NULL);
                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: ");
+                html_txt(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/>");
        }
 }