summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-04-28 23:09:41 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-04-28 23:09:41 (UTC)
commit71adba1f1678914063fc109cf3805afde2c68f75 (patch) (side-by-side diff)
tree34712da2eef917be04b2acc5585612b65c1e49cc
parentc6431a71508f1b61a95b01d85fe4534a0245e626 (diff)
downloadcgit-71adba1f1678914063fc109cf3805afde2c68f75.zip
cgit-71adba1f1678914063fc109cf3805afde2c68f75.tar.gz
cgit-71adba1f1678914063fc109cf3805afde2c68f75.tar.bz2
Add 'about site' and 'about repo' pages
This commit uses the options and changes from the last few commits to implement a new 'about' command which works both with and without a repo. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cmd.c9
-rw-r--r--ui-shared.c53
2 files changed, 59 insertions, 3 deletions
diff --git a/cmd.c b/cmd.c
index e0eacbe..6cc91e6 100644
--- a/cmd.c
+++ b/cmd.c
@@ -21,4 +21,12 @@
#include "ui-tree.h"
+static void about_fn(struct cgit_context *ctx)
+{
+ if (ctx->repo)
+ cgit_print_repo_readme();
+ else
+ cgit_print_site_readme();
+}
+
static void blob_fn(struct cgit_context *ctx)
{
@@ -85,4 +93,5 @@ struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
{
static struct cgit_cmd cmds[] = {
+ def_cmd(about, 0, 1),
def_cmd(blob, 1, 0),
def_cmd(commit, 1, 1),
diff --git a/ui-shared.c b/ui-shared.c
index 83758f7..d08ede9 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -115,4 +115,47 @@ char *cgit_currurl()
}
+static void site_url(char *page, char *search)
+{
+ char *delim = "?";
+
+ if (ctx.cfg.virtual_root) {
+ html_attr(ctx.cfg.virtual_root);
+ if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
+ html("/");
+ } else
+ html(ctx.cfg.script_name);
+
+ if (page) {
+ htmlf("?p=%s", page);
+ delim = "&";
+ }
+ if (search) {
+ html(delim);
+ html("q=");
+ html_attr(search);
+ }
+}
+
+static void site_link(char *page, char *name, char *title, char *class,
+ char *search)
+{
+ html("<a");
+ if (title) {
+ html(" title='");
+ html_attr(title);
+ html("'");
+ }
+ if (class) {
+ html(" class='");
+ html_attr(class);
+ html("'");
+ }
+ html(" href='");
+ site_url(page, search);
+ html("'>");
+ html_txt(name);
+ html("</a>");
+}
+
static char *repolink(char *title, char *class, char *page, char *head,
char *path)
@@ -532,4 +575,8 @@ void cgit_print_pageheader(struct cgit_context *ctx)
cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
ctx->qry.sha1, ctx->qry.sha2, NULL);
+ if (ctx->repo->readme)
+ reporevlink("about", "about", NULL,
+ hc(cmd, "about"), ctx->qry.head, NULL,
+ NULL);
html("</td><td class='form'>");
html("<form class='right' method='get' action='");
@@ -550,7 +597,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
html("</form>\n");
} else {
- html("<a class='active' href='");
- html_attr(cgit_rooturl());
- html("'>index</a>\n");
+ site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL);
+ if (ctx->cfg.root_readme)
+ site_link("about", "about", NULL, hc(cmd, "about"), NULL);
html("</td><td class='form'>");
html("<form method='get' action='");