1 files changed, 30 insertions, 36 deletions

diff --git a/ui-repolist.c b/ui-repolist.c
index 4c86543..e5c6c20 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -44,19 +44,16 @@ static void print_modtime(struct repoinfo *repo)
 
 void cgit_print_repolist(struct cacheitem *item)
 {
-	int i, columns = 4;
+	struct repoinfo *repo;
+	int i;
 	char *last_group = NULL;
 
-	if (cgit_enable_index_links)
-		columns++;
-
 	cgit_print_docstart(cgit_root_title, item);
 	cgit_print_pageheader(cgit_root_title, 0);
 
 	html("<table class='list nowrap'>");
 	if (cgit_index_header) {
-		htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
-		      columns);
+		html("<tr class='nohover'><td colspan='5' class='include-block'>");
 		html_include(cgit_index_header);
 		html("</td></tr>");
 	}
@@ -64,45 +61,42 @@ void cgit_print_repolist(struct cacheitem *item)
 	     "<th class='left'>Name</th>"
 	     "<th class='left'>Description</th>"
 	     "<th class='left'>Owner</th>"
-	     "<th class='left'>Idle</th>");
-	if (cgit_enable_index_links)
-		html("<th>Links</th>");
-	html("</tr>\n");
+	     "<th class='left'>Idle</th>"
+	     "<th>Links</th></tr>\n");
 
 	for (i=0; i<cgit_repolist.count; i++) {
-		cgit_repo = &cgit_repolist.repos[i];
-		if ((last_group == NULL && cgit_repo->group != NULL) ||
-		    (last_group != NULL && cgit_repo->group == NULL) ||
-		    (last_group != NULL && cgit_repo->group != NULL &&
-		     strcmp(cgit_repo->group, last_group))) {
-			htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
-			      columns);
-			html_txt(cgit_repo->group);
+		repo = &cgit_repolist.repos[i];
+		if ((last_group == NULL && repo->group != NULL) ||
+		    (last_group != NULL && repo->group == NULL) ||
+		    (last_group != NULL && repo->group!= NULL &&
+		     strcmp(repo->group, last_group))) {
+			html("<tr class='nohover'><td colspan='4' class='repogroup'>");
+			html_txt(repo->group);
 			html("</td></tr>");
-			last_group = cgit_repo->group;
+			last_group = repo->group;
 		}
 		htmlf("<tr><td class='%s'>",
-		      cgit_repo->group ? "sublevel-repo" : "toplevel-repo");
-		html_link_open(cgit_repourl(cgit_repo->url), NULL, NULL);
-		html_txt(cgit_repo->name);
+		      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>");
-		html_ntxt(cgit_max_repodesc_len, cgit_repo->desc);
+		html_ntxt(cgit_max_repodesc_len, repo->desc);
 		html("</td><td>");
-		html_txt(cgit_repo->owner);
+		html_txt(repo->owner);
 		html("</td><td>");
-		print_modtime(cgit_repo);
-		html("</td>");
-		if (cgit_enable_index_links) {
-			html("<td>");
-			html_link_open(cgit_repourl(cgit_repo->url),
-				       NULL, "button");
-			html("summary</a>");
-			cgit_log_link("log", NULL, "button", NULL, NULL, NULL, 0);
-			cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
-			html("</td>");
-		}
-		html("</tr>\n");
+		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", "button");
+		html("L</a>");
+		html_link_open(cgit_pageurl(repo->name, "tree", NULL),
+			       "Files", "button");
+		html("F</a>");
+		html("</td></tr>\n");
 	}
 	html("</table>");
 	cgit_print_docend();