1
0
Эх сурвалжийг харах

Ticket #3657 - Application page type: Apps popup.

AntonLV 4 жил өмнө
parent
commit
e0dd7fcfe1

+ 1 - 1
install/sql/system.sql

@@ -4427,7 +4427,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- member toolbar menu
 -- member toolbar menu
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `hidden_on_pt`, `active`, `copyable`, `order`) VALUES 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `hidden_on_pt`, `active`, `copyable`, `order`) VALUES 
 ('sys_toolbar_member', 'system', 'add-content', '_sys_menu_item_title_system_add_content', '', 'javascript:void(0);', 'bx_menu_slide_inline(\'#bx-sliding-menu-sys_add_content\', this, \'site\');', '', 'plus', '', '', 0, 2147483646, 0, 1, 1, 0),
 ('sys_toolbar_member', 'system', 'add-content', '_sys_menu_item_title_system_add_content', '', 'javascript:void(0);', 'bx_menu_slide_inline(\'#bx-sliding-menu-sys_add_content\', this, \'site\');', '', 'plus', '', '', 0, 2147483646, 0, 1, 1, 0),
-('sys_toolbar_member', 'system', 'apps', '_sys_menu_item_title_system_apps', '', 'javascript:void(0);', 'bx_menu_popup(''sys_homepage'', this);', '', 'qrcode', '', 'sys_homepage', 1, 2147483646, 3, 1, 1, 0),
+('sys_toolbar_member', 'system', 'apps', '_sys_menu_item_title_system_apps', '', 'javascript:void(0);', '', '', 'qrcode', '', '', 0, 2147483646, 3, 1, 1, 0),
 ('sys_toolbar_member', 'system', 'account', '_sys_menu_item_title_system_account_menu', '_sys_menu_item_title_account_menu', 'javascript:void(0);', 'bx_menu_slide_inline(''#bx-sliding-menu-account'', this, ''site'');', '', 'user',  'a:3:{s:6:"module";s:6:"system";s:6:"method";s:21:"profile_notifications";s:5:"class";s:20:"TemplServiceProfiles";}', 'sys_account_popup', 1, 2147483646, 0, 1, 0, 1),
 ('sys_toolbar_member', 'system', 'account', '_sys_menu_item_title_system_account_menu', '_sys_menu_item_title_account_menu', 'javascript:void(0);', 'bx_menu_slide_inline(''#bx-sliding-menu-account'', this, ''site'');', '', 'user',  'a:3:{s:6:"module";s:6:"system";s:6:"method";s:21:"profile_notifications";s:5:"class";s:20:"TemplServiceProfiles";}', 'sys_account_popup', 1, 2147483646, 0, 1, 0, 1),
 ('sys_toolbar_member', 'system', 'login', '_sys_menu_item_title_system_login', '', 'page.php?i=login', '', '', 'user',  '', '', 0, 1, 0, 1, 0, 2);
 ('sys_toolbar_member', 'system', 'login', '_sys_menu_item_title_system_login', '', 'page.php?i=login', '', '', 'user',  '', '', 0, 1, 0, 1, 0, 2);
 
 

+ 1 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -15,6 +15,7 @@
     <string name="_anonymous"><![CDATA[anonymous]]></string>
     <string name="_anonymous"><![CDATA[anonymous]]></string>
     <string name="_anonymous_f"><![CDATA[anonymous ({0})]]></string>
     <string name="_anonymous_f"><![CDATA[anonymous ({0})]]></string>
         <string name="_Apply"><![CDATA[Apply]]></string>
         <string name="_Apply"><![CDATA[Apply]]></string>
+        <string name="_apps"><![CDATA[Apps]]></string>
 	<string name="_Are_you_sure"><![CDATA[Are you sure?]]></string>
 	<string name="_Are_you_sure"><![CDATA[Are you sure?]]></string>
 	<string name="_Auth type"><![CDATA[Auth type]]></string>
 	<string name="_Auth type"><![CDATA[Auth type]]></string>
 	<string name="_Basic"><![CDATA[Basic]]></string>
 	<string name="_Basic"><![CDATA[Basic]]></string>

+ 1 - 0
modules/boonex/russian/data/langs/system/ru.xml

@@ -15,6 +15,7 @@
     <string name="_anonymous"><![CDATA[Аноним]]></string>
     <string name="_anonymous"><![CDATA[Аноним]]></string>
     <string name="_anonymous_f"><![CDATA[Аноним ({0})]]></string>
     <string name="_anonymous_f"><![CDATA[Аноним ({0})]]></string>
         <string name="_Apply"><![CDATA[Применить]]></string>
         <string name="_Apply"><![CDATA[Применить]]></string>
+        <string name="_apps"><![CDATA[Приложения]]></string>
 	<string name="_Are_you_sure"><![CDATA[Вы уверены?]]></string>
 	<string name="_Are_you_sure"><![CDATA[Вы уверены?]]></string>
 	<string name="_Auth type"><![CDATA[Тип авторизации]]></string>
 	<string name="_Auth type"><![CDATA[Тип авторизации]]></string>
 	<string name="_Basic"><![CDATA[Базовая]]></string>
 	<string name="_Basic"><![CDATA[Базовая]]></string>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
plugins_public/tailwind/css/tailwind.min.css


+ 17 - 0
template/scripts/BxBaseFunctions.php

@@ -850,6 +850,23 @@ class BxBaseFunctions extends BxDolFactory implements iBxDolSingleton
 
 
         return $sContent;
         return $sContent;
     }
     }
+    
+    protected function getInjFooterPopupApps() 
+    {
+        if($this->_oTemplate->getPageType() != BX_PAGE_TYPE_APPLICATION) 
+            return '';
+
+        $oMenu = BxDolMenu::getObjectInstance('sys_homepage');
+        if(!$oMenu) 
+            return '';
+
+        $this->_oTemplate->addJs(['popper.js']);
+        return $this->_oTemplate->parsePageByName('menu_apps.html', [
+            'name' => 'sys-menu-apps',
+            'title' => _t('_apps'),
+            'bx_repeat:menu_items' => $oMenu->getMenuItems(),
+        ]);
+    }
 
 
     protected function getInjFooterPopups() 
     protected function getInjFooterPopups() 
     {
     {

+ 10 - 0
template/scripts/BxBaseMenuToolbar.php

@@ -80,6 +80,16 @@ class BxBaseMenuToolbar extends BxTemplMenu
 
 
         return $a;
         return $a;
     }
     }
+    
+    protected function _getMenuAttrs ($aMenuItem)
+    {
+        $sAttrs = parent::_getMenuAttrs($aMenuItem);
+
+        if($aMenuItem['name'] == 'apps') 
+            $sAttrs .= ' data-dropdown-toggle="sys-menu-apps"';
+
+        return $sAttrs;
+    }
 
 
     protected function _getTmplVarsAddon($mixedAddon, $aMenuItem)
     protected function _getTmplVarsAddon($mixedAddon, $aMenuItem)
     {
     {

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно