Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.zx2c4.com/cgit.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2015-08-14 14:47:12 +0300
committerJason A. Donenfeld <Jason@zx2c4.com>2015-08-14 16:46:51 +0300
commit51d9176e4bb5c619481355c6b895c6dec30c4f82 (patch)
treef4a8ca97af15496a2090627c38affc6b86b9be73
parent764987980ec0e806205b8e075feafd4e010dcbd9 (diff)
about: move layout into page functions
Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r--cmd.c2
-rw-r--r--ui-repolist.c5
-rw-r--r--ui-summary.c8
3 files changed, 11 insertions, 4 deletions
diff --git a/cmd.c b/cmd.c
index 315edc3..616890c 100644
--- a/cmd.c
+++ b/cmd.c
@@ -155,7 +155,7 @@ struct cgit_cmd *cgit_get_cmd(void)
static struct cgit_cmd cmds[] = {
def_cmd(HEAD, 1, 0, 0, 1),
def_cmd(atom, 1, 0, 0, 0),
- def_cmp(about, 0, 1, 0, 0),
+ def_cmp(about, 0, 0, 0, 0),
def_cmd(blob, 1, 0, 0, 0),
def_cmd(commit, 1, 1, 1, 0),
def_cmd(diff, 1, 1, 1, 0),
diff --git a/ui-repolist.c b/ui-repolist.c
index 43253ed..ac1b3e3 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -345,9 +345,12 @@ void cgit_print_repolist(void)
void cgit_print_site_readme(void)
{
+ cgit_print_layout_start();
if (!ctx.cfg.root_readme)
- return;
+ goto done;
cgit_open_filter(ctx.cfg.about_filter, ctx.cfg.root_readme);
html_include(ctx.cfg.root_readme);
cgit_close_filter(ctx.cfg.about_filter);
+done:
+ cgit_print_layout_end();
}
diff --git a/ui-summary.c b/ui-summary.c
index a5c7078..cd1fef5 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -101,8 +101,9 @@ void cgit_print_repo_readme(char *path)
char *filename, *ref;
int free_filename = 0;
+ cgit_print_layout_start();
if (ctx.repo->readme.nr == 0)
- return;
+ goto done;
filename = ctx.repo->readme.items[0].string;
ref = ctx.repo->readme.items[0].util;
@@ -111,7 +112,7 @@ void cgit_print_repo_readme(char *path)
free_filename = 1;
filename = append_readme_path(filename, ref, path);
if (!filename)
- return;
+ goto done;
}
/* Print the calculated readme, either from the git repo or from the
@@ -128,4 +129,7 @@ void cgit_print_repo_readme(char *path)
html("</div>");
if (free_filename)
free(filename);
+
+done:
+ cgit_print_layout_end();
}