author | Lars Hjemli <hjemli@gmail.com> | 2008-04-13 10:48:44 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-13 10:48:44 (UTC) |
commit | 76ba6287bfb533baca7285b107b5d975581d449d (patch) (unidiff) | |
tree | 22445a77f5b87280ec980f9b4da5a511f1f27faf /ui-repolist.c | |
parent | 4a842288260a0b0c4a3d4032d441f7fd2afee699 (diff) | |
parent | 28d781f34b2c2d4c2b994ef3953d1cf37d8f28f0 (diff) | |
download | cgit-76ba6287bfb533baca7285b107b5d975581d449d.zip cgit-76ba6287bfb533baca7285b107b5d975581d449d.tar.gz cgit-76ba6287bfb533baca7285b107b5d975581d449d.tar.bz2 |
Merge branch 'lh/layout'
* lh/layout:
Make repository search case insensitive
Remove 'patch' link from tab, add to commit view
Implement minimal freetext search in the repolist
More layout fixes
Minor fixup in tree-view css
Reintroduce the branch switcher
Add fixed link to index page from repo header
Include diff in commit view
Replace sidebar/logo
-rw-r--r-- | ui-repolist.c | 51 |
1 files changed, 38 insertions, 13 deletions
diff --git a/ui-repolist.c b/ui-repolist.c index eeeaf3d..7a7e95a 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -43,22 +43,25 @@ static void print_modtime(struct cgit_repo *repo) | |||
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 | void cgit_print_repolist() | 47 | int is_match(struct cgit_repo *repo) |
48 | { | 48 | { |
49 | int i, columns = 4; | 49 | if (!ctx.qry.search) |
50 | char *last_group = NULL; | 50 | return 1; |
51 | 51 | if (repo->url && strcasestr(repo->url, ctx.qry.search)) | |
52 | if (ctx.cfg.enable_index_links) | 52 | return 1; |
53 | columns++; | 53 | if (repo->name && strcasestr(repo->name, ctx.qry.search)) |
54 | 54 | return 1; | |
55 | ctx.page.title = ctx.cfg.root_title; | 55 | if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) |
56 | cgit_print_http_headers(&ctx); | 56 | return 1; |
57 | cgit_print_docstart(&ctx); | 57 | if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) |
58 | cgit_print_pageheader(&ctx); | 58 | return 1; |
59 | return 0; | ||
60 | } | ||
59 | 61 | ||
60 | html("<table summary='repository list' class='list nowrap'>"); | 62 | void print_header(int columns) |
63 | { | ||
61 | if (ctx.cfg.index_header) { | 64 | if (ctx.cfg.index_header) { |
62 | htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", | 65 | htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", |
63 | columns); | 66 | columns); |
64 | html_include(ctx.cfg.index_header); | 67 | html_include(ctx.cfg.index_header); |
@@ -69,13 +72,33 @@ void cgit_print_repolist() | |||
69 | "<th class='left'>Description</th>" | 72 | "<th class='left'>Description</th>" |
70 | "<th class='left'>Owner</th>" | 73 | "<th class='left'>Owner</th>" |
71 | "<th class='left'>Idle</th>"); | 74 | "<th class='left'>Idle</th>"); |
72 | if (ctx.cfg.enable_index_links) | 75 | if (ctx.cfg.enable_index_links) |
73 | html("<th>Links</th>"); | 76 | html("<th class='left'>Links</th>"); |
74 | html("</tr>\n"); | 77 | html("</tr>\n"); |
78 | } | ||
75 | 79 | ||
80 | void cgit_print_repolist() | ||
81 | { | ||
82 | int i, columns = 4, hits = 0, header = 0; | ||
83 | char *last_group = NULL; | ||
84 | |||
85 | if (ctx.cfg.enable_index_links) | ||
86 | columns++; | ||
87 | |||
88 | ctx.page.title = ctx.cfg.root_title; | ||
89 | cgit_print_http_headers(&ctx); | ||
90 | cgit_print_docstart(&ctx); | ||
91 | cgit_print_pageheader(&ctx); | ||
92 | |||
93 | html("<table summary='repository list' class='list nowrap'>"); | ||
76 | for (i=0; i<cgit_repolist.count; i++) { | 94 | for (i=0; i<cgit_repolist.count; i++) { |
77 | ctx.repo = &cgit_repolist.repos[i]; | 95 | ctx.repo = &cgit_repolist.repos[i]; |
96 | if (!is_match(ctx.repo)) | ||
97 | continue; | ||
98 | if (!header++) | ||
99 | print_header(columns); | ||
100 | hits++; | ||
78 | if ((last_group == NULL && ctx.repo->group != NULL) || | 101 | if ((last_group == NULL && ctx.repo->group != NULL) || |
79 | (last_group != NULL && ctx.repo->group == NULL) || | 102 | (last_group != NULL && ctx.repo->group == NULL) || |
80 | (last_group != NULL && ctx.repo->group != NULL && | 103 | (last_group != NULL && ctx.repo->group != NULL && |
81 | strcmp(ctx.repo->group, last_group))) { | 104 | strcmp(ctx.repo->group, last_group))) { |
@@ -109,6 +132,8 @@ void cgit_print_repolist() | |||
109 | } | 132 | } |
110 | html("</tr>\n"); | 133 | html("</tr>\n"); |
111 | } | 134 | } |
112 | html("</table>"); | 135 | html("</table>"); |
136 | if (!hits) | ||
137 | cgit_print_error("No repositories found"); | ||
113 | cgit_print_docend(); | 138 | cgit_print_docend(); |
114 | } | 139 | } |