X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/71adba1f1678914063fc109cf3805afde2c68f75..502865a5ec40fed5f1f865cb34002aecaab8405e:/ui-shared.c?ds=inline diff --git a/ui-shared.c b/ui-shared.c index d08ede9..6f83d2a 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -114,7 +114,7 @@ char *cgit_currurl() return fmt("%s/", ctx.cfg.virtual_root); } -static void site_url(char *page, char *search) +static void site_url(char *page, char *search, int ofs) { char *delim = "?"; @@ -133,11 +133,16 @@ static void site_url(char *page, char *search) html(delim); html("q="); html_attr(search); + delim = "&"; + } + if (ofs) { + html(delim); + htmlf("ofs=%d", ofs); } } static void site_link(char *page, char *name, char *title, char *class, - char *search) + char *search, int ofs) { html(""); html_txt(name); html(""); } +void cgit_index_link(char *name, char *title, char *class, char *pattern, + int ofs) +{ + site_link(NULL, name, title, class, pattern, ofs); +} + static char *repolink(char *title, char *class, char *page, char *head, char *path) { @@ -426,13 +437,27 @@ void cgit_print_docstart(struct cgit_context *ctx) html("\n"); + if (ctx->cfg.favicon) { + html("\n"); + } html("\n"); html("\n"); } void cgit_print_docend() { - html("\n\n\n"); + html(""); + if (ctx.cfg.footer) + html_include(ctx.cfg.footer); + else { + html("\n"); + } + html("\n\n"); } int print_branch_option(const char *refname, const unsigned char *sha1, @@ -531,10 +556,10 @@ void cgit_print_pageheader(struct cgit_context *ctx) html(""); if (ctx->repo) { + cgit_index_link("index", NULL, NULL, NULL, 0); + html(" : "); reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"), ctx->qry.head, NULL, NULL); - html(" : "); - html_txt(ctx->qry.page); html(""); html("
\n"); add_hidden_formfields(0, 1, ctx->qry.page); @@ -596,9 +621,10 @@ void cgit_print_pageheader(struct cgit_context *ctx) html("\n"); html("
\n"); } else { - site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL); + site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); if (ctx->cfg.root_readme) - site_link("about", "about", NULL, hc(cmd, "about"), NULL); + site_link("about", "about", NULL, hc(cmd, "about"), + NULL, 0); html(""); html("