From 48f7b982d3bb52f1307df73ceb6dd4cab3fdcc80 Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Thu, 10 Jun 2010 01:09:30 +0200 Subject: 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 Signed-off-by: Lars Hjemli --- ui-tree.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'ui-tree.c') diff --git a/ui-tree.c b/ui-tree.c index 0ee38f2..75ec9cb 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -102,10 +102,10 @@ static void print_object(const unsigned char *sha1, char *path, const char *base return; } - html(" ("); + htmlf("blob: %s (", sha1_to_hex(sha1)); cgit_plain_link("plain", NULL, NULL, ctx.qry.head, curr_rev, path); - htmlf(")
blob: %s\n", sha1_to_hex(sha1)); + html(")\n"); if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) { htmlf("
blob size (%dKB) exceeds display size limit (%dKB).
", @@ -225,17 +225,10 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, { 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; @@ -278,10 +271,6 @@ void cgit_print_tree(const char *rev, char *path) return; } - html("path: root"); - if (path == NULL) { ls_tree(commit->tree->object.sha1, NULL); return; -- cgit v1.2.3-24-g4f1b