Make internal item entry consistent - galItem

Improve gallery handling in simple_list
Still need list items to use mime display properly

1 files changed, 40 insertions, 32 deletions

diff --git a/templates/view_gallery_images_inc.tpl b/templates/view_gallery_images_inc.tpl
index 4416fbc..98324d4 100644
--- a/templates/view_gallery_images_inc.tpl
+++ b/templates/view_gallery_images_inc.tpl
@@ -50,38 +50,44 @@
 			{/if}
 			<th style="width:20%">{tr}Actions{/tr}</th>
 		</tr>
-			{foreach from=$gContent->mItems item=item}
+			{foreach from=$gContent->mItems item=galItem}
 			<tr class="{cycle values="odd,even"}">
 				{if $thumbsize}
 					<td style="text-align:center;">
-						{if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )}
-							{if $gContent->hasEditPermission() || $gGallery && $gGallery->getPreference( 'link_original_images' )}
-								<a href="{$item->mInfo.source_url|escape}">
-							{else}
-								<a href="{$item->mInfo.thumbnail_url.large}">
+						{if $galItem->mInfo.content_type_guid != 'fisheyegallery' }
+							{if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )}
+								{if $gContent->hasEditPermission() || $gGallery && $gGallery->getPreference( 'link_original_images' )}
+									<a href="{$galItem->mInfo.source_url|escape}">
+								{else}
+									<a href="{$galItem->mInfo.thumbnail_url.large}">
+								{/if}
 							{/if}
-						{/if}
-						<img src="{$item->mInfo.thumbnail_url.$thumbsize}" alt="{$item->mInfo.title|escape}" title="{$item->mInfo.title|escape}" />
-						{if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )}
-							</a>
+							<img src="{$galItem->mInfo.thumbnail_url.$thumbsize}" alt="{$galItem->mInfo.title|escape}" title="{$galItem->mInfo.title|escape}" />
+							{if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )}
+								</a>
+							{/if}
+						{else}
+							<a href="{$galItem->getDisplayUrl()|escape}">
+								<img class="thumb" src="{$galItem->getThumbnailUri()}" alt="{$galItem->mInfo.title|escape|default:'image'}" />
+							</a>				
 						{/if}
 					</td>
 				{/if}
 				<td>
-					<h3><a href="{$item->mInfo.display_url}">{$item->mInfo.title|escape}</a></h3>
-					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) && $item->mInfo.data}
-						{$item->mInfo.parsed_data}
+					<h3><a href="{$galItem->mInfo.display_url}">{$galItem->mInfo.title|escape}</a></h3>
+					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) && $galItem->mInfo.data}
+						{$galItem->mInfo.parsed_data}
 					{/if}
 					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_attid' )}
-						<small>{$item->mInfo.wiki_plugin_link}</small>
+						<small>{$galItem->mInfo.wiki_plugin_link}</small>
 						{assign var=br value=1}
 					{/if}
 					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_name' )}
 						{if $br}<br />{/if}
 						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
-							<a href="{$item->mInfo.display_url}">
+							<a href="{$galItem->mInfo.display_url}">
 						{/if}
-						{$item->mInfo.filename} <small>({$item->mInfo.mime_type})</small>
+						{$galItem->mInfo.filename} <small>({$galItem->mInfo.mime_type})</small>
 						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
 							</a>
 						{/if}
@@ -90,38 +96,40 @@
 				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
 					<td>
 						{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' )}
-							{$item->mInfo.created|bit_short_date}<br />
+							{$galItem->mInfo.created|bit_short_date}<br />
 						{/if}
 						{if $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
-							{tr}by{/tr}: {displayname hash=$item->mInfo}
+							{tr}by{/tr}: {displayname hash=$galItem->mInfo}
 						{/if}
 					</td>
 				{/if}
 				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_size' )}
 					<td style="text-align:right;">
-						{if $item->mInfo.download_url}
-							{$item->mInfo.file_size|display_bytes}
+						{if $galItem->mInfo.download_url}
+							{$galItem->mInfo.file_size|display_bytes}
 						{/if}
-						{if $item->mInfo.prefs.duration}
-							{if $item->mInfo.download_url} / {/if}{$item->mInfo.prefs.duration|display_duration}
+						{if $galItem->mInfo.prefs.duration}
+							{if $galItem->mInfo.download_url} / {/if}{$galItem->mInfo.prefs.duration|display_duration}
 						{/if}
 					</td>
 				{/if}
 				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_hits' )}
 					<td style="text-align:right;">
-						{$item->mInfo.hits|default:"{tr}none{/tr}"}
+						{$galItem->mInfo.hits|default:"{tr}none{/tr}"}
 					</td>
 				{/if}
 				<td class="actionicon">
-					{if $gBitUser->hasPermission( 'p_treasury_download_item' ) && $item->mInfo.download_url}
-						<a href="{$item->mInfo.download_url}">{biticon ipackage="icons" iname="emblem-downloads" iexplain="Download File"}</a>
-					{/if}
-					{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
-						<a href="{$item->mInfo.display_url}">{biticon ipackage="icons" iname="document-open" iexplain="View File"}</a>
-					{/if}
-					{if $gContent->isOwner( $item->mInfo ) || $gBitUser->isAdmin()}
-						<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$item->mInfo.content_id}&amp;action=edit">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit File"}</a>
-						<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$item->mInfo.content_id}&amp;delete=1">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove File"}</a>
+					{if $galItem->mInfo.content_type_guid != 'fisheyegallery' }
+						{if $gBitUser->hasPermission( 'p_treasury_download_item' ) && $galItem->mInfo.download_url}
+							<a href="{$galItem->mInfo.download_url}">{biticon ipackage="icons" iname="emblem-downloads" iexplain="Download File"}</a>
+						{/if}
+						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
+							<a href="{$galItem->mInfo.display_url}">{biticon ipackage="icons" iname="document-open" iexplain="View File"}</a>
+						{/if}
+						{if $gContent->isOwner( $galItem->mInfo ) || $gBitUser->isAdmin()}
+							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;action=edit">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit File"}</a>
+							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove File"}</a>
+						{/if}
 					{/if}
 				</td>
 			</tr>