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
@@ -15,16 +15,24 @@
 #include "ui-patch.h"
 #include "ui-refs.h"
 #include "ui-repolist.h"
 #include "ui-snapshot.h"
 #include "ui-summary.h"
 #include "ui-tag.h"
 #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)
 {
         cgit_print_blob(ctx->qry.sha1, ctx->qry.path);
 }
 
 static void commit_fn(struct cgit_context *ctx)
 {
         cgit_print_commit(ctx->qry.sha1);
@@ -79,16 +87,17 @@ static void tree_fn(struct cgit_context *ctx)
 }
 
 #define def_cmd(name, want_repo, want_layout) \
         {#name, name##_fn, want_repo, want_layout}
 
 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),
                 def_cmd(diff, 1, 1),
                 def_cmd(log, 1, 1),
                 def_cmd(patch, 1, 0),
                 def_cmd(refs, 1, 1),
                 def_cmd(repolist, 0, 0),
                 def_cmd(snapshot, 1, 0),
diff --git a/ui-shared.c b/ui-shared.c
index 83758f7..d08ede9 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -109,16 +109,59 @@ char *cgit_currurl()
         else if (ctx.qry.page)
                 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
         else if (ctx.qry.repo)
                 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
         else
                 return fmt("%s/", ctx.cfg.virtual_root);
 }
 
+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)
 {
         char *delim = "?";
 
         html("<a");
         if (title) {
                 html(" title='");
@@ -526,16 +569,20 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
                               NULL, NULL, 0, NULL, NULL);
                 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
                                ctx->qry.sha1, NULL);
                 cgit_commit_link("commit", NULL, hc(cmd, "commit"),
                                  ctx->qry.head, ctx->qry.sha1);
                 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='");
                 if (ctx->cfg.virtual_root)
                         html_attr(cgit_fileurl(ctx->qry.repo, "log",
                                                ctx->qry.path, NULL));
                 html("'>\n");
                 add_hidden_formfields(1, 0, "log");
                 html("<select name='qt'>\n");
@@ -544,19 +591,19 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 html_option("committer", "committer", ctx->qry.grep);
                 html("</select>\n");
                 html("<input class='txt' type='text' size='10' name='q' value='");
                 html_attr(ctx->qry.search);
                 html("'/>\n");
                 html("<input type='submit' value='search'/>\n");
                 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='");
                 html_attr(cgit_rooturl());
                 html("'>\n");
                 html("<input type='text' name='q' size='10' value='");
                 html_attr(ctx->qry.search);
                 html("'/>\n");
                 html("<input type='submit' value='search'/>\n");