summaryrefslogtreecommitdiff
path: root/gallery_views
diff options
context:
space:
mode:
authorLester Caine ext:(%22) <lester@lsces.co.uk>2012-04-29 16:32:01 +0100
committerLester Caine ext:(%22) <lester@lsces.co.uk>2012-04-29 16:32:01 +0100
commita8868a5c98ea26ff7066a9e89f540b1d6ba0db80 (patch)
tree074f6a1bbb930a9ea04d61619d3e3da1db772b5e /gallery_views
parentfad791a43aea469023b37a8c1293ff795816e33e (diff)
downloadfisheye-a8868a5c98ea26ff7066a9e89f540b1d6ba0db80.tar.gz
fisheye-a8868a5c98ea26ff7066a9e89f540b1d6ba0db80.tar.bz2
fisheye-a8868a5c98ea26ff7066a9e89f540b1d6ba0db80.zip
Roll back getContentUrl to alternate static getDisplayUrl fix
getDisplayUrlFrom Hash used for static calls
Diffstat (limited to 'gallery_views')
-rw-r--r--gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl6
-rw-r--r--gallery_views/position_number/fisheye_position_number_inc.tpl2
-rw-r--r--gallery_views/simple_list/fisheye_simple_list_inc.tpl10
3 files changed, 9 insertions, 9 deletions
diff --git a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
index 536589c..d33284b 100644
--- a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
+++ b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
@@ -25,7 +25,7 @@
<td style="width:{$tdWidth}%; vertical-align:top;"> <!-- Begin Image Cell -->
{box class="box `$galItem->mInfo.content_type_guid`"}
- <a href="{$galItem->getContentUrl()|escape}">
+ <a href="{$galItem->getDisplayUrl()|escape}">
<img class="thumb" src="{$galItem->getThumbnailUri()}" alt="{$galItem->mInfo.title|escape|default:'image'}" />
</a>
{if $gBitSystem->isFeatureActive( 'fisheye_gallery_list_image_titles' )}
@@ -46,6 +46,7 @@
{foreachelse}
<tr><td class="norecords">{tr}This gallery is empty{/tr}. <a href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gContent->mGalleryId}">Upload pictures!</a></td></tr>
{/foreach}
+
{if $imageCount % $cols_per_page != 0}</tr>{/if}
</table>
</div> <!-- end .body -->
@@ -58,5 +59,4 @@
{include file="bitpackage:liberty/comments.tpl"}
{/if}
</div> <!-- end .fisheye -->
-{/strip}
-
+{/strip}
diff --git a/gallery_views/position_number/fisheye_position_number_inc.tpl b/gallery_views/position_number/fisheye_position_number_inc.tpl
index 2492a1b..0396559 100644
--- a/gallery_views/position_number/fisheye_position_number_inc.tpl
+++ b/gallery_views/position_number/fisheye_position_number_inc.tpl
@@ -25,7 +25,7 @@
<td style="width:{$tdWidth}%; vertical-align:top;"> <!-- Begin Image Cell -->
{box class="box `$galItem->mInfo.content_type_guid`"}
- <a href="{$galItem->getContentUrl()|escape}">
+ <a href="{$galItem->getDisplayUrl()|escape}">
<img class="thumb" src="{$galItem->getThumbnailUri()}" alt="{$galItem->mInfo.title|escape|default:'image'}" />
</a>
{if $gBitSystem->isFeatureActive( 'fisheye_gallery_list_image_titles' )}
diff --git a/gallery_views/simple_list/fisheye_simple_list_inc.tpl b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
index 26aacfd..97a0935 100644
--- a/gallery_views/simple_list/fisheye_simple_list_inc.tpl
+++ b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
@@ -40,14 +40,14 @@
</a>
{/if}
{else}
- <a href="{$galItem->getContentUrl()|escape}">
+ <a href="{$galItem->getDisplayUrl()|escape}">
<img class="thumb" src="{$galItem->getThumbnailUri()}" alt="{$galItem->getTitle()|escape|default:'image'}" />
- </a>
+ </a>
{/if}
</td>
{/if}
<td>
- <h3><a href="{$galItem->getContentUrl()}">{$galItem->getTitle()|escape}</a></h3>
+ <h3><a href="{$galItem->getDisplayUrl()}">{$galItem->getTitle()|escape}</a></h3>
{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) && $galItem->mInfo.data}
{$galItem->mInfo.parsed_data}
{/if}
@@ -58,7 +58,7 @@
{if $gBitSystem->isFeatureActive( 'fisheye_item_list_name' )}
{if $br}<br />{/if}
{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
- <a href="{$galItem->getContentUrl()}">
+ <a href="{$galItem->getDisplayUrl()}">
{/if}
{$galItem->mInfo.filename} <small>({$galItem->mInfo.mime_type})</small>
{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
@@ -97,7 +97,7 @@
<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->getContentUrl()}">{biticon ipackage="icons" iname="document-open" iexplain="View File"}</a>
+ <a href="{$galItem->getDisplayUrl()}">{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>