Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updates for wggallery in theme xswatch4 #1453

Merged
merged 1 commit into from
Feb 2, 2024
Merged

updates for wggallery in theme xswatch4 #1453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions htdocs/themes/xswatch4/modules/wggallery/blocks/wggallery_block_albums_default.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,10 @@
<{/if}>
<{/if}>
</div>
<{if $album.linebreak}>
<{if $album.linebreak|default:false}>
<div class='clear'>&nbsp;</div>
<{/if}>
<{if $album.linebreak}></div><{/if}>
<{if $album.linebreak|default:false}></div><{/if}>
<{/foreach}>
<div class="clear"></div>
<{if isset($show_more_albums)}>
Expand Down
8 changes: 4 additions & 4 deletions htdocs/themes/xswatch4/modules/wggallery/wggallery_album_images.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@
<div class="col-12 col-md-6">
<div class="row">
<{foreach item=image from=$images|default:null name=fe_image}>
<{if $image.alb_name}>
<{if $image.alb_name|default:''}>
<div class="clear"></div>
<div class="selimages col-12 col-md-12"><h5 class="modal-title" style="width:100%"><{$image.alb_name}></h5></div>
<div class="selimages col-12 col-md-12"><h5 class="modal-title" style="width:100%"><{$image.alb_name|default:''}></h5></div>
<{/if}>
<div class="selimages col-6 col-md-3">
<input id="<{$image.id}>_image" class="imgSelect1 img-fluid wgg-album-img <{if $image.selected}>wgg-modal-selected<{/if}>" type="image" src="<{$image.thumb}>" preview="<{$image.medium}>" alt="<{$image.title}>" style="padding:3px;" value="<{$image.name}>">
<input id="<{$image.id}>_image" class="imgSelect1 img-fluid wgg-album-img <{if $image.selected|default:false}>wgg-modal-selected<{/if}>" type="image" src="<{$image.thumb}>" preview="<{$image.medium}>" alt="<{$image.title}>" style="padding:3px;" value="<{$image.name}>">
</div>
<{if $image.counter % 3 == 0}>
<div class="clear"></div>
Expand Down Expand Up @@ -292,7 +292,7 @@
</div>
<div class="modal-body">
<{foreach item=image from=$images|default:null}>
<{if $image.alb_name}><h4 class="modal-title"><{$image.alb_name}></h4><{/if}>
<{if $image.alb_name|default:''}><h4 class="modal-title"><{$image.alb_name|default:''}></h4><{/if}>
<input class="imgGrid<{$m}>" type="image" src="<{$image.thumb}>" alt="<{$image.title}>"
style="padding:3px;max-height:150px;max-width:200px" value="<{$image.name}>" onclick="selectGridImage(this, <{$m}>)">
<{/foreach}>
Expand Down
4 changes: 2 additions & 2 deletions htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_1.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<a disabled class='disabled btn btn-secondary wgg-btn' title='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>'>
<span class='wgg-btn'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGES_COUNT}>' title='<{$smarty.const._CO_WGGALLERY_IMAGES_COUNT}>'><{$smarty.const._CO_WGGALLERY_ALBUM_NO_IMAGES}></span></a>
<{/if}>
<{if $album.edit}>
<{if $album.edit|default:false}>
<a class='btn btn-secondary wgg-btn' href='albums.php?op=edit&amp;alb_id=<{$album.id}>' title='<{$smarty.const._EDIT}>'>
<span class = "wgg-btn-icon"><img class='' src='<{$wggallery_icon_url_16}>edit.png' alt='<{$smarty.const._EDIT}>'></span><{if isset($displayButtonText)}><{$smarty.const._EDIT}><{/if}></a>
<a class='btn btn-secondary wgg-btn' href='albums.php?op=delete&amp;alb_id=<{$album.id}>' title='<{$smarty.const._DELETE}>'>
Expand All @@ -42,7 +42,7 @@
<a class='btn btn-secondary wgg-btn' href='index.php?op=list&amp;subm_id=<{$album.alb_submitter}>' title='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'>
<span class = "wgg-btn-icon"><img class='' src='<{$wggallery_icon_url_16}>submitter.png' alt='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'></span><{if isset($displayButtonText)}><{$album.submitter}><{/if}></a>
<{/if}>
<{if $album.download}>
<{if $album.download|default:false}>
<a class='btn btn-secondary wgg-btn' href='<{$wggallery_url}>/download.php?op=album&amp;alb_id=<{$album.id}>' title='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'>
<img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>download.png' alt='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}><{/if}></a>
<{/if}>
Expand Down
8 changes: 4 additions & 4 deletions htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_2.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<{if $album.image}>
<{if $album.image|default:''}>
<div class='center'>
<{if $album.nb_images}>
<{if $album.nb_images|default:0}>
<{if isset($gallery)}>
<a class='' href='<{$wggallery_url}>/gallery.php?op=show&amp;alb_id=<{$album.id}><{if isset($subm_id)}>&amp;subm_id=<{$subm_id}><{/if}>' title='<{$smarty.const._CO_WGGALLERY_IMAGES_ALBUMSHOW}>' target='<{$gallery_target}>' >
<img class='img-fluid wgg-album-img' src='<{$album.image}>' alt='<{$album.name}>'></a>
Expand All @@ -27,7 +27,7 @@
<a disabled class='disabled btn btn-secondary wgg-btn' title='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>'>
<span class='wgg-btn'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGES_COUNT}>' title='<{$smarty.const._CO_WGGALLERY_IMAGES_COUNT}>'><{$smarty.const._CO_WGGALLERY_ALBUM_NO_IMAGES}></span></a>
<{/if}>
<{if $album.edit}>
<{if $album.edit|default:false}>
<a class='btn btn-secondary wgg-btn' href='albums.php?op=edit&amp;alb_id=<{$album.id}>' title='<{$smarty.const._EDIT}>'>
<span class = "wgg-btn-icon"><img class='' src='<{$wggallery_icon_url_16}>edit.png' alt='<{$smarty.const._EDIT}>'></span><{if isset($displayButtonText)}><{$smarty.const._EDIT}><{/if}></a>
<a class='btn btn-secondary wgg-btn' href='albums.php?op=delete&amp;alb_id=<{$album.id}>' title='<{$smarty.const._DELETE}>'>
Expand All @@ -37,7 +37,7 @@
<a class='btn btn-secondary wgg-btn' href='index.php?op=list&amp;subm_id=<{$album.alb_submitter}>' title='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'>
<span class = "wgg-btn-icon"><img class='' src='<{$wggallery_icon_url_16}>submitter.png' alt='<{$smarty.const._CO_WGGALLERY_SUBMITTER}>'></span><{if isset($displayButtonText)}><{$album.submitter}><{/if}></a>
<{/if}>
<{if $album.download}>
<{if $album.download|default:false}>
<a class='btn btn-secondary wgg-btn' href='<{$wggallery_url}>/download.php?op=album&amp;alb_id=<{$album.id}>' title='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'>
<img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>download.png' alt='<{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}>'><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_DOWNLOAD_ALB}><{/if}></a>
<{/if}>
Expand Down
2 changes: 1 addition & 1 deletion htdocs/themes/xswatch4/modules/wggallery/wggallery_albumitem_bcards.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
</div>
</div>

<{if $album.linebreak}>
<{if $album.linebreak|default:false}>
<div class='clear'>&nbsp;</div>
<{/if}>
12 changes: 6 additions & 6 deletions htdocs/themes/xswatch4/modules/wggallery/wggallery_albums_default.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<{include file='db:wggallery_header.tpl'}>
<{if isset($albums_list)}>
<div class='col-sm-12 col-sm-8'>
<div class='panel panel-<{$panel_type}>'>
<div class='panel panel-<{$panel_type|default:'none'}>'>
<div class='panel-heading'><{$smarty.const._CO_WGGALLERY_ALBUMS_TITLE}></div>
<div class='panel-body'>
<{foreach item=album from=$albums_list|default:null}>
Expand Down Expand Up @@ -41,7 +41,7 @@
<{else}>
<a class='disabled btn btn-secondary wgg-btn'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>' title='<{$smarty.const._CO_WGGALLERY_IMAGES_INDEX}>'><{$smarty.const._CO_WGGALLERY_ALBUM_NO_IMAGES}></a>
<{/if}>
<{if $album.edit}>
<{if $album.edit|default:false}>
<{if $album.nb_images}>
<a class='btn btn-secondary wgg-btn' href='images.php?op=manage&amp;ref=albums&amp;alb_id=<{$album.id}>&amp;alb_pid=<{$album.pid}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_MANAGE}>'>
<img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>images.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_MANAGE}>'><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_IMAGE_MANAGE}><{/if}></a>
Expand Down Expand Up @@ -81,7 +81,7 @@


<div class='col-sm-12 col-sm-4'>
<div class='panel panel-<{$panel_type}>'>
<div class='panel panel-<{$panel_type|default:'none'}>'>
<div class='panel-heading'><{$smarty.const._CO_WGGALLERY_ALBUMS_SORT}></div>
<div class='panel-body'>
<ol class="sortable ui-sortable mjs-nestedSortable-branch mjs-nestedSortable-expanded">
Expand All @@ -91,7 +91,7 @@
<a class='btn btn-secondary wgg-btn' href='albums.php' title='<{$smarty.const._CO_WGGALLERY_UPDATE}>'>
<img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>reset.png' alt='<{$smarty.const._CO_WGGALLERY_UPDATE}>'><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_UPDATE}><{/if}></a>
<{if isset($global_submit)}>
<a class='btn btn-secondary wgg-btn' href='albums.php?op=new&alb_pid=<{$albpid}>' title='<{$smarty.const._CO_WGGALLERY_ALBUM_ADD}>'>
<a class='btn btn-secondary wgg-btn' href='albums.php?op=new&alb_pid=<{$albPid|default:0}>' title='<{$smarty.const._CO_WGGALLERY_ALBUM_ADD}>'>
<img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>add.png' alt='<{$smarty.const._CO_WGGALLERY_ALBUM_ADD}>'><{if isset($displayButtonText)}><{$smarty.const._CO_WGGALLERY_ALBUM_ADD}><{/if}></a>
<{/if}>
</p>
Expand All @@ -117,8 +117,8 @@
</div>
<div class="modal-body">
<{foreach item=image from=$images|default:null}>
<{if $image.alb_name}><h4 class="modal-title"><{$image.alb_name}></h4><{/if}>
<input class="img <{if $image.selected}>wgg-modal-selected<{/if}>" type="image" src="<{$image.medium}>" alt="<{$image.title}>"
<{if $image.alb_name|default:''}><h4 class="modal-title"><{$image.alb_name|default:''}></h4><{/if}>
<input class="img <{if $image.selected|default:false}>wgg-modal-selected<{/if}>" type="image" src="<{$image.medium}>" alt="<{$image.title}>"
style="padding:3px;max-height:150px;max-width:200px" value="<{$image.name}>">
<{/foreach}>
</div>
Expand Down
16 changes: 8 additions & 8 deletions htdocs/themes/xswatch4/modules/wggallery/wggallery_images_default.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<{include file='db:wggallery_header.tpl'}>

<div class='card panel-<{$panel_type}> mb-3'>
<div class='card panel-<{$panel_type|default:'none'}> mb-3'>
<{if isset($showlist)}>
<div class='card-header wgg-imgindex-header'><{$smarty.const._CO_WGGALLERY_IMAGES_TITLE}> <{$alb_name}></div>
<div class='card-body'>
<{if isset($images)}>
<{foreach item=image from=$images|default:null}>
<div id='imglist_<{$image.id}>' class='row wgg-img-panel wgg-image-list'>
<div class='wgg-img-panel-row col-sm-8'>
<{if $image.medium}>
<{if $image.medium|default:''}>
<div class='center'><img id='image_<{$image.id}>' class='img-fluid wgg-img' src='<{$image.medium}>#<{$random}>' alt='<{$image.title}>'></div>
<{/if}>
</div>
<div class='wgg-img-panel-row col-sm-4'>
<p><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_TITLE}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_TITLE}>'><{$image.title}>
<{if $image.desc}><{$image.desc}><{/if}>
<{if $image.desc|default:''}><{$image.desc}><{/if}>
</p>
<p><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>size.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_SIZE}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_SIZE}>'><{$image.size}> kb</p>
<p><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>dimension.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_SIZE}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_SIZE}>'><{$image.resx}>px / <{$image.resy}>px</p>
Expand All @@ -33,10 +33,10 @@
<{if $use_categories && $image.cats_list}>
<p class='wgg-cats'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>categories.png' alt='<{$smarty.const._CO_WGGALLERY_CATS}>' title='<{$smarty.const._CO_WGGALLERY_CATS}>'><{$image.cats_list}></p>
<{/if}>
<{if $use_tags && $image.tags}>
<{if $use_tags|default:false && $image.tags|default:false}>
<p class='wgg-tags'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>tags.png' alt='<{$smarty.const._CO_WGGALLERY_TAGS}>' title='<{$smarty.const._CO_WGGALLERY_TAGS}>'><{$image.tags}></p>
<{/if}>
<{if $image.com_show}>
<{if $image.com_show|default:false}>
<p class='wgg-comcount'><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>comments.png' alt='<{$smarty.const._CO_WGGALLERY_COMMENTS}>' title='<{$smarty.const._CO_WGGALLERY_COMMENTS}>'><{$image.com_count_text}></p>
<{/if}>
<{if isset($rating) && $rating > 0}>
Expand Down Expand Up @@ -113,7 +113,7 @@
<div class='wgg-img-panel-row col-12 col-sm-12 col-md-12 col-lg-12 center'><img class='img-fluid wgg-img' src='<{$file}>' alt='<{$image.title}>'></div>
<div class='wgg-img-panel-row col-12 col-sm-6 col-md-6 col-lg6'>
<p><img class='wgg-btn-icon' src='<{$wggallery_icon_url_16}>photos.png' alt='<{$smarty.const._CO_WGGALLERY_IMAGE_TITLE}>' title='<{$smarty.const._CO_WGGALLERY_IMAGE_TITLE}>'><{$image.title}></p>
<{if $image.desc}>
<{if $image.desc|default:''}>
<p class='justify'><{$image.desc}></p>
<{/if}>
</div>
Expand Down Expand Up @@ -191,8 +191,8 @@
<{else}>
<div class="col-12 col-md-12 col-lg-12">
<{/if}>
<{if $image.alb_name}><h4 class='modal-title'><{$image.alb_name}></h4><{/if}>
<img class='img-fluid wgg-img' src='<{$image.img_modal}>' alt='<{$image.title}>'>
<{if $image.alb_name|default:''}><h4 class='modal-title'><{$image.alb_name}></h4><{/if}>
<img class='img-fluid wgg-img' src='<{$image.img_modal|default:''}>' alt='<{$image.title}>'>
<{if isset($showModalInfo)}>
</div>
<div class="col-12 col-md-6 col-lg-6">
Expand Down
4 changes: 2 additions & 2 deletions htdocs/themes/xswatch4/modules/wggallery/wggallery_images_manage.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<{if isset($form)}>
<{$form}>
<{else}>
<div class='card panel-<{$panel_type}>'>
<div class='card panel-<{$panel_type|default:'none'}>'>
<div class='card-header wgg-imgindex-header'>
<h3><{$smarty.const._CO_WGGALLERY_IMAGE_MANAGE}> <{$alb_name}></h3>
<p><{$smarty.const._CO_WGGALLERY_IMAGE_MANAGE_DESC}></p>
Expand Down Expand Up @@ -37,7 +37,7 @@
</li>
<{/foreach}>
</ol>
<{else if $showlist}>
<{elseif $showlist}>
<div class=''>
<div class='errorMsg'><strong><{$smarty.const._CO_WGGALLERY_THEREARENT_IMAGES}></strong></div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions htdocs/themes/xswatch4/modules/wggallery/wggallery_index_default.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<{include file='db:wggallery_header.tpl'}>

<{if isset($albums)}>
<div class='card panel-<{$panel_type}>'>
<div class='card panel-<{$panel_type|default:'none'}>'>
<div class='card-header wgg-cats-header'><{$index_alb_title}></div>
<div class='row card-body'>
<{foreach item=album from=$albums|default:null}>
<{if isset($number_cols_album) && $number_cols_album == 4}>
<div class='col-12 col-md-3 wgg-album-panel'>
<{include file='db:wggallery_albumitem_2.tpl' album=$album}>
</div>
<{if $album.linebreak}>
<{if $album.linebreak|default:false}>
<div class='clear'>&nbsp;</div>
<{/if}>
<{elseif $number_cols_album == 3}>
<div class='col-12 col-md-4 wgg-album-panel'>
<{include file='db:wggallery_albumitem_2.tpl' album=$album}>
</div>
<{if $album.linebreak}>
<{if $album.linebreak|default:false}>
<div class='clear'>&nbsp;</div>
<{/if}>
<{elseif $number_cols_album == 2}>
<div class='col-12 col-md-6 wgg-album-panel'>
<{include file='db:wggallery_albumitem_2.tpl' album=$album}>
</div>
<{if $album.linebreak}>
<{if $album.linebreak|default:false}>
<div class='clear'>&nbsp;</div>
<{/if}>
<{else}>
Expand All @@ -39,7 +39,7 @@
<{/if}>
<{/if}>
<{if isset($categories)}>
<div class='card panel-<{$panel_type}>'>
<div class='card panel-<{$panel_type|default:'none'}>'>
<div class='card-header wgg-cats-header'><{$index_cats_title}></div>
<div class='row card-body'>
<{foreach item=category from=$categories|default:null}>
Expand Down
4 changes: 2 additions & 2 deletions htdocs/themes/xswatch4/modules/wggallery/wggallery_index_hovereffectideas.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="container no-pad-lr">
<{if isset($albums)}>
<div class='card panel-<{$panel_type}>'>
<div class='card panel-<{$panel_type|default:'none'}>'>
<div class='card-header wgg-cats-header'><{$index_alb_title}></div>
<div class='card-body'>
<{foreach item=album from=$albums|default:null name=album}>
Expand All @@ -19,7 +19,7 @@
<{/if}>
<{/if}>
<{if isset($categories)}>
<div class='card panel-<{$panel_type}>'>
<div class='card panel-<{$panel_type|default:'none'}>'>
<div class='card-header wgg-cats-header'><{$index_cats_title}></div>
<div class='card-body'>
<{foreach item=category from=$categories|default:null name=category}>
Expand Down
4 changes: 2 additions & 2 deletions htdocs/themes/xswatch4/modules/wggallery/wggallery_index_simple.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="container no-pad-lr">
<{if isset($albums)}>
<div class='card panel-<{$panel_type}>'>
<div class='card panel-<{$panel_type|default:'none'}>'>
<div class='card-header wgg-cats-header'><{$index_alb_title}></div>
<div class='row card-body'>
<{foreach item=album from=$albums|default:null}>
Expand All @@ -19,7 +19,7 @@
<{/if}>
<{/if}>
<{if !empty($categories)}>
<div class='card panel-<{$panel_type}>'>
<div class='card panel-<{$panel_type|default:'none'}>'>
<div class='card-header wgg-cats-header'><{$index_cats_title}></div>
<div class='row card-body'>
<{foreach item=category from=$categories|default:null}>
Expand Down
Loading