Rework all gallery view headers to blue header pattern; tidy gallery views

- New gallery_breadcrumb_inc.tpl (small breadcrumb trail from gallery_nav)
- gallery_nav.tpl stripped to prev/next navigation only
- view_image.tpl: semantic <header> with floaticons + breadcrumb
- All gallery view styles (galleriffic 1/2/5, auto_flow, fixed_grid, matteo,
  position_number, simple_list): <header> with gallery_icons_inc + breadcrumb,
  remove separate gallery_nav include, section.body for description
- fixed_grid: drop inc2/inc3, rewrite inc.tpl with cols_per_page from mInfo,
  img-responsive center-block, width:100% table, pagination at bottom
- simple_list: Bootstrap table-striped/hover, img-thumbnail, pagination,
  unconditional data block below title, 100px image column, 15% actions
- auto_flow/position_number: remove duplicate data block from body div
- Replace network-receive/transmit with go-down/go-up; Add Comment icon;
  various data|escape and getParsedData fixes

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

13 files changed, 217 insertions, 368 deletions

diff --git a/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl b/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl
index b8a1be0..14836d9 100755
--- a/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl
+++ b/gallery_views/auto_flow/fisheye_auto_flow_inc.tpl
@@ -1,24 +1,21 @@
 {strip}
-{include file="bitpackage:fisheye/gallery_nav.tpl"}
-<div class="display fisheye container">
-	<div class="header col-xs-12">
+<div class="display fisheye">
+	<header>
 		{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}
 		<h1>{$gContent->getTitle()|escape}</h1>
-	</div>
+		{include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"}
+	</header>
 
 	{if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'}
-	<div class="body">
+	<section class="body">
 		<p>{$gContent->mInfo.data|escape}</p>
-	</div>
+	</section>
 	{/if}
 
 	<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}
-		{if $gContent->mInfo.data}
-			<p>{$gContent->mInfo.data|escape}</p>
-		{/if}
 
 		<div class="col-xs-12">
 		{counter assign="imageCount" start="0" print=false}
diff --git a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
index 8c4e032..5d908f2 100755
--- a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
+++ b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
@@ -1,59 +1,64 @@
 {strip}
-{include file="bitpackage:fisheye/gallery_nav.tpl"}
-<div class="display fisheye container">
-	<div class="header col-xs-12">
+<div class="display fisheye">
+	<header>
 		{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}
 		<h1>{$gContent->getTitle()|escape}</h1>
-	</div>
+		{include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"}
+	</header>
 
 	{if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'}
-	<div class="body">
+	<section class="body">
 		<p>{$gContent->mInfo.data|escape}</p>
-	</div>
+	</section>
 	{/if}
 
 	<div class="body">
-		{if $gContent->mGalleryId != 0}
-			<table class="thumbnailblock">
-			{counter assign="imageCount" start="0" print=false}
-			{assign var="max" value=100}
-			{assign var="tdWidth" value="4"}
-			{foreach from=$gContent->mItems item=galItem key=itemContentId}
-				{if $imageCount % 4 == 0}
-					<tr > <!-- Begin Image Row -->
-				{/if}
+		{formfeedback success=$fisheyeSuccess error=$fisheyeErrors warning=$fisheyeWarnings}
+
+		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
+
+		{assign var="cols" value=$gContent->mInfo.cols_per_page|default:4}
+		{assign var="tdWidth" value="`100/$cols`"}
+		<table class="thumbnailblock" style="width:100%">
+		{counter assign="imageCount" start="0" print=false}
+		{foreach from=$gContent->mItems item=galItem key=itemContentId}
+			{if $imageCount % $cols == 0}
+				<tr><!-- Begin Image Row -->
+			{/if}
 
-				<td style="width:25%; vertical-align:top;"> <!-- Begin Image Cell -->
-					{box class="box `$galItem->mInfo.content_type_guid`"}
-						<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' )}
-							<h4>{$galItem->mInfo.title|escape}</h4>
-						{/if}
+			<td style="width:{$tdWidth}%; vertical-align:top; text-align:center;"><!-- Begin Image Cell -->
+				{box class="box `$galItem->mInfo.content_type_guid`" style="margin-left:0;"}
+					<a href="{$galItem->getDisplayUrl()|escape}">
+						<img class="thumb img-responsive center-block" src="{$galItem->getThumbnailUri($gContent->getField('thumbnail_size'))}" alt="{$galItem->mInfo.title|escape|default:'image'}" />
+					</a>
+					{if $gBitSystem->isFeatureActive('fisheye_gallery_list_image_titles')}
+						<h4>{$galItem->mInfo.title|escape}</h4>
+					{/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}
-				</td> <!-- End Image Cell -->
-				{counter}
+					{if $gBitSystem->isFeatureActive('fisheye_gallery_list_image_descriptions')}
+						<p>{$galItem->mInfo.data|truncate:200:"..."|escape}</p>
+					{/if}
+				{/box}
+			</td><!-- End Image Cell -->
+			{counter}
 
-				{if $imageCount % 4 == 0}
-					</tr> <!-- End Image Row -->
-				{/if}
+			{if $imageCount % $cols == 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={$gGallery->mGalleryId}">Upload pictures!</a></td></tr>
-			{/foreach}
+		{foreachelse}
+			<tr><td class="norecords">{tr}This gallery is empty{/tr}. <a href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gGallery->mGalleryId ?? 0}">Upload pictures!</a></td></tr>
+		{/foreach}
 
-			{if $imageCount % 4 != 0}</tr>{/if}
-			</table>
-		{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}
+		{if $imageCount % $cols != 0}</tr>{/if}
+		</table>
+		{pagination gallery_id=$gContent->mGalleryId ?? 0}
+	</div><!-- end .body -->
 
-		{pagination gallery_id=$galleryId}
-	</div>	<!-- end .body -->
-</div>	<!-- end .fisheye -->
-{/strip}	
+	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
+
+	{if $gContent->getPreference('allow_comments') eq 'y'}
+		{include file="bitpackage:liberty/comments.tpl"}
+	{/if}
+</div><!-- end .fisheye -->
+{/strip}
diff --git a/gallery_views/fixed_grid/fisheye_fixed_grid_inc2.tpl b/gallery_views/fixed_grid/fisheye_fixed_grid_inc2.tpl
deleted file mode 100755
index 48ac28c..0000000
--- a/gallery_views/fixed_grid/fisheye_fixed_grid_inc2.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-{strip}
-{include file="bitpackage:fisheye/gallery_nav.tpl"}
-<div class="display fisheye">
-	<div class="header">
-		{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}
-		<h1>{$gContent->getTitle()|escape}</h1>
-	</div>
-
-	{pagination gallery_id=$gContent->mGalleryId ?? 0}
-
-	<div class="body">
-		{if !empty($fisheyeSuccess) || !empty($fisheyeErrors) || !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 && $gContent->getPreference('show_description') ne 'n'}
-			<p>{$gContent->mInfo.data|escape}</p>
-		{/if}
-
-		<table class="thumbnailblock">
-		{counter assign="imageCount" start="0" print=false}
-		{assign var="max" value=100}
-		{if !empty($cols_per_page) && $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 -->
-			{/if}
-
-			<td style="width:{$tdWidth}%; vertical-align:top;"> <!-- Begin Image Cell -->
-				{box class="box `$galItem->mInfo.content_type_guid`" style="margin-left:0;"}
-					<a href="{$galItem->getDisplayUrl()|escape}">
-						<img class="thumb img-responsive" src="{$galItem->getThumbnailUri($gContent->getField('thumbnail_size'))}" alt="{$galItem->mInfo.title|escape|default:'image'}" />
-					</a>
-					{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|truncate:200:"..."|escape}</p>
-					{/if}
-				{/box}
-			</td> <!-- End Image Cell -->
-			{counter}
-
-			{if $imageCount % $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={$gGallery->mGalleryId ?? 0}">Upload pictures!</a></td></tr>
-		{/foreach}
-
-		{if $imageCount % $cols_per_page != 0}</tr>{/if}
-		</table>
-	</div>	<!-- end .body -->
-
-	{* pagination *}
-
-	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
-
-	{if $gContent->getPreference('allow_comments') eq 'y'}
-		{include file="bitpackage:liberty/comments.tpl"}
-	{/if}
-</div>	<!-- end .fisheye -->
-{/strip}	
diff --git a/gallery_views/fixed_grid/fisheye_fixed_grid_inc3.tpl b/gallery_views/fixed_grid/fisheye_fixed_grid_inc3.tpl
deleted file mode 100755
index 6df08a5..0000000
--- a/gallery_views/fixed_grid/fisheye_fixed_grid_inc3.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-{strip}
-{* 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 col-xs-12">
-		{formfeedback success=$fisheyeSuccess error=$fisheyeErrors warning=$fisheyeWarnings}
-
-		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
-		{if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'}
-			<p>{$gContent->mInfo.data|escape}</p>
-		{/if}
-
-		<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->getDisplayUrl()|escape}">
-						<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}
-			<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}
-		</div>
-		<div class="clear"></div>
-	</div>	<!-- end .body -->
-
-	{pagination gallery_id=$gContent->mGalleryId}
-
-	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
-
-	{if $gContent->getPreference('allow_comments') eq 'y'}
-		{include file="bitpackage:liberty/comments.tpl"}
-	{/if}
-</div>	<!-- end .fisheye -->
-{/strip}
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
index c06ddcc..ee2b6c6 100755
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
@@ -1,16 +1,16 @@
 {strip}
-{include file="bitpackage:fisheye/gallery_nav.tpl"}
-<div class="galleriffic">
+<div class="display fisheye">
 
-<div class="header">
+<header>
 	{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}
 	<h1>{$gContent->getTitle()|escape}</h1>
-</div>
+	{include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"}
+</header>
 
 {if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'}
-<div class="body">
+<section class="body">
 	<p>{$gContent->mInfo.data|escape}</p>
-</div>
+</section>
 {/if}
 
 <!-- Start Advanced Gallery Html Containers -->				
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_2.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_2.tpl
index e04d2e2..4d9c9f5 100644
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_2.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_2.tpl
@@ -1,16 +1,16 @@
 {strip}
-{include file="bitpackage:fisheye/gallery_nav.tpl"}
-<div class="galleriffic">
+<div class="display fisheye">
 
-<div class="header">
+<header>
 	{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}
 	<h1>{$gContent->getTitle()|escape}</h1>
-</div>
+	{include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"}
+</header>
 
 {if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'}
-<div class="body">
+<section class="body">
 	<p>{$gContent->mInfo.data|escape}</p>
-</div>
+</section>
 {/if}
 
 {assign var=hasVideos value=false}
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
index d2d49ab..a21db6d 100755
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
@@ -1,16 +1,16 @@
 {strip}
-{include file="bitpackage:fisheye/gallery_nav.tpl"}
-<div class="galleriffic">
+<div class="display fisheye">
 
-<div class="header">
+<header>
 	{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}
 	<h1>{$gContent->getTitle()|escape}</h1>
-</div>
+	{include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"}
+</header>
 
 {if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'}
-<div class="body">
+<section class="body">
 	<p>{$gContent->mInfo.data|escape}</p>
-</div>
+</section>
 {/if}
 
 <!-- Start Advanced Gallery Html Containers -->
diff --git a/gallery_views/matteo/fisheye_matteo_inc.tpl b/gallery_views/matteo/fisheye_matteo_inc.tpl
index bdeaa8d..a7e468d 100755
--- a/gallery_views/matteo/fisheye_matteo_inc.tpl
+++ b/gallery_views/matteo/fisheye_matteo_inc.tpl
@@ -38,13 +38,15 @@ $(function(){
 /*]]>*/</script>
 
 
-<div class="header">
+<div class="display fisheye">
+<header>
 	{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}
 	<h1>{$gContent->getTitle()|escape}</h1>
-</div>
+	{include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"}
+</header>
 
 {if $gContent->mInfo.data}
-	<p>{$gContent->mInfo.data|escape}</p>
+	<section class="body"><p>{$gContent->mInfo.data|escape}</p></section>
 {/if}
 
 {assign var=thumbsize value='avatar'}
@@ -61,3 +63,4 @@ $(function(){
 {if $gContent->getPreference('allow_comments') eq 'y'}
 	{include file="bitpackage:liberty/comments.tpl"}
 {/if}
+</div>
diff --git a/gallery_views/position_number/fisheye_position_number_inc.tpl b/gallery_views/position_number/fisheye_position_number_inc.tpl
index 29e1f67..cf0a973 100755
--- a/gallery_views/position_number/fisheye_position_number_inc.tpl
+++ b/gallery_views/position_number/fisheye_position_number_inc.tpl
@@ -1,24 +1,21 @@
 {strip}
-{include file="bitpackage:fisheye/gallery_nav.tpl"}
 <div class="display fisheye">
-	<div class="header">
+	<header>
 		{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}
 		<h1>{$gContent->getTitle()|escape}</h1>
-	</div>
+		{include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"}
+	</header>
 
 	{if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'}
-	<div class="body">
+	<section class="body">
 		<p>{$gContent->mInfo.data|escape}</p>
-	</div>
+	</section>
 	{/if}
 
 	<div class="body">
 		{formfeedback success=$fisheyeSuccess error=$fisheyeErrors warning=$fisheyeWarnings}
 
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
-		{if $gContent->mInfo.data}
-			<p>{$gContent->mInfo.data|escape}</p>
-		{/if}
 
 	<table class="thumbnailblock">
 		{counter assign="imageCount" start="0" print=false}
diff --git a/gallery_views/simple_list/fisheye_simple_list_inc.tpl b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
index 988e603..c9ed5fd 100755
--- a/gallery_views/simple_list/fisheye_simple_list_inc.tpl
+++ b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
@@ -1,124 +1,102 @@
-{include file="bitpackage:fisheye/gallery_nav.tpl"}
-<div class="header">
+{strip}
+<div class="display fisheye">
+<header>
 	{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}
 	<h1>{$gContent->getTitle()|escape}</h1>
-</div>
+	{include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"}
+</header>
 
 {if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'}
-<div class="body">
+<section class="body">
 	<p>{$gContent->mInfo.data|escape}</p>
-</div>
+</section>
 {/if}
 
-	{assign var=thumbsize value='small'}
-	<table class="data">
+<div class="body">
+	<table class="table table-striped table-hover">
 		<caption>{tr}List of files{/tr} <span class="total">[ {$galInfo.total_records|default:0} ]</span></caption>
-		<tr>
-			{if $thumbsize}
-				<th style="width:1%"></th>
-			{/if}
-			<th style="width:60%">
-				{smartlink ititle=Name isort=title icontrol=$galInfo}
-			</th>
-			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
-				<th style="width:10%">
-					{smartlink ititle=Uploaded isort=created iorder=desc idefault=1 icontrol=$galInfo}
-				</th>
-			{/if}
-			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_size' )}
-				<th style="width:10%">{tr}Size{/tr} /<br />{tr}Duration{/tr}</th>
-			{/if}
-			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_hits' )}
-				<th style="width:10%">
-					{smartlink ititle=Downloads isort="lch.hits" icontrol=$galInfo}
-				</th>
-			{/if}
-			<th style="width:20%">{tr}Actions{/tr}</th>
-		</tr>
+		<thead>
+			<tr>
+				<th style="width:100px"></th>
+				<th>{smartlink ititle=Name isort=title icontrol=$galInfo}</th>
+				{if $gBitSystem->isFeatureActive('fisheye_item_list_date') || $gBitSystem->isFeatureActive('fisheye_item_list_creator')}
+					<th style="width:10%">{smartlink ititle=Uploaded isort=created iorder=desc idefault=1 icontrol=$galInfo}</th>
+				{/if}
+				{if $gBitSystem->isFeatureActive('fisheye_item_list_size')}
+					<th style="width:8%">{tr}Size{/tr}</th>
+				{/if}
+				{if $gBitSystem->isFeatureActive('fisheye_item_list_hits')}
+					<th style="width:5%">{smartlink ititle=Downloads isort="lch.hits" icontrol=$galInfo}</th>
+				{/if}
+				<th style="width:15%; text-align:right">{tr}Actions{/tr}</th>
+			</tr>
+		</thead>
+		<tbody>
 			{foreach from=$gContent->mItems item=galItem}
-			<tr class="{cycle values="odd,even"}">
-				{if $thumbsize}
-					<td style="text-align:center;">
-						{if $galItem->mInfo.content_type_guid != 'fisheyegallery' }
-							{if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )}
-								{if $gContent->hasUpdatePermission() || $gGallery && $gGallery->getPreference( 'link_original_images' )}
-									<a href="{$galItem->getDownloadUrl()|escape}">
-								{else}
-									<a href="{$galItem->mInfo.thumbnail_url.large}">
-								{/if}
-							{/if}
-							<img src="{$galItem->mInfo.thumbnail_url.$thumbsize}" alt="{$galItem->getTitle()|escape}" title="{$galItem->getTitle()|escape}" />
-							{if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )}
-								</a>
+			<tr>
+				<td style="text-align:center; vertical-align:middle;">
+					{if $galItem->mInfo.content_type_guid != 'fisheyegallery'}
+						{if $gBitSystem->isFeatureActive('site_fancy_zoom')}
+							{if $gContent->hasUpdatePermission() || $gGallery && $gGallery->getPreference('link_original_images')}
+								<a href="{$galItem->getDownloadUrl()|escape}">
+							{else}
+								<a href="{$galItem->mInfo.thumbnail_url.large}">
 							{/if}
-						{else}
-							<a href="{$galItem->getDisplayUrl()|escape}">
-								<img class="thumb" src="{$galItem->getThumbnailUri()}" alt="{$galItem->getTitle()|escape|default:'image'}" />
+						{/if}
+						<img class="img-thumbnail" src="{$galItem->mInfo.thumbnail_url.small}" alt="{$galItem->getTitle()|escape}" title="{$galItem->getTitle()|escape}" style="max-height:80px; max-width:100%" />
+						{if $gBitSystem->isFeatureActive('site_fancy_zoom')}
 							</a>
 						{/if}
-					</td>
-				{/if}
-				<td>
-					<h3><a href="{$galItem->getDisplayUrl()}">{$galItem->getTitle()|escape}</a></h3>
-					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) && $galItem->mInfo.data}
-						{$galItem->mInfo.parsed_data}
+					{else}
+						<a href="{$galItem->getDisplayUrl()|escape}">
+							<img class="img-thumbnail" src="{$galItem->getThumbnailUri()}" alt="{$galItem->getTitle()|escape|default:'image'}" style="max-height:80px; max-width:100%" />
+						</a>
 					{/if}
-					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_attid' )}
-						<small>{$galItem->mInfo.wiki_plugin_link}</small>
-						{assign var=br value=1}
+				</td>
+				<td>
+					<h4><a href="{$galItem->getDisplayUrl()}">{$galItem->getTitle()|escape}</a></h4>
+					{if $galItem->mInfo.data}
+						<small class="text-muted">{$galItem->mInfo.data|truncate:200|escape}</small>
 					{/if}
-					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_name' )}
-						{if $br}<br />{/if}
-						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
-							<a href="{$galItem->getDisplayUrl()}">
-						{/if}
-						{$galItem->mInfo.filename} <small>({$galItem->mInfo.mime_type})</small>
-						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
-							</a>
-						{/if}
+					{if $gBitSystem->isFeatureActive('fisheye_item_list_name')}
+						<br/><small class="text-muted">{$galItem->mInfo.filename} ({$galItem->mInfo.mime_type})</small>
 					{/if}
 				</td>
-				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
+				{if $gBitSystem->isFeatureActive('fisheye_item_list_date') || $gBitSystem->isFeatureActive('fisheye_item_list_creator')}
 					<td>
-						{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' )}
-							{$galItem->mInfo.created|bit_short_date}<br />
-						{/if}
-						{if $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
-							{tr}by{/tr}: {displayname hash=$galItem->mInfo}
-						{/if}
+						{if $gBitSystem->isFeatureActive('fisheye_item_list_date')}{$galItem->mInfo.created|bit_short_date}{/if}
+						{if $gBitSystem->isFeatureActive('fisheye_item_list_creator')}<br/>{tr}by{/tr} {displayname hash=$galItem->mInfo}{/if}
 					</td>
 				{/if}
-				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_size' )}
+				{if $gBitSystem->isFeatureActive('fisheye_item_list_size')}
 					<td style="text-align:right;">
-						{if $galItem->mInfo.download_url}
-							{$galItem->mInfo.file_size|display_bytes}
-						{/if}
-						{if $galItem->mInfo.prefs.duration}
-							{if $galItem->mInfo.download_url} / {/if}{$galItem->mInfo.prefs.duration|display_duration}
-						{/if}
+						{if $galItem->mInfo.download_url}{$galItem->mInfo.file_size|display_bytes}{/if}
+						{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;">
-						{$galItem->mInfo.hits|default:"{tr}none{/tr}"}
-					</td>
+				{if $gBitSystem->isFeatureActive('fisheye_item_list_hits')}
+					<td style="text-align:right;">{$galItem->mInfo.hits|default:"{tr}none{/tr}"}</td>
 				{/if}
 				<td class="actionicon">
-					{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="network-receive" iexplain="Download 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="go-down" iexplain="Download File"}</a>
 						{/if}
-						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
+						{if $gBitUser->hasPermission('p_treasury_view_item')}
 							<a href="{$galItem->getDisplayUrl()}">{biticon ipackage="icons" iname="folder-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>
+						{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="edit" 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="user-trash" iexplain="Remove File"}</a>
 						{/if}
 					{/if}
 				</td>
 			</tr>
-		{/foreach}
+			{/foreach}
+		</tbody>
 	</table>
+	{pagination gallery_id=$gContent->mGalleryId ?? 0}
+</div>
 
-
+</div>
+{/strip}
diff --git a/templates/gallery_breadcrumb_inc.tpl b/templates/gallery_breadcrumb_inc.tpl
new file mode 100644
index 0000000..12ce26d
--- /dev/null
+++ b/templates/gallery_breadcrumb_inc.tpl
@@ -0,0 +1,18 @@
+<small>
+	{if $gContent->hasUpdatePermission()}
+		{if !empty($gGallery->mInfo)}
+			{assign var=creatorInfo value=$gGallery->mInfo}
+		{else}
+			{assign var=creatorInfo value=$gContent->mInfo}
+		{/if}
+		<a href="{$smarty.const.FISHEYE_PKG_URL}?user_id={$creatorInfo.user_id}">{displayname user=$creatorInfo.creator_user user_id=$creatorInfo.creator_user_id|default:0 real_name=$creatorInfo.creator_real_name}</a> &rsaquo;
+	{/if}
+	{assign var=breadCrumbs value=$gContent->getBreadcrumbLinks(1)}
+	{foreach from=$breadCrumbs item=breadTitle key=breadId}
+		{if $breadId == $gContent->mGalleryId}
+			{$breadTitle|escape}
+		{else}
+			<a href="{$smarty.const.FISHEYE_PKG_URL}gallery/{$breadId}">{$breadTitle|escape}</a> &rsaquo;
+		{/if}
+	{/foreach}
+</small>
diff --git a/templates/gallery_nav.tpl b/templates/gallery_nav.tpl
index 55c4a3c..97d6638 100755
--- a/templates/gallery_nav.tpl
+++ b/templates/gallery_nav.tpl
@@ -1,63 +1,39 @@
 {strip}
-<div class="gallerybar">
-	<nav>
-		{assign var=breadCrumbs value=$gContent->getBreadcrumbLinks(1)}
-		<ol class="breadcrumb">
-			{if $gContent->hasUpdatePermission()}
-				{if !empty($gGallery->mInfo)}
-					{assign var=creatorInfo value=$gGallery->mInfo}
-				{else}
-					{assign var=creatorInfo value=$gContent->mInfo}
-				{/if}
-				<li>{displayname user=$creatorInfo.creator_user user_id=$creatorInfo.creator_user_id|default:0 real_name=$creatorInfo.creator_real_name} :: <a href="{$smarty.const.FISHEYE_PKG_URL}?user_id={$creatorInfo.user_id}">Galleries</a></li>
-			{/if}
-			{if $breadCrumbs}
-				{foreach from=$breadCrumbs item=breadTitle key=breadId}
-					{if $breadId==$gContent->mGalleryId}<li class="active">{$breadTitle}</li>
-					{else}<li><a href="{$smarty.const.FISHEYE_PKG_URL}gallery/{$breadId}">{$breadTitle}</a></li>{/if}
-				{/foreach}
-			{/if}
-		</ol>
-	</nav>
+{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='nav' serviceHash=$gContent->mInfo}
 
-	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='nav' serviceHash=$gContent->mInfo}
+{if $gGallery}
+	<div class="navigation">
+		<span class="pull-left">
+			{if !empty( $gGallery->mInfo.previous_image_id )}
+				<a href="{$gContent->getImageUrl($gGallery->mInfo.previous_image_id)|escape}">
+					{if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )}
+						{biticon ipackage="icons" iname="go-previous" iexplain=previous}
+					{else}
+						&laquo;&nbsp;{tr}previous{/tr}
+					{/if}
+					{if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )}
+						<br />
+						<img src="{$gGallery->mInfo.previous_image_avatar}" />
+					{/if}
+				</a>
+			{else}&nbsp;{/if}
+		</span>
 
-	{if $gGallery}
-		<div class="navigation">
-			<span class="pull-left">
-				{if !empty( $gGallery->mInfo.previous_image_id )}
-					<a href="{$gContent->getImageUrl($gGallery->mInfo.previous_image_id)|escape}">
-						{if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )}
-							{biticon ipackage="icons" iname="go-previous"  iexplain=previous}
-						{else}
-							&laquo;&nbsp;{tr}previous{/tr}
-						{/if}
-						{if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )}
-							<br />
-							<img src="{$gGallery->mInfo.previous_image_avatar}" />
-						{/if}
-					</a>
-				{else}&nbsp;{/if}
-			</span>
-
-			<span class="pull-right">
-				{if !empty( $gGallery->mInfo.next_image_id )}
-					<a href="{$gContent->getImageUrl($gGallery->mInfo.next_image_id)|escape}">
-						{if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )}
-							{biticon ipackage="icons" iname="go-next" iexplain=next}
-						{else}
-							{tr}next{/tr}&nbsp;&raquo;
-						{/if}
-						{if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )}
-							<br />
-							<img src="{$gGallery->mInfo.next_image_avatar}" />
-						{/if}
-					</a>
-				{else}&nbsp;{/if}
-			</span>
-		</div><!-- end .navigation -->
-	{/if}
-
-	<div class="clear"></div>
-</div><!-- end .gallerybar -->
+		<span class="pull-right">
+			{if !empty( $gGallery->mInfo.next_image_id )}
+				<a href="{$gContent->getImageUrl($gGallery->mInfo.next_image_id)|escape}">
+					{if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )}
+						{biticon ipackage="icons" iname="go-next" iexplain=next}
+					{else}
+						{tr}next{/tr}&nbsp;&raquo;
+					{/if}
+					{if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )}
+						<br />
+						<img src="{$gGallery->mInfo.next_image_avatar}" />
+					{/if}
+				</a>
+			{else}&nbsp;{/if}
+		</span>
+	</div><!-- end .navigation -->
+{/if}
 {/strip}
diff --git a/templates/view_image.tpl b/templates/view_image.tpl
index 0ef8992..86cedae 100755
--- a/templates/view_image.tpl
+++ b/templates/view_image.tpl
@@ -1,34 +1,26 @@
 {strip}
-{if empty($liberty_preview)}
-	{include file="bitpackage:fisheye/gallery_nav.tpl"}
-{/if}
-
 <div class="display fisheye">
 	{if empty($liberty_preview)}
-		<div class="floaticon">
-			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo}
-			{if $gContent->hasUpdatePermission()}
-				<a title="{tr}Refresh{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image/{$gContent->mImageId}?rethumb=1">{biticon ipackage="icons" iname="view-refresh" iexplain="Refresh"}</a>
-				<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}">{biticon ipackage="icons" iname="edit" iexplain="Edit Image"}</a>
-				<a title="{tr}Delete{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}&amp;delete=1">{biticon ipackage="icons" iname="user-trash" iexplain="Delete Image"}</a>
-			{/if}
-		</div>
+	<header>
+		{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}
+		<h1>{$gContent->getTitle()|default:$gContent->mInfo.filename|escape}</h1>
+		{include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"}
+	</header>
 	{/if}
 
 	{formfeedback hash=$feedback}
-	<div class="header">
-		<h1>{$gContent->getTitle()|default:$gContent->mInfo.filename|escape}</h1>
-	</div>
-
-	<div class="body">
+	<section class="body">
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
 		<div class="image">
 			{include file=$gLibertySystem->getMimeTemplate('view',$gContent->mInfo.attachment_plugin_guid) attachment=$gContent->mInfo.image_file}
 			{if $gBitSystem->isFeatureActive('fisheye_image_list_description') && $gContent->mInfo.data ne ''}
 				<p class="description">{$gContent->mInfo.parsed_data|truncate:250:"..."}</p>
 			{/if}
-			</div>
-	</div>	<!-- end .body -->
+		</div>
+		{if empty($liberty_preview)}
+			{include file="bitpackage:fisheye/gallery_nav.tpl"}
+		{/if}
+	</section>
 
 	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
 
@@ -36,5 +28,5 @@
 		{include file="bitpackage:liberty/comments.tpl"}
 	{/if}
 
-</div>	<!-- end .fisheye -->
+</div>
 {/strip}