| author | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:46:34 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:46:34 (UTC) |
| commit | db8b8cb9467625cb8d9ecb67863aa67590e59cc0 (patch) (side-by-side diff) | |
| tree | d27644fc1b98ec6365e74f3ba40c19f78f8a287f /ui-summary.c | |
| parent | db6303b58883c4417f5bcc0c1ee34fed6553dca3 (diff) | |
| parent | 537c05f138d59c1eb3ac8e2d8b0dca3a38aa5dd4 (diff) | |
| download | cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.zip cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.tar.gz cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.tar.bz2 | |
Merge branch 'lh/about'
Conflicts:
cgit.h
| -rw-r--r-- | ui-summary.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/ui-summary.c b/ui-summary.c index ede4a62..a2c018e 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -57,20 +57,36 @@ void cgit_print_summary() if (ctx.cfg.summary_log > 0) { html("<tr class='nohover'><td colspan='4'> </td></tr>"); cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, NULL, NULL, 0); } if (ctx.repo->clone_url) print_urls(ctx.repo->clone_url, NULL); else if (ctx.cfg.clone_prefix) print_urls(ctx.cfg.clone_prefix, ctx.repo->url); html("</table>"); } -void cgit_print_repo_readme() +void cgit_print_repo_readme(char *path) { - if (ctx.repo->readme) { + 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(ctx.repo->readme); + if (ctx.repo->about_filter) + cgit_open_filter(ctx.repo->about_filter); + html_include(tmp); + if (ctx.repo->about_filter) + cgit_close_filter(ctx.repo->about_filter); html("</div>"); } -} |