Add support for 'enable-gitweb-owner' option

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index d56654d72a0f076681d0d3d4f2e617c40a4974e0..0a0b6ca19e942f0ddcb52128594f8584aab8c12c 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -94,7 +94,7 @@ int is_in_url(struct cgit_repo *repo)
 
 void print_sort_header(const char *title, const char *sort)
 {
 
 void print_sort_header(const char *title, const char *sort)
 {

-       htmlf("<th class='left'><a href='./?s=%s", sort);
+       htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);

        if (ctx.qry.search) {
                html("&q=");
                html_url_arg(ctx.qry.search);
        if (ctx.qry.search) {
                html("&q=");
                html_url_arg(ctx.qry.search);


@@ -217,6 +217,7 @@ void cgit_print_repolist()
 {
        int i, columns = 4, hits = 0, header = 0;
        char *last_section = NULL;
 {
        int i, columns = 4, hits = 0, header = 0;
        char *last_section = NULL;

+       char *section;

        int sorted = 0;
 
        if (ctx.cfg.enable_index_links)
        int sorted = 0;
 
        if (ctx.cfg.enable_index_links)


@@ -247,19 +248,22 @@ void cgit_print_repolist()
                        continue;
                if (!header++)
                        print_header(columns);
                        continue;
                if (!header++)
                        print_header(columns);

+               section = ctx.repo->section;
+               if (section && !strcmp(section, ""))
+                       section = NULL;

                if (!sorted &&
                if (!sorted &&

-                   ((last_section == NULL && ctx.repo->section != NULL) ||
-                   (last_section != NULL && ctx.repo->section == NULL) ||
-                   (last_section != NULL && ctx.repo->section != NULL &&
-                    strcmp(ctx.repo->section, last_section)))) {
+                   ((last_section == NULL && section != NULL) ||
+                   (last_section != NULL && section == NULL) ||
+                   (last_section != NULL && section != NULL &&
+                    strcmp(section, last_section)))) {

                        htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
                              columns);
                        htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
                              columns);

-                       html_txt(ctx.repo->section);
+                       html_txt(section);

                        html("</td></tr>");
                        html("</td></tr>");

-                       last_section = ctx.repo->section;
+                       last_section = section;

                }
                htmlf("<tr><td class='%s'>",
                }
                htmlf("<tr><td class='%s'>",

-                     !sorted && ctx.repo->section ? "sublevel-repo" : "toplevel-repo");
+                     !sorted && section ? "sublevel-repo" : "toplevel-repo");

                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                html("</td><td>");
                html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                html("</td><td>");
                html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);