diff options
| author | Lester Caine <lester@lsces.co.uk> | 2026-06-16 11:01:33 +0100 |
|---|---|---|
| committer | Lester Caine <lester@lsces.co.uk> | 2026-06-16 11:01:33 +0100 |
| commit | 593d1c22ed5d7f36f3ab9f1bd5b4148b9a8948b1 (patch) | |
| tree | b845d29f7dd3474ccddb7758f6837a21aed6b48f /templates | |
| parent | 58215fc33b420f986b47a97bc544bfe19acd3c59 (diff) | |
| download | fisheye-593d1c22ed5d7f36f3ab9f1bd5b4148b9a8948b1.tar.gz fisheye-593d1c22ed5d7f36f3ab9f1bd5b4148b9a8948b1.tar.bz2 fisheye-593d1c22ed5d7f36f3ab9f1bd5b4148b9a8948b1.zip | |
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>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/gallery_breadcrumb_inc.tpl | 18 | ||||
| -rwxr-xr-x | templates/gallery_nav.tpl | 94 | ||||
| -rwxr-xr-x | templates/view_image.tpl | 32 |
3 files changed, 65 insertions, 79 deletions
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> › + {/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> › + {/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} + « {tr}previous{/tr} + {/if} + {if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )} + <br /> + <img src="{$gGallery->mInfo.previous_image_avatar}" /> + {/if} + </a> + {else} {/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} - « {tr}previous{/tr} - {/if} - {if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )} - <br /> - <img src="{$gGallery->mInfo.previous_image_avatar}" /> - {/if} - </a> - {else} {/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} » - {/if} - {if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )} - <br /> - <img src="{$gGallery->mInfo.next_image_avatar}" /> - {/if} - </a> - {else} {/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} » + {/if} + {if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )} + <br /> + <img src="{$gGallery->mInfo.next_image_avatar}" /> + {/if} + </a> + {else} {/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}&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} |
