Remove swf based fallbacks since they no longer exist

4 files changed, 15 insertions, 83 deletions

diff --git a/templates/mime/audio/admin.tpl b/templates/mime/audio/admin.tpl
index d97ab6d..9dd5d36 100755
--- a/templates/mime/audio/admin.tpl
+++ b/templates/mime/audio/admin.tpl
@@ -1,14 +1,11 @@
 {strip}
 <div class="admin liberty">
 	<div class="header">
-		<h1>{tr}Flashvideo Plugin Settings{/tr}</h1>
+		<h1>{tr}Audio Plugin Settings{/tr}</h1>
 	</div>
 
 	<div class="body">
-		{form legend="Flashvideo specific settings"}
-			<p class="formhelp">
-				You can find some information relating to this plugin on the <a class="external" href="https://www.bitweaver.org/wiki/LibertyMime+Flv+Plugin">LibertyMime Flv Plugin page</a> at bitweaver.org.
-			</p>
+		{form legend="Audio plugin settings"}
 
 			{if !$gLibertySystem->isPluginActive( 'mimeaudio' )}
 				{formfeedback error="This plugins has not been enabled. All settings you change here will have no effect on uploaded videos unless you enable the plugin in the liberty plugins administration screen"}
@@ -96,22 +93,6 @@
 				{/forminput}
 			</div>
 
-			<div class="form-group">
-				{formlabel label="Foreground Colour" for="mime_audio_frontcolor"}
-				{forminput}
-					<input type='text' name="mime_audio_frontcolor" id="mime_audio_frontcolor" size="10" value="{$gBitSystem->getConfig('mime_audio_frontcolor')|default:"FFFFFF"}" />
-					{formhelp note="Foreground colour of the progress bar."}
-				{/forminput}
-			</div>
-
-			<div class="form-group">
-				{formlabel label="Background Colour" for="mime_audio_backcolor"}
-				{forminput}
-					<input type='text' name="mime_audio_backcolor" id="mime_audio_backcolor" size="10" value="{$gBitSystem->getConfig('mime_audio_backcolor')|default:"000000"}" />
-					{formhelp note="Background colour of the progress bar."}
-				{/forminput}
-			</div>
-
 			<div class="form-group submit">
 				<input type="submit" name="plugin_settings" value="{tr}Save Plugin Settings{/tr}" />
 			</div>
diff --git a/templates/mime/audio/player.tpl b/templates/mime/audio/player.tpl
index 18701f3..e4db9cc 100755
--- a/templates/mime/audio/player.tpl
+++ b/templates/mime/audio/player.tpl
@@ -2,27 +2,13 @@
 {if $attachment.media_url}
 	{assign var=id value="audio_`$caller``$attachment.attachment_id`"}
 	{if $uploadTab}{assign var=id value="`$id`_tab"}{/if}
-
-	{* album covers are usually square - scrollbar is 20px high *}
-	{if $thumbsize eq "small"}
-		{assign var=width value=160}
-		{assign var=height value=180}
-	{else}
-		{assign var=width value=400}
-		{assign var=height value=420}
-	{/if}
-	<div id="{$id}"><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this video.</div>
-	<script>/* <![CDATA[ */
+	<div id="{$id}">
 		{if !$attachment.thumbnail_is_mime && $attachment.thumbnail_url.medium}
-			var so = new SWFObject('{$smarty.const.UTIL_PKG_URL}javascript/flv_player/mediaplayer.swf','mpl','{$width}','{$height}','7');
-			so.addVariable("image","{$attachment.thumbnail_url.medium}");
-		{else}
-			var so = new SWFObject('{$smarty.const.UTIL_PKG_URL}javascript/flv_player/mediaplayer.swf','mpl','{$width}','20','7');
+			<img src="{$attachment.thumbnail_url.medium}" alt="{$attachment.filename|escape}" /><br />
 		{/if}
-		so.addVariable("file","{$attachment.media_url}");
-		so.addVariable("frontcolor","0x{$gBitSystem->getConfig('mime_audio_frontcolor','FFFFFF')}");
-		so.addVariable("backcolor","0x{$gBitSystem->getConfig('mime_audio_backcolor','000000')}");
-		so.write('{$id}');
-	/* ]]> */</script>
+		<audio controls preload="none" src="{$attachment.media_url}">
+			{tr}Your browser does not support the audio element.{/tr}
+		</audio>
+	</div>
 {/if}
 {/strip}
diff --git a/templates/mime/image/player.tpl b/templates/mime/image/player.tpl
index abec80a..84ab6a0 100755
--- a/templates/mime/image/player.tpl
+++ b/templates/mime/image/player.tpl
@@ -1,19 +1,3 @@
-{if $attachment.pano.aspect}
-	{assign var=params value="&minPA=-`$attachment.pano.pa`&maxPA=`$attachment.pano.pa`"}
+{if $attachment.thumbnail_url.panorama}
+	<a href="{$attachment.thumbnail_url.panorama}">{$attachment.filename|escape}</a>
 {/if}
-{if $wrapper.panosize}
-	{assign var=panosize value=$wrapper.panosize}
-	{assign var=panowidth  value=$gThumbSizes.$panosize.width}
-	{assign var=panoheight value=$gThumbSizes.$panosize.height}
-{/if}
-<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,19,0" width="100%" height="100%" title="{$attachment.filename}">
-	<param name="allowFullScreen" value="true" />
-	<param name="movie" value="{$smarty.const.UTIL_PKG_URL}javascript/fspp/pan0.swf?panoSrc={$attachment.thumbnail_url.panorama}{$params}" />
-	<param name="quality" value="high" />
-	<param name="BGCOLOR" value="#AAAAAA" />
-	<embed src="{$smarty.const.UTIL_PKG_URL}javascript/fspp/pan0.swf?panoSrc={$attachment.thumbnail_url.panorama}{$params}" allowFullScreen="true"
-		width="{$panowidth|default:"100%"}" height="{$panoheight|default:"500px"}" quality="high"
-		pluginspage="http://www.macromedia.com/go/getflashplayer"
-		type="application/x-shockwave-flash" bgcolor="#DDDDDD">
-	</embed>
-</object>
diff --git a/templates/mime/video/admin.tpl b/templates/mime/video/admin.tpl
index 1300a5a..6bddcab 100755
--- a/templates/mime/video/admin.tpl
+++ b/templates/mime/video/admin.tpl
@@ -1,14 +1,11 @@
 {strip}
 <div class="admin liberty">
 	<div class="header">
-		<h1>{tr}Flashvideo Plugin Settings{/tr}</h1>
+		<h1>{tr}Video Plugin Settings{/tr}</h1>
 	</div>
 
 	<div class="body">
-		{form legend="Flashvideo specific settings"}
-			<p class="formhelp">
-				You can find some information relating to this plugin on the <a class="external" href="https://www.bitweaver.org/wiki/LibertyMime+Flv+Plugin">LibertyMime Flv Plugin page</a> at bitweaver.org.
-			</p>
+		{form legend="Video plugin settings"}
 
 			{if $ffmpeg_extension}
 				<p class="success">
@@ -42,11 +39,11 @@
 						name=mime_video_video_codec
 						id=mime_video_video_codec
 						selected=$gBitSystem->getConfig('mime_video_video_codec')|default:flv}
-						{formhelp note="You can choose between codecs you wan to use to encode the uploaded video with. We recommend flashvideo if you don't require high quality videos.
+						{formhelp note="Choose the codec for encoding uploaded videos.
 						<dl>
-							<dt>Flashvideo</dt><dd>Medium filesize, medium quality, fast encoding.</dd>
+							<dt>FLV</dt><dd>Medium filesize, medium quality, fast encoding.</dd>
 							<dt>MP4/AVC</dt><dd>Small filesize, high quality, slow encoding.</dd>
-							<dt>MP4/AVC - 2 passes</dt><dd>Small filesize, very high quality, very slow encoding (this is likey to take at least as long as the video length).</dd>
+							<dt>MP4/AVC - 2 passes</dt><dd>Small filesize, very high quality, very slow encoding (this is likely to take at least as long as the video length).</dd>
 						</dl>"}
 				{/forminput}
 			</div>
@@ -132,22 +129,6 @@
 				{/forminput}
 			</div>
 
-			<div class="form-group">
-				{formlabel label="Foreground Colour" for="mime_video_frontcolor"}
-				{forminput}
-					<input type='text' name="mime_video_frontcolor" id="mime_video_frontcolor" size="10" value="{$gBitSystem->getConfig('mime_video_frontcolor')|default:"FFFFFF"}" />
-					{formhelp note="Foreground colour of the progress bar."}
-				{/forminput}
-			</div>
-
-			<div class="form-group">
-				{formlabel label="Background Colour" for="mime_video_backcolor"}
-				{forminput}
-					<input type='text' name="mime_video_backcolor" id="mime_video_backcolor" size="10" value="{$gBitSystem->getConfig('mime_video_backcolor')|default:"000000"}" />
-					{formhelp note="Background colour of the progress bar."}
-				{/forminput}
-			</div>
-
 			<p class="warning">
 				{booticon iname="fa-triangle-exclamation" iexplain="Warning"} {tr}ffmpeg has a habit of changing the API when releasing new versions. Due to the demand for new features and the tendency to use cutting edge versions of ffmpeg it is very difficult to keep track of these API changes.{/tr}
 			</p>