Merge branch 'master' of git://git.klever.net/patchwork/cgit

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index de95053a6a1d415b4245926c22e06e60a634bfc5..ad0b4a7b251a448201b6d509e6949fe68c1647c8 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -7,61 +7,29 @@
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-log.h"
+#include "ui-refs.h"
 
-static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
-                               int flags, void *cb_data)
+void cgit_print_summary()
 {
-       struct commit *commit;
-       struct commitinfo *info;
-       char buf[256], *url;
-
-       commit = lookup_commit(sha1);
-       if (commit && !parse_commit(commit)){
-               info = cgit_parse_commit(commit);
-               html("<tr><td>");
-               url = cgit_pageurl(cgit_query_repo, "log", 
-                                  fmt("h=%s", refname));
-               html_link_open(url, NULL, NULL);
-               strncpy(buf, refname, sizeof(buf));
-               html_txt(buf);
-               html_link_close();
-               html("</td><td>");
-               cgit_print_date(commit->date);
-               html("</td><td>");
-               url = cgit_pageurl(cgit_query_repo, "commit", 
-                                  fmt("id=%s", sha1_to_hex(sha1)));
-               html_link_open(url, NULL, NULL);
-               html_ntxt(80, info->subject);
-               html_link_close();
-               html("</td><td>");
-               html_txt(info->author);
-               html("</td></tr>\n");
-               cgit_free_commitinfo(info);
-       } else {
-               html("<tr><td>");
-               html_txt(buf);
-               html("</td><td>");
-               htmlf("*** bad ref %s", sha1_to_hex(sha1));
-               html("</td></tr>\n");
+       html("<table summary='repository info' class='list nowrap'>");
+       cgit_print_branches(ctx.cfg.summary_branches);
+       html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+       cgit_print_tags(ctx.cfg.summary_tags);
+       if (ctx.cfg.summary_log > 0) {
+               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+               cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
+                              NULL, NULL, 0);
        }
-       return 0;
-}
-
-static void cgit_print_branches()
-{
-       html("<table class='list nowrap'>");
-       html("<tr><th class='left'>Branch</th>"
-            "<th class='left'>Updated</th>"
-            "<th class='left'>Commit subject</th>"
-            "<th class='left'>Author</th></tr>\n");
-       for_each_branch_ref(cgit_print_branch_cb, NULL);
        html("</table>");
 }
 
-void cgit_print_summary()
+void cgit_print_repo_readme()
 {
-       html("<h2>");
-       html_txt("Repo summary page");
-       html("</h2>");
-       cgit_print_branches();
+       if (ctx.repo->readme) {
+               html("<div id='summary'>");
+               html_include(ctx.repo->readme);
+               html("</div>");
+       }
 }