author | Lars Hjemli <hjemli@gmail.com> | 2008-05-03 08:54:39 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-05-03 08:54:39 (UTC) |
commit | c6078b8b006bcb0671a3c1bc21dd1a2c01035a2e (patch) (unidiff) | |
tree | 0ca48d3ac455a7aecd30590ed71703ba5b34c4f1 | |
parent | 141f1c3eb657470e81bbf998f44f9723f9009def (diff) | |
download | cgit-c6078b8b006bcb0671a3c1bc21dd1a2c01035a2e.zip cgit-c6078b8b006bcb0671a3c1bc21dd1a2c01035a2e.tar.gz cgit-c6078b8b006bcb0671a3c1bc21dd1a2c01035a2e.tar.bz2 |
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
@@ -20,190 +20,193 @@ void config_cb(const char *name, const char *value) | |||
20 | if (!strcmp(name, "root-title")) | 20 | if (!strcmp(name, "root-title")) |
21 | ctx.cfg.root_title = xstrdup(value); | 21 | ctx.cfg.root_title = xstrdup(value); |
22 | else if (!strcmp(name, "root-desc")) | 22 | else if (!strcmp(name, "root-desc")) |
23 | ctx.cfg.root_desc = xstrdup(value); | 23 | ctx.cfg.root_desc = xstrdup(value); |
24 | else if (!strcmp(name, "root-readme")) | 24 | else if (!strcmp(name, "root-readme")) |
25 | ctx.cfg.root_readme = xstrdup(value); | 25 | ctx.cfg.root_readme = xstrdup(value); |
26 | else if (!strcmp(name, "css")) | 26 | else if (!strcmp(name, "css")) |
27 | ctx.cfg.css = xstrdup(value); | 27 | ctx.cfg.css = xstrdup(value); |
28 | else if (!strcmp(name, "logo")) | 28 | else if (!strcmp(name, "logo")) |
29 | ctx.cfg.logo = xstrdup(value); | 29 | ctx.cfg.logo = xstrdup(value); |
30 | else if (!strcmp(name, "index-header")) | 30 | else if (!strcmp(name, "index-header")) |
31 | ctx.cfg.index_header = xstrdup(value); | 31 | ctx.cfg.index_header = xstrdup(value); |
32 | else if (!strcmp(name, "index-info")) | 32 | else if (!strcmp(name, "index-info")) |
33 | ctx.cfg.index_info = xstrdup(value); | 33 | ctx.cfg.index_info = xstrdup(value); |
34 | else if (!strcmp(name, "logo-link")) | 34 | else if (!strcmp(name, "logo-link")) |
35 | ctx.cfg.logo_link = xstrdup(value); | 35 | ctx.cfg.logo_link = xstrdup(value); |
36 | else if (!strcmp(name, "module-link")) | 36 | else if (!strcmp(name, "module-link")) |
37 | ctx.cfg.module_link = xstrdup(value); | 37 | ctx.cfg.module_link = xstrdup(value); |
38 | else if (!strcmp(name, "virtual-root")) { | 38 | else if (!strcmp(name, "virtual-root")) { |
39 | ctx.cfg.virtual_root = trim_end(value, '/'); | 39 | ctx.cfg.virtual_root = trim_end(value, '/'); |
40 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 40 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
41 | ctx.cfg.virtual_root = ""; | 41 | ctx.cfg.virtual_root = ""; |
42 | } else if (!strcmp(name, "nocache")) | 42 | } else if (!strcmp(name, "nocache")) |
43 | ctx.cfg.nocache = atoi(value); | 43 | ctx.cfg.nocache = atoi(value); |
44 | else if (!strcmp(name, "snapshots")) | 44 | else if (!strcmp(name, "snapshots")) |
45 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 45 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
46 | else if (!strcmp(name, "enable-index-links")) | 46 | else if (!strcmp(name, "enable-index-links")) |
47 | ctx.cfg.enable_index_links = atoi(value); | 47 | ctx.cfg.enable_index_links = atoi(value); |
48 | else if (!strcmp(name, "enable-log-filecount")) | 48 | else if (!strcmp(name, "enable-log-filecount")) |
49 | ctx.cfg.enable_log_filecount = atoi(value); | 49 | ctx.cfg.enable_log_filecount = atoi(value); |
50 | else if (!strcmp(name, "enable-log-linecount")) | 50 | else if (!strcmp(name, "enable-log-linecount")) |
51 | ctx.cfg.enable_log_linecount = atoi(value); | 51 | ctx.cfg.enable_log_linecount = atoi(value); |
52 | else if (!strcmp(name, "cache-size")) | 52 | else if (!strcmp(name, "cache-size")) |
53 | ctx.cfg.cache_size = atoi(value); | 53 | ctx.cfg.cache_size = atoi(value); |
54 | else if (!strcmp(name, "cache-root")) | 54 | else if (!strcmp(name, "cache-root")) |
55 | ctx.cfg.cache_root = xstrdup(value); | 55 | ctx.cfg.cache_root = xstrdup(value); |
56 | else if (!strcmp(name, "cache-root-ttl")) | 56 | else if (!strcmp(name, "cache-root-ttl")) |
57 | ctx.cfg.cache_root_ttl = atoi(value); | 57 | ctx.cfg.cache_root_ttl = atoi(value); |
58 | else if (!strcmp(name, "cache-repo-ttl")) | 58 | else if (!strcmp(name, "cache-repo-ttl")) |
59 | ctx.cfg.cache_repo_ttl = atoi(value); | 59 | ctx.cfg.cache_repo_ttl = atoi(value); |
60 | else if (!strcmp(name, "cache-static-ttl")) | 60 | else if (!strcmp(name, "cache-static-ttl")) |
61 | ctx.cfg.cache_static_ttl = atoi(value); | 61 | ctx.cfg.cache_static_ttl = atoi(value); |
62 | else if (!strcmp(name, "cache-dynamic-ttl")) | 62 | else if (!strcmp(name, "cache-dynamic-ttl")) |
63 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 63 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
64 | else if (!strcmp(name, "max-message-length")) | 64 | else if (!strcmp(name, "max-message-length")) |
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")) |
71 | ctx.cfg.summary_log = atoi(value); | 73 | ctx.cfg.summary_log = atoi(value); |
72 | else if (!strcmp(name, "summary-branches")) | 74 | else if (!strcmp(name, "summary-branches")) |
73 | ctx.cfg.summary_branches = atoi(value); | 75 | ctx.cfg.summary_branches = atoi(value); |
74 | else if (!strcmp(name, "summary-tags")) | 76 | else if (!strcmp(name, "summary-tags")) |
75 | ctx.cfg.summary_tags = atoi(value); | 77 | ctx.cfg.summary_tags = atoi(value); |
76 | else if (!strcmp(name, "agefile")) | 78 | else if (!strcmp(name, "agefile")) |
77 | ctx.cfg.agefile = xstrdup(value); | 79 | ctx.cfg.agefile = xstrdup(value); |
78 | else if (!strcmp(name, "renamelimit")) | 80 | else if (!strcmp(name, "renamelimit")) |
79 | ctx.cfg.renamelimit = atoi(value); | 81 | ctx.cfg.renamelimit = atoi(value); |
80 | else if (!strcmp(name, "robots")) | 82 | else if (!strcmp(name, "robots")) |
81 | ctx.cfg.robots = xstrdup(value); | 83 | ctx.cfg.robots = xstrdup(value); |
82 | else if (!strcmp(name, "clone-prefix")) | 84 | else if (!strcmp(name, "clone-prefix")) |
83 | ctx.cfg.clone_prefix = xstrdup(value); | 85 | ctx.cfg.clone_prefix = xstrdup(value); |
84 | else if (!strcmp(name, "repo.group")) | 86 | else if (!strcmp(name, "repo.group")) |
85 | ctx.cfg.repo_group = xstrdup(value); | 87 | ctx.cfg.repo_group = xstrdup(value); |
86 | else if (!strcmp(name, "repo.url")) | 88 | else if (!strcmp(name, "repo.url")) |
87 | ctx.repo = cgit_add_repo(value); | 89 | ctx.repo = cgit_add_repo(value); |
88 | else if (!strcmp(name, "repo.name")) | 90 | else if (!strcmp(name, "repo.name")) |
89 | ctx.repo->name = xstrdup(value); | 91 | ctx.repo->name = xstrdup(value); |
90 | else if (ctx.repo && !strcmp(name, "repo.path")) | 92 | else if (ctx.repo && !strcmp(name, "repo.path")) |
91 | ctx.repo->path = trim_end(value, '/'); | 93 | ctx.repo->path = trim_end(value, '/'); |
92 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 94 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
93 | ctx.repo->clone_url = xstrdup(value); | 95 | ctx.repo->clone_url = xstrdup(value); |
94 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 96 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
95 | ctx.repo->desc = xstrdup(value); | 97 | ctx.repo->desc = xstrdup(value); |
96 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 98 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
97 | ctx.repo->owner = xstrdup(value); | 99 | ctx.repo->owner = xstrdup(value); |
98 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 100 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
99 | ctx.repo->defbranch = xstrdup(value); | 101 | ctx.repo->defbranch = xstrdup(value); |
100 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 102 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
101 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 103 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
102 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 104 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
103 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 105 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
104 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 106 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
105 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 107 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
106 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 108 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
107 | ctx.repo->module_link= xstrdup(value); | 109 | ctx.repo->module_link= xstrdup(value); |
108 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 110 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
109 | if (*value == '/') | 111 | if (*value == '/') |
110 | ctx.repo->readme = xstrdup(value); | 112 | ctx.repo->readme = xstrdup(value); |
111 | else | 113 | else |
112 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 114 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
113 | } else if (!strcmp(name, "include")) | 115 | } else if (!strcmp(name, "include")) |
114 | parse_configfile(value, config_cb); | 116 | parse_configfile(value, config_cb); |
115 | } | 117 | } |
116 | 118 | ||
117 | static void querystring_cb(const char *name, const char *value) | 119 | static void querystring_cb(const char *name, const char *value) |
118 | { | 120 | { |
119 | if (!strcmp(name,"r")) { | 121 | if (!strcmp(name,"r")) { |
120 | ctx.qry.repo = xstrdup(value); | 122 | ctx.qry.repo = xstrdup(value); |
121 | ctx.repo = cgit_get_repoinfo(value); | 123 | ctx.repo = cgit_get_repoinfo(value); |
122 | } else if (!strcmp(name, "p")) { | 124 | } else if (!strcmp(name, "p")) { |
123 | ctx.qry.page = xstrdup(value); | 125 | ctx.qry.page = xstrdup(value); |
124 | } else if (!strcmp(name, "url")) { | 126 | } else if (!strcmp(name, "url")) { |
125 | cgit_parse_url(value); | 127 | cgit_parse_url(value); |
126 | } else if (!strcmp(name, "qt")) { | 128 | } else if (!strcmp(name, "qt")) { |
127 | ctx.qry.grep = xstrdup(value); | 129 | ctx.qry.grep = xstrdup(value); |
128 | } else if (!strcmp(name, "q")) { | 130 | } else if (!strcmp(name, "q")) { |
129 | ctx.qry.search = xstrdup(value); | 131 | ctx.qry.search = xstrdup(value); |
130 | } else if (!strcmp(name, "h")) { | 132 | } else if (!strcmp(name, "h")) { |
131 | ctx.qry.head = xstrdup(value); | 133 | ctx.qry.head = xstrdup(value); |
132 | ctx.qry.has_symref = 1; | 134 | ctx.qry.has_symref = 1; |
133 | } else if (!strcmp(name, "id")) { | 135 | } else if (!strcmp(name, "id")) { |
134 | ctx.qry.sha1 = xstrdup(value); | 136 | ctx.qry.sha1 = xstrdup(value); |
135 | ctx.qry.has_sha1 = 1; | 137 | ctx.qry.has_sha1 = 1; |
136 | } else if (!strcmp(name, "id2")) { | 138 | } else if (!strcmp(name, "id2")) { |
137 | ctx.qry.sha2 = xstrdup(value); | 139 | ctx.qry.sha2 = xstrdup(value); |
138 | ctx.qry.has_sha1 = 1; | 140 | ctx.qry.has_sha1 = 1; |
139 | } else if (!strcmp(name, "ofs")) { | 141 | } else if (!strcmp(name, "ofs")) { |
140 | ctx.qry.ofs = atoi(value); | 142 | ctx.qry.ofs = atoi(value); |
141 | } else if (!strcmp(name, "path")) { | 143 | } else if (!strcmp(name, "path")) { |
142 | ctx.qry.path = trim_end(value, '/'); | 144 | ctx.qry.path = trim_end(value, '/'); |
143 | } else if (!strcmp(name, "name")) { | 145 | } else if (!strcmp(name, "name")) { |
144 | ctx.qry.name = xstrdup(value); | 146 | ctx.qry.name = xstrdup(value); |
145 | } | 147 | } |
146 | } | 148 | } |
147 | 149 | ||
148 | static void prepare_context(struct cgit_context *ctx) | 150 | static void prepare_context(struct cgit_context *ctx) |
149 | { | 151 | { |
150 | memset(ctx, 0, sizeof(ctx)); | 152 | memset(ctx, 0, sizeof(ctx)); |
151 | ctx->cfg.agefile = "info/web/last-modified"; | 153 | ctx->cfg.agefile = "info/web/last-modified"; |
152 | ctx->cfg.nocache = 0; | 154 | ctx->cfg.nocache = 0; |
153 | ctx->cfg.cache_size = 0; | 155 | ctx->cfg.cache_size = 0; |
154 | ctx->cfg.cache_dynamic_ttl = 5; | 156 | ctx->cfg.cache_dynamic_ttl = 5; |
155 | ctx->cfg.cache_max_create_time = 5; | 157 | ctx->cfg.cache_max_create_time = 5; |
156 | ctx->cfg.cache_repo_ttl = 5; | 158 | ctx->cfg.cache_repo_ttl = 5; |
157 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 159 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
158 | ctx->cfg.cache_root_ttl = 5; | 160 | ctx->cfg.cache_root_ttl = 5; |
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; |
165 | ctx->cfg.max_repodesc_len = 60; | 168 | ctx->cfg.max_repodesc_len = 60; |
166 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 169 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
167 | ctx->cfg.renamelimit = -1; | 170 | ctx->cfg.renamelimit = -1; |
168 | ctx->cfg.robots = "index, nofollow"; | 171 | ctx->cfg.robots = "index, nofollow"; |
169 | ctx->cfg.root_title = "Git repository browser"; | 172 | ctx->cfg.root_title = "Git repository browser"; |
170 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 173 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
171 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 174 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
172 | ctx->page.mimetype = "text/html"; | 175 | ctx->page.mimetype = "text/html"; |
173 | ctx->page.charset = PAGE_ENCODING; | 176 | ctx->page.charset = PAGE_ENCODING; |
174 | ctx->page.filename = NULL; | 177 | ctx->page.filename = NULL; |
175 | ctx->page.modified = time(NULL); | 178 | ctx->page.modified = time(NULL); |
176 | ctx->page.expires = ctx->page.modified; | 179 | ctx->page.expires = ctx->page.modified; |
177 | } | 180 | } |
178 | 181 | ||
179 | struct refmatch { | 182 | struct refmatch { |
180 | char *req_ref; | 183 | char *req_ref; |
181 | char *first_ref; | 184 | char *first_ref; |
182 | int match; | 185 | int match; |
183 | }; | 186 | }; |
184 | 187 | ||
185 | int find_current_ref(const char *refname, const unsigned char *sha1, | 188 | int find_current_ref(const char *refname, const unsigned char *sha1, |
186 | int flags, void *cb_data) | 189 | int flags, void *cb_data) |
187 | { | 190 | { |
188 | struct refmatch *info; | 191 | struct refmatch *info; |
189 | 192 | ||
190 | info = (struct refmatch *)cb_data; | 193 | info = (struct refmatch *)cb_data; |
191 | if (!strcmp(refname, info->req_ref)) | 194 | if (!strcmp(refname, info->req_ref)) |
192 | info->match = 1; | 195 | info->match = 1; |
193 | if (!info->first_ref) | 196 | if (!info->first_ref) |
194 | info->first_ref = xstrdup(refname); | 197 | info->first_ref = xstrdup(refname); |
195 | return info->match; | 198 | return info->match; |
196 | } | 199 | } |
197 | 200 | ||
198 | char *find_default_branch(struct cgit_repo *repo) | 201 | char *find_default_branch(struct cgit_repo *repo) |
199 | { | 202 | { |
200 | struct refmatch info; | 203 | struct refmatch info; |
201 | 204 | ||
202 | info.req_ref = repo->defbranch; | 205 | info.req_ref = repo->defbranch; |
203 | info.first_ref = NULL; | 206 | info.first_ref = NULL; |
204 | info.match = 0; | 207 | info.match = 0; |
205 | for_each_branch_ref(find_current_ref, &info); | 208 | for_each_branch_ref(find_current_ref, &info); |
206 | if (info.match) | 209 | if (info.match) |
207 | return info.req_ref; | 210 | return info.req_ref; |
208 | else | 211 | else |
209 | return info.first_ref; | 212 | return info.first_ref; |
@@ -368,72 +368,82 @@ table.diff td div.hunk { | |||
368 | 368 | ||
369 | table.diff td div.add { | 369 | table.diff td div.add { |
370 | color: green; | 370 | color: green; |
371 | } | 371 | } |
372 | 372 | ||
373 | table.diff td div.del { | 373 | table.diff td div.del { |
374 | color: red; | 374 | color: red; |
375 | } | 375 | } |
376 | 376 | ||
377 | .sha1 { | 377 | .sha1 { |
378 | font-family: monospace; | 378 | font-family: monospace; |
379 | font-size: 90%; | 379 | font-size: 90%; |
380 | } | 380 | } |
381 | 381 | ||
382 | .left { | 382 | .left { |
383 | text-align: left; | 383 | text-align: left; |
384 | } | 384 | } |
385 | 385 | ||
386 | .right { | 386 | .right { |
387 | text-align: right; | 387 | text-align: right; |
388 | } | 388 | } |
389 | 389 | ||
390 | table.list td.repogroup { | 390 | table.list td.repogroup { |
391 | font-style: italic; | 391 | font-style: italic; |
392 | color: #888; | 392 | color: #888; |
393 | } | 393 | } |
394 | 394 | ||
395 | a.button { | 395 | a.button { |
396 | font-size: 80%; | 396 | font-size: 80%; |
397 | padding: 0em 0.5em; | 397 | padding: 0em 0.5em; |
398 | } | 398 | } |
399 | 399 | ||
400 | a.primary { | 400 | a.primary { |
401 | font-size: 100%; | 401 | font-size: 100%; |
402 | } | 402 | } |
403 | 403 | ||
404 | a.secondary { | 404 | a.secondary { |
405 | font-size: 90%; | 405 | font-size: 90%; |
406 | } | 406 | } |
407 | 407 | ||
408 | td.toplevel-repo { | 408 | td.toplevel-repo { |
409 | 409 | ||
410 | } | 410 | } |
411 | 411 | ||
412 | table.list td.sublevel-repo { | 412 | 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; |
419 | } | 429 | } |
420 | 430 | ||
421 | span.age-hours { | 431 | span.age-hours { |
422 | color: #080; | 432 | color: #080; |
423 | } | 433 | } |
424 | 434 | ||
425 | span.age-days { | 435 | span.age-days { |
426 | color: #040; | 436 | color: #040; |
427 | } | 437 | } |
428 | 438 | ||
429 | span.age-weeks { | 439 | span.age-weeks { |
430 | color: #444; | 440 | color: #444; |
431 | } | 441 | } |
432 | 442 | ||
433 | span.age-months { | 443 | span.age-months { |
434 | color: #888; | 444 | color: #888; |
435 | } | 445 | } |
436 | 446 | ||
437 | span.age-years { | 447 | span.age-years { |
438 | color: #bbb; | 448 | color: #bbb; |
439 | } | 449 | } |
@@ -100,96 +100,97 @@ struct refinfo { | |||
100 | struct reflist { | 100 | struct reflist { |
101 | struct refinfo **refs; | 101 | struct refinfo **refs; |
102 | int alloc; | 102 | int alloc; |
103 | int count; | 103 | int count; |
104 | }; | 104 | }; |
105 | 105 | ||
106 | struct cgit_query { | 106 | struct cgit_query { |
107 | int has_symref; | 107 | int has_symref; |
108 | int has_sha1; | 108 | int has_sha1; |
109 | char *raw; | 109 | char *raw; |
110 | char *repo; | 110 | char *repo; |
111 | char *page; | 111 | char *page; |
112 | char *search; | 112 | char *search; |
113 | char *grep; | 113 | char *grep; |
114 | char *head; | 114 | char *head; |
115 | char *sha1; | 115 | char *sha1; |
116 | char *sha2; | 116 | char *sha2; |
117 | char *path; | 117 | char *path; |
118 | char *name; | 118 | char *name; |
119 | int ofs; | 119 | int ofs; |
120 | }; | 120 | }; |
121 | 121 | ||
122 | struct cgit_config { | 122 | struct cgit_config { |
123 | char *agefile; | 123 | char *agefile; |
124 | char *cache_root; | 124 | char *cache_root; |
125 | char *clone_prefix; | 125 | char *clone_prefix; |
126 | char *css; | 126 | char *css; |
127 | char *index_header; | 127 | char *index_header; |
128 | char *index_info; | 128 | char *index_info; |
129 | char *logo; | 129 | char *logo; |
130 | char *logo_link; | 130 | char *logo_link; |
131 | char *module_link; | 131 | char *module_link; |
132 | char *repo_group; | 132 | char *repo_group; |
133 | char *robots; | 133 | char *robots; |
134 | char *root_title; | 134 | char *root_title; |
135 | char *root_desc; | 135 | char *root_desc; |
136 | char *root_readme; | 136 | char *root_readme; |
137 | char *script_name; | 137 | char *script_name; |
138 | char *virtual_root; | 138 | char *virtual_root; |
139 | int cache_size; | 139 | int cache_size; |
140 | int cache_dynamic_ttl; | 140 | int cache_dynamic_ttl; |
141 | int cache_max_create_time; | 141 | int cache_max_create_time; |
142 | int cache_repo_ttl; | 142 | int cache_repo_ttl; |
143 | int cache_root_ttl; | 143 | int cache_root_ttl; |
144 | int cache_static_ttl; | 144 | int cache_static_ttl; |
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; |
151 | int max_repodesc_len; | 152 | int max_repodesc_len; |
152 | int nocache; | 153 | int nocache; |
153 | int renamelimit; | 154 | int renamelimit; |
154 | int snapshots; | 155 | int snapshots; |
155 | int summary_branches; | 156 | int summary_branches; |
156 | int summary_log; | 157 | int summary_log; |
157 | int summary_tags; | 158 | int summary_tags; |
158 | }; | 159 | }; |
159 | 160 | ||
160 | struct cgit_page { | 161 | struct cgit_page { |
161 | time_t modified; | 162 | time_t modified; |
162 | time_t expires; | 163 | time_t expires; |
163 | char *mimetype; | 164 | char *mimetype; |
164 | char *charset; | 165 | char *charset; |
165 | char *filename; | 166 | char *filename; |
166 | char *title; | 167 | char *title; |
167 | }; | 168 | }; |
168 | 169 | ||
169 | struct cgit_context { | 170 | struct cgit_context { |
170 | struct cgit_query qry; | 171 | struct cgit_query qry; |
171 | struct cgit_config cfg; | 172 | struct cgit_config cfg; |
172 | struct cgit_repo *repo; | 173 | struct cgit_repo *repo; |
173 | struct cgit_page page; | 174 | struct cgit_page page; |
174 | }; | 175 | }; |
175 | 176 | ||
176 | struct cgit_snapshot_format { | 177 | struct cgit_snapshot_format { |
177 | const char *suffix; | 178 | const char *suffix; |
178 | const char *mimetype; | 179 | const char *mimetype; |
179 | write_archive_fn_t write_func; | 180 | write_archive_fn_t write_func; |
180 | int bit; | 181 | int bit; |
181 | }; | 182 | }; |
182 | 183 | ||
183 | extern const char *cgit_version; | 184 | extern const char *cgit_version; |
184 | 185 | ||
185 | extern struct cgit_repolist cgit_repolist; | 186 | extern struct cgit_repolist cgit_repolist; |
186 | extern struct cgit_context ctx; | 187 | extern struct cgit_context ctx; |
187 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 188 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
188 | 189 | ||
189 | extern struct cgit_repo *cgit_add_repo(const char *url); | 190 | extern struct cgit_repo *cgit_add_repo(const char *url); |
190 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 191 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
191 | extern void cgit_repo_config_cb(const char *name, const char *value); | 192 | extern void cgit_repo_config_cb(const char *name, const char *value); |
192 | 193 | ||
193 | extern int chk_zero(int result, char *msg); | 194 | extern int chk_zero(int result, char *msg); |
194 | extern int chk_positive(int result, char *msg); | 195 | extern int chk_positive(int result, char *msg); |
195 | extern int chk_non_negative(int result, char *msg); | 196 | extern int chk_non_negative(int result, char *msg); |
diff --git a/ui-repolist.c b/ui-repolist.c index 3f78e28..ee4facb 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -26,119 +26,136 @@ time_t read_agefile(char *path) | |||
26 | else | 26 | else |
27 | return 0; | 27 | return 0; |
28 | } | 28 | } |
29 | 29 | ||
30 | static void print_modtime(struct cgit_repo *repo) | 30 | static void print_modtime(struct cgit_repo *repo) |
31 | { | 31 | { |
32 | char *path; | 32 | char *path; |
33 | struct stat s; | 33 | struct stat s; |
34 | 34 | ||
35 | path = fmt("%s/%s", repo->path, ctx.cfg.agefile); | 35 | path = fmt("%s/%s", repo->path, ctx.cfg.agefile); |
36 | if (stat(path, &s) == 0) { | 36 | if (stat(path, &s) == 0) { |
37 | cgit_print_age(read_agefile(path), -1, NULL); | 37 | cgit_print_age(read_agefile(path), -1, NULL); |
38 | return; | 38 | return; |
39 | } | 39 | } |
40 | 40 | ||
41 | path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); | 41 | path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); |
42 | if (stat(path, &s) != 0) | 42 | if (stat(path, &s) != 0) |
43 | return; | 43 | return; |
44 | cgit_print_age(s.st_mtime, -1, NULL); | 44 | cgit_print_age(s.st_mtime, -1, NULL); |
45 | } | 45 | } |
46 | 46 | ||
47 | int is_match(struct cgit_repo *repo) | 47 | int is_match(struct cgit_repo *repo) |
48 | { | 48 | { |
49 | if (!ctx.qry.search) | 49 | if (!ctx.qry.search) |
50 | return 1; | 50 | return 1; |
51 | if (repo->url && strcasestr(repo->url, ctx.qry.search)) | 51 | if (repo->url && strcasestr(repo->url, ctx.qry.search)) |
52 | return 1; | 52 | return 1; |
53 | if (repo->name && strcasestr(repo->name, ctx.qry.search)) | 53 | if (repo->name && strcasestr(repo->name, ctx.qry.search)) |
54 | return 1; | 54 | return 1; |
55 | if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) | 55 | if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) |
56 | return 1; | 56 | return 1; |
57 | if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) | 57 | if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) |
58 | return 1; | 58 | return 1; |
59 | return 0; | 59 | return 0; |
60 | } | 60 | } |
61 | 61 | ||
62 | void print_header(int columns) | 62 | void print_header(int columns) |
63 | { | 63 | { |
64 | html("<tr class='nohover'>" | 64 | html("<tr class='nohover'>" |
65 | "<th class='left'>Name</th>" | 65 | "<th class='left'>Name</th>" |
66 | "<th class='left'>Description</th>" | 66 | "<th class='left'>Description</th>" |
67 | "<th class='left'>Owner</th>" | 67 | "<th class='left'>Owner</th>" |
68 | "<th class='left'>Idle</th>"); | 68 | "<th class='left'>Idle</th>"); |
69 | if (ctx.cfg.enable_index_links) | 69 | if (ctx.cfg.enable_index_links) |
70 | html("<th class='left'>Links</th>"); | 70 | html("<th class='left'>Links</th>"); |
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; |
77 | char *last_group = NULL; | 88 | char *last_group = NULL; |
78 | 89 | ||
79 | if (ctx.cfg.enable_index_links) | 90 | if (ctx.cfg.enable_index_links) |
80 | columns++; | 91 | columns++; |
81 | 92 | ||
82 | ctx.page.title = ctx.cfg.root_title; | 93 | ctx.page.title = ctx.cfg.root_title; |
83 | cgit_print_http_headers(&ctx); | 94 | cgit_print_http_headers(&ctx); |
84 | cgit_print_docstart(&ctx); | 95 | cgit_print_docstart(&ctx); |
85 | cgit_print_pageheader(&ctx); | 96 | cgit_print_pageheader(&ctx); |
86 | 97 | ||
87 | if (ctx.cfg.index_header) | 98 | if (ctx.cfg.index_header) |
88 | html_include(ctx.cfg.index_header); | 99 | html_include(ctx.cfg.index_header); |
89 | 100 | ||
90 | html("<table summary='repository list' class='list nowrap'>"); | 101 | html("<table summary='repository list' class='list nowrap'>"); |
91 | for (i=0; i<cgit_repolist.count; i++) { | 102 | for (i=0; i<cgit_repolist.count; i++) { |
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 && |
101 | strcmp(ctx.repo->group, last_group))) { | 116 | strcmp(ctx.repo->group, last_group))) { |
102 | htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", | 117 | htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", |
103 | columns); | 118 | columns); |
104 | html_txt(ctx.repo->group); | 119 | html_txt(ctx.repo->group); |
105 | html("</td></tr>"); | 120 | html("</td></tr>"); |
106 | last_group = ctx.repo->group; | 121 | last_group = ctx.repo->group; |
107 | } | 122 | } |
108 | htmlf("<tr><td class='%s'>", | 123 | htmlf("<tr><td class='%s'>", |
109 | ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); | 124 | ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); |
110 | html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); | 125 | html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); |
111 | html_txt(ctx.repo->name); | 126 | html_txt(ctx.repo->name); |
112 | html_link_close(); | 127 | html_link_close(); |
113 | html("</td><td>"); | 128 | html("</td><td>"); |
114 | html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); | 129 | html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); |
115 | html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); | 130 | html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); |
116 | html_link_close(); | 131 | html_link_close(); |
117 | html("</td><td>"); | 132 | html("</td><td>"); |
118 | html_txt(ctx.repo->owner); | 133 | html_txt(ctx.repo->owner); |
119 | html("</td><td>"); | 134 | html("</td><td>"); |
120 | print_modtime(ctx.repo); | 135 | print_modtime(ctx.repo); |
121 | html("</td>"); | 136 | html("</td>"); |
122 | if (ctx.cfg.enable_index_links) { | 137 | if (ctx.cfg.enable_index_links) { |
123 | html("<td>"); | 138 | html("<td>"); |
124 | html_link_open(cgit_repourl(ctx.repo->url), | 139 | html_link_open(cgit_repourl(ctx.repo->url), |
125 | NULL, "button"); | 140 | NULL, "button"); |
126 | html("summary</a>"); | 141 | html("summary</a>"); |
127 | cgit_log_link("log", NULL, "button", NULL, NULL, NULL, | 142 | cgit_log_link("log", NULL, "button", NULL, NULL, NULL, |
128 | 0, NULL, NULL); | 143 | 0, NULL, NULL); |
129 | cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); | 144 | cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); |
130 | html("</td>"); | 145 | html("</td>"); |
131 | } | 146 | } |
132 | html("</tr>\n"); | 147 | html("</tr>\n"); |
133 | } | 148 | } |
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 | ||
140 | void cgit_print_site_readme() | 157 | void cgit_print_site_readme() |
141 | { | 158 | { |
142 | if (ctx.cfg.root_readme) | 159 | if (ctx.cfg.root_readme) |
143 | html_include(ctx.cfg.root_readme); | 160 | html_include(ctx.cfg.root_readme); |
144 | } | 161 | } |