author | Johan Herland <johan@herland.net> | 2010-06-09 23:09:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 08:40:23 (UTC) |
commit | 48f7b982d3bb52f1307df73ceb6dd4cab3fdcc80 (patch) (side-by-side diff) | |
tree | e1d275b72e7e3fe47eafd44dbae3b720c895da1f /ui-tree.c | |
parent | 24fd7e54c82294efa68ecae5dd9cb8a8986c04bf (diff) | |
download | cgit-48f7b982d3bb52f1307df73ceb6dd4cab3fdcc80.zip cgit-48f7b982d3bb52f1307df73ceb6dd4cab3fdcc80.tar.gz cgit-48f7b982d3bb52f1307df73ceb6dd4cab3fdcc80.tar.bz2 |
ui-tree: Remove unnecessary path breadcrumb navigation
The path breadcrumb navigation at the top of the 'tree' page has now been
duplicated in ui-shared, which leaves the ui-tree implementation unnecessary.
This patch removes the breadcrumb navigation from ui-tree, and moves the
"(plain)" link that followed the breadcrumb when displaying blobs to the
end of the next line, following the blob SHA1.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-tree.c | 15 |
1 files changed, 2 insertions, 13 deletions
@@ -101,12 +101,12 @@ static void print_object(const unsigned char *sha1, char *path, const char *base sha1_to_hex(sha1))); return; } - html(" ("); + htmlf("blob: %s (", sha1_to_hex(sha1)); cgit_plain_link("plain", NULL, NULL, ctx.qry.head, curr_rev, path); - htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); + html(")\n"); if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) { htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>", size / 1024, ctx.cfg.max_blob_size); @@ -224,19 +224,12 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, void *cbdata) { static int state; static char buffer[PATH_MAX]; - char *url; if (state == 0) { memcpy(buffer, base, baselen); strcpy(buffer+baselen, pathname); - url = cgit_pageurl(ctx.qry.repo, "tree", - fmt("h=%s&path=%s", curr_rev, buffer)); - html("/"); - cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head, - curr_rev, buffer); - if (strcmp(match_path, buffer)) return READ_TREE_RECURSIVE; if (S_ISDIR(mode)) { @@ -277,12 +270,8 @@ void cgit_print_tree(const char *rev, char *path) cgit_print_error(fmt("Invalid commit reference: %s", rev)); return; } - html("path: <a href='"); - html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev))); - html("'>root</a>"); - if (path == NULL) { ls_tree(commit->tree->object.sha1, NULL); return; } |