cgit.css: set form margins

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 2679b59d7e5eabdf59cae0d9219b5cb2370c0832..dd36cc013244abb58a4516d7a929c659af39b41a 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -7,6 +7,9 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "html.h"
+#include "ui-shared.h"
+#include "ui-diff.h"

 
 static int files, slots;
 static int total_adds, total_rems, max_changes;
 
 static int files, slots;
 static int total_adds, total_rems, max_changes;


@@ -62,21 +65,21 @@ void print_fileinfo(struct fileinfo *info)
        html("<tr>");
        htmlf("<td class='mode'>");
        if (is_null_sha1(info->new_sha1)) {
        html("<tr>");
        htmlf("<td class='mode'>");
        if (is_null_sha1(info->new_sha1)) {

-               html_filemode(info->old_mode);
+               cgit_print_filemode(info->old_mode);

        } else {
        } else {

-               html_filemode(info->new_mode);
+               cgit_print_filemode(info->new_mode);

        }
 
        if (info->old_mode != info->new_mode &&
            !is_null_sha1(info->old_sha1) &&
            !is_null_sha1(info->new_sha1)) {
                html("<span class='modechange'>[");
        }
 
        if (info->old_mode != info->new_mode &&
            !is_null_sha1(info->old_sha1) &&
            !is_null_sha1(info->new_sha1)) {
                html("<span class='modechange'>[");

-               html_filemode(info->old_mode);
+               cgit_print_filemode(info->old_mode);

                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);
                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);

-       cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
-                      info->new_path);
+       cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev,
+                      NULL, info->new_path);

        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
                htmlf(" (%s from %s)",
                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
                htmlf(" (%s from %s)",
                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",


@@ -84,7 +87,7 @@ void print_fileinfo(struct fileinfo *info)
        html("</td><td class='right'>");
        htmlf("%d", info->added + info->removed);
        html("</td><td class='graph'>");
        html("</td><td class='right'>");
        htmlf("%d", info->added + info->removed);
        html("</td><td class='graph'>");

-       htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
+       htmlf("<table summary='file diffstat' 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%%;'/>",
        htmlf("<td class='add' style='width: %.1f%%;'/>",
              info->added * 100.0 / max_changes);
        htmlf("<td class='rem' style='width: %.1f%%;'/>",


@@ -139,12 +142,11 @@ void cgit_print_commit(char *hex)
        struct commitinfo *info;
        struct commit_list *p;
        unsigned char sha1[20];
        struct commitinfo *info;
        struct commit_list *p;
        unsigned char sha1[20];

-       char *filename;

        char *tmp;
        int i;
 
        if (!hex)
        char *tmp;
        int i;
 
        if (!hex)

-               hex = cgit_query_head;
+               hex = ctx.qry.head;

        curr_rev = hex;
 
        if (get_sha1(hex, sha1)) {
        curr_rev = hex;
 
        if (get_sha1(hex, sha1)) {


@@ -158,7 +160,7 @@ void cgit_print_commit(char *hex)
        }
        info = cgit_parse_commit(commit);
 
        }
        info = cgit_parse_commit(commit);
 

-       html("<table class='commit-info'>\n");
+       html("<table summary='commit info' class='commit-info'>\n");

        html("<tr><th>author</th><td>");
        html_txt(info->author);
        html(" ");
        html("<tr><th>author</th><td>");
        html_txt(info->author);
        html(" ");


@@ -173,10 +175,16 @@ void cgit_print_commit(char *hex)
        html("</td><td class='right'>");
        cgit_print_date(info->committer_date, FMT_LONGDATE);
        html("</td></tr>\n");
        html("</td><td class='right'>");
        cgit_print_date(info->committer_date, FMT_LONGDATE);
        html("</td></tr>\n");

+       html("<tr><th>commit</th><td colspan='2' class='sha1'>");
+       tmp = sha1_to_hex(commit->object.sha1);
+       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp);
+       html(" (");
+       cgit_patch_link("patch", NULL, NULL, NULL, tmp);
+       html(")</td></tr>\n");

        html("<tr><th>tree</th><td colspan='2' class='sha1'>");
        tmp = xstrdup(hex);
        cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
        html("<tr><th>tree</th><td colspan='2' class='sha1'>");
        tmp = xstrdup(hex);
        cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,

-                      cgit_query_head, tmp, NULL);
+                      ctx.qry.head, tmp, NULL);

        html("</td></tr>\n");
        for (p = commit->parents; p ; p = p->next) {
                parent = lookup_commit_reference(p->item->object.sha1);
        html("</td></tr>\n");
        for (p = commit->parents; p ; p = p->next) {
                parent = lookup_commit_reference(p->item->object.sha1);


@@ -189,18 +197,17 @@ void cgit_print_commit(char *hex)
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>");
                cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>");
                cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,

-                                cgit_query_head, sha1_to_hex(p->item->object.sha1));
+                                ctx.qry.head, sha1_to_hex(p->item->object.sha1));

                html(" (");
                html(" (");

-               cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex,
+               cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,

                               sha1_to_hex(p->item->object.sha1), NULL);
                html(")</td></tr>");
        }
                               sha1_to_hex(p->item->object.sha1), NULL);
                html(")</td></tr>");
        }

-       if (cgit_repo->snapshots) {
-               htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
-               filename = fmt("%s-%s.zip", cgit_query_repo, hex);
-               html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
-                                      fmt("id=%s&amp;name=%s", hex, filename)));
-               htmlf("'>%s</a></td></tr>", filename);
+       if (ctx.repo->snapshots) {
+               html("<tr><th>download</th><td colspan='2' class='sha1'>");
+               cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
+                                         hex, ctx.repo->snapshots);
+               html("</td></tr>");

        }
        html("</table>\n");
        html("<div class='commit-subject'>");
        }
        html("</table>\n");
        html("<div class='commit-subject'>");


@@ -211,17 +218,18 @@ void cgit_print_commit(char *hex)
        html("</div>");
        if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
                html("<div class='diffstat-header'>Diffstat</div>");
        html("</div>");
        if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
                html("<div class='diffstat-header'>Diffstat</div>");

-               html("<table class='diffstat'>");
+               html("<table summary='diffstat' class='diffstat'>");

                max_changes = 0;
                cgit_diff_commit(commit, inspect_filepair);
                for(i = 0; i<files; i++)
                        print_fileinfo(&items[i]);
                html("</table>");
                html("<div class='diffstat-summary'>");
                max_changes = 0;
                cgit_diff_commit(commit, inspect_filepair);
                for(i = 0; i<files; i++)
                        print_fileinfo(&items[i]);
                html("</table>");
                html("<div class='diffstat-summary'>");

-               htmlf("%d files changed, %d insertions, %d deletions (",
+               htmlf("%d files changed, %d insertions, %d deletions",

                      files, total_adds, total_rems);
                      files, total_adds, total_rems);

-               cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex,
-                              NULL, NULL);
+               cgit_print_diff(ctx.qry.sha1,
+                               sha1_to_hex(commit->parents->item->object.sha1),
+                               NULL);

                html(")</div>");
        }
        cgit_free_commitinfo(info);
                html(")</div>");
        }
        cgit_free_commitinfo(info);