Merge branch 'stable'

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 9a837e2a058c28f8b371a73d04e725ec9dab8951..9876c9972e9558f82632d03280997cc8db234fac 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -35,10 +35,10 @@ static void print_object(const unsigned char *sha1, char *path)
                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;
@@ -54,8 +54,10 @@ static void print_object(const unsigned char *sha1, char *path)
                }
                idx++;
        }
-       htmlf(linefmt, ++lineno);
-       html_txt(buf + start);
+       if (start < idx) {
+               htmlf(linefmt, ++lineno);
+               html_txt(buf + start);
+       }
        html("</td></tr>\n");
        html("</table>\n");
 }
@@ -106,7 +108,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 
        html("<td>");
        cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
-                     fullpath, 0, NULL, NULL);
+                     fullpath, 0, NULL, NULL, ctx.qry.showmsg);
        html("</td></tr>\n");
        free(name);
        return 0;