Ticket #1558

modules/boonex/notifications/classes/BxNtfsModule.php

@@ -106,12 +106,8 @@ class BxNtfsModule extends BxBaseModNotificationsModule
 
         $this->_oDb->initSettingUser(bx_get_logged_profile_id());
 
-        $oMenu = BxDolMenu::getObjectInstance($this->_oConfig->CNF['OBJECT_MENU_SETTINGS']);
-        $oMenu->setSelected($this->_oConfig->getName(), 'notifications-' . $sDeliveryType);
-
         return array(
             'content' => $this->getBlockSettings($sDeliveryType, $aParams),
-            'menu' => $oMenu
         );
     }
 

modules/boonex/notifications/classes/BxNtfsPageSettings.php

@@ -21,6 +21,15 @@ class BxNtfsPageSettings extends BxTemplPage
     	$this->_sModule = 'bx_notifications';
         $this->_oModule = BxDolModule::getInstance($this->_sModule);
 
+        if(empty($sDeliveryType) && bx_get('delivery') !== false)
+            $sDeliveryType = bx_process_input(bx_get('delivery'));
+
+        if(empty($sDeliveryType))
+            $sDeliveryType = BX_BASE_MOD_NTFS_DTYPE_SITE;
+
+        $oMenu = BxDolMenu::getObjectInstance($this->_oModule->_oConfig->CNF['OBJECT_MENU_SETTINGS']);
+        $oMenu->setSelected($this->_oModule->_oConfig->getName(), 'notifications-' . $sDeliveryType);
+
         $oMenuSubmenu = BxDolMenu::getObjectInstance('sys_site_submenu');
         if($oMenuSubmenu) {
             $sSubmenu = 'sys_account_settings_submenu';

modules/boonex/notifications/install/langs/en.xml

@@ -8,13 +8,14 @@
     <string name="_bx_ntfs_page_block_title_view"><![CDATA[Notifications]]></string>
     <string name="_bx_ntfs_page_title_system_settings"><![CDATA[Notifications Settings]]></string>
     <string name="_bx_ntfs_page_title_settings"><![CDATA[Notifications Settings]]></string>
+    <string name="_bx_ntfs_page_block_title_delivery"><![CDATA[Receive via]]></string>
     <string name="_bx_ntfs_page_block_title_settings"><![CDATA[Notifications]]></string>
 
     <string name="_bx_ntfs_menu_title_submenu"><![CDATA[Notifications Submenu]]></string>
     <string name="_bx_ntfs_menu_set_title_submenu"><![CDATA[Notifications Submenu]]></string>
     <string name="_bx_ntfs_menu_item_title_system_notifications_all"><![CDATA[All Notifications]]></string>
     <string name="_bx_ntfs_menu_item_title_notifications_all"><![CDATA[All Notifications]]></string>
-    <string name="_bx_ntfs_menu_title_settings"><![CDATA[Settings Submenu]]]]></string>
+    <string name="_bx_ntfs_menu_title_settings"><![CDATA[Settings Submenu]]></string>
     <string name="_bx_ntfs_menu_set_title_settings"><![CDATA[Settings Submenu]]></string>
     <string name="_bx_ntfs_menu_item_title_system_notifications_site"><![CDATA[On Site]]></string>
     <string name="_bx_ntfs_menu_item_title_notifications_site"><![CDATA[On Site]]></string>

modules/boonex/notifications/install/sql/enable.sql

@@ -9,10 +9,11 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designb
 ('bx_notifications_view', 1, @sName, '_bx_ntfs_page_block_title_view', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:16:"bx_notifications";s:6:"method";s:14:"get_block_view";}', 0, 1, 1);
 
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_notifications_settings', '_bx_ntfs_page_title_system_settings', '_bx_ntfs_page_title_settings', @sName, 5, 2147483647, 1, 'notifications-settings', 'page.php?i=notifications-settings', '', '', '', 0, 1, 0, 'BxNtfsPageSettings', 'modules/boonex/notifications/classes/BxNtfsPageSettings.php');
+('bx_notifications_settings', '_bx_ntfs_page_title_system_settings', '_bx_ntfs_page_title_settings', @sName, 1, 2147483647, 1, 'notifications-settings', 'page.php?i=notifications-settings', '', '', '', 0, 1, 0, 'BxNtfsPageSettings', 'modules/boonex/notifications/classes/BxNtfsPageSettings.php');
 
 INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES
-('bx_notifications_settings', 1, @sName, '_bx_ntfs_page_block_title_settings', 11, 2147483644, 'service', 'a:2:{s:6:"module";s:16:"bx_notifications";s:6:"method";s:18:"get_block_settings";}', 0, 1, 1);
+('bx_notifications_settings', 1, @sName, '_bx_ntfs_page_block_title_delivery', 13, 2147483644, 'menu', 'bx_notifications_settings', 0, 0, 1),
+('bx_notifications_settings', 2, @sName, '_bx_ntfs_page_block_title_settings', 13, 2147483644, 'service', 'a:2:{s:6:"module";s:16:"bx_notifications";s:6:"method";s:18:"get_block_settings";}', 0, 1, 1);
 
 -- PAGES: add page block on dashboard
 SET @iPBCellDashboard = 3;

modules/boonex/russian/data/langs/bx_notifications/ru.xml

@@ -8,13 +8,14 @@
     <string name="_bx_ntfs_page_block_title_view"><![CDATA[Уведомления]]></string>
     <string name="_bx_ntfs_page_title_system_settings"><![CDATA[Настройки уведомлений]]></string>
     <string name="_bx_ntfs_page_title_settings"><![CDATA[Настройки уведомлений]]></string>
+    <string name="_bx_ntfs_page_block_title_delivery"><![CDATA[Получить через]]></string>
     <string name="_bx_ntfs_page_block_title_settings"><![CDATA[Уведомления]]></string>
 
     <string name="_bx_ntfs_menu_title_submenu"><![CDATA[Уведомления - Подменю]]></string>
     <string name="_bx_ntfs_menu_set_title_submenu"><![CDATA[Уведомления - Подменю]]></string>
     <string name="_bx_ntfs_menu_item_title_system_notifications_all"><![CDATA[Все уведомления]]></string>
     <string name="_bx_ntfs_menu_item_title_notifications_all"><![CDATA[Все уведомления]]></string>
-    <string name="_bx_ntfs_menu_title_settings"><![CDATA[Настройки - Подменю]]]]></string>
+    <string name="_bx_ntfs_menu_title_settings"><![CDATA[Настройки - Подменю]]></string>
     <string name="_bx_ntfs_menu_set_title_settings"><![CDATA[Настройки - Подменю]]></string>
     <string name="_bx_ntfs_menu_item_title_system_notifications_site"><![CDATA[На сайте]]></string>
     <string name="_bx_ntfs_menu_item_title_notifications_site"><![CDATA[На сайте]]></string>