about: move layout into page functions

Signed-off-by: John Keeping <john@keeping.me.uk>

diff --git a/cmd.c b/cmd.c
index 315edc3519486bb0d921c20289e6aefcc90df031..616890c072724bf223478dc74da27d57fba3d560 100644 (file)
--- 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 43253ed92c93e3a0597da3c3944b8f77793f9f68..ac1b3e391356d94b1d5370fba45e0a40ce901424 100644 (file)
--- 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 a5c70788104373b07fa9071e905541f7ef47c043..cd1fef554eb8833cf7acfdd7ae689a46be6b8fe3 100644 (file)
--- 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();
 }