Merge branch 'lh/plain'

* lh/plain:
  Supply status description to html_status()
  ui-tree: link to plain view instead of blob view
  Implement plain view

1 files changed, 4 insertions, 4 deletions

diff --git a/ui-tree.c b/ui-tree.c
index 9a837e2..79332fc 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -26,28 +26,28 @@ static void print_object(const unsigned char *sha1, char *path)
                 cgit_print_error(fmt("Bad object name: %s",
                                      sha1_to_hex(sha1)));
                 return;
         }
 
         buf = read_sha1_file(sha1, &type, &size);
         if (!buf) {
                 cgit_print_error(fmt("Error reading object %s",
                                      sha1_to_hex(sha1)));
                 return;
         }
 
-        html(" blob: <a href='");
-        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(" (");
+        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
+                        curr_rev, path);
+        htmlf(")<br/>blob: %s", sha1_to_hex(sha1));
 
         html("<table summary='blob content' class='blob'>\n");
         idx = 0;
         start = 0;
         lineno = 0;
         while(idx < size) {
                 if (buf[idx] == '\n') {
                         buf[idx] = '\0';
                         htmlf(linefmt, ++lineno);
                         html_txt(buf + start);
                         html("</td></tr>\n");
                         start = idx + 1;