gallery_views code updated to PHP8.4 and namespace ... work in progress on updating some third party code

6 files changed, 52 insertions, 47 deletions

diff --git a/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl b/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl
index 1c644a9..b754e77 100644..100755
--- a/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl
+++ b/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl
@@ -1,12 +1,12 @@
 {strip}
-{include file="bitpackage:fisheye/gallery_nav.tpl"}
-<div class="display fisheye">
-	<div class="header">
+{* include file="bitpackage:fisheye/gallery_nav.tpl" *}
+<div class="display fisheye container">
+	<div class="header col-xs-12">
 		{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}
 		<h1>{$gContent->getTitle()|escape}</h1>
 	</div>
 
-	<div class="body">
+	<div class="body col-xs-12">
 		{formfeedback success=$fisheyeSuccess error=$fisheyeErrors warning=$fisheyeWarnings}
 
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
@@ -14,34 +14,34 @@
 			<p>{$gContent->mInfo.data|escape}</p>
 		{/if}
 
-		{if $gBrowserInfo.browser eq 'ie'}
-			<!-- we need this friggin table for MSIE that images don't float outside of the designated area - once again a hack for our favourite browser - grrr -->
-			<table style="border:0;border-collapse:collapse;border-spacing:0; width:auto;"><tr><td>
-		{/if}
-		<div class="thumbnailblock">
-			{foreach from=$gContent->mItems item=galItem key=itemContentId}
-				{box class="box `$gContent->mInfo.thumbnail_size`-thmb `$galItem->mInfo.content_type_guid`"}
-					{include file=$gLibertySystem->getMimeTemplate('inline',$galItem->mInfo.attachment_plugin_guid) attachment=$galItem->mInfo.image_file}
-					{if $gBitSystem->isFeatureActive( 'fisheye_gallery_list_image_titles' )}
-						<h2>{$galItem->mInfo.title|escape}</h2>
-					{/if}
-					{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$galItem->mInfo type=mini}
-					{if $gBitSystem->isFeatureActive( 'fisheye_gallery_list_image_descriptions' )}
-						<p>{$galItem->mInfo.data|escape}</p>
-					{/if}
-				{/box}
-			{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>
-			{/foreach}
+		<div class="col-xs-12">
+		{counter assign="imageCount" start="0" print=false}
+		{assign var="max" value=100}
+		{foreach from=$gContent->mItems item=galItem key=itemContentId}
+			<div class="col-md-4 col-sm-6 col-xs-12"> <!-- Begin Image Cell -->
+				<div class="col-xs-12 gallery-box">
+					<a href="{$galItem->mInfo.source_url}">
+						<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>
+						<div class="col-xs-12 gallery-img-title table-cell center">
+							<h3>{$galItem->mInfo.title|escape}</h3>
+						</div>
+					</a>
+				</div>
+			</div> <!-- End Image Cell -->
+			{counter}
+			{if $imageCount % 2 == 0}<div class="hidden-xs hidden-md hidden-lg clear"></div>{/if}
+			{if $imageCount % 3 == 0}<div class="hidden-xs hidden-sm 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>
+		{/foreach}
 		</div>
-		{if $gBrowserInfo.browser eq 'ie'}
-			</td></tr></table>
-		{/if}
 		<div class="clear"></div>
 
 	</div>	<!-- end .body -->
 
-	{libertypagination numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}
+	{pagination gallery_id=$gContent->mGalleryId}
 
 	{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 aae8c66..8b3a4e8 100644..100755
--- a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
+++ b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
@@ -6,8 +6,12 @@
 		<h1>{$gContent->getTitle()|escape}</h1>
 	</div>
 
+	{pagination gallery_id=$gContent->mGalleryId}
+
 	<div class="body">
-		{formfeedback success=$fisheyeSuccess error=$fisheyeErrors warning=$fisheyeWarnings}
+		{if !empty($fisheyeSuccess) or !empty($fisheyeErrors) or !empty($fisheyeWarnings) }
+			{formfeedback success=$fisheyeSuccess error=$fisheyeErrors warning=$fisheyeWarnings}
+		{/if}
 
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
 		{if $gContent->mInfo.data}
@@ -17,7 +21,7 @@
 		<table class="thumbnailblock">
 		{counter assign="imageCount" start="0" print=false}
 		{assign var="max" value=100}
-		{assign var="tdWidth" value="`$max/$cols_per_page`"}
+		{if !empty($cols_per_page) and $cols_per_page > 0}{assign var="tdWidth" value="`$max/$cols_per_page`"}{else}{assign var="tdWidth" value="25"}{assign var="cols_per_page" value="1"}{/if}
 		{foreach from=$gContent->mItems item=galItem key=itemContentId}
 			{if $imageCount % $cols_per_page == 0}
 				<tr > <!-- Begin Image Row -->
@@ -44,14 +48,14 @@
 			{/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}">Upload pictures!</a></td></tr>
+				<tr><td class="norecords">{tr}This gallery is empty{/tr}. <a href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gGallery->mGalleryId}">Upload pictures!</a></td></tr>
 		{/foreach}
 
 		{if $imageCount % $cols_per_page != 0}</tr>{/if}
 		</table>
 	</div>	<!-- end .body -->
 
-	{libertypagination numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}
+	{* pagination *}
 
 	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
 
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
index 46fc192..c4f3472 100644..100755
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
@@ -6,7 +6,6 @@
 	<nav>
 		{assign var=breadCrumbs value=$gContent->getBreadcrumbLinks(1)}
 		<ol class="breadcrumb">
-			<li>{displayname user=$gContent->mInfo.creator_user user_id=$gContent->mInfo.creator_user_id real_name=$gContent->mInfo.creator_real_name} :: <a href="{$smarty.const.FISHEYE_PKG_URL}?user_id={$gContent->mInfo.user_id}">{tr}Galleries{/tr}</a></li>
 			{if $breadCrumbs}
 				{foreach from=$breadCrumbs item=breadTitle key=breadId}
 					{if $breadId==$gContent->mGalleryId}<li class="active">{$breadTitle}</li>
@@ -25,12 +24,12 @@
 		<ul class="thumbs noscript">
 			{foreach from=$gContent->mItems item=galItem}
 			<li>
-				{if is_a($galItem, 'FisheyeImage')}
+				{if is_a($galItem, '\Bitweaver\Fisheye\FisheyeImage')}
 					<a class="thumb" name="{$galItem->mImageId}" href="{$galItem->mInfo.thumbnail_url.large}{*$smarty.const.FISHEYE_PKG_URL}view_image.php?image_id={$galItem->mImageId*}" title="{$galItem->mInfo.title|escape}">
 						<img src="{$galItem->mInfo.thumbnail_url.avatar}" alt="{$galItem->mInfo.title|escape}" />
 					</a>
 					<h2 class="heading">
-						<div class="image-heading">{booticon iname="fa-image-landscape" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink()}</div>
+						<div class="image-heading">{booticon iname="icon-picture" isize="small" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink( null )}</div>
 					</h2>
 					<div class="caption">
 						<div class="meta floatright">
@@ -48,17 +47,19 @@
 							</div>
 							{/if}
 						</div>
-						<div class="image-desc"><p>{$galItem->mInfo.description|escape}</p></div>
+						<div class="image-title"><p>{$galItem->mInfo.title|escape}</p></div>
+						<div class="image-desc"><p>{$galItem->mInfo.description|default:''}</p></div>
 					</div>
 				{elseif is_a($galItem, 'FisheyeGallery')}
 					<a class="thumb" name="{$galItem->mContentId}" href="{$galItem->mPreviewImage->mInfo.thumbnail_url.large}" title="{$galItem->mInfo.title|escape}">
 						<img src="{$galItem->mPreviewImage->mInfo.thumbnail_url.avatar}" alt="{$galItem->mInfo.title|escape}"/>
 					</a>
 					<div class="heading">
-						<h2>{booticon iname="fa-image-landscape" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink()}</h2><span class="image-count">({$galItem->getImageCount()} {tr}Items{/tr})</span>
+						<h2>{booticon iname="icon-picture"   isize="small" iexplain=$galItem->getContentTypeName()|escape}{$galItem->getDisplayLink( null )}</h2><span class="image-count">({$galItem->getImageCount()} {tr}Items{/tr})</span>
 					</div>
 					<div class="caption">
-						<div class="image-desc">{$galItem->mInfo.description|escape}</div>
+						<div class="image-title"><p>{$galItem->mInfo.title|escape}</p></div>
+						<div class="image-desc">{$galItem->mInfo.description|default:''}</div>
 						<div class="download">
 							
 						</div>
@@ -89,7 +90,7 @@
 	<div id="caption" class="caption-container"></div>
 </div>
 
-<script type="text/javascript">/*<![CDATA[*/
+<script>/*<![CDATA[*/
 {literal}
 jQuery(document).ready(function($) {
 	// We only want these styles applied when javascript is enabled
@@ -121,9 +122,9 @@ jQuery(document).ready(function($) {
 		renderSSControls:          true,
 		renderNavControls:         true,
 		playLinkText:              '',
-		playLinkImage:             '{/literal}{booticon iname="fa-circle-play" class="fa-small" iexplain="Play Slideshow"}{literal}',
+		playLinkImage:             '{/literal}{booticon iname="icon-control-start" isize="small" iexplain="Play Slideshow"}{literal}',
 		pauseLinkText:             '',
-		pauseLinkImage:            '{/literal}{booticon iname="fa-circle-pause" class="fa-small" iexplain="Pause Slideshow"}{literal}',
+		pauseLinkImage:            '{/literal}{booticon iname="icon-control-pause" isize="small" iexplain="Pause Slideshow"}{literal}',
 		prevLinkText:              '&laquo;',
 		nextLinkText:              '&raquo;',
 		nextPageLinkText:          'Next &rsaquo;',
@@ -201,10 +202,10 @@ jQuery(document).ready(function($) {
 
 	// Initialize history plugin.
 	// The callback is called at once by present location.hash. 
-	$.historyInit(pageload, "advanced.html");
+	//$.historyInit(pageload, "advanced.html");
 
 	// set onlick event for buttons using the jQuery 1.3 live method
-	$("a[rel='history']").live('click', function(e) {
+/*	$("a[rel='history']").live('click', function(e) {
 		if (e.button != 0) return true;
 
 		var hash = this.href;
@@ -216,7 +217,7 @@ jQuery(document).ready(function($) {
 		$.historyLoad(hash);
 
 		return false;
-	});
+	}); */
 
 	/****************************************************************************************/
 });
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
index c2acfa2..9bece31 100644..100755
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
@@ -89,7 +89,7 @@
 	<div id="caption" class="caption-container"></div>
 </div>
 
-<script type="text/javascript">/*<![CDATA[*/
+<script>/*<![CDATA[*/
 {literal}
 jQuery(document).ready(function($) {
 	// We only want these styles applied when javascript is enabled
diff --git a/gallery_views/matteo/fisheye_matteo_inc.tpl b/gallery_views/matteo/fisheye_matteo_inc.tpl
index 46bca5a..bdeaa8d 100644..100755
--- a/gallery_views/matteo/fisheye_matteo_inc.tpl
+++ b/gallery_views/matteo/fisheye_matteo_inc.tpl
@@ -1,4 +1,4 @@
-<script type="text/javascript">/*<![CDATA[*/
+<script>/*<![CDATA[*/
 {literal}
 $(function(){
 		$("#g1").mbGallery( {
diff --git a/gallery_views/position_number/fisheye_position_number_inc.tpl b/gallery_views/position_number/fisheye_position_number_inc.tpl
index 0396559..d48535a 100644..100755
--- a/gallery_views/position_number/fisheye_position_number_inc.tpl
+++ b/gallery_views/position_number/fisheye_position_number_inc.tpl
@@ -44,7 +44,7 @@
 			{/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}">Upload pictures!</a></td></tr>
+			<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>
 		{/foreach}
 
 		{if $imageCount % $cols_per_page != 0}</tr>{/if}
@@ -52,7 +52,7 @@
 
 	</div>	<!-- end .body -->
 
-	{libertypagination numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}
+	{pagination numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}
 
 	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}