split storage and attachment templates into separate templates for easier maintenance and better control.

14 files changed, 111 insertions, 86 deletions

diff --git a/templates/edit_storage_list.tpl b/templates/edit_storage_list.tpl
index 768ca45..180a6e0 100644
--- a/templates/edit_storage_list.tpl
+++ b/templates/edit_storage_list.tpl
@@ -8,7 +8,8 @@
 		<table class="data" summary="List of attached files">
 			<caption>{tr}Items {if $libertyUploader && empty($gContent->mContentId)}That Will Be{/if} Attached Directly to this Content{/tr}</caption>
 			<tr>
-				<th scope="col" class="width30p" title="{tr}Thumbnail{/tr}">{tr}Thumbnail{/tr}</th>
+				<th scope="col" class="width1p"  title="{tr}Attachment ID{/tr}">{tr}Attachment ID{/tr}</th>
+				<th scope="col" class="width29p" title="{tr}Thumbnail{/tr}">{tr}Thumbnail{/tr}</th>
 				<th scope="col" class="width40p" title="{tr}Inclusion Code{/tr}">{tr}Inclusion Code{/tr}</th>
 				<th scope="col" class="width30p" title="{tr}Actions{/tr}">{tr}Actions{/tr}</th>
 			</tr>
@@ -27,9 +28,12 @@
 
 			{foreach from=$gContent->mStorage item=storage key=attachmentId name=atts}
 				<tr class="{cycle values="odd,even"}">
+					<td>
+						{$storage.attachment_id}
+					</td>
 					<td class="aligncenter">
 						{if $storage.is_mime}
-							{include file=$gLibertySystem->getMimeTemplate('inline',$storage.attachment_plugin_guid) display_type=storage_thumbs thumbsize=small preferences=$gContent->mStoragePrefs.$attachmentId attachment=$storage}
+							{include file=$gLibertySystem->getMimeTemplate('storage',$storage.attachment_plugin_guid) thumbsize=small preferences=$gContent->mStoragePrefs.$attachmentId attachment=$storage}
 						{else}
 							{jspopup href=$storage.source_url title=$storage.title|default:$storage.filename notra=1 img=$storage.thumbnail_url.avatar}
 							<br />{$storage.filename} <span class="date">{$storage.file_size|display_bytes}</span>
diff --git a/templates/mime/audio/attachment.tpl b/templates/mime/audio/attachment.tpl
new file mode 100644
index 0000000..c7e09d2
--- /dev/null
+++ b/templates/mime/audio/attachment.tpl
@@ -0,0 +1,16 @@
+{strip}
+{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
+	{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
+		{$wrapper.description|escape|default:$attachment.filename}
+	{if $attachment.display_url}</a>{/if}
+{else}
+	<{$wrapper.wrapper|default:'div'} class="mimeaudio {$wrapper.class|default:'att-plugin'}"{if $wrapper.style} style="{$wrapper.style}{/if}">
+		{if $attachment.media_url}
+			{include file="bitpackage:liberty/mime/audio/player.tpl" caller=attachment}
+		{/if}
+		{if $wrapper.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url}">{/if}
+			{$wrapper.description|escape|default:$attachment.meta.title|default:"{tr}Full Details{/tr}"}
+		{if $wrapper.display_url}</a>{/if}
+	</{$wrapper.wrapper|default:'div'}>
+{/if}
+{/strip}
diff --git a/templates/mime/audio/inline.tpl b/templates/mime/audio/inline.tpl
index 72696a2..c5f20d0 100644
--- a/templates/mime/audio/inline.tpl
+++ b/templates/mime/audio/inline.tpl
@@ -1,29 +1,7 @@
 {strip}
-{if $display_type == "attachment_plugin"}
-	{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
-		{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
-			{$wrapper.description|escape|default:$attachment.filename}
-		{if $attachment.display_url}</a>{/if}
-	{else}
-		<{$wrapper.wrapper|default:'div'} class="mimeaudio {$wrapper.class|default:'att-plugin'}"{if $wrapper.style} style="{$wrapper.style}{/if}">
-			{if $attachment.media_url}
-				{include file="bitpackage:liberty/mime/audio/player.tpl"}
-			{/if}
-			{if $wrapper.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url}">{/if}
-				{$wrapper.description|escape|default:$attachment.meta.title|default:"{tr}Full Details{/tr}"}
-			{if $wrapper.display_url}</a>{/if}
-		</{$wrapper.wrapper|default:'div'}>
+<div class="item">
+	{if $attachment.media_url}
+		{include file="bitpackage:liberty/mime/audio/player.tpl" caller=inline}
 	{/if}
-{else}
-	<div class="item">
-		{if $attachment.media_url}
-			{include file="bitpackage:liberty/mime/audio/player.tpl"}
-		{/if}
-
-		{if $display_type eq "storage_thumbs"}
-			{if $attachment.meta.title}{$attachment.meta.title}<br />{/if}
-			<a href="{$attachment.display_url}">{tr}Full Details{/tr}</a>
-		{/if}
-	</div>
-{/if}
+</div>
 {/strip}
diff --git a/templates/mime/audio/player.tpl b/templates/mime/audio/player.tpl
index 7f4234c..d39d296 100644
--- a/templates/mime/audio/player.tpl
+++ b/templates/mime/audio/player.tpl
@@ -1,6 +1,6 @@
 {strip}
 {if $attachment.media_url}
-	{assign var=id value="audio_`$display_type``$attachment.attachment_id`"}
+	{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 *}
diff --git a/templates/mime/audio/storage.tpl b/templates/mime/audio/storage.tpl
new file mode 100644
index 0000000..59b98f3
--- /dev/null
+++ b/templates/mime/audio/storage.tpl
@@ -0,0 +1,10 @@
+{strip}
+<div class="item">
+	{if $attachment.media_url}
+		{include file="bitpackage:liberty/mime/audio/player.tpl" caller=storage}
+	{/if}
+
+	{if $attachment.meta.title}{$attachment.meta.title}<br />{/if}
+	<a href="{$attachment.display_url}">{tr}Full Details{/tr}</a>
+</div>
+{/strip}
diff --git a/templates/mime/default/attachment.tpl b/templates/mime/default/attachment.tpl
new file mode 100644
index 0000000..2b241e8
--- /dev/null
+++ b/templates/mime/default/attachment.tpl
@@ -0,0 +1,18 @@
+{strip}
+{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
+	{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
+		{$wrapper.description|escape|default:$attachment.filename}
+	{if $attachment.display_url}</a>{/if}
+{else}
+	<{$wrapper.wrapper|default:'div'} class="{$wrapper.class|default:'att-plugin'}"{if $wrapper.style} style="{$wrapper.style}{/if}">
+		{if $wrapper.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url}">{/if}
+			{if $thumbsize == 'original'}
+				<img class="thumb" src="{$attachment.source_url}" alt="{$attachment.filename}" title="{$attachment.filename}"/>
+			{elseif $attachment.thumbnail_url.$thumbsize}
+				<img class="thumb" src="{$attachment.thumbnail_url.$thumbsize}" alt="{$attachment.filename}" title="{$attachment.filename}"/>
+			{/if}
+			<br />{$wrapper.description|escape}
+		{if $wrapper.display_url}</a>{/if}
+	</{$wrapper.wrapper|default:'div'}>
+{/if}
+{/strip}
diff --git a/templates/mime/default/inline.tpl b/templates/mime/default/inline.tpl
index 0e16369..b869b7c 100644
--- a/templates/mime/default/inline.tpl
+++ b/templates/mime/default/inline.tpl
@@ -1,33 +1,14 @@
 {strip}
-{if $display_type == "attachment_plugin"}
-	{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
-		{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
-			{$wrapper.description|escape|default:$attachment.filename}
-		{if $attachment.display_url}</a>{/if}
+<div class="item">
+	{assign var=thumbsize value=$thumbsize|default:'small'}
+	{if $attachment.thumbnail_url.$thumbsize}
+		{if !$attachment.is_primary or ( $attachment.is_primary and !$hideprimary )}
+			<a href="{$attachment.display_url}">
+				<img class="thumb" src="{$attachment.thumbnail_url.$thumbsize}" alt="{$attachment.filename}" title="{$attachment.filename}"/>
+			</a>
+		{/if}
 	{else}
-		<{$wrapper.wrapper|default:'div'} class="{$wrapper.class|default:'att-plugin'}"{if $wrapper.style} style="{$wrapper.style}{/if}">
-			{if $wrapper.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url}">{/if}
-				{if $thumbsize == 'original'}
-					<img class="thumb" src="{$attachment.source_url}" alt="{$attachment.filename}" title="{$attachment.filename}"/>
-				{elseif $attachment.thumbnail_url.$thumbsize}
-					<img class="thumb" src="{$attachment.thumbnail_url.$thumbsize}" alt="{$attachment.filename}" title="{$attachment.filename}"/>
-				{/if}
-				<br />{$wrapper.description|escape}
-			{if $wrapper.display_url}</a>{/if}
-		</{$wrapper.wrapper|default:'div'}>
+		{tr}No thumbnail for {$attachment.source_url}{/tr}
 	{/if}
-{else}
-	<div class="item">
-		{assign var=thumbsize value=$thumbsize|default:'small'}
-		{if $attachment.thumbnail_url.$thumbsize}
-			{if !$attachment.is_primary or ( $attachment.is_primary and !$hideprimary )}
-				<a href="{$attachment.display_url}">
-					<img class="thumb" src="{$attachment.thumbnail_url.$thumbsize}" alt="{$attachment.filename}" title="{$attachment.filename}"/>
-				</a>
-			{/if}
-		{else}
-			{tr}No thumbnail for {$attachment.source_url}{/tr}
-		{/if}
-	</div>
-{/if}
+</div>
 {/strip}
diff --git a/templates/mime/default/storage.tpl b/templates/mime/default/storage.tpl
new file mode 100644
index 0000000..b869b7c
--- /dev/null
+++ b/templates/mime/default/storage.tpl
@@ -0,0 +1,14 @@
+{strip}
+<div class="item">
+	{assign var=thumbsize value=$thumbsize|default:'small'}
+	{if $attachment.thumbnail_url.$thumbsize}
+		{if !$attachment.is_primary or ( $attachment.is_primary and !$hideprimary )}
+			<a href="{$attachment.display_url}">
+				<img class="thumb" src="{$attachment.thumbnail_url.$thumbsize}" alt="{$attachment.filename}" title="{$attachment.filename}"/>
+			</a>
+		{/if}
+	{else}
+		{tr}No thumbnail for {$attachment.source_url}{/tr}
+	{/if}
+</div>
+{/strip}
diff --git a/templates/mime/flv/attachment.tpl b/templates/mime/flv/attachment.tpl
new file mode 100644
index 0000000..1755035
--- /dev/null
+++ b/templates/mime/flv/attachment.tpl
@@ -0,0 +1,16 @@
+{strip}
+{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
+	{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
+		{$wrapper.description|escape|default:$attachment.filename}
+	{if $attachment.display_url}</a>{/if}
+{else}
+	<{$wrapper.wrapper|default:'div'} class="mimeflv {$wrapper.class|default:'att-plugin'}"{if $wrapper.style} style="{$wrapper.style}{/if}">
+		{if $attachment.media_url}
+			{include file="bitpackage:liberty/mime/flv/player.tpl" caller=attachment}
+		{/if}
+		{if $wrapper.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url}">{/if}
+			{$wrapper.description|escape|default:"{tr}Full Details{/tr}"}
+		{if $wrapper.display_url}</a>{/if}
+	</{$wrapper.wrapper|default:'div'}>
+{/if}
+{/strip}
diff --git a/templates/mime/flv/inline.tpl b/templates/mime/flv/inline.tpl
index ba19c9b..2eab92c 100644
--- a/templates/mime/flv/inline.tpl
+++ b/templates/mime/flv/inline.tpl
@@ -1,28 +1,7 @@
 {strip}
-{if $display_type == "attachment_plugin"}
-	{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
-		{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
-			{$wrapper.description|escape|default:$attachment.filename}
-		{if $attachment.display_url}</a>{/if}
-	{else}
-		<{$wrapper.wrapper|default:'div'} class="mimeflv {$wrapper.class|default:'att-plugin'}"{if $wrapper.style} style="{$wrapper.style}{/if}">
-			{if $attachment.media_url}
-				{include file="bitpackage:liberty/mime/flv/player.tpl"}
-			{/if}
-			{if $wrapper.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url}">{/if}
-				{$wrapper.description|escape|default:"{tr}Full Details{/tr}"}
-			{if $wrapper.display_url}</a>{/if}
-		</{$wrapper.wrapper|default:'div'}>
+<div class="item">
+	{if $attachment.media_url}
+		{include file="bitpackage:liberty/mime/flv/player.tpl" caller=inline}
 	{/if}
-{else}
-	<div class="item">
-		{if $attachment.media_url}
-			{include file="bitpackage:liberty/mime/flv/player.tpl"}
-		{/if}
-
-		{if $display_type eq "storage_thumbs"}
-			<a href="{$attachment.display_url}">{tr}Full Details{/tr}</a>
-		{/if}
-	</div>
-{/if}
+</div>
 {/strip}
diff --git a/templates/mime/flv/player.tpl b/templates/mime/flv/player.tpl
index 2a47f3a..2a75cde 100644
--- a/templates/mime/flv/player.tpl
+++ b/templates/mime/flv/player.tpl
@@ -1,6 +1,6 @@
 {strip}
 {if $attachment.media_url}
-	{assign var=id value="video_`$display_type``$attachment.attachment_id`"}
+	{assign var=id value="video_`$caller``$attachment.attachment_id`"}
 	{if $uploadTab}{assign var=id value="`$id`_tab"}{/if}
 	<div id="{$id}"><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this video.</div>
 	<script type="text/javascript">/* <![CDATA[ */
diff --git a/templates/mime/flv/storage.tpl b/templates/mime/flv/storage.tpl
new file mode 100644
index 0000000..3973995
--- /dev/null
+++ b/templates/mime/flv/storage.tpl
@@ -0,0 +1,9 @@
+{strip}
+<div class="item">
+	{if $attachment.media_url}
+		{include file="bitpackage:liberty/mime/flv/player.tpl" caller=storage}
+	{/if}
+
+	<a href="{$attachment.display_url}">{tr}Full Details{/tr}</a>
+</div>
+{/strip}
diff --git a/templates/mime/image/inline.tpl b/templates/mime/image/attachment.tpl
index f84bbe9..db970fe 100644
--- a/templates/mime/image/inline.tpl
+++ b/templates/mime/image/attachment.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $display_type == "attachment_plugin" && $attachment.thumbnail_url.panorama}
+{if $attachment.thumbnail_url.panorama}
 	{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
 		{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
 			{$wrapper.description|escape|default:$attachment.filename}
diff --git a/templates/storage_thumbs.tpl b/templates/storage_thumbs.tpl
index 1d7c22c..e5695ed 100644
--- a/templates/storage_thumbs.tpl
+++ b/templates/storage_thumbs.tpl
@@ -12,7 +12,7 @@
 		{foreach from=$gContent->mStorage item=attachment key=id}
 			{* TODO: this should not be necessary anymore as soon as we've faded out old attachment plugins *}
 			{if $attachment.is_mime}
-				{include file=$gLibertySystem->getMimeTemplate('inline',$attachment.attachment_plugin_guid) display_type=storage_thumbs preferences=$gContent->mStoragePrefs.$id}
+				{include file=$gLibertySystem->getMimeTemplate('storage',$attachment.attachment_plugin_guid) preferences=$gContent->mStoragePrefs.$id}
 			{else}
 				{* TODO: get rid of old plugin system *}
 				{capture name="size"}{$attachment.file_size|display_bytes}{/capture}