From b7fee521ecc382174b79601cf0c479e03ab29920 Mon Sep 17 00:00:00 2001 From: ggoffy Date: Thu, 25 Jun 2020 11:39:55 +0200 Subject: [PATCH] - added album name to lc_lightbox --- .../lclightboxlite/js/lc_lightbox.lite.js | 5 ++-- docs/changelog.txt | 1 + gallery.php | 3 ++- images.php | 4 ++-- .../wggallery_gallery_lclightboxlite.tpl | 23 ++++++++++++++++--- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/assets/gallerytypes/lclightboxlite/js/lc_lightbox.lite.js b/assets/gallerytypes/lclightboxlite/js/lc_lightbox.lite.js index 85ff5dd..860e025 100644 --- a/assets/gallerytypes/lclightboxlite/js/lc_lightbox.lite.js +++ b/assets/gallerytypes/lclightboxlite/js/lc_lightbox.lite.js @@ -40,15 +40,14 @@ '
'+ '
'+ '
'+ - - '
'+ - + '
'+ '
'+ '
'+ '
'+ '
'+ '
'+ ''+ + '
'+ '
'+ '
'+ '
'+ diff --git a/docs/changelog.txt b/docs/changelog.txt index 056e8c9..b50bf47 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -22,6 +22,7 @@ - fixed perm bug for moving image from one to another album (lupin/goffy) - fixed bug in nested sorting (lupin/goffy) - fixed bug in extract exif (lupin/goffy) + - added album name to lc_lightbox (goffy)
1.14 RC1
[2019/11/09]
diff --git a/gallery.php b/gallery.php index 12b42c8..d6e9c3c 100644 --- a/gallery.php +++ b/gallery.php @@ -116,7 +116,8 @@ case 'lclightboxlite': $GLOBALS['xoTheme']->addStylesheet(WGGALLERY_URL . '/assets/gallerytypes/lclightboxlite/css/lc_lightbox.min.css', null); $GLOBALS['xoTheme']->addStylesheet(WGGALLERY_URL . '/assets/gallerytypes/lclightboxlite/skins/' . $lcl_skin . '.css', null); - $GLOBALS['xoTheme']->addScript(WGGALLERY_URL . '/assets/gallerytypes/lclightboxlite/js/lc_lightbox.lite.min.js'); + $GLOBALS['xoTheme']->addScript(WGGALLERY_URL . '/assets/gallerytypes/lclightboxlite/js/lc_lightbox.lite.js'); + $GLOBALS['xoopsTpl']->assign('lbl_album', $albName); break; case 'jssor': $GLOBALS['xoopsTpl']->assign('uniqid', preg_replace('/[^a-zA-Z0-9]+/', '_', uniqid('', true))); diff --git a/images.php b/images.php index ebe0ccc..469e56e 100644 --- a/images.php +++ b/images.php @@ -286,9 +286,9 @@ $ratingsHandler->deleteAllRatings($imgId, 1); if ('manage' === $redir_op) { - redirect_header('images.php?op=manage&alb_id=' . $imgAlbId . '&alb_pid=' . $imgAlbPid, 2, _CO_WGGALLERY_FORM_DELETE_OK); + redirect_header('images.php?op=manage&alb_id=' . $imgAlbId . '&alb_pid=' . $albPid, 2, _CO_WGGALLERY_FORM_DELETE_OK); } else { - redirect_header('images.php?op=list&alb_id=' . $imgAlbId . '&alb_pid=' . $imgAlbPid, 2, _CO_WGGALLERY_FORM_DELETE_OK); + redirect_header('images.php?op=list&alb_id=' . $imgAlbId . '&alb_pid=' . $albPid, 2, _CO_WGGALLERY_FORM_DELETE_OK); } redirect_header('images.php?op=list&alb_id=' . $albId, 3, _CO_WGGALLERY_FORM_DELETE_OK); diff --git a/templates/wggallery_gallery_lclightboxlite.tpl b/templates/wggallery_gallery_lclightboxlite.tpl index ee6c4ee..8744ea7 100644 --- a/templates/wggallery_gallery_lclightboxlite.tpl +++ b/templates/wggallery_gallery_lclightboxlite.tpl @@ -18,7 +18,7 @@ <{/foreach}><{/if}>]; var $instance = lc_lightbox(data, { - gallery:true, + gallery:true, slideshow:<{$lcl_slideshow}>, skin:'<{$lcl_skin}>', open_close_time : <{$speedOpen}>, @@ -69,8 +69,12 @@ lclSetAttribute("lcl_txt_toggle", "<{$smarty.const._MA_WGGALLERY_LCL_TXT_TOGGLE}>"); lclSetAttribute("lcl_download", "<{$smarty.const._MA_WGGALLERY_LCL_DOWNLOAD}>"); lclSetAttribute("lcl_thumbs_toggle", "<{$smarty.const._MA_WGGALLERY_LCL_THUMBS_TOGGLE}>"); - lclSetAttribute("lcl_socials", "<{$smarty.const._MA_WGGALLERY_LCL_SOCIALS}>"); - + lclSetAttribute("lcl_socials", "<{$smarty.const._MA_WGGALLERY_LCL_SOCIALS}>"); + //set album name + <{if $lbl_album}> + $('#lbl_album').html('

<{$lbl_album}>

'); + <{/if}> + }); $(document).on('click', '#lcl_downloadlink', function(){ var ele = document.getElementById("lcl_downloadlink"); @@ -89,8 +93,21 @@ x[i].setAttribute("title", mytitle); } }; + + +