Merge branch 'index-header'

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 1fe70590452dc997d6c60fe7a62fcb374cc12156..8e367a2e34e386944bf9b2915c68945f1f886acb 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -10,51 +10,49 @@
 
 void cgit_print_repolist(struct cacheitem *item)
 {
 
 void cgit_print_repolist(struct cacheitem *item)
 {

-       DIR *d;
-       struct dirent *de;
-       struct stat st;
-       char *name;
+       struct repoinfo *repo;
+       int i;

 
 

-       chdir(cgit_root);

        cgit_print_docstart(cgit_root_title, item);
        cgit_print_docstart(cgit_root_title, item);

-       cgit_print_pageheader(cgit_root_title);
+       cgit_print_pageheader(cgit_root_title, 0);

 
 

-       if (!(d = opendir("."))) {
-               cgit_print_error(fmt("Unable to scan repository directory: %s",
-                                    strerror(errno)));
-               cgit_print_docend();
-               return;
+       html("<table class='list nowrap'>");
+       if (cgit_index_header) {
+               html("<tr class='nohover'><td colspan='4' class='include-block'>");
+               html_include(cgit_index_header);
+               html("</td></tr>");

        }
        }

-
-       html("<h2>Repositories</h2>\n");
-       html("<table class='list'>");
-       html("<tr><th>Name</th><th>Description</th><th>Owner</th></tr>\n");
-       while ((de = readdir(d)) != NULL) {
-               if (de->d_name[0] == '.')
-                       continue;
-               if (stat(de->d_name, &st) < 0)
-                       continue;
-               if (!S_ISDIR(st.st_mode))
-                       continue;
-
-               cgit_repo_name = cgit_repo_desc = cgit_repo_owner = NULL;
-               name = fmt("%s/info/cgit", de->d_name);
-               if (cgit_read_config(name, cgit_repo_config_cb))
-                       continue;
-
+       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");
+
+       for (i=0; i<cgit_repolist.count; i++) {
+               repo = &cgit_repolist.repos[i];

                html("<tr><td>");
                html("<tr><td>");

-               html_link_open(cgit_repourl(de->d_name), NULL, NULL);
-               html_txt(cgit_repo_name);
+               html_link_open(cgit_repourl(repo->url), NULL, NULL);
+               html_txt(repo->name);

                html_link_close();
                html("</td><td>");
                html_link_close();
                html("</td><td>");

-               html_txt(cgit_repo_desc);
+               html_ntxt(cgit_max_repodesc_len, repo->desc);

                html("</td><td>");
                html("</td><td>");

-               html_txt(cgit_repo_owner);
+               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> ");
+               html_link_open(cgit_pageurl(repo->name, "log", NULL),
+                              "Log: show history of the main branch", NULL);
+               html("L</a> ");
+               html_link_open(cgit_pageurl(repo->name, "tree", NULL),
+                              "Tree: browse the files in the main branch", NULL);
+               html("T</a>");

                html("</td></tr>\n");
        }
                html("</td></tr>\n");
        }

-       closedir(d);

        html("</table>");
        cgit_print_docend();
 }
        html("</table>");
        cgit_print_docend();
 }

-
-