Merge branch 'ml/head-include'

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index cc918adbb39faad1dbfdc98bc2ab387688272cde..ede4a629765e4d58314d6c78e408159ef3dfddab 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -7,49 +7,70 @@
  */
 
 #include "cgit.h"
  */
 
 #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)
+int urls = 0;
+
+static void print_url(char *base, char *suffix)
+{
+       if (!base || !*base)
+               return;
+       if (urls++ == 0) {
+               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+               html("<tr><th class='left' colspan='4'>Clone</th></tr>\n");
+       }
+       if (suffix && *suffix)
+               base = fmt("%s/%s", base, suffix);
+       html("<tr><td colspan='4'><a href='");
+       html_url_path(base);
+       html("'>");
+       html_txt(base);
+       html("</a></td></tr>\n");
+}
+
+static void print_urls(char *txt, char *suffix)

 {
 {

-       struct commit *commit;
-       char buf[256], *url;
+       char *h = txt, *t, c;

 
 

-       commit = lookup_commit(sha1);
-       if (commit && !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>");
-               pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf,
-                                   sizeof(buf), 0, NULL, NULL, 0);
-               html_txt(buf);
-               html("</td></tr>\n");
-       } else {
-               html("<tr><td>");
-               html_txt(buf);
-               html("</td><td>");
-               htmlf("*** bad ref %s", sha1_to_hex(sha1));
-               html("</td></tr>\n");
+       while (h && *h) {
+               while (h && *h == ' ')
+                       h++;
+               t = h;
+               while (t && *t && *t != ' ')
+                       t++;
+               c = *t;
+               *t = 0;
+               print_url(h, suffix);
+               *t = c;
+               h = t;

        }
        }

-       return 0;

 }
 
 }
 

-static void cgit_print_branches()
+void cgit_print_summary()

 {
 {

-       html("<table class='list'>");
-       html("<tr><th>Branch name</th><th>Head commit</th></tr>\n");
-       for_each_branch_ref(cgit_print_branch_cb, NULL);
+       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);
+       }
+       if (ctx.repo->clone_url)
+               print_urls(ctx.repo->clone_url, NULL);
+       else if (ctx.cfg.clone_prefix)
+               print_urls(ctx.cfg.clone_prefix, ctx.repo->url);

        html("</table>");
 }
 
        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>");
+       }

 }
 }