X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/79c985e13c10b498c3ea62f4607c2e2a460c3b10..c3b5b5f648d953307672a4b30e9222787668f708:/ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 3728c3e..8e81ac4 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -9,39 +9,16 @@
 #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 <libgen.h>
-
-static void print_url(char *base, char *suffix)
-{
-	int columns = 3;
-	struct strbuf basebuf = STRBUF_INIT;
-
-	if (ctx.repo->enable_log_filecount)
-		columns++;
-	if (ctx.repo->enable_log_linecount)
-		columns++;
+#include "ui-shared.h"
 
-	if (!base || !*base)
-		return;
-	if (suffix && *suffix) {
-		strbuf_addf(&basebuf, "%s/%s", base, suffix);
-		base = basebuf.buf;
-	}
-	htmlf("<tr><td colspan='%d'><a href='", columns);
-	html_url_path(base);
-	html("'>");
-	html_txt(base);
-	html("</a></td></tr>\n");
-	strbuf_release(&basebuf);
-}
+static int urls;
 
-static void print_urls(char *txt, char *suffix)
+static void print_url(const char *url)
 {
-	char *h = txt, *t, c;
-	int urls = 0;
 	int columns = 3;
 
 	if (ctx.repo->enable_log_filecount)
@@ -49,28 +26,21 @@ static void print_urls(char *txt, char *suffix)
 	if (ctx.repo->enable_log_linecount)
 		columns++;
 
-
-	while (h && *h) {
-		while (h && *h == ' ')
-			h++;
-		if (!*h)
-			break;
-		t = h;
-		while (t && *t && *t != ' ')
-			t++;
-		c = *t;
-		*t = 0;
-		if (urls++ == 0) {
-			htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
-			htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
-		}
-		print_url(h, suffix);
-		*t = c;
-		h = t;
+	if (urls++ == 0) {
+		htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+		htmlf("<tr class='nohover'><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
 	}
+
+	htmlf("<tr><td colspan='%d'><a rel='vcs-git' href='", columns);
+	html_url_path(url);
+	html("' title='");
+	html_attr(ctx.repo->name);
+	html(" Git repository'>");
+	html_txt(url);
+	html("</a></td></tr>\n");
 }
 
-void cgit_print_summary()
+void cgit_print_summary(void)
 {
 	int columns = 3;
 
@@ -79,6 +49,7 @@ void cgit_print_summary()
 	if (ctx.repo->enable_log_linecount)
 		columns++;
 
+	cgit_print_layout_start();
 	html("<table summary='repository info' class='list nowrap'>");
 	cgit_print_branches(ctx.cfg.summary_branches);
 	htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
@@ -88,11 +59,10 @@ void cgit_print_summary()
 		cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
 			       NULL, NULL, 0, 0, 0);
 	}
-	if (ctx.repo->clone_url)
-		print_urls(expand_macros(ctx.repo->clone_url), NULL);
-	else if (ctx.cfg.clone_prefix)
-		print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
+	urls = 0;
+	cgit_add_clone_urls(print_url);
 	html("</table>");
+	cgit_print_layout_end();
 }
 
 /* The caller must free the return value. */
@@ -131,11 +101,22 @@ static char* append_readme_path(const char *filename, const char *ref, const cha
 
 void cgit_print_repo_readme(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;
@@ -144,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
@@ -161,4 +142,7 @@ void cgit_print_repo_readme(char *path)
 	html("</div>");
 	if (free_filename)
 		free(filename);
+
+done:
+	cgit_print_layout_end();
 }