summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show 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
@@ -20,6 +20,14 @@
20#include "ui-tag.h" 20#include "ui-tag.h"
21#include "ui-tree.h" 21#include "ui-tree.h"
22 22
23static void about_fn(struct cgit_context *ctx)
24{
25 if (ctx->repo)
26 cgit_print_repo_readme();
27 else
28 cgit_print_site_readme();
29}
30
23static void blob_fn(struct cgit_context *ctx) 31static void blob_fn(struct cgit_context *ctx)
24{ 32{
25 cgit_print_blob(ctx->qry.sha1, ctx->qry.path); 33 cgit_print_blob(ctx->qry.sha1, ctx->qry.path);
@@ -84,6 +92,7 @@ static void tree_fn(struct cgit_context *ctx)
84struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) 92struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
85{ 93{
86 static struct cgit_cmd cmds[] = { 94 static struct cgit_cmd cmds[] = {
95 def_cmd(about, 0, 1),
87 def_cmd(blob, 1, 0), 96 def_cmd(blob, 1, 0),
88 def_cmd(commit, 1, 1), 97 def_cmd(commit, 1, 1),
89 def_cmd(diff, 1, 1), 98 def_cmd(diff, 1, 1),
diff --git a/ui-shared.c b/ui-shared.c
index 83758f7..d08ede9 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -114,6 +114,49 @@ char *cgit_currurl()
114 return fmt("%s/", ctx.cfg.virtual_root); 114 return fmt("%s/", ctx.cfg.virtual_root);
115} 115}
116 116
117static void site_url(char *page, char *search)
118{
119 char *delim = "?";
120
121 if (ctx.cfg.virtual_root) {
122 html_attr(ctx.cfg.virtual_root);
123 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
124 html("/");
125 } else
126 html(ctx.cfg.script_name);
127
128 if (page) {
129 htmlf("?p=%s", page);
130 delim = "&";
131 }
132 if (search) {
133 html(delim);
134 html("q=");
135 html_attr(search);
136 }
137}
138
139static void site_link(char *page, char *name, char *title, char *class,
140 char *search)
141{
142 html("<a");
143 if (title) {
144 html(" title='");
145 html_attr(title);
146 html("'");
147 }
148 if (class) {
149 html(" class='");
150 html_attr(class);
151 html("'");
152 }
153 html(" href='");
154 site_url(page, search);
155 html("'>");
156 html_txt(name);
157 html("</a>");
158}
159
117static char *repolink(char *title, char *class, char *page, char *head, 160static char *repolink(char *title, char *class, char *page, char *head,
118 char *path) 161 char *path)
119{ 162{
@@ -531,6 +574,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
531 ctx->qry.head, ctx->qry.sha1); 574 ctx->qry.head, ctx->qry.sha1);
532 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, 575 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
533 ctx->qry.sha1, ctx->qry.sha2, NULL); 576 ctx->qry.sha1, ctx->qry.sha2, NULL);
577 if (ctx->repo->readme)
578 reporevlink("about", "about", NULL,
579 hc(cmd, "about"), ctx->qry.head, NULL,
580 NULL);
534 html("</td><td class='form'>"); 581 html("</td><td class='form'>");
535 html("<form class='right' method='get' action='"); 582 html("<form class='right' method='get' action='");
536 if (ctx->cfg.virtual_root) 583 if (ctx->cfg.virtual_root)
@@ -549,9 +596,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
549 html("<input type='submit' value='search'/>\n"); 596 html("<input type='submit' value='search'/>\n");
550 html("</form>\n"); 597 html("</form>\n");
551 } else { 598 } else {
552 html("<a class='active' href='"); 599 site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL);
553 html_attr(cgit_rooturl()); 600 if (ctx->cfg.root_readme)
554 html("'>index</a>\n"); 601 site_link("about", "about", NULL, hc(cmd, "about"), NULL);
555 html("</td><td class='form'>"); 602 html("</td><td class='form'>");
556 html("<form method='get' action='"); 603 html("<form method='get' action='");
557 html_attr(cgit_rooturl()); 604 html_attr(cgit_rooturl());