all repos — cgit @ bbcdc290c6c0b8121e57dbca4bd66c9e5e729959

a hyperfast web frontend for git written in c 

Add repo.readme parameter

This parameter can be used to specify a repo-specific includefile, which will
then be printed on the summary page for the repo.

If the parametervalue is a not an absolute path, it is taken to be relative
to repo.path.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Lars Hjemli hjemli@gmail.com
Wed, 23 May 2007 22:46:54 +0200
commit

bbcdc290c6c0b8121e57dbca4bd66c9e5e729959

parent

25da3f76255754c8b3f98232a5eb84f47088d0f7

5 files changed, 23 insertions(+), 15 deletions(-)

jump to
M cgit.css → cgit.css 
@@ -140,22 +140,20 @@ color: #333;
 	background-color: #fff;
 }
 
-td#summary {
+div#summary {
 	vertical-align: top;
-	padding-bottom: 1em;
-}
-
-td#archivelist {
-	padding-bottom: 1em;
+	margin-bottom: 1em;
 }
 
-td#archivelist table {
+table#downloads {
 	float: right;
 	border-collapse: collapse;
 	border: solid 1px #777;
+	margin-left: 0.5em;
+	margin-bottom: 0.5em;
 }
 
-td#archivelist table th {
+table#downloads th {
 	background-color: #ccc;
 }
M cgit.h → cgit.h 
@@ -68,6 +68,7 @@ char *owner;
 	char *defbranch;
 	char *group;
 	char *module_link;
+	char *readme;
 	int snapshots;
 	int enable_log_filecount;
 	int enable_log_linecount;
M cgitrc → cgitrc 
@@ -108,3 +108,4 @@ #repo.snapshots=1				# override a sitewide snapshot-setting
 #repo.enable-log-filecount=0			# override the default filecount setting
 #repo.enable-log-linecount=0			# override the default linecount setting
 #repo.module-link=/git/%s/commit/?id=%s		# override the standard module-link
+#repo.readme=info/web/readme			# specify a file to include on summary page
M shared.c → shared.c 
@@ -107,6 +107,7 @@ ret->snapshots = cgit_snapshots;
 	ret->enable_log_filecount = cgit_enable_log_filecount;
 	ret->enable_log_linecount = cgit_enable_log_linecount;
 	ret->module_link = cgit_module_link;
+	ret->readme = NULL;
 	return ret;
 }
 

@@ -187,7 +188,12 @@ else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
 		cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
 	else if (cgit_repo && !strcmp(name, "repo.module-link"))
 		cgit_repo->module_link= xstrdup(value);
-	else if (!strcmp(name, "include"))
+	else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) {
+		if (*value == '/')
+			cgit_repo->readme = xstrdup(value);
+		else
+			cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value));
+	} else if (!strcmp(name, "include"))
 		cgit_read_config(value, cgit_global_config_cb);
 }
M ui-summary.c → ui-summary.c 
@@ -153,7 +153,7 @@ } else {
 		hashcpy(fileid, sha1);
 	}
 	if (!header) {
-		html("<table>");
+		html("<table id='downloads'>");
 		html("<tr><th>Downloads</th></tr>");
 		header = 1;
 	}

@@ -193,16 +193,18 @@ }
 
 void cgit_print_summary()
 {
-	html("<table class='list nowrap'>");
-	html("<tr class='nohover'><td id='summary' colspan='3'>");
+	html("<div id='summary'>");
+	cgit_print_archives();
 	html("<h2>");
 	html_txt(cgit_repo->name);
 	html(" - ");
 	html_txt(cgit_repo->desc);
 	html("</h2>");
-	html("</td><td id='archivelist'>");
-	cgit_print_archives();
-	html("</td></tr>");
+	if (cgit_repo->readme)
+		html_include(cgit_repo->readme);
+	html("</div>");
+
+	html("<table class='list nowrap'>");
 	cgit_print_branches();
 	html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
 	cgit_print_tags();