diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:50:34 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 13:41:54 +0200 |
| commit | e1782fff8a78b7f265432603351281ad2988bb40 (patch) | |
| tree | 83a8ed623178b870f2e3f34041743ccde5bed944 | |
| parent | 97b3d252629a8a3b9d356c2532dec7611438e4b9 (diff) | |
ui-summary: enable arbitrary paths below repo.readme
This change makes it possible to include any number of pages below
the 'about' tab for a repository. The path is assumed to be located
in the same directory as the 'repo.readme' file.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | cmd.c | 2 | ||||
| -rw-r--r-- | ui-summary.c | 24 | ||||
| -rw-r--r-- | ui-summary.h | 2 |
3 files changed, 20 insertions, 8 deletions
@@ -39,7 +39,7 @@ static void atom_fn(struct cgit_context *ctx) static void about_fn(struct cgit_context *ctx) { if (ctx->repo) - cgit_print_repo_readme(); + cgit_print_repo_readme(ctx->qry.path); else cgit_print_site_readme(); } diff --git a/ui-summary.c b/ui-summary.c index ede4a62..f2a9b46 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -66,11 +66,23 @@ void cgit_print_summary() html("</table>"); } -void cgit_print_repo_readme() +void cgit_print_repo_readme(char *path) { - if (ctx.repo->readme) { - html("<div id='summary'>"); - html_include(ctx.repo->readme); - html("</div>"); - } + char *slash, *tmp; + + if (!ctx.repo->readme) + return; + + if (path) { + slash = strrchr(ctx.repo->readme, '/'); + if (!slash) + return; + tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); + strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); + strcpy(tmp + (slash - ctx.repo->readme + 1), path); + } else + tmp = ctx.repo->readme; + html("<div id='summary'>"); + html_include(tmp); + html("</div>"); } diff --git a/ui-summary.h b/ui-summary.h index 3e13039..c01f560 100644 --- a/ui-summary.h +++ b/ui-summary.h @@ -2,6 +2,6 @@ #define UI_SUMMARY_H extern void cgit_print_summary(); -extern void cgit_print_repo_readme(); +extern void cgit_print_repo_readme(char *path); #endif /* UI_SUMMARY_H */ |