Merge pull request #58 from slims/develop

Develop
slims · Nov 11, 2020 · f3b8edf · f3b8edf
2 parents 9ad23de + 1d055d6
commit f3b8edf
Show file tree

Hide file tree

Showing 166 changed files with 13,294 additions and 5,939 deletions.
diff --git a/admin/admin_template/akasia-dz/function.php b/admin/admin_template/akasia-dz/function.php
@@ -87,6 +87,17 @@ function sub_menu($str_module = '', $_module = array())
     $_submenu_file 	= $modules_dir.DS.$_module['path'].DS.'submenu.php';
     if (file_exists($_submenu_file)) {
         include $_submenu_file;
+
+        if ($_SESSION['uid'] > 1) {
+            $tmp_menu = [];
+            if (isset($menu) && count($menu) > 0) {
+                foreach ($menu as $item) {
+                    if (in_array(md5($item[1]), $_SESSION['priv'][$str_module]['menus'])) $tmp_menu[] = $item;
+                }
+            }
+            $menu = $tmp_menu;
+        }
+
     } else {
         include 'default/submenu.php';
 	$shortcuts = get_shortcuts_menu();

diff --git a/admin/admin_template/akasia/function.php b/admin/admin_template/akasia/function.php
@@ -92,6 +92,17 @@ function sub_menu($str_module = '', $_module = array())
     $_submenu_file 	= $modules_dir.DS.$_module['path'].DS.'submenu.php';
     if (file_exists($_submenu_file)) {
         include $_submenu_file;
+
+        if ($_SESSION['uid'] > 1) {
+            $tmp_menu = [];
+            if (isset($menu) && count($menu) > 0) {
+                foreach ($menu as $item) {
+                    if (in_array(md5($item[1]), $_SESSION['priv'][$str_module]['menus'])) $tmp_menu[] = $item;
+                }
+            }
+            $menu = $tmp_menu;
+        }
+
     } else {
         include 'default/submenu.php';
 	$shortcuts = get_shortcuts_menu();

diff --git a/admin/admin_template/default/index_template.inc.php b/admin/admin_template/default/index_template.inc.php
@@ -111,7 +111,7 @@
 let Scrollbar = window.Scrollbar;
 Scrollbar.use(window.OverscrollPlugin)
 Scrollbar.init(document.querySelector('#sidepan'), {
-    alwaysShowTracks: true,
+    alwaysShowTracks: <?= $sysconf['admin_template']['always_show_tracks'] ? 'true' : 'false' ?>,
     continuousScrolling: false,
     plugins: {
       overscroll: {

diff --git a/admin/admin_template/default/js/overscroll.js b/admin/admin_template/default/js/overscroll.js
diff --git a/admin/admin_template/default/js/smooth-scrollbar.js b/admin/admin_template/default/js/smooth-scrollbar.js
diff --git a/admin/admin_template/default/less/sidebar.less b/admin/admin_template/default/less/sidebar.less
@@ -29,7 +29,7 @@ sidebar
     margin-top: 10px;
   }
 
-  div,
+  div:not(.scrollbar-track-y),
   a {
     margin: 0;
     color: @white;
@@ -39,6 +39,10 @@ sidebar
     font-size: @font-size;
     font-family: @font-family;
   }
+
+  .scrollbar-track.scrollbar-track-x.show {
+    display: none !important;
+  }
 
   div {
     font-weight: bold;
@@ -54,6 +58,9 @@ sidebar
   a:hover,
   .curModuleLink {
     color: @color-3;
-  }
-
+  }  
 }
+
+#sidepan > div.scroll-content > div.subMenuHeader {
+  font-size: 16px;
+  }
diff --git a/admin/admin_template/default/style.css b/admin/admin_template/default/style.css
@@ -1145,7 +1145,7 @@ sidebar
   font-size: 12pt;
   margin-top: 10px;
 }
-#sidepan div,
+#sidepan div:not(.scrollbar-track-y),
 #sidepan a {
   margin: 0;
   color: #ffffff;
@@ -1155,6 +1155,9 @@ sidebar
   font-size: 10pt;
   font-family: 'Quicksand', sans-serif;
 }
+#sidepan .scrollbar-track.scrollbar-track-x.show {
+  display: none !important;
+}
 #sidepan div {
   font-weight: bold;
   color: #ffffff;
@@ -1169,6 +1172,9 @@ sidebar
 #sidepan .curModuleLink {
   color: #00a9ff;
 }
+#sidepan > div.scroll-content > div.subMenuHeader {
+  font-size: 16px;
+}
 .envinfo {
   background: #fff;
 }

diff --git a/admin/admin_template/default/tinfo.inc.php b/admin/admin_template/default/tinfo.inc.php
@@ -1,13 +1,24 @@
 <?php
 
 $sysconf['admin_template']['default_color'] = '#004db6';
+$sysconf['admin_template']['always_show_tracks'] = 0;
 
 $sysconf['admin_template']['option'][$sysconf['admin_template']['theme']] = [
-  'color' => [
-    'dbfield' => 'default_color',
-    'label' => __('Color Theme.<br><small>( Default : #004db6 )</small>'),
-    'type' => 'text',
-    'default' => $sysconf['admin_template']['default_color'],
-    'class' => 'colorpicker'
-  ]
+    'color' => [
+        'dbfield' => 'default_color',
+        'label' => __('Color Theme.<br><small>( Default : #004db6 )</small>'),
+        'type' => 'text',
+        'default' => $sysconf['admin_template']['default_color'],
+        'class' => 'colorpicker'
+    ],
+    'always-show-tracks' => [
+        'dbfield' => 'always_show_tracks',
+        'label' => __('Always Show Tracks'),
+        'type' => 'dropdown',
+        'default' => 1,
+        'data' => [
+            [1, __('Yes')],
+            [0, __('No')]
+        ]
+    ],
 ];
diff --git a/admin/admin_template/printed_settings.inc.php b/admin/admin_template/printed_settings.inc.php
@@ -185,3 +185,10 @@ function loadPrintSettings($dbs, $type) {
 $sysconf['print']['membercard']['address_font_size'] = "7";
 $sysconf['print']['membercard']['address_left'] = "";
 $sysconf['print']['membercard']['address_top'] = "";
+
+// catalog card settings
+$sysconf['print']['catalog']['self_list_card'] = '1';
+$sysconf['print']['catalog']['title_card'] = '1';
+$sysconf['print']['catalog']['author_card'] = '1';
+$sysconf['print']['catalog']['subject_card'] = '1';
+