Tidies to bring templates up to date with smarty5 and add in missing elements

4 files changed, 14 insertions, 10 deletions

diff --git a/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl b/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl
index 89d79c1..59e48c9 100755
--- a/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl
+++ b/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl
@@ -20,8 +20,8 @@
 		{foreach from=$gContent->mItems item=galItem key=itemContentId}
 			<div class="col-lg-3 col-md-4 col-sm-6 col-xs-12"> <!-- Begin Image Cell -->
 				<div class="col-xs-12 gallery-box">
-					<a href="{if empty($galItem->mInfo.source_url)}/fisheye/gallery/{$galItem->mInfo.gallery_id}
-							{else}{$galItem->mInfo.source_url}{/if}">
+					<a href="{if empty($galItem->mInfo.display_url)}/fisheye/gallery/{$galItem->mInfo.gallery_id}
+							{else}{$galItem->mInfo.display_url}{/if}">
 						<div class="col-xs-12 gallery-img table-cell">
 							<img class="col-xs-12 thumb" src="{$galItem->getThumbnailUri($gContent->getField('thumbnail_size'))}" alt="{$galItem->mInfo.title|escape|default:'image'}" />
 						</div>
@@ -39,14 +39,14 @@
 			{/if}
 			{if $imageCount % 3 == 0}<div class="hidden-xs hidden-sm hidden-lg clear"></div>{/if}
 		{foreachelse}
-			<div class="norecords">{tr}This gallery is empty{/tr}. <a href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gContent->mGalleryId}">Upload pictures!</a></div>
+			<div class="norecords">{tr}This gallery is empty{/tr}. <a href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$galleryId}">Upload pictures!</a></div>
 		{/foreach}
 		</div>
 		<div class="clear"></div>
 
 	</div>	<!-- end .body -->
 
-	{pagination gallery_id=$gContent->mGalleryId}
+	{pagination gallery_id=$galleryId}
 
 	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
 
diff --git a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
index 5a528cd..925ce95 100755
--- a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
+++ b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
@@ -45,6 +45,8 @@
 		{else}
 			{tr}No gallery for this contact{/tr}. <a href="{$smarty.const.FISHEYE_PKG_URL}create.php?title={$gContent->mInfo.organisation}&contact={$gContent->mInfo.content_id}">Create Contact Gallery!</a>
 		{/if}
+
+		{pagination gallery_id=$galleryId}
 	</div>	<!-- end .body -->
 </div>	<!-- end .fisheye -->
 {/strip}	
diff --git a/gallery_views/position_number/fisheye_position_number_inc.tpl b/gallery_views/position_number/fisheye_position_number_inc.tpl
index d48535a..e74c6c5 100755
--- a/gallery_views/position_number/fisheye_position_number_inc.tpl
+++ b/gallery_views/position_number/fisheye_position_number_inc.tpl
@@ -17,9 +17,9 @@
 	<table class="thumbnailblock">
 		{counter assign="imageCount" start="0" print=false}
 		{assign var="max" value=100}
-		{assign var="tdWidth" value="`$max/$cols_per_page`"}
+		{assign var="tdWidth" value="`$max/$gContent->mInfo.cols_per_page`"}
 		{foreach from=$gContent->mItems item=galItem key=itemContentId}
-			{if $imageCount % $cols_per_page == 0}
+			{if $imageCount % $gContent->mInfo.cols_per_page == 0}
 				<tr > <!-- Begin Image Row -->
 			{/if}
 
@@ -39,20 +39,20 @@
 			</td> <!-- End Image Cell -->
 			{counter}
 
-			{if $imageCount % $cols_per_page == 0}
+			{if $imageCount % $gContent->mInfo.cols_per_page == 0}
 				</tr> <!-- End Image Row -->
 			{/if}
 
 		{foreachelse}
-			<tr><td class="norecords">{tr}This gallery is empty{/tr}. <a href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gContent->mGalleryId}">{tr}Upload pictures{/tr}!</a></td></tr>
+			<tr><td class="norecords">{tr}This gallery is empty{/tr}. <a href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$galleryId}">{tr}Upload pictures{/tr}!</a></td></tr>
 		{/foreach}
 
-		{if $imageCount % $cols_per_page != 0}</tr>{/if}
+		{if $imageCount % $gContent->mInfo.cols_per_page != 0}</tr>{/if}
 	</table>
 
 	</div>	<!-- end .body -->
 
-	{pagination numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}
+	{pagination gallery_id=$galleryId gallery_path=$gContent->mGalleryPath}
 
 	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
 
diff --git a/templates/edit_image_inc.tpl b/templates/edit_image_inc.tpl
index eb19ea2..d67a52a 100755
--- a/templates/edit_image_inc.tpl
+++ b/templates/edit_image_inc.tpl
@@ -51,6 +51,8 @@
 		{include file="bitpackage:fisheye/resize_image_select.tpl"}
 	</div>
 
+	{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"}
+
 	<div class="form-group submit">
 		<input type="submit" class="btn btn-default" name="saveImage" value="Save Image"/>
 	</div>