From mboxrd@z Thu Jan 1 00:00:00 1970 From: john at keeping.me.uk (John Keeping) Date: Sun, 5 Apr 2015 16:54:54 +0100 Subject: [PATCH 08/17] about: move layout into page functions In-Reply-To: References: Message-ID: <3613152dce90cdaba9fa6e4f73cd561a4a494a74.1428248621.git.john@keeping.me.uk> Signed-off-by: John Keeping --- cmd.c | 2 +- ui-repolist.c | 5 ++++- ui-summary.c | 8 ++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cmd.c b/cmd.c index 188cd56..0f67c74 100644 --- a/cmd.c +++ b/cmd.c @@ -144,7 +144,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_cmd(about, 0, 1, 0, 0), + def_cmd(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 2453a7f..ea38384 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -346,9 +346,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 b0af073..52ed2eb 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -102,8 +102,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; @@ -112,7 +113,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 @@ -129,4 +130,7 @@ void cgit_print_repo_readme(char *path) html(""); if (free_filename) free(filename); + +done: + cgit_print_layout_end(); } -- 2.4.0.rc0.173.gb1cefcc