X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/184c5655b2e350dbd0dd8be75d3f370f22aa6dee..b1e172acca870e7999f2d2d917db7b4c42aa05b3:/ui-repolist.c?ds=sidebyside

diff --git a/ui-repolist.c b/ui-repolist.c
index 4e2bdf4..2a910bd 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,6 +1,7 @@
 /* ui-repolist.c: functions for generating the repolist page
  *
  * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2012 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -42,8 +43,10 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 	path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
 	if (stat(path, &s) == 0) {
 		*mtime = read_agefile(path);
-		r->mtime = *mtime;
-		return 1;
+		if (*mtime) {
+			r->mtime = *mtime;
+			return 1;
+		}
 	}
 
 	path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ?
@@ -101,18 +104,19 @@ void print_sort_header(const char *title, const char *sort)
 {
 	htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
 	if (ctx.qry.search) {
-		html("&q=");
+		html("&amp;q=");
 		html_url_arg(ctx.qry.search);
 	}
 	htmlf("'>%s</a></th>", title);
 }
 
-void print_header(int columns)
+void print_header()
 {
 	html("<tr class='nohover'>");
 	print_sort_header("Name", "name");
 	print_sort_header("Description", "desc");
-	print_sort_header("Owner", "owner");
+	if (ctx.cfg.enable_index_owner)
+		print_sort_header("Owner", "owner");
 	print_sort_header("Idle", "idle");
 	if (ctx.cfg.enable_index_links)
 		html("<th class='left'>Links</th>");
@@ -122,11 +126,14 @@ void print_header(int columns)
 
 void print_pager(int items, int pagelen, char *search, char *sort)
 {
-	int i;
+	int i, ofs;
+	char *class = NULL;
 	html("<div class='pager'>");
-	for(i = 0; i * pagelen < items; i++)
-		cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL,
-				search, sort, i * pagelen);
+	for(i = 0, ofs = 0; ofs < items; i++, ofs = i * pagelen) {
+		class = (ctx.qry.ofs == ofs) ? "current" : NULL;
+		cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), class,
+				search, sort, ofs);
+	}
 	html("</div>");
 }
 
@@ -154,7 +161,7 @@ static int sort_section(const void *a, const void *b)
 
 	result = cmp(r1->section, r2->section);
 	if (!result) {
-		if (!strcmp(ctx.cfg.section_sort, "age")) {
+		if (!strcmp(ctx.cfg.repository_sort, "age")) {
 			// get_repo_modtime caches the value in r->mtime, so we don't
 			// have to worry about inefficiencies here.
 			if (get_repo_modtime(r1, &t) && get_repo_modtime(r2, &t))
@@ -233,13 +240,15 @@ int sort_repolist(char *field)
 
 void cgit_print_repolist()
 {
-	int i, columns = 4, hits = 0, header = 0;
+	int i, columns = 3, hits = 0, header = 0;
 	char *last_section = NULL;
 	char *section;
 	int sorted = 0;
 
 	if (ctx.cfg.enable_index_links)
-		columns++;
+		++columns;
+	if (ctx.cfg.enable_index_owner)
+		++columns;
 
 	ctx.page.title = ctx.cfg.root_title;
 	cgit_print_http_headers(&ctx);
@@ -251,7 +260,7 @@ void cgit_print_repolist()
 
 	if(ctx.qry.sort)
 		sorted = sort_repolist(ctx.qry.sort);
-	else
+	else if (ctx.cfg.section_sort)
 		sort_repolist("section");
 
 	html("<table summary='repository list' class='list nowrap'>");
@@ -265,7 +274,7 @@ void cgit_print_repolist()
 		if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
 			continue;
 		if (!header++)
-			print_header(columns);
+			print_header();
 		section = ctx.repo->section;
 		if (section && !strcmp(section, ""))
 			section = NULL;
@@ -288,8 +297,10 @@ void cgit_print_repolist()
 		html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
 		html_link_close();
 		html("</td><td>");
-		html_txt(ctx.repo->owner);
-		html("</td><td>");
+		if (ctx.cfg.enable_index_owner) {
+			html_txt(ctx.repo->owner);
+			html("</td><td>");
+		}
 		print_modtime(ctx.repo);
 		html("</td>");
 		if (ctx.cfg.enable_index_links) {