ui-diff: close td/tr/table properly

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 872458983361fb5917b3b8b2aaea84aeb1ea5163..e5c6c207818669ddb034bb2012ab6e44c6616498 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -7,6 +7,40 @@
  */
 
 #include "cgit.h"
+#include <time.h>
+
+
+time_t read_agefile(char *path)
+{
+       FILE *f;
+       static char buf[64], buf2[64];
+
+       if (!(f = fopen(path, "r")))
+               return -1;
+       fgets(buf, sizeof(buf), f);
+       fclose(f);
+       if (parse_date(buf, buf2, sizeof(buf2)))
+               return strtoul(buf2, NULL, 10);
+       else
+               return 0;
+}
+
+static void print_modtime(struct repoinfo *repo)
+{
+       char *path;
+       struct stat s;
+
+       path = fmt("%s/%s", repo->path, cgit_agefile);
+       if (stat(path, &s) == 0) {
+               cgit_print_age(read_agefile(path), -1, NULL);
+               return;
+       }
+
+       path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
+       if (stat(path, &s) != 0)
+               return;
+       cgit_print_age(s.st_mtime, -1, NULL);
+}
 
 void cgit_print_repolist(struct cacheitem *item)
 {
@@ -18,11 +52,17 @@ void cgit_print_repolist(struct cacheitem *item)
        cgit_print_pageheader(cgit_root_title, 0);
 
        html("<table class='list nowrap'>");
+       if (cgit_index_header) {
+               html("<tr class='nohover'><td colspan='5' class='include-block'>");
+               html_include(cgit_index_header);
+               html("</td></tr>");
+       }
        html("<tr class='nohover'>"
             "<th class='left'>Name</th>"
             "<th class='left'>Description</th>"
             "<th class='left'>Owner</th>"
-            "<th class='left'>Links</th></tr>\n");
+            "<th class='left'>Idle</th>"
+            "<th>Links</th></tr>\n");
 
        for (i=0; i<cgit_repolist.count; i++) {
                repo = &cgit_repolist.repos[i];
@@ -35,8 +75,9 @@ void cgit_print_repolist(struct cacheitem *item)
                        html("</td></tr>");
                        last_group = repo->group;
                }
-               html("<tr><td>");
-               html_link_open(cgit_repourl(repo->url), NULL, NULL);
+               htmlf("<tr><td class='%s'>",
+                     repo->group ? "sublevel-repo" : "toplevel-repo");
+               html_link_open(cgit_repourl(repo->url), repo->desc, NULL);
                html_txt(repo->name);
                html_link_close();
                html("</td><td>");
@@ -44,18 +85,17 @@ void cgit_print_repolist(struct cacheitem *item)
                html("</td><td>");
                html_txt(repo->owner);
                html("</td><td>");
-               html_link_open(cgit_pageurl(repo->name, "commit", NULL),
-                              "Commit: display last commit", NULL);
-               html("C</a> ");
-               html_link_open(cgit_pageurl(repo->name, "diff", NULL),
-                              "Diff: see changes introduced by last commit", NULL);
-               html("D</a> ");
+               print_modtime(repo);
+               html("</td><td>");
+               html_link_open(cgit_repourl(repo->url),
+                              "Summary", "button");
+               html("S</a>");
                html_link_open(cgit_pageurl(repo->name, "log", NULL),
-                              "Log: show history of the main branch", NULL);
-               html("L</a> ");
+                              "Log", "button");
+               html("L</a>");
                html_link_open(cgit_pageurl(repo->name, "tree", NULL),
-                              "Tree: browse the files in the main branch", NULL);
-               html("T</a>");
+                              "Files", "button");
+               html("F</a>");
                html("</td></tr>\n");
        }
        html("</table>");