瀏覽代碼

Merge branch 'master' of https://github.com/unaio/una

RomanL 5 年之前
父節點
當前提交
29b83043b0

+ 1 - 1
modules/boonex/ads/install/sql/enable.sql

@@ -375,7 +375,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_ads', 'ads-administration', '_bx_ads_menu_item_title_system_admt_ads', '_bx_ads_menu_item_title_admt_ads', 'page.php?i=ads-administration', '', '_self', 'ad col-green2', 'a:2:{s:6:"module";s:6:"bx_ads";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_ads', 'ads-administration', '_bx_ads_menu_item_title_system_admt_ads', '_bx_ads_menu_item_title_admt_ads', 'page.php?i=ads-administration', '', '_self', 'ad', 'a:2:{s:6:"module";s:6:"bx_ads";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: account dashboard
 SET @iDashboardMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard' LIMIT 1);

+ 1 - 1
modules/boonex/artificer/data/template/system/menu_floating_blocks.html

@@ -1,4 +1,4 @@
-<ul id="__html_id__" class="bx-menu-floating-blocks<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-wrap">
+<ul id="__html_id__" class="bx-menu-floating-blocks<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-wrap justify-center">
     <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ w-20 rounded __class_add__">
         <a href="__link__" onclick="__onclick__" class="flex flex-col items-center text-gray-600 dark:text-gray-300 dark:hover:bg-gray-700 hover:bg-gray-100 hover:text-gray-700 dark:hover:text-white px-3 py-2 rounded text-sm font-medium"__attrs__>
             <div class="bx-menu-floating-blocks-icon m-2">

+ 17 - 0
modules/boonex/artificer/data/template/system/menu_floating_blocks_big.html

@@ -0,0 +1,17 @@
+<ul class="bx-menu-floating-blocks-big bx-menu-object-__object__ flex flex-wrap justify-center">
+    <bx_repeat:menu_items><li class="bx-def-round-corners w-32 rounded __class_add__">
+        <a href="__link__" onclick="__onclick__" class="flex flex-col items-center text-gray-600 dark:text-gray-300 dark:hover:bg-gray-700 hover:bg-gray-100 hover:text-gray-700 dark:hover:text-white px-3 py-2 rounded text-sm font-medium"__attrs__>
+            <div class="bx-menu-floating-blocks-icon m-2">
+                <bx_if:icon><i class="sys-icon __icon__ block w-16 h-16 leading-16 text-6xl text-center"></i></bx_if:icon>
+                <bx_if:image><img class="block w-16 h-16" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
+            </div>
+            <div class="bx-menu-floating-blocks-title">__title__</div>
+        </a>                
+    </li></bx_repeat:menu_items>
+</ul>
+<script language="javascript">
+    $(document).ready(function () {
+        // add default class to active menu items
+        $('.bx-menu-floating-blocks-big > li.bx-menu-tab-active').not('.bx-def-color-bg-active').addClass('bx-def-color-bg-active');
+    });
+</script>

+ 18 - 0
modules/boonex/artificer/data/template/system/menu_floating_blocks_dash.html

@@ -0,0 +1,18 @@
+<ul class="bx-menu-floating-blocks-dash bx-menu-object-__object__ flex flex-wrap -mx-2">
+    <bx_repeat:menu_items>
+        <li class="sm:w-full md:w-2/4 lg:w-1/4 mb-4">
+            <div class="bx-menu-floating-blocks-dash-item group bg-white hover: bg-gray-50 dark:bg-gray-800 dark:hover:bg-gray-700 p-2 mx-2 rounded box-border bx-def-box __class_add__">
+                <a class="flex items-center" href="__link__" onclick="__onclick__"__attrs__>
+                    <div class="bx-menu-floating-blocks-icon flex items-center justify-center w-10 h-10 mx-1 bg-gray-100 group-hover:bg-gray-200 dark:bg-gray-700 dark:group-hover:bg-gray-600 rounded-full text-gray-400 group-hover:text-gray-600 dark:group-hover:text-gray-100 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-white">
+                        <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
+                        <bx_if:image><img style="background-image:url(__icon_url__)" src="><bx_icon_url:spacer.gif />" /></bx_if:image>
+                    </div>
+                    <div class="bx-menu-floating-blocks-dash-title">
+                        <div class="bx-menu-floating-blocks-title text-gray-400 group-hover:text-gray-600 dark:group-hover:text-gray-100">__title__</div>
+                        <bx_if:addon>__addonf__</bx_if:addon>
+                    </div>
+                </a>
+            </div>
+        </li>
+    </bx_repeat:menu_items>
+</ul>

+ 1 - 1
modules/boonex/credits/install/sql/enable.sql

@@ -118,7 +118,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_credits', 'credits-history-administration', '_bx_credits_menu_item_title_system_admt_credits', '_bx_credits_menu_item_title_admt_credits', 'page.php?i=credits-history-administration', '', '_self', 'copyright col-green3', 'a:2:{s:6:"module";s:10:"bx_credits";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_credits', 'credits-history-administration', '_bx_credits_menu_item_title_system_admt_credits', '_bx_credits_menu_item_title_admt_credits', 'page.php?i=credits-history-administration', '', '_self', 'copyright', 'a:2:{s:6:"module";s:10:"bx_credits";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 
 -- GRIDS: bundles

+ 1 - 1
modules/boonex/payment/install/sql/enable.sql

@@ -123,7 +123,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_payment', 'payment-invoices', '_bx_payment_menu_item_title_system_admt_invoices', '_bx_payment_menu_item_title_admt_invoices', 'page.php?i=payment-invoices', '', '_self', 'credit-card col-gray-dark', 'a:2:{s:6:"module";s:10:"bx_payment";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_payment', 'payment-invoices', '_bx_payment_menu_item_title_system_admt_invoices', '_bx_payment_menu_item_title_admt_invoices', 'page.php?i=payment-invoices', '', '_self', 'credit-card', 'a:2:{s:6:"module";s:10:"bx_payment";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 
 -- ALERTS