Merge branch 'virtual-url'

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index b6a106fb0681a9e93638787f54443dff93dc17f8..ff1fad33c9c73f074e93d1984bff354ec1b6381e 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -29,7 +29,6 @@ void print_fileinfo(struct fileinfo *info)
 {
        char *query, *query2;
        char *class;
-       double width;
 
        switch (info->status) {
        case DIFF_STATUS_ADDED:
@@ -96,18 +95,15 @@ void print_fileinfo(struct fileinfo *info)
        }
        html("</td><td class='right'>");
        htmlf("%d", info->added + info->removed);
-
        html("</td><td class='graph'>");
-       width = (info->added + info->removed) * 100.0 / max_changes;
-       if (width < 0.1)
-               width = 0.1;
-       html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
-                      NULL, NULL);
-       htmlf("<img src='/cgit/add.png' style='width: %.1f%%;'/>",
-             info->added * width / (info->added + info->removed));
-       htmlf("<img src='/cgit/del.png' style='width: %.1f%%;'/>",
-             info->removed * width / (info->added + info->removed));
-       html("</a></td></tr>\n");
+       htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
+       htmlf("<td class='add' style='width: %.1f%%;'/>",
+             info->added * 100.0 / max_changes);
+       htmlf("<td class='rem' style='width: %.1f%%;'/>",
+             info->removed * 100.0 / max_changes);
+       htmlf("<td class='none' style='width: %.1f%%;'/>",
+             (max_changes - info->removed - info->added) * 100.0 / max_changes);
+       html("</tr></table></a></td></tr>\n");
 }
 
 void cgit_count_diff_lines(char *line, int len)
@@ -201,7 +197,7 @@ void cgit_print_commit(const char *hex)
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>"
                     "<a href='");
-               query = fmt("id=%s", sha1_to_hex(p->item->object.sha1));
+               query = fmt("h=%s", sha1_to_hex(p->item->object.sha1));
                html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
                htmlf("'>%s</a> (<a href='",
                      sha1_to_hex(p->item->object.sha1));
@@ -225,6 +221,7 @@ void cgit_print_commit(const char *hex)
        html_txt(info->msg);
        html("</div>");
        if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
+               html("<div class='diffstat-header'>Diffstat</div>");
                html("<table class='diffstat'>");
                max_changes = 0;
                cgit_diff_commit(commit, inspect_filepair);
@@ -232,8 +229,11 @@ void cgit_print_commit(const char *hex)
                        print_fileinfo(&items[i]);
                html("</table>");
                html("<div class='diffstat-summary'>");
-               htmlf("%d files changed, %d insertions, %d deletions\n",
+               htmlf("%d files changed, %d insertions, %d deletions (",
                      files, total_adds, total_rems);
+               query = fmt("h=%s", hex);
+               html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL);
+               html("show diff</a>)");
                html("</div>");
        }
        cgit_free_commitinfo(info);