From 66b88bed17577f11703cf3dbc4665d5a188f8151 Mon Sep 17 00:00:00 2001
From: Stuart Longland <me@vk4msl.id.au>
Date: Wed, 18 Apr 2018 12:49:05 +1000
Subject: [PATCH] templates: Use "friendly" image URIs

---
 templates/gallery.thtml | 2 +-
 templates/photo.thtml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/gallery.thtml b/templates/gallery.thtml
index ea5e3f2..cb7c54d 100644
--- a/templates/gallery.thtml
+++ b/templates/gallery.thtml
@@ -33,7 +33,7 @@ body {
 			{% set hh = p.thumbheight / 2 %}
 			{% set xpad = 60 - hw %}
 			{% set ypad = 60 - hh %}
-			<a href="{{site_uri}}/{{gallery.name}}/{{p.name}}?{{page_query}}"><img src="{{site_uri}}/{{gallery.name}}/{{p.name}}?width={{p.thumbwidth}}&height={{p.thumbheight}}&show=on"
+			<a href="{{site_uri}}/{{gallery.name}}/{{p.name}}?{{page_query}}"><img src="{{site_uri}}/{{gallery.name}}/{{p.name}}/thumb.jpg"
 					align="absmiddle"
 					width="{{p.thumbwidth}}"
 					height="{{p.thumbheight}}"
diff --git a/templates/photo.thtml b/templates/photo.thtml
index c314832..531a2ae 100644
--- a/templates/photo.thtml
+++ b/templates/photo.thtml
@@ -143,7 +143,7 @@ body {
 	<p align="center"><img	id="photoimg"
 				width="{{width}}"
 				height="{{height}}"
-				src="{{site_uri}}/{{gallery.name}}/{{photo.name}}?width={{width}}&height={{height}}&show=on"
+				src="{{site_uri}}/{{photo.get_rel_uri(**settings)}}"
 				alt="{{photo.annotation or photo.name}}"
 				lowsrc="{{site_uri}}/{{gallery.name}}/{{photo.name}}?width={{photo.thumbwidth}}&height={{photo.thumbheight}}&show=on" /></p>