X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/bd24832cd7a72117afb7fa785f4e6bfa4324bf30..06671f4b2167951c6b46401b0f5ac8af4d48d50a:/ui-summary.c diff --git a/ui-summary.c b/ui-summary.c index fa5ba04..947812a 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -9,11 +9,11 @@ #include "cgit.h" #include "ui-summary.h" #include "html.h" +#include "ui-blob.h" #include "ui-log.h" +#include "ui-plain.h" #include "ui-refs.h" -#include "ui-blob.h" #include "ui-shared.h" -#include static int urls; @@ -40,7 +40,7 @@ static void print_url(const char *url) html("\n"); } -void cgit_print_summary() +void cgit_print_summary(void) { int columns = 3; @@ -49,6 +49,7 @@ void cgit_print_summary() if (ctx.repo->enable_log_linecount) columns++; + cgit_print_layout_start(); html(""); cgit_print_branches(ctx.cfg.summary_branches); htmlf("", columns); @@ -61,6 +62,7 @@ void cgit_print_summary() urls = 0; cgit_add_clone_urls(print_url); html("
 
"); + cgit_print_layout_end(); } /* The caller must free the return value. */ @@ -97,13 +99,24 @@ static char* append_readme_path(const char *filename, const char *ref, const cha return full_path; } -void cgit_print_repo_readme(char *path) +void cgit_print_repo_readme(const char *path) { - char *filename, *ref; + char *filename, *ref, *mimetype; int free_filename = 0; - if (ctx.repo->readme.nr == 0) + mimetype = get_mimetype_for_filename(path); + if (mimetype && (!strncmp(mimetype, "image/", 6) || !strncmp(mimetype, "video/", 6))) { + ctx.page.mimetype = mimetype; + ctx.page.charset = NULL; + cgit_print_plain(); + free(mimetype); return; + } + free(mimetype); + + cgit_print_layout_start(); + if (ctx.repo->readme.nr == 0) + goto done; filename = ctx.repo->readme.items[0].string; ref = ctx.repo->readme.items[0].util; @@ -112,7 +125,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 +142,7 @@ void cgit_print_repo_readme(char *path) html(""); if (free_filename) free(filename); + +done: + cgit_print_layout_end(); }