Merge branch 'lh/about'

* lh/about:
  Add 'about site' and 'about repo' pages
  Prepare for 'about site' page / add 'root-readme' option to cgitrc
  Make it possible for a single cmd to work both with and without a repo
  Re-enable 'index-info' and add support for 'root-desc' in cgitrc
  Move included header-file out of repolist table
  Prepare for 'about repo' page

1 files changed, 9 insertions, 6 deletions

diff --git a/ui-repolist.c b/ui-repolist.c
index 98009c0..3f78e28 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -61,12 +61,6 @@ int is_match(struct cgit_repo *repo)
 
 void print_header(int columns)
 {
-        if (ctx.cfg.index_header) {
-                htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
-                      columns);
-                html_include(ctx.cfg.index_header);
-                html("</td></tr>");
-        }
         html("<tr class='nohover'>"
              "<th class='left'>Name</th>"
              "<th class='left'>Description</th>"
@@ -90,6 +84,9 @@ void cgit_print_repolist()
         cgit_print_docstart(&ctx);
         cgit_print_pageheader(&ctx);
 
+        if (ctx.cfg.index_header)
+                html_include(ctx.cfg.index_header);
+
         html("<table summary='repository list' class='list nowrap'>");
         for (i=0; i<cgit_repolist.count; i++) {
                 ctx.repo = &cgit_repolist.repos[i];
@@ -139,3 +136,9 @@ void cgit_print_repolist()
                 cgit_print_error("No repositories found");
         cgit_print_docend();
 }
+
+void cgit_print_site_readme()
+{
+        if (ctx.cfg.root_readme)
+                html_include(ctx.cfg.root_readme);
+}