Layout update

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 46814dd7c9b12192c650f6f180ff0227666d8b0b..42f4300c19afa98c187ad16e2e47ec9948b51f1a 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -12,32 +12,97 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                                int flags, void *cb_data)
 {
        struct commit *commit;
+       struct commitinfo *info;
        char buf[256], *url;
 
+       strncpy(buf, refname, sizeof(buf));
        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>");
-               pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf,
-                                   sizeof(buf), 0, NULL, NULL, 0);
-               html_txt(buf);
-               html("</td><td><a href='");
-               html_attr(cgit_pageurl(cgit_query_repo, "tree", 
-                                      fmt("id=%s", 
-                                          sha1_to_hex(commit->tree->object.sha1))));
-               html("'>tree</a>");
+               cgit_print_date(commit->date);
+               html("</td><td>");
+               html_txt(info->author);
+               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(cgit_max_msg_len, info->subject);
+               html_link_close();
                html("</td></tr>\n");
+               cgit_free_commitinfo(info);
        } else {
                html("<tr><td>");
                html_txt(buf);
+               html("</td><td colspan='3'>");
+               htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
+               html("</td></tr>\n");
+       }
+       return 0;
+}
+
+
+static void cgit_print_object_ref(struct object *obj)
+{
+       char *page, *url;
+
+       if (obj->type == OBJ_COMMIT)
+               page = "commit";
+       else if (obj->type == OBJ_TREE)
+               page = "tree";
+       else
+               page = "view";
+
+       url = cgit_pageurl(cgit_query_repo, page, 
+                          fmt("id=%s", sha1_to_hex(obj->sha1)));
+       html_link_open(url, NULL, NULL);
+       htmlf("%s %s", type_names[obj->type], 
+             sha1_to_hex(obj->sha1));
+       html_link_close();
+}
+
+static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
+                               int flags, void *cb_data)
+{
+       struct tag *tag;
+       struct taginfo *info;
+       struct object *obj;
+       char buf[256], *url;
+ 
+       strncpy(buf, refname, sizeof(buf));
+       obj = parse_object(sha1);
+       if (!obj)
+               return 1;
+       if (obj->type == OBJ_TAG) {
+               tag = lookup_tag(sha1);
+               if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
+                       return 2;
+               html("<tr><td>");
+               url = cgit_pageurl(cgit_query_repo, "view", 
+                                  fmt("id=%s", sha1_to_hex(sha1)));
+               html_link_open(url, NULL, NULL);
+               html_txt(buf);
+               html_link_close();
+               html("</td><td>");
+               if (info->tagger_date > 0)
+                       cgit_print_date(info->tagger_date);
                html("</td><td>");
-               htmlf("*** bad ref %s", sha1_to_hex(sha1));
+               if (info->tagger)
+                       html(info->tagger);
+               html("</td><td>");
+               cgit_print_object_ref(tag->tagged);
+               html("</td></tr>\n");
+       } else {
+               html("<tr><td>");
+               html_txt(buf);
+               html("</td><td colspan='2'/><td>");
+               cgit_print_object_ref(obj);
                html("</td></tr>\n");
        }
        return 0;
@@ -45,16 +110,32 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 
 static void cgit_print_branches()
 {
-       html("<table class='list'>");
-       html("<tr><th>Branch</th><th>Last commit</th><th>Link</th></tr>\n");
+       html("<tr class='nohover'><th class='left'>Branch</th>"
+            "<th class='left'>Updated</th>"
+            "<th class='left'>Author</th>"
+            "<th class='left'>Head commit</th></tr>\n");
        for_each_branch_ref(cgit_print_branch_cb, NULL);
-       html("</table>");
+}
+
+static void cgit_print_tags()
+{
+       html("<tr class='nohover'><th class='left'>Tag</th>"
+            "<th class='left'>Created</th>"
+            "<th class='left'>Author</th>"
+            "<th class='left'>Reference</th></tr>\n");
+       for_each_tag_ref(cgit_print_tag_cb, NULL);
 }
 
 void cgit_print_summary()
 {
        html("<h2>");
-       html_txt("Repo summary page");
-       html("</h2>");
+       html(cgit_repo->name);
+       html("</h2><h3>");
+       html(cgit_repo->desc);
+       html("</h3>");
+       html("<table class='list nowrap'>");
        cgit_print_branches();
+       html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+       cgit_print_tags();
+       html("</table>");
 }