From 593d1c22ed5d7f36f3ab9f1bd5b4148b9a8948b1 Mon Sep 17 00:00:00 2001 From: Lester Caine Date: Tue, 16 Jun 2026 11:01:33 +0100 Subject: 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
with floaticons + breadcrumb - All gallery view styles (galleriffic 1/2/5, auto_flow, fixed_grid, matteo, position_number, simple_list):
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 --- gallery_views/auto_flow/fisheye_auto_flow_inc.tpl | 15 +- .../fixed_grid/fisheye_fixed_grid_inc.tpl | 103 +++++++------- .../fixed_grid/fisheye_fixed_grid_inc2.tpl | 66 --------- .../fixed_grid/fisheye_fixed_grid_inc3.tpl | 51 ------- .../galleriffic/fisheye_galleriffic_inc_1.tpl | 12 +- .../galleriffic/fisheye_galleriffic_inc_2.tpl | 12 +- .../galleriffic/fisheye_galleriffic_inc_5.tpl | 12 +- gallery_views/matteo/fisheye_matteo_inc.tpl | 9 +- .../fisheye_position_number_inc.tpl | 13 +- .../simple_list/fisheye_simple_list_inc.tpl | 158 +++++++++------------ templates/gallery_breadcrumb_inc.tpl | 18 +++ templates/gallery_nav.tpl | 94 +++++------- templates/view_image.tpl | 32 ++--- 13 files changed, 222 insertions(+), 373 deletions(-) delete mode 100755 gallery_views/fixed_grid/fisheye_fixed_grid_inc2.tpl delete mode 100755 gallery_views/fixed_grid/fisheye_fixed_grid_inc3.tpl create mode 100644 templates/gallery_breadcrumb_inc.tpl 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"} -
-
+
+
{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}

{$gContent->getTitle()|escape}

-
+ {include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"} +
{if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'} -
+

{$gContent->mInfo.data|escape}

-
+ {/if}
{formfeedback success=$fisheyeSuccess error=$fisheyeErrors warning=$fisheyeWarnings} {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo} - {if $gContent->mInfo.data} -

{$gContent->mInfo.data|escape}

- {/if}
{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"} -
-
+
+
{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}

{$gContent->getTitle()|escape}

-
+ {include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"} +
{if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'} -
+

{$gContent->mInfo.data|escape}

-
+ {/if}
- {if $gContent->mGalleryId != 0} - - {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} - - {/if} - - + {counter} + + {if $imageCount % $cols == 0} + + {/if} + + {foreachelse} + + {/foreach} + + {if $imageCount % $cols != 0}{/if} +
- {box class="box `$galItem->mInfo.content_type_guid`"} - - {$galItem->mInfo.title|escape|default:'image'} - - {if $gBitSystem->isFeatureActive( 'fisheye_gallery_list_image_titles' )} -

{$galItem->mInfo.title|escape}

- {/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`"} + + {counter assign="imageCount" start="0" print=false} + {foreach from=$gContent->mItems item=galItem key=itemContentId} + {if $imageCount % $cols == 0} + + {/if} + + - {counter} - - {if $imageCount % 4 == 0} - - {/if} - - {foreachelse} - - {/foreach} - - {if $imageCount % 4 != 0}{/if} -
+ {box class="box `$galItem->mInfo.content_type_guid`" style="margin-left:0;"} + + {$galItem->mInfo.title|escape|default:'image'} + + {if $gBitSystem->isFeatureActive('fisheye_gallery_list_image_titles')} +

{$galItem->mInfo.title|escape}

+ {/if} {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$galItem->mInfo type=mini} - {if $gBitSystem->isFeatureActive( 'fisheye_gallery_list_image_descriptions' )} -

{$galItem->mInfo.data|escape}

- {/if} - {/box} -
{tr}This gallery is empty{/tr}. Upload pictures!
- {else} - {tr}No gallery for this contact{/tr}. Create Contact Gallery! - {/if} - - {pagination gallery_id=$galleryId} - - -{/strip} + {if $gBitSystem->isFeatureActive('fisheye_gallery_list_image_descriptions')} +

{$galItem->mInfo.data|truncate:200:"..."|escape}

+ {/if} + {/box} +
{tr}This gallery is empty{/tr}. Upload pictures!
+ {pagination gallery_id=$gContent->mGalleryId ?? 0} +
+ + {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} + +{/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"} -
-
- {include file="bitpackage:fisheye/gallery_icons_inc.tpl"} -

{$gContent->getTitle()|escape}

-
- - {pagination gallery_id=$gContent->mGalleryId ?? 0} - -
- {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'} -

{$gContent->mInfo.data|escape}

- {/if} - - - {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} - - {/if} - - - {counter} - - {if $imageCount % $cols_per_page == 0} - - {/if} - - {foreachelse} - - {/foreach} - - {if $imageCount % $cols_per_page != 0}{/if} -
- {box class="box `$galItem->mInfo.content_type_guid`" style="margin-left:0;"} - - {$galItem->mInfo.title|escape|default:'image'} - - {if $gBitSystem->isFeatureActive( 'fisheye_gallery_list_image_titles' )} -

{$galItem->mInfo.title|escape}

- {/if} - {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$galItem->mInfo type=mini} - {if $gBitSystem->isFeatureActive( 'fisheye_gallery_list_image_descriptions' )} -

{$galItem->mInfo.data|truncate:200:"..."|escape}

- {/if} - {/box} -
{tr}This gallery is empty{/tr}. Upload pictures!
-
- - {* 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} -
-{/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" *} -
-
- {include file="bitpackage:fisheye/gallery_icons_inc.tpl"} -

{$gContent->getTitle()|escape}

-
- -
- {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'} -

{$gContent->mInfo.data|escape}

- {/if} - -
- {counter assign="imageCount" start="0" print=false} - {assign var="max" value=100} - {foreach from=$gContent->mItems item=galItem key=itemContentId} -
-
- -
- {$galItem->mInfo.title|escape|default:'image'} -
-
-

{$galItem->mInfo.title|escape}

-
- -
-
- {counter} - {if $imageCount % 2 == 0}{/if} - {if $imageCount % 3 == 0}{/if} - {foreachelse} - {tr}This gallery is empty{/tr}. Upload pictures! - {/foreach} -
-
-
- - {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} -
-{/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"} -
+
-
+
{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}

{$gContent->getTitle()|escape}

-
+ {include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"} + {if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'} -
+

{$gContent->mInfo.data|escape}

-
+ {/if} 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"} -
+
-
+
{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}

{$gContent->getTitle()|escape}

-
+ {include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"} + {if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'} -
+

{$gContent->mInfo.data|escape}

-
+ {/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"} -
+
-
+
{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}

{$gContent->getTitle()|escape}

-
+ {include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"} + {if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'} -
+

{$gContent->mInfo.data|escape}

-
+ {/if} 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(){ /*]]>*/ -
+
+
{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}

{$gContent->getTitle()|escape}

-
+ {include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"} + {if $gContent->mInfo.data} -

{$gContent->mInfo.data|escape}

+

{$gContent->mInfo.data|escape}

{/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} +
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"}
-
+
{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}

{$gContent->getTitle()|escape}

-
+ {include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"} + {if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'} -
+

{$gContent->mInfo.data|escape}

-
+ {/if}
{formfeedback success=$fisheyeSuccess error=$fisheyeErrors warning=$fisheyeWarnings} {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo} - {if $gContent->mInfo.data} -

{$gContent->mInfo.data|escape}

- {/if} {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"} -
+{strip} +
+
{include file="bitpackage:fisheye/gallery_icons_inc.tpl"}

{$gContent->getTitle()|escape}

-
+ {include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"} + {if $gContent->mInfo.data && $gContent->getPreference('show_description') ne 'n'} -
+

{$gContent->mInfo.data|escape}

-
+ {/if} - {assign var=thumbsize value='small'} -
+
+
- - {if $thumbsize} - - {/if} - - {if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )} - - {/if} - {if $gBitSystem->isFeatureActive( 'fisheye_item_list_size' )} - - {/if} - {if $gBitSystem->isFeatureActive( 'fisheye_item_list_hits' )} - - {/if} - - + + + + + {if $gBitSystem->isFeatureActive('fisheye_item_list_date') || $gBitSystem->isFeatureActive('fisheye_item_list_creator')} + + {/if} + {if $gBitSystem->isFeatureActive('fisheye_item_list_size')} + + {/if} + {if $gBitSystem->isFeatureActive('fisheye_item_list_hits')} + + {/if} + + + + {foreach from=$gContent->mItems item=galItem} - - {if $thumbsize} - + - {/if} - + - {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')} {/if} - {if $gBitSystem->isFeatureActive( 'fisheye_item_list_size' )} + {if $gBitSystem->isFeatureActive('fisheye_item_list_size')} {/if} - {if $gBitSystem->isFeatureActive( 'fisheye_item_list_hits' )} - + {if $gBitSystem->isFeatureActive('fisheye_item_list_hits')} + {/if} - {/foreach} + {/foreach} +
{tr}List of files{/tr} [ {$galInfo.total_records|default:0} ]
- {smartlink ititle=Name isort=title icontrol=$galInfo} - - {smartlink ititle=Uploaded isort=created iorder=desc idefault=1 icontrol=$galInfo} - {tr}Size{/tr} /
{tr}Duration{/tr}		 - {smartlink ititle=Downloads isort="lch.hits" icontrol=$galInfo} - {tr}Actions{/tr}
{smartlink ititle=Name isort=title icontrol=$galInfo}{smartlink ititle=Uploaded isort=created iorder=desc idefault=1 icontrol=$galInfo}{tr}Size{/tr}{smartlink ititle=Downloads isort="lch.hits" icontrol=$galInfo}{tr}Actions{/tr}
- {if $galItem->mInfo.content_type_guid != 'fisheyegallery' } - {if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )} - {if $gContent->hasUpdatePermission() || $gGallery && $gGallery->getPreference( 'link_original_images' )} - - {else} - - {/if} - {/if} - {$galItem->getTitle()|escape} - {if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )} - +
+ {if $galItem->mInfo.content_type_guid != 'fisheyegallery'} + {if $gBitSystem->isFeatureActive('site_fancy_zoom')} + {if $gContent->hasUpdatePermission() || $gGallery && $gGallery->getPreference('link_original_images')} + + {else} + {/if} - {else} - - {$galItem->getTitle()|escape|default:'image'} + {/if} + {$galItem->getTitle()|escape} + {if $gBitSystem->isFeatureActive('site_fancy_zoom')} {/if} - -

{$galItem->getTitle()|escape}

- {if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) && $galItem->mInfo.data} - {$galItem->mInfo.parsed_data} + {else} + + {$galItem->getTitle()|escape|default:'image'} + {/if} - {if $gBitSystem->isFeatureActive( 'fisheye_item_list_attid' )} - {$galItem->mInfo.wiki_plugin_link} - {assign var=br value=1} + 		+

{$galItem->getTitle()|escape}

+ {if $galItem->mInfo.data} + {$galItem->mInfo.data|truncate:200|escape} {/if} - {if $gBitSystem->isFeatureActive( 'fisheye_item_list_name' )} - {if $br}
{/if} - {if $gBitUser->hasPermission( 'p_treasury_view_item' )} - - {/if} - {$galItem->mInfo.filename} ({$galItem->mInfo.mime_type}) - {if $gBitUser->hasPermission( 'p_treasury_view_item' )} - - {/if} + {if $gBitSystem->isFeatureActive('fisheye_item_list_name')} +
{$galItem->mInfo.filename} ({$galItem->mInfo.mime_type}) {/if} 		- {if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' )} - {$galItem->mInfo.created|bit_short_date}
- {/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')}
{tr}by{/tr} {displayname hash=$galItem->mInfo}{/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} + {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} - {$galItem->mInfo.hits|default:"{tr}none{/tr}"} - {$galItem->mInfo.hits|default:"{tr}none{/tr}"} - {if $galItem->mInfo.content_type_guid != 'fisheyegallery' } - {if $gBitUser->hasPermission( 'p_treasury_download_item' ) && $galItem->mInfo.download_url} - {biticon ipackage="icons" iname="network-receive" iexplain="Download File"} + {if $galItem->mInfo.content_type_guid != 'fisheyegallery'} + {if $gBitUser->hasPermission('p_treasury_download_item') && $galItem->mInfo.download_url} + {biticon ipackage="icons" iname="go-down" iexplain="Download File"} {/if} - {if $gBitUser->hasPermission( 'p_treasury_view_item' )} + {if $gBitUser->hasPermission('p_treasury_view_item')} {biticon ipackage="icons" iname="folder-open" iexplain="View File"} {/if} - {if $gContent->isOwner( $galItem->mInfo ) || $gBitUser->isAdmin()} - {biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit File"} + {if $gContent->isOwner($galItem->mInfo) || $gBitUser->isAdmin()} + {biticon ipackage="icons" iname="edit" iexplain="Edit File"} {biticon ipackage="icons" iname="user-trash" iexplain="Remove File"} {/if} {/if}
+ {pagination gallery_id=$gContent->mGalleryId ?? 0} +
- +
+{/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 @@ + + {if $gContent->hasUpdatePermission()} + {if !empty($gGallery->mInfo)} + {assign var=creatorInfo value=$gGallery->mInfo} + {else} + {assign var=creatorInfo value=$gContent->mInfo} + {/if} + {displayname user=$creatorInfo.creator_user user_id=$creatorInfo.creator_user_id|default:0 real_name=$creatorInfo.creator_real_name} › + {/if} + {assign var=breadCrumbs value=$gContent->getBreadcrumbLinks(1)} + {foreach from=$breadCrumbs item=breadTitle key=breadId} + {if $breadId == $gContent->mGalleryId} + {$breadTitle|escape} + {else} + {$breadTitle|escape} › + {/if} + {/foreach} + 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} -
- +{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} +
+ + {if !empty( $gGallery->mInfo.previous_image_id )} + + {if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )} + {biticon ipackage="icons" iname="go-previous" iexplain=previous} + {else} + « {tr}previous{/tr} + {/if} + {if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )} +
+ + {/if} + + {else} {/if} + - {if $gGallery} -
- - {if !empty( $gGallery->mInfo.previous_image_id )} - - {if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )} - {biticon ipackage="icons" iname="go-previous" iexplain=previous} - {else} - « {tr}previous{/tr} - {/if} - {if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )} -
- - {/if} - - {else} {/if} - - - - {if !empty( $gGallery->mInfo.next_image_id )} - - {if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )} - {biticon ipackage="icons" iname="go-next" iexplain=next} - {else} - {tr}next{/tr} » - {/if} - {if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )} -
- - {/if} - - {else} {/if} - -
- {/if} - -
-
+ + {if !empty( $gGallery->mInfo.next_image_id )} + + {if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )} + {biticon ipackage="icons" iname="go-next" iexplain=next} + {else} + {tr}next{/tr} » + {/if} + {if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )} +
+ + {/if} + + {else} {/if} + +
+{/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} -
{if empty($liberty_preview)} -
- {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo} - {if $gContent->hasUpdatePermission()} - {biticon ipackage="icons" iname="view-refresh" iexplain="Refresh"} - {biticon ipackage="icons" iname="edit" iexplain="Edit Image"} - {biticon ipackage="icons" iname="user-trash" iexplain="Delete Image"} - {/if} -
+
+ {include file="bitpackage:fisheye/gallery_icons_inc.tpl"} +

{$gContent->getTitle()|default:$gContent->mInfo.filename|escape}

+ {include file="bitpackage:fisheye/gallery_breadcrumb_inc.tpl"} +
{/if} {formfeedback hash=$feedback} -
-

{$gContent->getTitle()|default:$gContent->mInfo.filename|escape}

-
- -
+
{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
{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 ''}

{$gContent->mInfo.parsed_data|truncate:250:"..."}

{/if} -
-
+
+ {if empty($liberty_preview)} + {include file="bitpackage:fisheye/gallery_nav.tpl"} + {/if} + {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo} @@ -36,5 +28,5 @@ {include file="bitpackage:liberty/comments.tpl"} {/if} -
+
{/strip} -- cgit v1.3