Extend repo summary with tag list

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 84930cb50df30988a7930f44cb8ea64edd31f851..ed9f05ea9cddf12df55228be316cd8d0b02510d7 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -23,15 +23,22 @@ static int print_entry(const unsigned char *sha1, const char *base,
                return 0;
        }
        name = xstrdup(pathname);
-       html("<tr><td>");
+       html("<tr><td class='filemode'>");
+       html_filemode(mode);
+       html("</td><td>");
        if (S_ISDIR(mode)) {
                html("<div class='ls-dir'><a href='");
                html_attr(cgit_pageurl(cgit_query_repo, "tree", 
-                                      fmt("id=%s", sha1_to_hex(sha1))));
+                                      fmt("id=%s&path=%s%s/", 
+                                          sha1_to_hex(sha1),
+                                          cgit_query_path ? cgit_query_path : "",
+                                          pathname)));
        } else {
                html("<div class='ls-blob'><a href='");
                html_attr(cgit_pageurl(cgit_query_repo, "view",
-                                     fmt("id=%s", sha1_to_hex(sha1))));
+                                     fmt("id=%s&path=%s%s", sha1_to_hex(sha1),
+                                         cgit_query_path ? cgit_query_path : "",
+                                         pathname)));
        }
        html("'>");
        html_txt(name);
@@ -39,13 +46,12 @@ static int print_entry(const unsigned char *sha1, const char *base,
                html("/");
        html("</a></div></td>");
        htmlf("<td class='filesize'>%li</td>", size);
-       htmlf("<td class='filemode'>%06o</td>", mode);
        html("</tr>\n");
        free(name);
        return 0;
 }
 
-void cgit_print_tree(const char *hex)
+void cgit_print_tree(const char *hex, char *path)
 {
        struct tree *tree;
        unsigned char sha1[20];
@@ -61,10 +67,13 @@ void cgit_print_tree(const char *hex)
        }
 
        html("<h2>Tree content</h2>\n");
+       html_txt(path);
        html("<table class='list'>\n");
-       html("<tr><th>Name</th>");
-       html("<th class='filesize'>Size</th>");
-       html("<th class='filemode'>Mode</th></tr>\n");
+       html("<tr>");
+       html("<th class='left'>Mode</th>");
+       html("<th class='left'>Name</th>");
+       html("<th class='right'>Size</th>");
+       html("</tr>\n");
        read_tree_recursive(tree, "", 0, 1, NULL, print_entry);
        html("</table>\n");
 }