about: move layout into page functions

Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
John Keeping 2015-08-14 12:47:12 +01:00 committed by Jason A. Donenfeld
parent 764987980e
commit 51d9176e4b
3 changed files with 11 additions and 4 deletions

2
cmd.c
View File

@ -155,7 +155,7 @@ struct cgit_cmd *cgit_get_cmd(void)
static struct cgit_cmd cmds[] = { static struct cgit_cmd cmds[] = {
def_cmd(HEAD, 1, 0, 0, 1), def_cmd(HEAD, 1, 0, 0, 1),
def_cmd(atom, 1, 0, 0, 0), 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(blob, 1, 0, 0, 0),
def_cmd(commit, 1, 1, 1, 0), def_cmd(commit, 1, 1, 1, 0),
def_cmd(diff, 1, 1, 1, 0), def_cmd(diff, 1, 1, 1, 0),

View File

@ -345,9 +345,12 @@ void cgit_print_repolist(void)
void cgit_print_site_readme(void) void cgit_print_site_readme(void)
{ {
cgit_print_layout_start();
if (!ctx.cfg.root_readme) if (!ctx.cfg.root_readme)
return; goto done;
cgit_open_filter(ctx.cfg.about_filter, ctx.cfg.root_readme); cgit_open_filter(ctx.cfg.about_filter, ctx.cfg.root_readme);
html_include(ctx.cfg.root_readme); html_include(ctx.cfg.root_readme);
cgit_close_filter(ctx.cfg.about_filter); cgit_close_filter(ctx.cfg.about_filter);
done:
cgit_print_layout_end();
} }

View File

@ -101,8 +101,9 @@ void cgit_print_repo_readme(char *path)
char *filename, *ref; char *filename, *ref;
int free_filename = 0; int free_filename = 0;
cgit_print_layout_start();
if (ctx.repo->readme.nr == 0) if (ctx.repo->readme.nr == 0)
return; goto done;
filename = ctx.repo->readme.items[0].string; filename = ctx.repo->readme.items[0].string;
ref = ctx.repo->readme.items[0].util; ref = ctx.repo->readme.items[0].util;
@ -111,7 +112,7 @@ void cgit_print_repo_readme(char *path)
free_filename = 1; free_filename = 1;
filename = append_readme_path(filename, ref, path); filename = append_readme_path(filename, ref, path);
if (!filename) if (!filename)
return; goto done;
} }
/* Print the calculated readme, either from the git repo or from the /* 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>"); html("</div>");
if (free_filename) if (free_filename)
free(filename); free(filename);
done:
cgit_print_layout_end();
} }