ui-tree: html/css cleanup

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 57997739e37bd834ccab72bae14f4f4916ead53f..4bda4c2f73f8ed98195e5d0c427c6d85a3a9cb05 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -19,6 +19,9 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 
        strncpy(buf, refname, sizeof(buf));
        commit = lookup_commit(sha1);
+       // object is not really parsed at this point, because of some fallout
+       // from previous calls to git functions in cgit_print_log()
+       commit->object.parsed = 0;
        if (commit && !parse_commit(commit)){
                info = cgit_parse_commit(commit);
                html("<tr><td>");
@@ -153,18 +156,18 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
                hashcpy(fileid, sha1);
        }
        if (!header) {
-               html("<table>");
+               html("<table id='downloads'>");
                html("<tr><th>Downloads</th></tr>");
                header = 1;
        }
        html("<tr><td>");
        url = cgit_pageurl(cgit_query_repo, "blob",
-                          fmt("id=%s&path=%s", sha1_to_hex(fileid),
+                          fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
                               buf));
        html_link_open(url, NULL, NULL);
        html_txt(buf);
        html_link_close();
-       html("</td><tr>");
+       html("</td></tr>");
        return 0;
 }
 
@@ -193,16 +196,21 @@ static void cgit_print_archives()
 
 void cgit_print_summary()
 {
-       html("<table class='list nowrap'>");
-       html("<tr class='nohover'><td id='summary' colspan='3'>");
+       html("<div id='summary'>");
+       cgit_print_archives();
        html("<h2>");
        html_txt(cgit_repo->name);
        html(" - ");
        html_txt(cgit_repo->desc);
        html("</h2>");
-       html("</td><td id='archivelist'>");
-       cgit_print_archives();
-       html("</td></tr>");
+       if (cgit_repo->readme)
+               html_include(cgit_repo->readme);
+       html("</div>");
+       if (cgit_summary_log > 0)
+               cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0);
+       html("<table class='list nowrap'>");
+       if (cgit_summary_log > 0)
+               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
        cgit_print_branches();
        html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
        cgit_print_tags();