-rw-r--r-- | ui-repolist.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ui-repolist.c b/ui-repolist.c index 98009c0..200640c 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -48,61 +48,58 @@ 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 | if (ctx.cfg.index_header) { | ||
65 | htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", | ||
66 | columns); | ||
67 | html_include(ctx.cfg.index_header); | ||
68 | html("</td></tr>"); | ||
69 | } | ||
70 | html("<tr class='nohover'>" | 64 | html("<tr class='nohover'>" |
71 | "<th class='left'>Name</th>" | 65 | "<th class='left'>Name</th>" |
72 | "<th class='left'>Description</th>" | 66 | "<th class='left'>Description</th>" |
73 | "<th class='left'>Owner</th>" | 67 | "<th class='left'>Owner</th>" |
74 | "<th class='left'>Idle</th>"); | 68 | "<th class='left'>Idle</th>"); |
75 | if (ctx.cfg.enable_index_links) | 69 | if (ctx.cfg.enable_index_links) |
76 | html("<th class='left'>Links</th>"); | 70 | html("<th class='left'>Links</th>"); |
77 | html("</tr>\n"); | 71 | html("</tr>\n"); |
78 | } | 72 | } |
79 | 73 | ||
80 | void cgit_print_repolist() | 74 | void cgit_print_repolist() |
81 | { | 75 | { |
82 | int i, columns = 4, hits = 0, header = 0; | 76 | int i, columns = 4, hits = 0, header = 0; |
83 | char *last_group = NULL; | 77 | char *last_group = NULL; |
84 | 78 | ||
85 | if (ctx.cfg.enable_index_links) | 79 | if (ctx.cfg.enable_index_links) |
86 | columns++; | 80 | columns++; |
87 | 81 | ||
88 | ctx.page.title = ctx.cfg.root_title; | 82 | ctx.page.title = ctx.cfg.root_title; |
89 | cgit_print_http_headers(&ctx); | 83 | cgit_print_http_headers(&ctx); |
90 | cgit_print_docstart(&ctx); | 84 | cgit_print_docstart(&ctx); |
91 | cgit_print_pageheader(&ctx); | 85 | cgit_print_pageheader(&ctx); |
92 | 86 | ||
87 | if (ctx.cfg.index_header) | ||
88 | html_include(ctx.cfg.index_header); | ||
89 | |||
93 | html("<table summary='repository list' class='list nowrap'>"); | 90 | html("<table summary='repository list' class='list nowrap'>"); |
94 | for (i=0; i<cgit_repolist.count; i++) { | 91 | for (i=0; i<cgit_repolist.count; i++) { |
95 | ctx.repo = &cgit_repolist.repos[i]; | 92 | ctx.repo = &cgit_repolist.repos[i]; |
96 | if (!is_match(ctx.repo)) | 93 | if (!is_match(ctx.repo)) |
97 | continue; | 94 | continue; |
98 | if (!header++) | 95 | if (!header++) |
99 | print_header(columns); | 96 | print_header(columns); |
100 | hits++; | 97 | hits++; |
101 | if ((last_group == NULL && ctx.repo->group != NULL) || | 98 | if ((last_group == NULL && ctx.repo->group != NULL) || |
102 | (last_group != NULL && ctx.repo->group == NULL) || | 99 | (last_group != NULL && ctx.repo->group == NULL) || |
103 | (last_group != NULL && ctx.repo->group != NULL && | 100 | (last_group != NULL && ctx.repo->group != NULL && |
104 | strcmp(ctx.repo->group, last_group))) { | 101 | strcmp(ctx.repo->group, last_group))) { |
105 | htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", | 102 | htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", |
106 | columns); | 103 | columns); |
107 | html_txt(ctx.repo->group); | 104 | html_txt(ctx.repo->group); |
108 | html("</td></tr>"); | 105 | html("</td></tr>"); |