From 0a15602fee39aaec715f3d72ca6f0f99b14f93a3 Mon Sep 17 00:00:00 2001
From: Stuart Longland <redhatter@gentoo.org>
Date: Fri, 11 Jan 2008 19:30:10 +1000
Subject: [PATCH] Further template tweaks.  Settings are passed between pages.

---
 templates/gallery.cs |  6 ++--
 templates/index.cs   |  3 +-
 templates/photo.cs   | 65 ++++++++++++++++++++++++++++++++++++--------
 3 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/templates/gallery.cs b/templates/gallery.cs
index 00d6ab1..dd6d560 100644
--- a/templates/gallery.cs
+++ b/templates/gallery.cs
@@ -10,7 +10,8 @@ body {
 	<table width="100%" class="controls">
 	<tr>
 		<td class="status"><a class="button" 
-			accesskey="i" href="<?cs var:CGI.ScriptName ?>"
+			accesskey="i" href="<?cs var:CGI.ScriptName ?>?<?cs
+			var:CGI.QueryString ?>"
 			target="_top"><img alt="Index" 
 			src="<?cs var:uri ?>/templates/images/top.png" 
 			border="0" align="absmiddle" /></a></td>
@@ -32,7 +33,8 @@ body {
 		?><?cs set:xpad = 60-hw
 		?><?cs set:ypad = 60-hh
 		?><a href="<?cs	var:CGI.ScriptName ?>/<?cs var:gallery.name 
-			?>/<?cs var:p.name ?>"><img src="<?cs var:uri 
+			?>/<?cs var:p.name ?>?<?cs var:CGI.QueryString 
+			?>"><img src="<?cs var:uri 
 				?>/<?cs var:p.thumbnail ?>"
 				align="absmiddle"
 				width="<?cs var:p.thumbwidth ?>"
diff --git a/templates/index.cs b/templates/index.cs
index 3b10bea..d68d490 100644
--- a/templates/index.cs
+++ b/templates/index.cs
@@ -8,7 +8,8 @@
 	<?cs each:g = gallery ?>
 		<div style="border: 1px solid #ccc; display: block;">
 			<h2><a style="display: block; text-align: center; padding: 0.5em;"
-				href="<?cs var:CGI.ScriptName ?>/<?cs var:g.name ?>"><?cs var:g.title ?></a></h2>
+				href="<?cs var:CGI.ScriptName ?>/<?cs var:g.name ?>?<?cs
+				var:CGI.QueryString ?>"><?cs var:g.title ?></a></h2>
 			<p style="padding-left: 1em; padding-right: 1em; text-align: center;"><?cs var:g.desc ?></p>
 		</div>
 		<div style="height: 1em;"></div>
diff --git a/templates/photo.cs b/templates/photo.cs
index dd69e7b..e7e101e 100644
--- a/templates/photo.cs
+++ b/templates/photo.cs
@@ -9,14 +9,54 @@ body {
 <?cs def:html_body() ?>
 	<table width="100%" class="controls">
 	<tr>
-		<td class="firstlink"><a class="button" accesskey="[" href="<?cs var:CGI.ScriptName ?>/<?cs var:gallery.name ?>/<?cs var:gallery.first ?>"><img alt="|&lt;- First" src="<?cs var:uri ?>/templates/images/start.png"  border="0" align="absmiddle" /></a></td>
-		<td class="prevlink"><a class="button" accesskey="," href="<?cs var:CGI.ScriptName ?>/<?cs var:gallery.name ?>/<?cs var:photo.previous ?>"><img alt="&lt;- Prev" src="<?cs var:uri ?>/templates/images/back.png"  border="0" align="absmiddle" /></a></td>
-		<td class="status"><a class="button" accesskey="l" href="<?cs var:CGI.ScriptName ?>/<?cs var:gallery.name ?>" target="_top"><img alt="Album" src="<?cs var:uri ?>/templates/images/up.png"  border="0" align="absmiddle" /></a></td>
-		<td class="status"><a class="button" accesskey="a" href="#adjust" target="_top"><img alt="Adjust" src="<?cs var:uri ?>/templates/images/configure.png"  border="0" align="absmiddle" /></a></td>
-		<td class="status"><a class="button" accesskey="i" href="<?cs var:CGI.ScriptName ?>" target="_top"><img alt="Index" src="<?cs var:uri ?>/templates/images/top.png"  border="0" align="absmiddle" /></a></td>
-		<td class="nextlink"><a class="button" accesskey="." href="<?cs var:CGI.ScriptName ?>/<?cs var:gallery.name ?>/<?cs var:photo.next ?>"><img alt="-&gt; Next" src="<?cs var:uri ?>/templates/images/forward.png"  border="0" align="absmiddle" /></a></td>
-		<td class="lastlink"><a class="button" accesskey="]" href="<?cs var:CGI.ScriptName ?>/<?cs var:gallery.name ?>/<?cs var:gallery.last ?>"><img alt="-&gt;| Last" src="<?cs var:uri ?>/templates/images/finish.png"  border="0" align="absmiddle" /></a></td>
-
+		<td class="firstlink"><a class="button" accesskey="["
+			href="<?cs var:CGI.ScriptName ?>/<?cs
+				var:gallery.name ?>/<?cs 
+				var:gallery.first ?>?<?cs
+				var:CGI.QueryString ?>"><img 
+				alt="|&lt;- First" src="<?cs var:uri 
+				?>/templates/images/start.png" 
+				border="0" align="absmiddle" /></a></td>
+		<td class="prevlink"><a class="button" accesskey=","
+			href="<?cs var:CGI.ScriptName ?>/<?cs
+				var:gallery.name ?>/<?cs
+				var:photo.previous ?>?<?cs
+				var:CGI.QueryString ?>"><img
+				alt="&lt;- Prev" src="<?cs
+				var:uri ?>/templates/images/back.png"
+				border="0" align="absmiddle" /></a></td>
+		<td class="status"><a class="button" accesskey="l"
+			href="<?cs var:CGI.ScriptName ?>/<?cs
+				var:gallery.name ?>?<?cs
+				var:CGI.QueryString ?>" target="_top"><img
+				alt="Album" src="<?cs var:uri
+				?>/templates/images/up.png"
+				border="0" align="absmiddle" /></a></td>
+		<td class="status"><a class="button" accesskey="a"
+			href="#adjust" target="_top"><img
+				alt="Adjust" src="<?cs var:uri
+				?>/templates/images/configure.png"
+				border="0" align="absmiddle" /></a></td>
+		<td class="status"><a class="button" accesskey="i"
+			href="<?cs var:CGI.ScriptName ?>?<?cs
+			var:CGI.QueryString ?>"
+				target="_top"><img alt="Index"
+				src="<?cs var:uri ?>/templates/images/top.png"
+				border="0" align="absmiddle" /></a></td>
+		<td class="nextlink"><a class="button" accesskey="."
+			href="<?cs var:CGI.ScriptName ?>/<?cs
+				var:gallery.name ?>/<?cs var:photo.next
+				?>?<?cs var:CGI.QueryString 
+				?>"><img alt="-&gt; Next" src="<?cs var:uri
+				?>/templates/images/forward.png" border="0"
+				align="absmiddle" /></a></td>
+		<td class="lastlink"><a class="button" accesskey="]"
+			href="<?cs var:CGI.ScriptName ?>/<?cs var:gallery.name
+				?>/<?cs var:gallery.last ?>?<?cs
+				var:CGI.QueryString ?>"><img
+				alt="-&gt;| Last" src="<?cs var:uri
+				?>/templates/images/finish.png"
+				border="0" align="absmiddle" /></a></td>
 	</tr>
 	<tr>
 		<td class="status" colspan="7">
@@ -24,15 +64,18 @@ body {
 		</td>
 	</tr>
 	</table>
-	<p align="center"><img	width="<?cs var:photo.width ?>" height="<?cs var:photo.height ?>"
+	<p align="center"><img	width="<?cs var:photo.width ?>"
+				height="<?cs var:photo.height ?>"
 				src="<?cs var:uri ?>/<?cs var:photo.resized ?>" 
 				alt="<?cs var:html_strip(photo.annotation) ?>" 
 				lowsrc="<?cs var:uri ?>/<?cs var:photo.thumbnail ?>" /></p>
 	<form>
 	<p align="center">
 		<a name="adjust">
-		Resize:	<input type="text" name="width" value="<?cs var:photo.width ?>" size="3" /> x
-			<input type="text" name="height" value="<?cs var:photo.height ?>" size="3" />
+		Resize:	<input type="text"	name="width"
+						value="<?cs var:photo.width ?>" size="3" /> x
+			<input type="text"	name="height"
+						value="<?cs var:photo.height ?>" size="3" />
 		Rotation:
 			<input type="text" name="rotation" value="0.000" size="3" />
 		Quality: <input type="text" name="quality" value="60" size="3" /> (100% = PNG)