From db7cba03e5d8ce17b44e83bddde883a021e23309 Mon Sep 17 00:00:00 2001
From: Max Kremmel <xing@synapse.plus.com>
Date: Thu, 25 Dec 2008 19:14:24 +0000
Subject: better pretty URLs, cleaner code, make use of gThumbSizes instead of
 rolling own set of sizes

---
 templates/mime/flv/admin.tpl | 28 ++++++++++++++--------------
 templates/mime/flv/view.tpl  | 10 ++++------
 2 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'templates/mime')

diff --git a/templates/mime/flv/admin.tpl b/templates/mime/flv/admin.tpl
index 9f72ae0..daba60f 100644
--- a/templates/mime/flv/admin.tpl
+++ b/templates/mime/flv/admin.tpl
@@ -37,8 +37,8 @@
 				{formlabel label="Video codec" for="mime_flv_video_codec"}
 				{forminput}
 					{html_options
-						options=$rates.video_codec
-						values=$rates.video_codec
+						options=$options.video_codec
+						values=$options.video_codec
 						name=mime_flv_video_codec
 						id=mime_flv_video_codec
 						selected=$gBitSystem->getConfig('mime_flv_video_codec')|default:flv}
@@ -55,8 +55,8 @@
 				{formlabel label="ffmpeg mp3 param" for="ffmpeg_mp3_param"}
 				{forminput}
 					{html_options
-						options=$rates.mp3_param
-						values=$rates.mp3_param
+						options=$options.mp3_param
+						values=$options.mp3_param
 						name=ffmpeg_mp3_param
 						id=ffmpeg_mp3_param
 						selected=$gBitSystem->getConfig('ffmpeg_mp3_param')|default:libmp3lame}
@@ -76,8 +76,8 @@
 				{formlabel label="Video bitrate" for="mime_flv_video_bitrate"}
 				{forminput}
 					{html_options
-						options=$rates.video_bitrate
-						values=$rates.video_bitrate
+						options=$options.video_bitrate
+						values=$options.video_bitrate
 						name=mime_flv_video_bitrate
 						id=mime_flv_video_bitrate
 						selected=$gBitSystem->getConfig('mime_flv_video_bitrate')|default:200000} kbits/s
@@ -89,8 +89,8 @@
 				{formlabel label="Video width" for="mime_flv_width"}
 				{forminput}
 					{html_options
-						options=$rates.video_width
-						values=$rates.video_width
+						options=$options.video_width
+						values=$options.video_width
 						name=mime_flv_width
 						id=mime_flv_width
 						selected=$gBitSystem->getConfig('mime_flv_width')|default:320} pixel
@@ -102,8 +102,8 @@
 				{formlabel label="Audio sample rate" for="mime_flv_audio_samplerate"}
 				{forminput}
 					{html_options
-						options=$rates.audio_samplerate
-						values=$rates.audio_samplerate
+						options=$options.audio_samplerate
+						values=$options.audio_samplerate
 						name=mime_flv_audio_samplerate
 						id=mime_flv_audio_samplerate
 						selected=$gBitSystem->getConfig('mime_flv_audio_samplerate')|default:22050} Hz
@@ -115,8 +115,8 @@
 				{formlabel label="Audio bitrate" for="mime_flv_audio_bitrate"}
 				{forminput}
 					{html_options
-						options=$rates.audio_bitrate
-						values=$rates.audio_bitrate
+						options=$options.audio_bitrate
+						values=$options.audio_bitrate
 						name=mime_flv_audio_bitrate
 						id=mime_flv_audio_bitrate
 						selected=$gBitSystem->getConfig('mime_flv_audio_bitrate')|default:32000} kbits/s
@@ -128,8 +128,8 @@
 				{formlabel label="Default displayed size" for="mime_flv_default_size"}
 				{forminput}
 					{html_options
-						options=$rates.display_size
-						values=$rates.display_size
+						options=$options.display_size
+						values=$options.display_size
 						name=mime_flv_default_size
 						id=mime_flv_default_size
 						selected=$gBitSystem->getConfig('mime_flv_default_size')}
diff --git a/templates/mime/flv/view.tpl b/templates/mime/flv/view.tpl
index 1a0682c..4ec02e3 100644
--- a/templates/mime/flv/view.tpl
+++ b/templates/mime/flv/view.tpl
@@ -6,12 +6,10 @@
 
 	<div class="pagination">
 		{tr}View other sizes{/tr}<br />
-		&nbsp;&bull;&nbsp;
-		<a href="{$attachment.display_url}&size=small">{tr}Small{/tr}</a>&nbsp;&bull;&nbsp;
-		<a href="{$attachment.display_url}&size=medium">{tr}Medium{/tr}</a>&nbsp;&bull;&nbsp;
-		<a href="{$attachment.display_url}&size=large">{tr}Large{/tr}</a>&nbsp;&bull;&nbsp;
-		<a href="{$attachment.display_url}&size=huge">{tr}Huge{/tr}</a>&nbsp;&bull;&nbsp;
-		<a href="{$attachment.display_url}&size=original">{tr}Original{/tr}</a>&nbsp;&bull;&nbsp;
+		{foreach name=size key=size from=$attachment.thumbnail_url item=url}
+			<a href="{$attachment.display_url|escape}{if strpos($attachment.display_url,'?')}&amp;{else}?{/if}size={$size}">{tr}{$size}{/tr}</a>
+			{if !$smarty.foreach.size.last}&nbsp;&bull;&nbsp;{/if}
+		{/foreach}
 	</div>
 {elseif $attachment.status.processing}
 	<div class="row aligncenter">
-- 
cgit v1.3