Reintroduce the branch switcher

[cgit.git] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index d6bcec3cfefd21e16e7d4e37737c13ec0949915f..2f052c71e13077ca2caed29a419401b39062ed6b 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -7,6 +7,8 @@
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
 
 char *curr_rev;
 char *match_path;
@@ -17,7 +19,7 @@ static void print_object(const unsigned char *sha1, char *path)
        enum object_type type;
        char *buf;
        unsigned long size, lineno, start, idx;
-       const char *linefmt = "<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>";
+       const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
@@ -34,10 +36,11 @@ static void print_object(const unsigned char *sha1, char *path)
        }
 
        html(" blob: <a href='");
-       html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
+       html_attr(cgit_pageurl(ctx.qry.repo, "blob",
+                              fmt("id=%s&path=%s", sha1_to_hex(sha1), path)));
        htmlf("'>%s</a>",sha1_to_hex(sha1));
 
-       html("<table class='blob'>\n");
+       html("<table summary='blob content' class='blob'>\n");
        idx = 0;
        start = 0;
        lineno = 0;
@@ -67,8 +70,8 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        unsigned long size = 0;
 
        name = xstrdup(pathname);
-       fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
-                      cgit_query_path ? "/" : "", name);
+       fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
+                      ctx.qry.path ? "/" : "", name);
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
@@ -79,28 +82,28 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        }
 
        html("<tr><td class='ls-mode'>");
-       html_filemode(mode);
+       cgit_print_filemode(mode);
        html("</td><td>");
        if (S_ISGITLINK(mode)) {
                htmlf("<a class='ls-mod' href='");
-               html_attr(fmt(cgit_repo->module_link,
+               html_attr(fmt(ctx.repo->module_link,
                              name,
                              sha1_to_hex(sha1)));
                html("'>");
                html_txt(name);
                html("</a>");
        } else if (S_ISDIR(mode)) {
-               cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
+               cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
                               curr_rev, fullpath);
        } else {
-               cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
+               cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,
                               curr_rev, fullpath);
        }
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");
-       cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
-                     fullpath, 0);
+       cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
+                     fullpath, 0, NULL, NULL);
        html("</td></tr>\n");
        free(name);
        return 0;
@@ -108,7 +111,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 
 static void ls_head()
 {
-       html("<table class='list'>\n");
+       html("<table summary='tree listing' class='list'>\n");
        html("<tr class='nohover'>");
        html("<th class='left'>Mode</th>");
        html("<th class='left'>Name</th>");
@@ -153,10 +156,10 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
        if (state == 0) {
                memcpy(buffer, base, baselen);
                strcpy(buffer+baselen, pathname);
-               url = cgit_pageurl(cgit_query_repo, "tree",
+               url = cgit_pageurl(ctx.qry.repo, "tree",
                                   fmt("h=%s&amp;path=%s", curr_rev, buffer));
                html("/");
-               cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head,
+               cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
                               curr_rev, buffer);
 
                if (strcmp(match_path, buffer))
@@ -188,7 +191,7 @@ void cgit_print_tree(const char *rev, char *path)
        const char *paths[] = {path, NULL};
 
        if (!rev)
-               rev = cgit_query_head;
+               rev = ctx.qry.head;
 
        curr_rev = xstrdup(rev);
        if (get_sha1(rev, sha1)) {
@@ -202,7 +205,7 @@ void cgit_print_tree(const char *rev, char *path)
        }
 
        html("path: <a href='");
-       html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("h=%s", rev)));
+       html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
        html("'>root</a>");
 
        if (path == NULL) {