From 8062817885495b07cf70304c484e8f18c78ab2b5 Mon Sep 17 00:00:00 2001
From: Lars Hjemli
Date: Tue, 29 Apr 2008 00:35:49 +0200
Subject: Move included header-file out of repolist table

When the 'index-header' option is specified in cgitrc we used to print
the included file content inside the repolist table, which is bad style.

This commit makes the included file be printed before the table.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
 ui-repolist.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'ui-repolist.c')

diff --git a/ui-repolist.c b/ui-repolist.c
index 98009c0..200640c 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];
-- 
cgit v1.2.3-70-g09d2


From c6431a71508f1b61a95b01d85fe4534a0245e626 Mon Sep 17 00:00:00 2001
From: Lars Hjemli
Date: Tue, 29 Apr 2008 01:06:30 +0200
Subject: Prepare for 'about site' page / add 'root-readme' option to cgitrc

The new option names a file which will be included on a new page, next
to the current 'index' page.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
 cgit.c        | 2 ++
 cgit.h        | 1 +
 ui-repolist.c | 6 ++++++
 ui-repolist.h | 1 +
 4 files changed, 10 insertions(+)

(limited to 'ui-repolist.c')

diff --git a/cgit.c b/cgit.c
index d37abc9..a402758 100644
--- a/cgit.c
+++ b/cgit.c
@@ -21,6 +21,8 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.root_title = xstrdup(value);
 	else if (!strcmp(name, "root-desc"))
 		ctx.cfg.root_desc = xstrdup(value);
+	else if (!strcmp(name, "root-readme"))
+		ctx.cfg.root_readme = xstrdup(value);
 	else if (!strcmp(name, "css"))
 		ctx.cfg.css = xstrdup(value);
 	else if (!strcmp(name, "logo"))
diff --git a/cgit.h b/cgit.h
index 7761b6e..daebeff 100644
--- a/cgit.h
+++ b/cgit.h
@@ -133,6 +133,7 @@ struct cgit_config {
 	char *robots;
 	char *root_title;
 	char *root_desc;
+	char *root_readme;
 	char *script_name;
 	char *virtual_root;
 	int cache_dynamic_ttl;
diff --git a/ui-repolist.c b/ui-repolist.c
index 200640c..3f78e28 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -136,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);
+}
diff --git a/ui-repolist.h b/ui-repolist.h
index c23e5d2..5b1e542 100644
--- a/ui-repolist.h
+++ b/ui-repolist.h
@@ -2,5 +2,6 @@
 #define UI_REPOLIST_H
 
 extern void cgit_print_repolist();
+extern void cgit_print_site_readme();
 
 #endif /* UI_REPOLIST_H */
-- 
cgit v1.2.3-70-g09d2