ui-shared: currenturl should take into account leading slash

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 79019c268027343e7944ceab6db35477219e861f..c16ed8c4885402970e535e1181a59fdd30d64382 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -93,6 +93,10 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                        repo->email_filter = cgit_new_filter(value, EMAIL);
                else if (!strcmp(name, "owner-filter"))
                        repo->owner_filter = cgit_new_filter(value, OWNER);
+       } else if (!strcmp(name, "hide")) {
+               repo->hide = atoi(value);
+       } else if (!strcmp(name, "ignore")) {
+               repo->ignore = atoi(value);
        }
 }
 
@@ -532,6 +536,17 @@ static void choose_readme(struct cgit_repo *repo)
                string_list_append(&repo->readme, filename)->util = ref;
 }
 
+static void print_no_repo_clone_urls(const char *url)
+{
+        html("<tr><td><a rel='vcs-git' href='");
+        html_url_path(url);
+        html("' title='");
+        html_attr(ctx.repo->name);
+        html(" Git repository'>");
+        html_txt(url);
+        html("</a></td></tr>\n");
+}
+
 static int prepare_repo_cmd(void)
 {
        unsigned char sha1[20];
@@ -582,6 +597,11 @@ static int prepare_repo_cmd(void)
                cgit_print_docstart();
                cgit_print_pageheader();
                cgit_print_error("Repository seems to be empty");
+               if (!strcmp(ctx.qry.page, "summary")) {
+                       html("<table class='list'><tr class='nohover'><td>&nbsp;</td></tr><tr class='nohover'><th class='left'>Clone</th></tr>\n");
+                       cgit_add_clone_urls(print_no_repo_clone_urls);
+                       html("</table>\n");
+               }
                cgit_print_docend();
                return 1;
        }
@@ -599,7 +619,7 @@ static int prepare_repo_cmd(void)
                free(tmp);
                return 1;
        }
-       sort_string_list(&ctx.repo->submodules);
+       string_list_sort(&ctx.repo->submodules);
        cgit_prepare_repo_env(ctx.repo);
        choose_readme(ctx.repo);
        return 0;
@@ -828,6 +848,8 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
                else if (repo->commit_sort == 2)
                        fprintf(f, "repo.commit-sort=topo\n");
        }
+       fprintf(f, "repo.hide=%d\n", repo->hide);
+       fprintf(f, "repo.ignore=%d\n", repo->ignore);
        fprintf(f, "\n");
 }
 
@@ -991,7 +1013,7 @@ static void cgit_parse_args(int argc, const char **argv)
        }
 }
 
-static int calc_ttl()
+static int calc_ttl(void)
 {
        if (!ctx.repo)
                return ctx.cfg.cache_root_ttl;