mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-25 18:08:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make root handling sane again.

Browse Source
This commit is contained in:
Jason A. Donenfeld 2015-03-03 17:23:40 +01:00
parent 6bcda2f73d
commit 2e4a41e840
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-repolist.c
View File

@ -140,7 +140,7 @@ static void print_pager(int items, int pagelen, char *search, char *sort)
class = (ctx.qry.ofs == ofs) ? "current" : NULL; class = (ctx.qry.ofs == ofs) ? "current" : NULL;
html("<li>"); html("<li>");
cgit_index_link(fmt("[%d]", i + 1), fmt("Page %d", i + 1), cgit_index_link(fmt("[%d]", i + 1), fmt("Page %d", i + 1),
class, search, sort, ofs); class, search, sort, ofs, 0);
html("</li>"); html("</li>");
} }
html("</ul>"); html("</ul>");

24
ui-shared.c
View File

@ -147,14 +147,14 @@ const char *cgit_repobasename(const char *reponame)
return rvbuf; return rvbuf;
} }
static void site_url(const char *page, const char *search, const char *sort, int ofs) static void site_url(const char *page, const char *search, const char *sort, int ofs, int always_root)
{ {
char *delim = "?"; char *delim = "?";
if (!page) if (always_root || page)
html_attr(cgit_currenturl());
else
html_attr(cgit_rooturl()); html_attr(cgit_rooturl());
else
html_attr(cgit_currenturl());
if (page) { if (page) {
htmlf("?p=%s", page); htmlf("?p=%s", page);
@ -179,7 +179,7 @@ static void site_url(const char *page, const char *search, const char *sort, int
} }
static void site_link(const char *page, const char *name, const char *title, static void site_link(const char *page, const char *name, const char *title,
const char *class, const char *search, const char *sort, int ofs) const char *class, const char *search, const char *sort, int ofs, int always_root)
{ {
html("<a"); html("<a");
if (title) { if (title) {
@ -193,16 +193,16 @@ static void site_link(const char *page, const char *name, const char *title,
html("'"); html("'");
} }
html(" href='"); html(" href='");
site_url(page, search, sort, ofs); site_url(page, search, sort, ofs, always_root);
html("'>"); html("'>");
html_txt(name); html_txt(name);
html("</a>"); html("</a>");
} }
void cgit_index_link(const char *name, const char *title, const char *class, void cgit_index_link(const char *name, const char *title, const char *class,
const char *pattern, const char *sort, int ofs) const char *pattern, const char *sort, int ofs, int always_root)
{ {
site_link(NULL, name, title, class, pattern, sort, ofs); site_link(NULL, name, title, class, pattern, sort, ofs, always_root);
} }
static char *repolink(const char *title, const char *class, const char *page, static char *repolink(const char *title, const char *class, const char *page,
@ -446,7 +446,7 @@ static void cgit_self_link(char *name, const char *title, const char *class)
{ {
if (!strcmp(ctx.qry.page, "repolist")) if (!strcmp(ctx.qry.page, "repolist"))
cgit_index_link(name, title, class, ctx.qry.search, ctx.qry.sort, cgit_index_link(name, title, class, ctx.qry.search, ctx.qry.sort,
ctx.qry.ofs); ctx.qry.ofs, 1);
else if (!strcmp(ctx.qry.page, "summary")) else if (!strcmp(ctx.qry.page, "summary"))
cgit_summary_link(name, title, class, ctx.qry.head); cgit_summary_link(name, title, class, ctx.qry.head);
else if (!strcmp(ctx.qry.page, "tag")) else if (!strcmp(ctx.qry.page, "tag"))
@ -875,7 +875,7 @@ static void print_header(void)
html("<td class='main'>"); html("<td class='main'>");
if (ctx.repo) { if (ctx.repo) {
cgit_index_link("index", NULL, NULL, NULL, NULL, 0); cgit_index_link("index", NULL, NULL, NULL, NULL, 0, 1);
html(" : "); html(" : ");
cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL); cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
if (ctx.env.authenticated) { if (ctx.env.authenticated) {
@ -953,10 +953,10 @@ void cgit_print_pageheader(void)
html("<input type='submit' value='search'/>\n"); html("<input type='submit' value='search'/>\n");
html("</form>\n"); html("</form>\n");
} else if (ctx.env.authenticated) { } else if (ctx.env.authenticated) {
site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0); site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0, 1);
if (ctx.cfg.root_readme) if (ctx.cfg.root_readme)
site_link("about", "about", NULL, hc("about"), site_link("about", "about", NULL, hc("about"),
NULL, NULL, 0); NULL, NULL, 0, 1);
html("</td><td class='form'>"); html("</td><td class='form'>");
html("<form method='get' action='"); html("<form method='get' action='");
html_attr(cgit_currenturl()); html_attr(cgit_currenturl());

2
ui-shared.h
View File

@ -15,7 +15,7 @@ extern char *cgit_pageurl(const char *reponame, const char *pagename,
extern void cgit_add_clone_urls(void (*fn)(const char *)); extern void cgit_add_clone_urls(void (*fn)(const char *));
extern void cgit_index_link(const char *name, const char *title, extern void cgit_index_link(const char *name, const char *title,
const char *class, const char *pattern, const char *sort, int ofs); const char *class, const char *pattern, const char *sort, int ofs, int always_root);
extern void cgit_summary_link(const char *name, const char *title, extern void cgit_summary_link(const char *name, const char *title,
const char *class, const char *head); const char *class, const char *head);
extern void cgit_tag_link(const char *name, const char *title, extern void cgit_tag_link(const char *name, const char *title,