Add a pager on the repolist

This enables a pager on the repolist which restricts the number of entries
displayed per page, controlled by the new option `max-repo-count` (default
value 50).

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

4 files changed, 32 insertions, 1 deletion

diff --git a/cgit.c b/cgit.cindex ccd61f4..2036ceb 100644--- a/cgit.c+++ b/cgit.c@@ -65,6 +65,8 @@ void config_cb(const char *name, const char *value) 		ctx.cfg.max_msg_len = atoi(value); 	else if (!strcmp(name, "max-repodesc-length")) 		ctx.cfg.max_repodesc_len = atoi(value);+	else if (!strcmp(name, "max-repo-count"))+		ctx.cfg.max_repo_count = atoi(value); 	else if (!strcmp(name, "max-commit-count")) 		ctx.cfg.max_commit_count = atoi(value); 	else if (!strcmp(name, "summary-log"))@@ -159,6 +161,7 @@ static void prepare_context(struct cgit_context *ctx) 	ctx->cfg.cache_static_ttl = -1; 	ctx->cfg.css = "/cgit.css"; 	ctx->cfg.logo = "/git-logo.png";+	ctx->cfg.max_repo_count = 50; 	ctx->cfg.max_commit_count = 50; 	ctx->cfg.max_lock_attempts = 5; 	ctx->cfg.max_msg_len = 60;
diff --git a/cgit.c b/cgit.c
index ccd61f4..2036ceb 100644
--- a/cgit.c
+++ b/cgit.c
@@ -65,6 +65,8 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.max_msg_len = atoi(value);
 	else if (!strcmp(name, "max-repodesc-length"))
 		ctx.cfg.max_repodesc_len = atoi(value);
+	else if (!strcmp(name, "max-repo-count"))
+		ctx.cfg.max_repo_count = atoi(value);
 	else if (!strcmp(name, "max-commit-count"))
 		ctx.cfg.max_commit_count = atoi(value);
 	else if (!strcmp(name, "summary-log"))
@@ -159,6 +161,7 @@ static void prepare_context(struct cgit_context *ctx)
 	ctx->cfg.cache_static_ttl = -1;
 	ctx->cfg.css = "/cgit.css";
 	ctx->cfg.logo = "/git-logo.png";
+	ctx->cfg.max_repo_count = 50;
 	ctx->cfg.max_commit_count = 50;
 	ctx->cfg.max_lock_attempts = 5;
 	ctx->cfg.max_msg_len = 60;
diff --git a/cgit.css b/cgit.cssindex 30cb8e6..d57722c 100644--- a/cgit.css+++ b/cgit.css@@ -413,6 +413,16 @@ table.list td.sublevel-repo { 	padding-left: 1.5em; } +div.pager {+	text-align: center;+	margin: 1em 0em 0em 0em;+}++div.pager a {+	color: #777;+	margin: 0em 0.5em;+}+ span.age-mins { 	font-weight: bold; 	color: #080;
diff --git a/cgit.css b/cgit.css
index 30cb8e6..d57722c 100644
--- a/cgit.css
+++ b/cgit.css
@@ -413,6 +413,16 @@ table.list td.sublevel-repo {
 	padding-left: 1.5em;
 }
 
+div.pager {
+	text-align: center;
+	margin: 1em 0em 0em 0em;
+}
+
+div.pager a {
+	color: #777;
+	margin: 0em 0.5em;
+}
+
 span.age-mins {
 	font-weight: bold;
 	color: #080;
diff --git a/cgit.h b/cgit.hindex bbb404e..4fa5cf2 100644--- a/cgit.h+++ b/cgit.h@@ -145,6 +145,7 @@ struct cgit_config { 	int enable_index_links; 	int enable_log_filecount; 	int enable_log_linecount;+	int max_repo_count; 	int max_commit_count; 	int max_lock_attempts; 	int max_msg_len;
diff --git a/cgit.h b/cgit.h
index bbb404e..4fa5cf2 100644
--- a/cgit.h
+++ b/cgit.h
@@ -145,6 +145,7 @@ struct cgit_config {
 	int enable_index_links;
 	int enable_log_filecount;
 	int enable_log_linecount;
+	int max_repo_count;
 	int max_commit_count;
 	int max_lock_attempts;
 	int max_msg_len;
diff --git a/ui-repolist.c b/ui-repolist.cindex 3f78e28..ee4facb 100644--- a/ui-repolist.c+++ b/ui-repolist.c@@ -71,6 +71,17 @@ void print_header(int columns) 	html("</tr>\n"); } ++void print_pager(int items, int pagelen, char *search)+{+	int i;+	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, i * pagelen);+	html("</div>");+}+ void cgit_print_repolist() { 	int i, columns = 4, hits = 0, header = 0;@@ -92,9 +103,13 @@ void cgit_print_repolist() 		ctx.repo = &cgit_repolist.repos[i]; 		if (!is_match(ctx.repo)) 			continue;+		hits++;+		if (hits <= ctx.qry.ofs)+			continue;+		if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)+			continue; 		if (!header++) 			print_header(columns);-		hits++; 		if ((last_group == NULL && ctx.repo->group != NULL) || 		    (last_group != NULL && ctx.repo->group == NULL) || 		    (last_group != NULL && ctx.repo->group != NULL &&@@ -134,6 +149,8 @@ void cgit_print_repolist() 	html("</table>"); 	if (!hits) 		cgit_print_error("No repositories found");+	else if (hits > ctx.cfg.max_repo_count)+		print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search); 	cgit_print_docend(); } 
diff --git a/ui-repolist.c b/ui-repolist.c
index 3f78e28..ee4facb 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -71,6 +71,17 @@ void print_header(int columns)
 	html("</tr>\n");
 }
 
+
+void print_pager(int items, int pagelen, char *search)
+{
+	int i;
+	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, i * pagelen);
+	html("</div>");
+}
+
 void cgit_print_repolist()
 {
 	int i, columns = 4, hits = 0, header = 0;
@@ -92,9 +103,13 @@ void cgit_print_repolist()
 		ctx.repo = &cgit_repolist.repos[i];
 		if (!is_match(ctx.repo))
 			continue;
+		hits++;
+		if (hits <= ctx.qry.ofs)
+			continue;
+		if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
+			continue;
 		if (!header++)
 			print_header(columns);
-		hits++;
 		if ((last_group == NULL && ctx.repo->group != NULL) ||
 		    (last_group != NULL && ctx.repo->group == NULL) ||
 		    (last_group != NULL && ctx.repo->group != NULL &&
@@ -134,6 +149,8 @@ void cgit_print_repolist()
 	html("</table>");
 	if (!hits)
 		cgit_print_error("No repositories found");
+	else if (hits > ctx.cfg.max_repo_count)
+		print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search);
 	cgit_print_docend();
 }