make better use of liberty/templates/mime_meta_inc.tpl by other templates. we'll have to make some / all of the displayed information optional at some point.

4 files changed, 16 insertions, 47 deletions

diff --git a/templates/mime/audio/view.tpl b/templates/mime/audio/view.tpl
index 04260d0..5821a72 100644
--- a/templates/mime/audio/view.tpl
+++ b/templates/mime/audio/view.tpl
@@ -59,21 +59,5 @@
 	</div>
 {/if}
 
-{if $attachment.download_url}
-	<div class="row">
-		{formlabel label="Filename" for=""}
-		{forminput}
-			<a href="{$attachment.download_url}">{$attachment.filename|escape}</a> <small>({$attachment.mime_type})</small>
-		{/forminput}
-	</div>
-
-	<div class="row">
-		{formlabel label="Filesize" for=""}
-		{forminput}
-			{$attachment.file_size|display_bytes}
-		{/forminput}
-	</div>
-{/if}
-
-{attachhelp legend=1 hash=$attachment}
+{include file=bitpackage:liberty/mime_meta_inc.tpl}
 {/strip}
diff --git a/templates/mime/default/view.tpl b/templates/mime/default/view.tpl
index 0b1e9c0..077372a 100644
--- a/templates/mime/default/view.tpl
+++ b/templates/mime/default/view.tpl
@@ -16,5 +16,5 @@
 		{/if}
 	</div>
 {/if}
-{/strip}
 {include file="bitpackage:liberty/mime_meta_inc.tpl"}
+{/strip}
diff --git a/templates/mime/flv/view.tpl b/templates/mime/flv/view.tpl
index c050708..1a0682c 100644
--- a/templates/mime/flv/view.tpl
+++ b/templates/mime/flv/view.tpl
@@ -33,13 +33,6 @@
 	{formfeedback error="{tr}The Video could not be processed. You can upload a different version of the film or simply leave as is.{/tr}"}
 {/if}
 
-<div class="row">
-	{formlabel label="Uploaded by" for=""}
-	{forminput}
-		{displayname user_id=$attachment.user_id}
-	{/forminput}
-</div>
-
 {if $attachment.meta.duration}
 	<div class="row">
 		{formlabel label="Duration" for=""}
@@ -49,22 +42,5 @@
 	</div>
 {/if}
 
-{if $attachment.download_url}
-	<div class="row">
-		{formlabel label="Filename" for=""}
-		{forminput}
-			<a href="{$attachment.download_url}">{$attachment.filename|escape}</a>
-			&nbsp; <small>({$attachment.mime_type})</small>
-		{/forminput}
-	</div>
-
-	<div class="row">
-		{formlabel label="Filesize" for=""}
-		{forminput}
-			{$attachment.file_size|display_bytes}
-		{/forminput}
-	</div>
-{/if}
-
-{attachhelp legend=1 hash=$attachment}
+{include file=bitpackage:liberty/mime_meta_inc.tpl}
 {/strip}
diff --git a/templates/mime_meta_inc.tpl b/templates/mime_meta_inc.tpl
index 8383d7d..a8ff434 100644
--- a/templates/mime_meta_inc.tpl
+++ b/templates/mime_meta_inc.tpl
@@ -23,18 +23,27 @@
 {/if}
 
 <div class="row">
-	{formlabel label="Last Modified" for=""}
+	{formlabel label="Downloads" for=""}
 	{forminput}
-		{$attachment.last_modified|bit_long_datetime}
+		{$attachment.downloads|default:"{tr}none{/tr}"}
 	{/forminput}
 </div>
 
 <div class="row">
-	{formlabel label="Downloads" for=""}
+	{formlabel label="Last Modified" for=""}
 	{forminput}
-		{$attachment.downloads|default:"{tr}none{/tr}"}
+		{$attachment.last_modified|bit_long_datetime}
 	{/forminput}
 </div>
 
+{if $gContent->mInfo.hits}
+	<div class="row">
+		{formlabel label="Hits" for=""}
+		{forminput}
+			{$gContent->mInfo.hits}
+		{/forminput}
+	</div>
+{/if}
+
 {attachhelp legend=1 nohelp=$nohelp hash=$attachment}
 {/strip}