diff options
author | Lars Hjemli <hjemli@gmail.com> | 2008-05-03 17:54:39 (JST) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-05-03 17:54:39 (JST) |
commit | c6078b8b006bcb0671a3c1bc21dd1a2c01035a2e (patch) | |
tree | 0ca48d3ac455a7aecd30590ed71703ba5b34c4f1 | |
parent | 141f1c3eb657470e81bbf998f44f9723f9009def (diff) | |
download | cgit-c6078b8b006bcb0671a3c1bc21dd1a2c01035a2e.zip cgit-c6078b8b006bcb0671a3c1bc21dd1a2c01035a2e.tar.gz |
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>
-rw-r--r-- | cgit.c | 3 | ||||
-rw-r--r-- | cgit.css | 10 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-repolist.c | 19 |
4 files changed, 32 insertions, 1 deletions
@@ -65,6 +65,8 @@ void config_cb(const char *name, const char *value) | |||
65 | ctx.cfg.max_msg_len = atoi(value); | 65 | ctx.cfg.max_msg_len = atoi(value); |
66 | else if (!strcmp(name, "max-repodesc-length")) | 66 | else if (!strcmp(name, "max-repodesc-length")) |
67 | ctx.cfg.max_repodesc_len = atoi(value); | 67 | ctx.cfg.max_repodesc_len = atoi(value); |
68 | else if (!strcmp(name, "max-repo-count")) | ||
69 | ctx.cfg.max_repo_count = atoi(value); | ||
68 | else if (!strcmp(name, "max-commit-count")) | 70 | else if (!strcmp(name, "max-commit-count")) |
69 | ctx.cfg.max_commit_count = atoi(value); | 71 | ctx.cfg.max_commit_count = atoi(value); |
70 | else if (!strcmp(name, "summary-log")) | 72 | else if (!strcmp(name, "summary-log")) |
@@ -159,6 +161,7 @@ static void prepare_context(struct cgit_context *ctx) | |||
159 | ctx->cfg.cache_static_ttl = -1; | 161 | ctx->cfg.cache_static_ttl = -1; |
160 | ctx->cfg.css = "/cgit.css"; | 162 | ctx->cfg.css = "/cgit.css"; |
161 | ctx->cfg.logo = "/git-logo.png"; | 163 | ctx->cfg.logo = "/git-logo.png"; |
164 | ctx->cfg.max_repo_count = 50; | ||
162 | ctx->cfg.max_commit_count = 50; | 165 | ctx->cfg.max_commit_count = 50; |
163 | ctx->cfg.max_lock_attempts = 5; | 166 | ctx->cfg.max_lock_attempts = 5; |
164 | ctx->cfg.max_msg_len = 60; | 167 | ctx->cfg.max_msg_len = 60; |
@@ -413,6 +413,16 @@ table.list td.sublevel-repo { | |||
413 | padding-left: 1.5em; | 413 | padding-left: 1.5em; |
414 | } | 414 | } |
415 | 415 | ||
416 | div.pager { | ||
417 | text-align: center; | ||
418 | margin: 1em 0em 0em 0em; | ||
419 | } | ||
420 | |||
421 | div.pager a { | ||
422 | color: #777; | ||
423 | margin: 0em 0.5em; | ||
424 | } | ||
425 | |||
416 | span.age-mins { | 426 | span.age-mins { |
417 | font-weight: bold; | 427 | font-weight: bold; |
418 | color: #080; | 428 | color: #080; |
@@ -145,6 +145,7 @@ struct cgit_config { | |||
145 | int enable_index_links; | 145 | int enable_index_links; |
146 | int enable_log_filecount; | 146 | int enable_log_filecount; |
147 | int enable_log_linecount; | 147 | int enable_log_linecount; |
148 | int max_repo_count; | ||
148 | int max_commit_count; | 149 | int max_commit_count; |
149 | int max_lock_attempts; | 150 | int max_lock_attempts; |
150 | int max_msg_len; | 151 | int max_msg_len; |
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) | |||
71 | html("</tr>\n"); | 71 | html("</tr>\n"); |
72 | } | 72 | } |
73 | 73 | ||
74 | |||
75 | void print_pager(int items, int pagelen, char *search) | ||
76 | { | ||
77 | int i; | ||
78 | html("<div class='pager'>"); | ||
79 | for(i = 0; i * pagelen < items; i++) | ||
80 | cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL, | ||
81 | search, i * pagelen); | ||
82 | html("</div>"); | ||
83 | } | ||
84 | |||
74 | void cgit_print_repolist() | 85 | void cgit_print_repolist() |
75 | { | 86 | { |
76 | int i, columns = 4, hits = 0, header = 0; | 87 | int i, columns = 4, hits = 0, header = 0; |
@@ -92,9 +103,13 @@ void cgit_print_repolist() | |||
92 | ctx.repo = &cgit_repolist.repos[i]; | 103 | ctx.repo = &cgit_repolist.repos[i]; |
93 | if (!is_match(ctx.repo)) | 104 | if (!is_match(ctx.repo)) |
94 | continue; | 105 | continue; |
106 | hits++; | ||
107 | if (hits <= ctx.qry.ofs) | ||
108 | continue; | ||
109 | if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) | ||
110 | continue; | ||
95 | if (!header++) | 111 | if (!header++) |
96 | print_header(columns); | 112 | print_header(columns); |
97 | hits++; | ||
98 | if ((last_group == NULL && ctx.repo->group != NULL) || | 113 | if ((last_group == NULL && ctx.repo->group != NULL) || |
99 | (last_group != NULL && ctx.repo->group == NULL) || | 114 | (last_group != NULL && ctx.repo->group == NULL) || |
100 | (last_group != NULL && ctx.repo->group != NULL && | 115 | (last_group != NULL && ctx.repo->group != NULL && |
@@ -134,6 +149,8 @@ void cgit_print_repolist() | |||
134 | html("</table>"); | 149 | html("</table>"); |
135 | if (!hits) | 150 | if (!hits) |
136 | cgit_print_error("No repositories found"); | 151 | cgit_print_error("No repositories found"); |
152 | else if (hits > ctx.cfg.max_repo_count) | ||
153 | print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search); | ||
137 | cgit_print_docend(); | 154 | cgit_print_docend(); |
138 | } | 155 | } |
139 | 156 | ||