Merge pull request #53 from ggoffy/master

- added album name to lc_lightbox
XoopsModules25x · Jun 25, 2020 · 5d61685 · 5d61685
2 parents e301a09 + b7fee52
commit 5d61685
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/assets/gallerytypes/lclightboxlite/js/lc_lightbox.lite.js b/assets/gallerytypes/lclightboxlite/js/lc_lightbox.lite.js
@@ -40,15 +40,14 @@
 				'<div id="lcl_play" class="lcl_icon lcl_play"></div>'+
 				'<div id="lcl_next" class="lcl_icon lcl_next" title="next"></div>'+
 				'<div id="lcl_counter" class="lcl_icon lcl_counter"></div>'+
-
-				'<div id="lcl_close" class="lcl_icon lcl_right_icon lcl_close" title="close"></div>'+
-
+				'<div id="lcl_close" class="lcl_icon lcl_right_icon lcl_close" title="close"></div>'+				
 				'<div id="lcl_fullscreen" class="lcl_icon lcl_right_icon lcl_fullscreen" title="toggle fullscreen"></div>'+
 				'<div id="lcl_txt_toggle" class="lcl_icon lcl_right_icon lcl_txt_toggle" title="toggle text"></div>'+
 				'<div id="lcl_download" class="lcl_icon lcl_right_icon lcl_download" title="download"></div>'+
 				'<div id="lcl_thumbs_toggle" class="lcl_icon lcl_right_icon lcl_thumbs_toggle" title="toggle thumbnails"></div>'+
 				'<div id="lcl_socials" class="lcl_icon lcl_right_icon lcl_socials" title="toggle socials"></div>'+
 			'</div>'+
+            '<div id="lbl_album"></div>'+
 			'<div id="lcl_contents_wrap">'+
 				'<div id="lcl_subj">'+
 					'<div id="lcl_elem_wrap"></div>'+

diff --git 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)
 
 <h5>1.14 RC1</h5>  [2019/11/09]
 <hr>

diff --git 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
@@ -286,9 +286,9 @@
                 $ratingsHandler->deleteAllRatings($imgId, 1);
 
                 if ('manage' === $redir_op) {
-                    redirect_header('images.php?op=manage&amp;alb_id=' . $imgAlbId . '&amp;alb_pid=' . $imgAlbPid, 2, _CO_WGGALLERY_FORM_DELETE_OK);
+                    redirect_header('images.php?op=manage&amp;alb_id=' . $imgAlbId . '&amp;alb_pid=' . $albPid, 2, _CO_WGGALLERY_FORM_DELETE_OK);
                 } else {
-                    redirect_header('images.php?op=list&amp;alb_id=' . $imgAlbId . '&amp;alb_pid=' . $imgAlbPid, 2, _CO_WGGALLERY_FORM_DELETE_OK);
+                    redirect_header('images.php?op=list&amp;alb_id=' . $imgAlbId . '&amp;alb_pid=' . $albPid, 2, _CO_WGGALLERY_FORM_DELETE_OK);
                 }
 
                 redirect_header('images.php?op=list&amp;alb_id=' . $albId, 3, _CO_WGGALLERY_FORM_DELETE_OK);

diff --git 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('<p><{$lbl_album}></p>');
+        <{/if}>
+
     });
     $(document).on('click', '#lcl_downloadlink', function(){
         var ele = document.getElementById("lcl_downloadlink"); 
@@ -89,8 +93,21 @@
           x[i].setAttribute("title", mytitle);
         } 
     };
+    
 </script>
 
+<style>
+    #lbl_album {
+        margin-top: -40px;
+        text-align: center;
+        height: 30px;
+    }
+    #lbl_album p {
+        padding-top:15px;
+        font-size: 18px;
+    }
+</style>
+
 <div style="height:<{$lcl_backgroundheight}>;">&nbsp;</div>
 
 <div class="clear spacer"></div>