summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.css14
-rw-r--r--cgit.h1
-rw-r--r--cgitrc1
-rw-r--r--shared.c8
-rw-r--r--ui-summary.c14
5 files changed, 23 insertions, 15 deletions
diff --git a/cgit.css b/cgit.css
index 327eaba..8977533 100644
--- a/cgit.css
+++ b/cgit.css
@@ -142,12 +142,8 @@ td#search input {
-td#summary {
+div#summary {
vertical-align: top;
- padding-bottom: 1em;
+ margin-bottom: 1em;
}
-td#archivelist {
- padding-bottom: 1em;
-}
-
-td#archivelist table {
+table#downloads {
float: right;
@@ -155,5 +151,7 @@ td#archivelist table {
border: solid 1px #777;
+ margin-left: 0.5em;
+ margin-bottom: 0.5em;
}
-td#archivelist table th {
+table#downloads th {
background-color: #ccc;
diff --git a/cgit.h b/cgit.h
index 3938633..5c55bec 100644
--- a/cgit.h
+++ b/cgit.h
@@ -70,2 +70,3 @@ struct repoinfo {
char *module_link;
+ char *readme;
int snapshots;
diff --git a/cgitrc b/cgitrc
index eaa9ce3..054a708 100644
--- a/cgitrc
+++ b/cgitrc
@@ -110 +110,2 @@
#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
diff --git a/shared.c b/shared.c
index ce3ca4f..e3123a8 100644
--- a/shared.c
+++ b/shared.c
@@ -109,2 +109,3 @@ struct repoinfo *add_repo(const char *url)
ret->module_link = cgit_module_link;
+ ret->readme = NULL;
return ret;
@@ -189,3 +190,8 @@ void cgit_global_config_cb(const char *name, const char *value)
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);
diff --git a/ui-summary.c b/ui-summary.c
index 5799773..5c1fc33 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -155,3 +155,3 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
if (!header) {
- html("<table>");
+ html("<table id='downloads'>");
html("<tr><th>Downloads</th></tr>");
@@ -195,4 +195,4 @@ 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>");
@@ -202,5 +202,7 @@ void cgit_print_summary()
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();