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

25 files changed, 116 insertions, 110 deletions

diff --git a/templates/admin_fisheye.tpl b/templates/admin_fisheye.tpl
index ece709b..ece709b 100644..100755
--- a/templates/admin_fisheye.tpl
+++ b/templates/admin_fisheye.tpl
diff --git a/templates/browse_galleries.tpl b/templates/browse_galleries.tpl
index b70b3c3..b70b3c3 100644..100755
--- a/templates/browse_galleries.tpl
+++ b/templates/browse_galleries.tpl
diff --git a/templates/center_image_comments.php b/templates/center_image_comments.php
index 01aeec0..bad376d 100644..100755
--- a/templates/center_image_comments.php
+++ b/templates/center_image_comments.php
@@ -8,12 +8,13 @@
 /**
  * A specialized version of liberty/modules/mod_last_comments.php for fisheye
  */
-require_once( LIBERTY_PKG_CLASS_PATH.'LibertyComment.php' );
+use Bitweaver\Liberty\LibertyComment;
+
 global $gQueryUser, $gBitUser, $gLibertySystem, $moduleParams;
 $params = $moduleParams['module_params'];
 $moduleTitle = !empty($moduleParams['title'])? $moduleParams['title'] : 'Recent Image Comments';
 
-$userId = NULL;
+$userId = null;
 if( !empty( $gQueryUser->mUserId ) ) {
 	$userId = $gQueryUser->mUserId;
 }
@@ -24,7 +25,7 @@ $listHash = array(
 );
 
 if (!empty($params['full'])) {
-	$listHash['parse'] = TRUE;
+	$listHash['parse'] = true;
 }
 
 if (!empty($params['pigeonholes'])) {
diff --git a/templates/center_image_comments.tpl b/templates/center_image_comments.tpl
index da808a5..ada3f5e 100644..100755
--- a/templates/center_image_comments.tpl
+++ b/templates/center_image_comments.tpl
@@ -28,7 +28,7 @@
 			{/section}
 		</ul>
 		<div class="clear"></div>
-		{pagination}
+		{pagination gallery_id=$gContent->mGalleryId}
 	</div>	<!-- end .body -->
 </div>	<!-- end .fisheye -->
 {/if}
diff --git a/templates/center_list_galleries.php b/templates/center_list_galleries.php
index ccea099..322ed0f 100644..100755
--- a/templates/center_list_galleries.php
+++ b/templates/center_list_galleries.php
@@ -3,12 +3,14 @@ global $gQueryUser;
 if( !empty( $moduleParams ) ) {
 	extract( $moduleParams );
 }
+use Bitweaver\Fisheye\FisheyeGallery;
+use Bitweaver\BitBase;
 
 $gFisheyeGallery = new FisheyeGallery();
 
 /* Get a list of galleries which matches the imput paramters (default is to list every gallery in the system) */
-$listHash['root_only'] = TRUE;
-$listHash['get_thumbnails'] = TRUE;
+$listHash['root_only'] = true;
+$listHash['get_thumbnails'] = true;
 /*	Not supported in FisheyeGallery::getList
 if( !empty( $module_params['gallery_id'] ) && is_numeric( $module_params['gallery_id'] ) ) {
 	$listHash['gallery_id'] = $module_params['gallery_id'];
@@ -21,11 +23,9 @@ if ($gQueryUserId) {
 if( !empty( $module_params['contain_item'] ) && BitBase::verifyId( $module_params['contain_item'] ) ) {
 	$listHash['contain_item'] = $module_params['contain_item'];
 }
-if ( !empty( $module_params['sort_mode'] ) ) {
-	$listHash['sort_mode'] = $module_params['sort_mode'];
-} else {
-	$listHash['sort_mode'] = 'created_desc';
-}
+$listHash['sort_mode'] = !empty( $module_params['sort_mode'] )
+	? $module_params['sort_mode']
+	: 'created_desc';
 if( !empty( $module_params['nav_bar'] ) ){
 	$gBitSmarty->assign('navBar', $module_params['nav_bar']);
 }else{
@@ -38,24 +38,23 @@ if( !empty( $module_params['max_records'] ) ){
 
 $galleryList = $gFisheyeGallery->getList( $listHash );
 // support for div/ul/li listing of galleries
-$gBitSmarty->assignByRef( 'galleryList', $galleryList );
+$gBitSmarty->assign( 'galleryList', $galleryList );
 
 
 
 /* Process the input parameters this page accepts */
 if (!empty($gQueryUser) && $gQueryUser->isRegistered()) {
-	$gBitSmarty->assignByRef('gQueryUserId', $gQueryUser->mUserId);
+	$gBitSmarty->assign('gQueryUserId', $gQueryUser->mUserId);
 	$template = 'user_galleries.tpl';
 } else {
 	$template = 'list_galleries.tpl';
 }
 if (!empty($_REQUEST['offset']) && is_numeric($_REQUEST['offset'])) {
-	$gBitSmarty->assignByRef('iMaxRows', $iMaxRows);
+	$gBitSmarty->assign('iMaxRows', $iMaxRows);
 }
 if (!empty($_REQUEST['sort_mode'])) {
-	$gBitSmarty->assignByRef('iSortMode', $_REQUEST['sort_mode']);
+	$gBitSmarty->assign('iSortMode', $_REQUEST['sort_mode']);
 }
 if (!empty($_REQUEST['search'])) {
-	$gBitSmarty->assignByRef('iSearchString', $iSearchtring);
+	$gBitSmarty->assign('iSearchString', $iSearchtring);
 }
-?>
diff --git a/templates/center_list_images.php b/templates/center_list_images.php
index 87782c0..e2dfcdf 100644..100755
--- a/templates/center_list_images.php
+++ b/templates/center_list_images.php
@@ -6,29 +6,29 @@ $gFisheyeImage = new FisheyeImage();
 if( !empty( $module_rows ) ) {
 	$_REQUEST['max_records'] = $module_rows;
 } elseif (!empty($_REQUEST['offset']) && is_numeric($_REQUEST['offset'])) {
-	$gBitSmarty->assignByRef('iMaxRows', $iMaxRows);
+	$gBitSmarty->assign('iMaxRows', $iMaxRows);
 }
 if (empty($_REQUEST['sort_mode'])) {
 	$_REQUEST['sort_mode'] = 'random';
 }
 if (!empty($_REQUEST['search'])) {
-	$gBitSmarty->assignByRef('iSearchString', $iSearchtring);
+	$gBitSmarty->assign('iSearchString', $iSearchtring);
 }
 
-$gBitSmarty->assignByRef('iSortMode', $_REQUEST['sort_mode']);
+$gBitSmarty->assign('iSortMode', $_REQUEST['sort_mode']);
 
 /* Get a list of galleries which matches the imput paramters (default is to list every gallery in the system) */
 if( !empty( $gQueryUser ) && $gQueryUser->mUserId ) {
 	$_REQUEST['user_id'] = $gQueryUser->mUserId;
 }
-$_REQUEST['root_only'] = TRUE;
-$_REQUEST['get_thumbnails'] = TRUE;
+$_REQUEST['root_only'] = true;
+$_REQUEST['get_thumbnails'] = true;
 $thumbnailList = $gFisheyeImage->getList( $_REQUEST );
-$gBitSmarty->assignByRef('thumbnailList', $thumbnailList);
+$gBitSmarty->assign('thumbnailList', $thumbnailList);
 
 /* Process the input parameters this page accepts */
 if (!empty($gQueryUser) && $gQueryUser->isRegistered()) {
-	$gBitSmarty->assignByRef('gQuerUserId', $gQueryUser->mUserId);
+	$gBitSmarty->assign('gQuerUserId', $gQueryUser->mUserId);
 	$template = 'user_galleries.tpl';
 } else {
 	$template = 'list_galleries.tpl';
diff --git a/templates/center_list_images.tpl b/templates/center_list_images.tpl
index 0033e0e..0033e0e 100644..100755
--- a/templates/center_list_images.tpl
+++ b/templates/center_list_images.tpl
diff --git a/templates/edit_gallery.tpl b/templates/edit_gallery.tpl
index 0fcd714..6f655e8 100644..100755
--- a/templates/edit_gallery.tpl
+++ b/templates/edit_gallery.tpl
@@ -45,7 +45,7 @@ function updateGalleryPagination() {
 						<div class="form-group">
 							{formlabel label="Description" for="gallery-desc"}
 							{forminput}
-								<textarea name="edit" id="gallery-desc" rows="4" cols="50">{$gContent->mInfo.data|escape}</textarea>
+								<textarea name="edit" id="gallery-desc" rows="4" cols="50">{$gContent->mInfo.data|default:''|escape}</textarea>
 							{/forminput}
 						</div>
 
@@ -117,7 +117,7 @@ function updateGalleryPagination() {
 
 						<div class="form-group">
 							{forminput label="checkbox"}
-								<input type="checkbox" name="allow_comments" id="allow_comments" value="y" {if !$gContent->isValid() || $gContent->getPreference('allow_comments') eq 'y'}checked="checked"{/if} />Image Comments
+								<input type="checkbox" name="allow_comments" id="allow_comments" value="y" {if !$gContent->isValid() or $gContent->getPreference('allow_comments') eq 'y'}checked="checked"{/if} />{tr}Image Comments{/tr}
 								{formhelp note="Allow posting comments for an image."}
 							{/forminput}
 						</div>
@@ -131,7 +131,7 @@ function updateGalleryPagination() {
 				{if $galleryTree}
 					{jstab title="Gallery Memberships"}
 						{legend legend="Gallery Memberships"}
-							{tr}If you would like this gallery to be a sub-gallery, check the parent gallery below. It is possible to belong to multiple galleries. If no parent is checked, this gallery will appear as a top-level gallery.{/tr}
+							If you would like this gallery to be a sub-gallery, check the parent gallery below. It is possible to belong to multiple galleries. If no parent is checked, this gallery will appear as a top-level gallery.
 							<div class="form-group">
 								{formlabel label=$gContent->getContentTypeName()|cat:" Belongs to These Galleries"}
 								{forminput}
@@ -141,7 +141,7 @@ function updateGalleryPagination() {
 										</div>
 									{else}
 										<p class="norecords">
-											{tr}No Galleries Found{/tr}.<br />
+											No Galleries Found.<br />
 										</p>
 									{/if}
 								{/forminput}
diff --git a/templates/edit_image.tpl b/templates/edit_image.tpl
index e9b54d4..b8722e1 100644..100755
--- a/templates/edit_image.tpl
+++ b/templates/edit_image.tpl
@@ -70,10 +70,10 @@
 							{formlabel label="Rotate Image"}
 							{forminput}
 {if function_exists('exif_read_data')}
-								<label class="radio-inline"><input type="radio" name="rotate_image" value="auto"/> {booticon iname="fa-chevron-up" iexplain="Auto Rotate"}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="auto"/> {booticon iname="icon-chevron-sign-up" iexplain="Auto Rotate"}</label>
 {/if}
-								<label class="radio-inline"><input type="radio" name="rotate_image" value="-90"/> {booticon iname="fa-arrow-rotate-left" iexplain="Rotate Counter Clockwise"}</label>
-								<label class="radio-inline"><input type="radio" name="rotate_image" value="90"/> {booticon iname="fa-arrow-rotate-left" iexplain="Rotate Clockwise"}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="-90"/> {booticon iname="icon-rotate-left" iexplain="Rotate Counter Clockwise"}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="90"/> {booticon iname="icon-rotate-left" iexplain="Rotate Clockwise"}</label>
 								<label class="radio-inline"><input type="radio" name="rotate_image" value="" checked="checked"/> {tr}don't rotate{/tr}</label>
 							{/forminput}
 						</div>
@@ -82,6 +82,10 @@
 							{include file="bitpackage:fisheye/resize_image_select.tpl"}
 						</div>
 
+						{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"}
+				{/jstab}
+				{jstab title="Image Galleries"}
+
 						<div class="form-group">
 							{formlabel label="Add This Image to These Galleries"}
 							{forminput}
@@ -90,14 +94,13 @@
 										{$galleryTree}
 									</div>
 								{else}
-							<p class="norecords">
-								{tr}No Galleries Found{/tr}.<br />
-							</p>
-						{/if}
-					{/forminput}
+									<p class="norecords">
+										{tr}No Galleries Found{/tr}.<br />
+									</p>
+								{/if}
+							{/forminput}
 						</div>
 
-						{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"}
 				{/jstab}
 
 				{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_tab_tpl"}
diff --git a/templates/edit_image_inc.tpl b/templates/edit_image_inc.tpl
index 0eef63c..eb19ea2 100644..100755
--- a/templates/edit_image_inc.tpl
+++ b/templates/edit_image_inc.tpl
@@ -7,7 +7,7 @@
 	<div class="form-group">
 		{formlabel label="Title" for="image-title"}
 		{forminput}
-			<input type="text" name="title" id="image-title" value="{$gContent->getTitle('',FALSE)|escape}" maxlength="160" size="40"/>
+			<input type="text" name="title" id="image-title" value="{$gContent->getTitle('',false)|escape}" maxlength="160" size="40"/>
 		{/forminput}
 	</div>
 
diff --git a/templates/gallery_icons_inc.tpl b/templates/gallery_icons_inc.tpl
index 9a2c5db..9a2c5db 100644..100755
--- a/templates/gallery_icons_inc.tpl
+++ b/templates/gallery_icons_inc.tpl
diff --git a/templates/gallery_nav.tpl b/templates/gallery_nav.tpl
index e192e67..5bd254a 100644..100755
--- a/templates/gallery_nav.tpl
+++ b/templates/gallery_nav.tpl
@@ -4,10 +4,10 @@
 		{assign var=breadCrumbs value=$gContent->getBreadcrumbLinks(1)}
 		<ol class="breadcrumb">
 			<li>
-		{if $gGallery}
-			{displayname user=$gGallery->mInfo.creator_user user_id=$gGallery->mInfo.creator_user_id real_name=$gGallery->mInfo.creator_real_name} :: <a href="{$smarty.const.FISHEYE_PKG_URL}?user_id={$gGallery->mInfo.user_id}">{tr}Galleries{/tr}</a>
+		{if !empty($gGallery->mInfo)}
+			{displayname user=$gGallery->mInfo.creator_user user_id=$gGallery->mInfo.creator_user_id|default:0 real_name=$gGallery->mInfo.creator_real_name} :: <a href="{$smarty.const.FISHEYE_PKG_URL}?user_id={$gGallery->mInfo.user_id}">Galleries</a>
 		{else}
-			{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>
+			{displayname user=$gContent->mInfo.creator_user user_id=$gContent->mInfo.creator_user_id|default:0 real_name=$gContent->mInfo.creator_real_name} :: <a href="{$smarty.const.FISHEYE_PKG_URL}?user_id={$gContent->mInfo.user_id}">Galleries</a>
 		{/if}
 			</li>
 
diff --git a/templates/gallery_tree.tpl b/templates/gallery_tree.tpl
index 45fb58c..45fb58c 100644..100755
--- a/templates/gallery_tree.tpl
+++ b/templates/gallery_tree.tpl
diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl
index f6fe781..9bebf49 100644..100755
--- a/templates/html_head_inc.tpl
+++ b/templates/html_head_inc.tpl
@@ -1,15 +1,15 @@
 {* $Header$ *}
 {strip}
-{if $gContent}
-	{if $gGallery->mInfo.previous_image_id}
+{if !empty($gGallery) and $gContent}
+	{if !empty($gGallery->mInfo.previous_image_id)}
 		<link rel="prev" title="{tr}Previous{/tr}" href="{$gContent->getImageUrl($gGallery->mInfo.previous_image_id)|escape}" />
 	{/if}
-	{if $gGallery->mInfo.next_image_id}
+	{if !empty($gGallery->mInfo.next_image_id)}
 		<link rel="next" title="{tr}Next{/tr}" href="{$gContent->getImageUrl($gGallery->mInfo.next_image_id)|escape}" />
 	{/if}
 {/if}
 {if $gBitSystem->isPackageActive( 'rss' ) and $gBitSystem->isFeatureActive( 'fisheye_rss' ) and $gBitSystem->getActivePackage() eq 'fisheye' and $gBitUser->hasPermission( 'p_fisheye_view' )}
-	{if $gGallery}
+	{if !empty($gGallery)}
 		{assign var=fisheye_rss_gal_id value=$gGallery->mGalleryId}
 	{elseif $gContent}
 		{assign var=fisheye_rss_gal_id value=$gContent->mGalleryId}
diff --git a/templates/image_order.tpl b/templates/image_order.tpl
index b12223b..076bcd2 100644..100755
--- a/templates/image_order.tpl
+++ b/templates/image_order.tpl
@@ -36,7 +36,7 @@
 					<tr class="{$pageClass}">
 						{counter name=imageCount print=false}
 						<td class="{$galItem->mType.content_type_guid}">
-							<a href="{$galItem->getDisplayUrl()|escape}"><img class="thumb" src="{$gContent->mItems.$itemContentId->getThumbnailUri()|replace:"&":"&amp;"}{if $batchEdit.$itemContentId ne ''}?{math equation="1 + rand(1,9999)"}{/if}" alt="{$galItem->getTitle()|escape}" /></a>
+							<a href="{$galItem->getDisplayUrl()|escape}"><img class="thumb" src="{$gContent->mItems.$itemContentId->getThumbnailUri()|replace:"&":"&amp;"}{if $batchEdit.$itemContentId|default:'' ne ''}?{math equation="1 + rand(1,9999)"}{/if}" alt="{$galItem->getTitle()|escape}" /></a>
 						</td>
 
 						<td>
diff --git a/templates/list_galleries.tpl b/templates/list_galleries.tpl
index 996ab93..99c1a1a 100644..100755
--- a/templates/list_galleries.tpl
+++ b/templates/list_galleries.tpl
@@ -29,16 +29,28 @@
 		</ul>
 
 		<div class="form-group">
-		<div class="row galleries">
-			{math assign=quarterValue equation="round(c/4)" c=$galleryList|count}
-			{foreach from=$galleryList key=galleryId item=gal}
-			<div class="col-xs-6 col-sm-4 col-md-3 ">
-				<div class="{$gal.content_type_guid} thumbnail">
-					{if $gBitSystem->isFeatureActive('fisheye_list_thumbnail') && $gal.display_url}
-					{assign var=thumbnailUri value=$gBitSystem->getParameter( $gal, 'thumbnail_uri', "`$smarty.const.FISHEYE_PKG_URL`image/no_image.png")}
-					<a href="{$gal.display_url}"><div class="square" style="background-image:url('{$thumbnailUri}');"alt="{$gal.title|escape}" title="{$gal.title|truncate:50|escape}" {if !empty($gal.data)} data-toggle="popover" data-trigger="click hover focus" data-placement="top" data-content="{$gal.data|truncate:100}"{else}{/if}><img src="{$thumbnailUri}" alt="{$gal.title|escape}"><h3 class="gallery-title"><a href="{$gal.display_url}">{if $gBitSystem->isFeatureActive('fisheye_list_title')}{$gal.title|truncate:25|escape}{else}Gallery {$gal.gallery_id}{/if}</a></h3><div class="security" style="position:absolute; top:5%;right:5%;color:#fff;">
+			<div class="row galleries">
+				{* math assign=quarterValue equation="round(c/4)" c=$galleryList|count *}
+				{foreach from=$galleryList key=galleryId item=gal}
+				<div class="col-xs-6 col-sm-4 col-md-3 ">
+					<div class="{$gal.content_type_guid} thumbnail">
+						{if $gBitSystem->isFeatureActive('fisheye_list_thumbnail') && $gal.display_url}
+							{assign var=thumbnailUri value=$gBitSystem->getParameter( $gal, 'thumbnail_uri', "`$smarty.const.FISHEYE_PKG_URL`image/no_image.png")}
+							<a href="{$gal.display_url}"><div class="square" style="background-image:url('{$thumbnailUri}');"alt="{$gal.title|escape}" 
+								title="{$gal.title|truncate:50|escape}" 
+							{if !empty($gal.data)}
+								data-toggle="popover" data-trigger="click hover focus" data-placement="top" data-content="{$gal.data|truncate}"
+							{/if}>
+							<img src="{$thumbnailUri}" alt="{$gal.title|escape}"><h3 class="gallery-title"><a href="{$gal.display_url}">
+							{if $gBitSystem->isFeatureActive('fisheye_list_title')}
+								{$gal.title|truncate|escape}
+							{else}
+								{tr}Gallery{/tr} {$gal.gallery_id}
+							{/if}
+							</a>
+							</h3><div class="security" style="position:absolute; top:5%;right:5%;color:#fff;">
 							{if $gal.is_hidden=='y' || $gal.is_private=='y' || $gal.access_answer}
-								{booticon iname="fa-lock" iexplain="Security" label=TRUE}
+								{booticon iname="fa-lock" iexplain="Security" label=true}
 							{/if}
 							{if $gal.is_hidden=='y'}
 								<span style="padding:5px;">{tr}Hidden{/tr}</span>
@@ -49,55 +61,46 @@
 							{if $gal.access_answer}
 								<span style="padding:5px;">{tr}Password{/tr}</span>
 							{/if}
-						</div></div></a>
-					{/if}
-					<div class="caption">
+							</div></div></a>
+						{/if}
+						<div class="caption">
 
-					{if $gBitSystem->isFeatureActive('fisheye_list_user')}
-						<strong>{displayname hash=$gal nolink=TRUE}</strong> <small><a href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gal.user_id}" style="display:block;">{tr}Galleries{/tr}</a></small>
-					{/if}
-					{* if $galleryList[ix]->isProtected()}
-						{booticon iname="fa-lock" iexplain="Protected"}
-					{/if *}
+						{if $gBitSystem->isFeatureActive('fisheye_list_user')}
+							<strong>{displayname hash=$gal nolink=true}</strong> <small><a href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gal.user_id}" style="display:block;">{tr}Galleries{/tr}</a></small>
+						{/if}
+						{* if $galleryList[ix]->isProtected()}
+							{booticon iname="fa-lock" iexplain="Protected"}
+						{/if *}
 
-					{if $gBitSystem->isFeatureActive('fisheye_list_created' ) or $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
-						<div class="date">
-							{if $gBitSystem->isFeatureActive('fisheye_list_created' ) }
-								<strong>{tr}Created{/tr}:</strong> {$gal.created|bit_short_date}<br />
-							{/if}
-							{if $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
-								<strong>{tr}Modified{/tr}:</strong> {$gal.last_modified|bit_short_date}<br />
-							{/if}
-						</div>
-					{/if}
+						{if $gBitSystem->isFeatureActive('fisheye_list_created' ) or $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
+							<div class="date">
+								{if $gBitSystem->isFeatureActive('fisheye_list_created' ) }
+									<strong>{tr}Created{/tr}:</strong> {$gal.created|bit_short_date}<br />
+								{/if}
+								{if $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
+									<strong>{tr}Modified{/tr}:</strong> {$gal.last_modified|bit_short_date}<br />
+								{/if}
+							</div>
+						{/if}
 
-					<!--{if $gBitSystem->isFeatureActive('fisheye_list_hits')}
-						<small><strong>{tr}Hits{/tr}:</strong> {$gal.hits}</small>
-					{/if}-->
+						<!--{if $gBitSystem->isFeatureActive('fisheye_list_hits')}
+							<small><strong>{tr}Hits{/tr}:</strong> {$gal.hits}</small>
+						{/if}-->
 
-					{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gal}
+						{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gal}
 
+						</div>
 					</div>
 				</div>
-			</div>
 
 			{/foreach}	
 			</div>
 		</div>
 
 		<nav>
-			{pagination}
+			{pagination gallery_id=$gContent->mGalleryId}
 		</nav>
 
-		</section>	<!-- end .body -->
-	</div>	<!-- end .fisheye -->
-	{/strip}
-	{literal}
-	<script src="/storage/static/js/popover.js"></script>
-	<script>
-		$('background-image').error(function(){
-        $(this).attr('src', '/storage/static/images/no-image.png');
-});
-	
-	</script>
-{/literal}
+	</section>	<!-- end .body -->
+{/strip}
+</div>	<!-- end .fisheye -->
diff --git a/templates/menu_fisheye.tpl b/templates/menu_fisheye.tpl
index 12ea186..123943f 100644..100755
--- a/templates/menu_fisheye.tpl
+++ b/templates/menu_fisheye.tpl
@@ -1,21 +1,21 @@
 {strip}
-{if $packageMenuTitle}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if}
+{if !empty($packageMenuTitle)}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if}
 <ul class="{$packageMenuClass}">
 	{if $gBitUser->hasPermission('p_fisheye_view')}
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php">{booticon iname="fa-list-ul" iexplain="List Galleries" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php">{booticon iname="icon-list" iexplain="List Galleries" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission('p_fisheye_create')}
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gBitUser->mUserId}">{booticon iname="fa-image-landscape" iexplain="My Galleries" ilocation=menu}</a></li>
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}edit.php">{booticon iname="fa-camera" iexplain="Create a Gallery" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gBitUser->mUserId}">{booticon iname="icon-picture" iexplain="My Galleries" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}edit.php">{booticon iname="icon-camera" iexplain="Create a Gallery" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission('p_fisheye_upload')}
 		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}upload.php">{booticon iname="fa-cloud-arrow-up" iexplain="Upload Images" ilocation=menu}</a></li>
 	{/if}
 	{* if $gBitUser->hasPermission('p_fisheye_view')}
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}gallery_tree.php">{booticon iname="fa-sitemap" iexplain="growser gallery tree" ilocation=menu} {tr}Browse Gallery Tree{/tr}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}gallery_tree.php">{booticon iname="icon-sitemap" iexplain="growser gallery tree" ilocation=menu} Browse Gallery Tree</a></li>
 	{/if *}
 	{if $gBitUser->isRegistered() && $gBitSystem->isPackageActive('quota')}
-		<li><a class="item" href="{$smarty.const.QUOTA_PKG_URL}">{booticon iname="fa-hard-drive" iexplain="Usage" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.QUOTA_PKG_URL}">{booticon iname="icon-hdd" iexplain="Usage" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->isRegistered() && $gBitSystem->isPackageActive('gatekeeper')}
 		<li><a class="item" href="{$smarty.const.GATEKEEPER_PKG_URL}">{booticon iname="fa-lock" iexplain="Security" ilocation=menu}</a></li>
diff --git a/templates/menu_fisheye_admin.tpl b/templates/menu_fisheye_admin.tpl
index a5b9605..5baaf5f 100644..100755
--- a/templates/menu_fisheye_admin.tpl
+++ b/templates/menu_fisheye_admin.tpl
@@ -1 +1,7 @@
+{strip}
+<ul class="{$packageMenuClass}">
+<li>
 <a class="nosubmenu" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=fisheye">{tr}{$smarty.const.FISHEYE_PKG_DIR|capitalize}{/tr}</a>
+</li>
+</ul>
+{/strip}
\ No newline at end of file
diff --git a/templates/resize_image_select.tpl b/templates/resize_image_select.tpl
index b9574ec..b9574ec 100644..100755
--- a/templates/resize_image_select.tpl
+++ b/templates/resize_image_select.tpl
diff --git a/templates/upload_fisheye.tpl b/templates/upload_fisheye.tpl
index 3a2cd5e..3a2cd5e 100644..100755
--- a/templates/upload_fisheye.tpl
+++ b/templates/upload_fisheye.tpl
diff --git a/templates/user_galleries.tpl b/templates/user_galleries.tpl
index 0a143f4..33db06c 100644..100755
--- a/templates/user_galleries.tpl
+++ b/templates/user_galleries.tpl
@@ -1 +1 @@
-{include file="bitpackage:fisheye/list_galleries.tpl"}
+{include file="bitpackage:fisheye/list_galleries2.tpl"}
diff --git a/templates/view_gallery_files_inc.tpl b/templates/view_gallery_files_inc.tpl
index 88b0402..88b0402 100644..100755
--- a/templates/view_gallery_files_inc.tpl
+++ b/templates/view_gallery_files_inc.tpl
diff --git a/templates/view_gallery_images_inc.tpl b/templates/view_gallery_images_inc.tpl
index d3c30ad..6928e28 100644..100755
--- a/templates/view_gallery_images_inc.tpl
+++ b/templates/view_gallery_images_inc.tpl
@@ -1,8 +1,5 @@
 {strip}
 {if $gContent->getLayout() == 'auto_flow'}
-	{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}
@@ -17,12 +14,9 @@
 				{/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>
+			<div class="norecords">This gallery is empty. <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>
 {elseif $gContent->getLayout() == 'simple_list'}
 	{assign var=thumbsize value='small'}
@@ -167,7 +161,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">This gallery is empty. <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}
diff --git a/templates/view_image.tpl b/templates/view_image.tpl
index 5884bd1..4d302ae 100644..100755
--- a/templates/view_image.tpl
+++ b/templates/view_image.tpl
@@ -1,10 +1,10 @@
 {strip}
-{if !$liberty_preview}
+{if !empty($liberty_preview)}
 	{include file="bitpackage:fisheye/gallery_nav.tpl"}
 {/if}
 
 <div class="display fisheye">
-	{if !$liberty_preview}
+	{if empty($liberty_preview)}
 		<div class="floaticon">
 			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo}
 			{if $gContent->hasUpdatePermission()}
diff --git a/templates/view_image_details.tpl b/templates/view_image_details.tpl
index 441823d..2239985 100644..100755
--- a/templates/view_image_details.tpl
+++ b/templates/view_image_details.tpl
@@ -5,7 +5,7 @@
 	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
 	<div class="image">
 		{if $gBitSystem->isFeatureActive('fisheye_image_list_description') and $gContent->mInfo.data ne ''}
-			<p class="description">{$gContent->mInfo.parsed_data}</p>
+			<p class="description">{$gContent->mInfo.parsed_data|default:''}</p>
 		{/if}
 		</div>
 </div>	<!-- end .body -->