Use html_filemode in ui-tree.c

No reason to show "100644" when we can show "-rw-r--r--"

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

2 files changed, 9 insertions, 6 deletions

diff --git a/cgit.css b/cgit.css
index ae304fa..5f01926 100644
--- a/cgit.css
+++ b/cgit.css
@@ -74,26 +74,26 @@ div#blob {
 
 div.error {
 	color: red;
 	font-weight: bold;
 	margin: 1em 2em;
 }
 div.ls-dir a {
 	font-weight: bold;
 }
 th.filesize, td.filesize {
 	text-align: right;
 }
-th.filemode, td.filemode {
-	text-align: center;
+td.filemode {
+	font-family: monospace;
 }
 
 td.blob {
 	white-space: pre;
 	font-family: courier;
 	font-size: 100%;
 	background-color: white;
 }
 
 table.log td {
 	white-space: nowrap;
 }
diff --git a/ui-tree.c b/ui-tree.c
index c4d75ab..54dcdbe 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -14,57 +14,60 @@ static int print_entry(const unsigned char *sha1, const char *base,
 		       int stage)
 {
 	char *name;
 	char type[20];
 	unsigned long size;
 
 	if (sha1_object_info(sha1, type, &size)) {
 		cgit_print_error(fmt("Bad object name: %s", 
 				     sha1_to_hex(sha1)));
 		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))));
 	} else {
 		html("<div class='ls-blob'><a href='");
 		html_attr(cgit_pageurl(cgit_query_repo, "view",
 				      fmt("id=%s", sha1_to_hex(sha1))));
 	}
 	html("'>");
 	html_txt(name);
 	if (S_ISDIR(mode))
 		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)
 {
 	struct tree *tree;
 	unsigned char sha1[20];
 
 	if (get_sha1_hex(hex, sha1)) {
 		cgit_print_error(fmt("Invalid object id: %s", hex));
 		return;
 	}
 	tree = parse_tree_indirect(sha1);
 	if (!tree) {
 		cgit_print_error(fmt("Not a tree object: %s", hex));
 		return;
 	}
 
 	html("<h2>Tree content</h2>\n");
 	html("<table class='list'>\n");
-	html("<tr><th class='left'>Name</th>");
+	html("<tr>");
+	html("<th class='left'>Mode</th>");
+	html("<th class='left'>Name</th>");
 	html("<th class='right'>Size</th>");
-	html("<th class='right'>Mode</th></tr>\n");
+	html("</tr>\n");
 	read_tree_recursive(tree, "", 0, 1, NULL, print_entry);
 	html("</table>\n");
 }