Просмотр исходного кода

#273 Cover image area: cover area in modules

Alex Trofimov 10 лет назад
Родитель
Сommit
7c49f232a4
27 измененных файлов с 14 добавлено и 160 удалено
  1. 1 1
      modules/base/text/classes/BxBaseModTextModule.php
  2. 0 2
      modules/boonex/convos/classes/BxCnvConfig.php
  3. 0 24
      modules/boonex/convos/classes/BxCnvMenuViewActions.php
  4. 0 1
      modules/boonex/convos/install/langs/en.xml
  5. 1 3
      modules/boonex/convos/install/sql/enable.sql
  6. 0 2
      modules/boonex/market/classes/BxMarketConfig.php
  7. 0 24
      modules/boonex/market/classes/BxMarketMenuViewActions.php
  8. 0 1
      modules/boonex/market/install/langs/en.xml
  9. 1 2
      modules/boonex/market/install/sql/enable.sql
  10. 0 2
      modules/boonex/organizations/classes/BxOrgsConfig.php
  11. 0 25
      modules/boonex/organizations/classes/BxOrgsMenuViewActions.php
  12. 0 1
      modules/boonex/organizations/install/langs/en.xml
  13. 1 2
      modules/boonex/organizations/install/sql/enable.sql
  14. 0 2
      modules/boonex/persons/classes/BxPersonsConfig.php
  15. 0 25
      modules/boonex/persons/classes/BxPersonsMenuViewActions.php
  16. 0 1
      modules/boonex/persons/install/langs/en.xml
  17. 1 2
      modules/boonex/persons/install/sql/enable.sql
  18. 0 2
      modules/boonex/posts/classes/BxPostsConfig.php
  19. 0 24
      modules/boonex/posts/classes/BxPostsMenuViewActions.php
  20. 0 1
      modules/boonex/posts/install/langs/en.xml
  21. 1 2
      modules/boonex/posts/install/sql/enable.sql
  22. 0 1
      modules/boonex/russian/data/langs/bx_convos/ru.xml
  23. 0 1
      modules/boonex/russian/data/langs/bx_market/ru.xml
  24. 0 1
      modules/boonex/russian/data/langs/bx_organizations/ru.xml
  25. 0 1
      modules/boonex/russian/data/langs/bx_persons/ru.xml
  26. 0 1
      modules/boonex/russian/data/langs/bx_posts/ru.xml
  27. 8 6
      template/scripts/BxBaseMenuSubmenu.php

+ 1 - 1
modules/base/text/classes/BxBaseModTextModule.php

@@ -106,7 +106,7 @@ class BxBaseModTextModule extends BxBaseModGeneralModule
 
 
     public function serviceEntityAllActions ($iContentId = 0)
     public function serviceEntityAllActions ($iContentId = 0)
     {
     {
-        return $this->_oTemplate->entryAllActions($this->serviceEntityActions($iContentId), $this->serviceEntitySocialSharing($iContentId));
+        return $this->_oTemplate->entryAllActions('', $this->serviceEntitySocialSharing($iContentId));
     }
     }
 
 
     /**
     /**

+ 0 - 2
modules/boonex/convos/classes/BxCnvConfig.php

@@ -69,7 +69,6 @@ class BxCnvConfig extends BxBaseModTextConfig
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => '',
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => '',
             'OBJECT_FORM_ENTRY_DISPLAY_DELETE' => 'bx_convos_entry_delete',
             'OBJECT_FORM_ENTRY_DISPLAY_DELETE' => 'bx_convos_entry_delete',
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY' => 'bx_convos_view', // actions menu on view entry page
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY' => 'bx_convos_view', // actions menu on view entry page
-            'OBJECT_MENU_ACTIONS_VIEW_ENTRY_POPUP' => 'bx_convos_view_popup', // actions menu popup on view entry page
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_convos_my', // actions menu on my entries page
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_convos_my', // actions menu on my entries page
             'OBJECT_MENU_SUBMENU' => 'bx_convos_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU' => 'bx_convos_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => '', // view entry submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => '', // view entry submenu
@@ -79,7 +78,6 @@ class BxCnvConfig extends BxBaseModTextConfig
             // menu items which visibility depends on custom visibility checking
             // menu items which visibility depends on custom visibility checking
             'MENU_ITEM_TO_METHOD' => array (
             'MENU_ITEM_TO_METHOD' => array (
                 'bx_convos_view' => $aMenuItems2Methods,
                 'bx_convos_view' => $aMenuItems2Methods,
-                'bx_convos_view_popup' => $aMenuItems2Methods,
             ),
             ),
 
 
             // some language keys
             // some language keys

+ 0 - 24
modules/boonex/convos/classes/BxCnvMenuViewActions.php

@@ -1,24 +0,0 @@
-<?php defined('BX_DOL') or die('hack attempt');
-/**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
- *
- * @defgroup    Convos Convos
- * @ingroup     TridentModules
- *
- * @{
- */
-
-/**
- * Actions popup menu.
- */
-class BxCnvMenuViewActions extends BxBaseModTextMenuViewActions
-{
-    public function __construct($aObject, $oTemplate = false)
-    {
-        $this->MODULE = 'bx_convos';
-        parent::__construct($aObject, $oTemplate);
-    }
-}
-
-/** @} */

+ 0 - 1
modules/boonex/convos/install/langs/en.xml

@@ -49,7 +49,6 @@
 
 
     <string name="_bx_cnv_menu_set_title_view_entry"><![CDATA[Conversation Actions]]></string>
     <string name="_bx_cnv_menu_set_title_view_entry"><![CDATA[Conversation Actions]]></string>
     <string name="_bx_cnv_menu_title_view_entry"><![CDATA[Conversation Actions]]></string>
     <string name="_bx_cnv_menu_title_view_entry"><![CDATA[Conversation Actions]]></string>
-    <string name="_bx_cnv_menu_title_view_entry_popup"><![CDATA[Conversation Popup Actions]]></string>
     <string name="_bx_cnv_menu_title_submenu"><![CDATA[Conversations Submenu]]></string>
     <string name="_bx_cnv_menu_title_submenu"><![CDATA[Conversations Submenu]]></string>
     <string name="_bx_cnv_menu_set_title_submenu"><![CDATA[Conversations Submenu]]></string>
     <string name="_bx_cnv_menu_set_title_submenu"><![CDATA[Conversations Submenu]]></string>
     <string name="_bx_cnv_menu_title_folders_more"><![CDATA[Conversations folders]]></string>
     <string name="_bx_cnv_menu_title_folders_more"><![CDATA[Conversations folders]]></string>

+ 1 - 3
modules/boonex/convos/install/sql/enable.sql

@@ -36,7 +36,6 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_convos_view_entry', 4, 'bx_convos', '_bx_cnv_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_convos\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 0),
 ('bx_convos_view_entry', 4, 'bx_convos', '_bx_cnv_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_convos\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 0),
 ('bx_convos_view_entry', 3, 'bx_convos', '_bx_cnv_page_block_title_entry_collaborators', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_convos\";s:6:\"method\";s:20:\"entity_collaborators\";}', 0, 0, 1, 0),
 ('bx_convos_view_entry', 3, 'bx_convos', '_bx_cnv_page_block_title_entry_collaborators', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_convos\";s:6:\"method\";s:20:\"entity_collaborators\";}', 0, 0, 1, 0),
-('bx_convos_view_entry', 1, 'bx_convos', '_bx_cnv_page_block_title_entry_actions', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_convos\";s:6:\"method\";s:14:\"entity_actions\";}', 0, 0, 1, 0),
 ('bx_convos_view_entry', 2, 'bx_convos', '_bx_cnv_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_convos\";s:6:\"method\";s:13:\"entity_author\";}', 0, 0, 1, 0),
 ('bx_convos_view_entry', 2, 'bx_convos', '_bx_cnv_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_convos\";s:6:\"method\";s:13:\"entity_author\";}', 0, 0, 1, 0),
 ('bx_convos_view_entry', 4, 'bx_convos', '_bx_cnv_page_block_title_entry_attachments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_convos\";s:6:\"method\";s:18:\"entity_attachments\";}', 0, 0, 1, 1),
 ('bx_convos_view_entry', 4, 'bx_convos', '_bx_cnv_page_block_title_entry_attachments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_convos\";s:6:\"method\";s:18:\"entity_attachments\";}', 0, 0, 1, 1),
 ('bx_convos_view_entry', 4, 'bx_convos', '_bx_cnv_page_block_title_entry_comments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_convos\";s:6:\"method\";s:15:\"entity_comments\";}', 0, 0, 1, 2);
 ('bx_convos_view_entry', 4, 'bx_convos', '_bx_cnv_page_block_title_entry_comments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_convos\";s:6:\"method\";s:15:\"entity_comments\";}', 0, 0, 1, 2);
@@ -54,8 +53,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbo
 -- MENU: actions menu for view entry 
 -- MENU: actions menu for view entry 
 
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_convos_view', '_bx_cnv_menu_title_view_entry', 'bx_convos_view', 'bx_convos', 9, 0, 1, 'BxCnvMenuView', 'modules/boonex/convos/classes/BxCnvMenuView.php'),
-('bx_convos_view_popup', '_bx_cnv_menu_title_view_entry_popup', '', 'bx_convos', 16, 0, 1, 'BxCnvMenuViewActions', 'modules/boonex/convos/classes/BxCnvMenuViewActions.php');
+('bx_convos_view', '_bx_cnv_menu_title_view_entry', 'bx_convos_view', 'bx_convos', 9, 0, 1, 'BxCnvMenuView', 'modules/boonex/convos/classes/BxCnvMenuView.php');
 
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_convos_view', 'bx_convos', '_bx_cnv_menu_set_title_view_entry', 0);
 ('bx_convos_view', 'bx_convos', '_bx_cnv_menu_set_title_view_entry', 0);

+ 0 - 2
modules/boonex/market/classes/BxMarketConfig.php

@@ -105,7 +105,6 @@ class BxMarketConfig extends BxBaseModTextConfig
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => 'bx_market_entry_edit',
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => 'bx_market_entry_edit',
             'OBJECT_FORM_ENTRY_DISPLAY_DELETE' => 'bx_market_entry_delete',
             'OBJECT_FORM_ENTRY_DISPLAY_DELETE' => 'bx_market_entry_delete',
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY' => 'bx_market_view', // actions menu on view entry page
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY' => 'bx_market_view', // actions menu on view entry page
-            'OBJECT_MENU_ACTIONS_VIEW_ENTRY_POPUP' => 'bx_market_view_popup', // actions menu popup on view entry page
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_market_my', // actions menu on my entries page
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_market_my', // actions menu on my entries page
             'OBJECT_MENU_SUBMENU' => 'bx_market_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU' => 'bx_market_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_market_view_submenu', // view entry submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_market_view_submenu', // view entry submenu
@@ -122,7 +121,6 @@ class BxMarketConfig extends BxBaseModTextConfig
                     'create-product' => 'checkAllowedAdd',
                     'create-product' => 'checkAllowedAdd',
                 ),
                 ),
                 'bx_market_view' => $aMenuItems2Methods,
                 'bx_market_view' => $aMenuItems2Methods,
-                'bx_market_view_popup' => $aMenuItems2Methods,
             ),
             ),
 
 
             // global settings
             // global settings

+ 0 - 24
modules/boonex/market/classes/BxMarketMenuViewActions.php

@@ -1,24 +0,0 @@
-<?php defined('BX_DOL') or die('hack attempt');
-/**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
- *
- * @defgroup    Market Market
- * @ingroup     TridentModules
- *
- * @{
- */
-
-/**
- * Actions popup menu.
- */
-class BxMarketMenuViewActions extends BxBaseModTextMenuViewActions
-{
-    public function __construct($aObject, $oTemplate = false)
-    {
-        $this->MODULE = 'bx_market';
-        parent::__construct($aObject, $oTemplate);
-    }
-}
-
-/** @} */

+ 0 - 1
modules/boonex/market/install/langs/en.xml

@@ -154,7 +154,6 @@
 
 
     <string name="_bx_market_menu_set_title_view_entry"><![CDATA[Product Actions]]></string>
     <string name="_bx_market_menu_set_title_view_entry"><![CDATA[Product Actions]]></string>
     <string name="_bx_market_menu_title_view_entry"><![CDATA[Product Actions]]></string>
     <string name="_bx_market_menu_title_view_entry"><![CDATA[Product Actions]]></string>
-    <string name="_bx_market_menu_title_view_entry_popup"><![CDATA[Product Popup Actions]]></string>
     <string name="_bx_market_menu_title_submenu"><![CDATA[Market Submenu]]></string>
     <string name="_bx_market_menu_title_submenu"><![CDATA[Market Submenu]]></string>
     <string name="_bx_market_menu_set_title_submenu"><![CDATA[Market Submenu]]></string>
     <string name="_bx_market_menu_set_title_submenu"><![CDATA[Market Submenu]]></string>
     <string name="_bx_market_menu_item_title_system_create_entry"><![CDATA[New Product]]></string>
     <string name="_bx_market_menu_item_title_system_create_entry"><![CDATA[New Product]]></string>

+ 1 - 2
modules/boonex/market/install/sql/enable.sql

@@ -175,8 +175,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 
 
 -- MENU: actions menu for view entry 
 -- MENU: actions menu for view entry 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_market_view', '_bx_market_menu_title_view_entry', 'bx_market_view', 'bx_market', 9, 0, 1, 'BxMarketMenuView', 'modules/boonex/market/classes/BxMarketMenuView.php'),
-('bx_market_view_popup', '_bx_market_menu_title_view_entry_popup', '', 'bx_market', 16, 0, 1, 'BxMarketMenuViewActions', 'modules/boonex/market/classes/BxMarketMenuViewActions.php');
+('bx_market_view', '_bx_market_menu_title_view_entry', 'bx_market_view', 'bx_market', 9, 0, 1, 'BxMarketMenuView', 'modules/boonex/market/classes/BxMarketMenuView.php');
 
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_market_view', 'bx_market', '_bx_market_menu_set_title_view_entry', 0);
 ('bx_market_view', 'bx_market', '_bx_market_menu_set_title_view_entry', 0);

+ 0 - 2
modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -83,7 +83,6 @@ class BxOrgsConfig extends BxBaseModProfileConfig
             'OBJECT_FORM_ENTRY_DISPLAY_DELETE' => 'bx_organization_delete',
             'OBJECT_FORM_ENTRY_DISPLAY_DELETE' => 'bx_organization_delete',
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY' => 'bx_organizations_view_actions', // actions menu on view entry page
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY' => 'bx_organizations_view_actions', // actions menu on view entry page
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY_MORE' => 'bx_organizations_view_actions_more', // actions menu on view entry page for "more" popup
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY_MORE' => 'bx_organizations_view_actions_more', // actions menu on view entry page for "more" popup
-            'OBJECT_MENU_ACTIONS_VIEW_ENTRY_POPUP' => 'bx_organizations_view_actions_popup', // actions menu popup on view entry page
             'OBJECT_MENU_SUBMENU' => 'bx_organizations_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU' => 'bx_organizations_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_organizations_view_submenu',  // view entry submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_organizations_view_submenu',  // view entry submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_COVER' => 'bx_organizations_view_submenu_cover',  // view entry submenu displayed in cover
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_COVER' => 'bx_organizations_view_submenu_cover',  // view entry submenu displayed in cover
@@ -99,7 +98,6 @@ class BxOrgsConfig extends BxBaseModProfileConfig
             'MENU_ITEM_TO_METHOD' => array (
             'MENU_ITEM_TO_METHOD' => array (
                 'bx_organizations_view_actions' => $aMenuItems2Methods,
                 'bx_organizations_view_actions' => $aMenuItems2Methods,
                 'bx_organizations_view_actions_more' => $aMenuItems2Methods,
                 'bx_organizations_view_actions_more' => $aMenuItems2Methods,
-                'bx_organizations_view_actions_popup' => $aMenuItems2Methods,
             ),
             ),
 
 
             // informer messages
             // informer messages

+ 0 - 25
modules/boonex/organizations/classes/BxOrgsMenuViewActions.php

@@ -1,25 +0,0 @@
-<?php defined('BX_DOL') or die('hack attempt');
-/**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
- *
- * @defgroup    Organizations Organizations
- * @ingroup     TridentModules
- *
- * @{
- */
-
-/**
- * Actions popup menu.
- */
-class BxOrgsMenuViewActions extends BxBaseModProfileMenuViewActions
-{
-
-    public function __construct($aObject, $oTemplate = false)
-    {
-        $this->MODULE = 'bx_organizations';
-        parent::__construct($aObject, $oTemplate);
-    }
-}
-
-/** @} */

+ 0 - 1
modules/boonex/organizations/install/langs/en.xml

@@ -95,7 +95,6 @@
     <string name="_bx_orgs_menu_title_view_profile_actions"><![CDATA[Organization Actions]]></string>
     <string name="_bx_orgs_menu_title_view_profile_actions"><![CDATA[Organization Actions]]></string>
     <string name="_bx_orgs_menu_set_title_view_profile_actions_more"><![CDATA[Organization More Actions]]></string>
     <string name="_bx_orgs_menu_set_title_view_profile_actions_more"><![CDATA[Organization More Actions]]></string>
     <string name="_bx_orgs_menu_title_view_profile_actions_more"><![CDATA[Organization More Actions]]></string>
     <string name="_bx_orgs_menu_title_view_profile_actions_more"><![CDATA[Organization More Actions]]></string>
-    <string name="_bx_orgs_menu_title_view_profile_actions_popup"><![CDATA[Organization Popup Actions]]></string>
     <string name="_bx_orgs_menu_set_title_view_profile_submenu"><![CDATA[View Organization Submenu]]></string>
     <string name="_bx_orgs_menu_set_title_view_profile_submenu"><![CDATA[View Organization Submenu]]></string>
     <string name="_bx_orgs_menu_title_view_profile_submenu"><![CDATA[View Organization Submenu]]></string>
     <string name="_bx_orgs_menu_title_view_profile_submenu"><![CDATA[View Organization Submenu]]></string>
     <string name="_bx_orgs_menu_title_view_profile_submenu_cover"><![CDATA[Organization Cover Submenu]]></string>
     <string name="_bx_orgs_menu_title_view_profile_submenu_cover"><![CDATA[Organization Cover Submenu]]></string>

+ 1 - 2
modules/boonex/organizations/install/sql/enable.sql

@@ -143,8 +143,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- MENU: view actions
 -- MENU: view actions
 
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_organizations_view_actions', '_bx_orgs_menu_title_view_profile_actions', 'bx_organizations_view_actions', 'bx_organizations', 9, 0, 1, 'BxOrgsMenuView', 'modules/boonex/organizations/classes/BxOrgsMenuView.php'),
-('bx_organizations_view_actions_popup', '_bx_orgs_menu_title_view_profile_actions_popup', '', 'bx_organizations', 16, 0, 1, 'BxOrgsMenuViewActions', 'modules/boonex/organizations/classes/BxOrgsMenuViewActions.php');
+('bx_organizations_view_actions', '_bx_orgs_menu_title_view_profile_actions', 'bx_organizations_view_actions', 'bx_organizations', 9, 0, 1, 'BxOrgsMenuView', 'modules/boonex/organizations/classes/BxOrgsMenuView.php');
 
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_organizations_view_actions', 'bx_organizations', '_bx_orgs_menu_set_title_view_profile_actions', 0);
 ('bx_organizations_view_actions', 'bx_organizations', '_bx_orgs_menu_set_title_view_profile_actions', 0);

+ 0 - 2
modules/boonex/persons/classes/BxPersonsConfig.php

@@ -83,7 +83,6 @@ class BxPersonsConfig extends BxBaseModProfileConfig
             'OBJECT_FORM_ENTRY_DISPLAY_DELETE' => 'bx_person_delete',
             'OBJECT_FORM_ENTRY_DISPLAY_DELETE' => 'bx_person_delete',
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY' => 'bx_persons_view_actions', // actions menu on view entry page
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY' => 'bx_persons_view_actions', // actions menu on view entry page
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY_MORE' => 'bx_persons_view_actions_more', // actions menu on view entry page for "more" popup
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY_MORE' => 'bx_persons_view_actions_more', // actions menu on view entry page for "more" popup
-            'OBJECT_MENU_ACTIONS_VIEW_ENTRY_POPUP' => 'bx_persons_view_actions_popup', // actions menu popup on view entry page 
             'OBJECT_MENU_SUBMENU' => 'bx_persons_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU' => 'bx_persons_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_persons_view_submenu',  // view entry submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_persons_view_submenu',  // view entry submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_COVER' => 'bx_persons_view_submenu_cover',  // view entry submenu displayed in cover
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_COVER' => 'bx_persons_view_submenu_cover',  // view entry submenu displayed in cover
@@ -99,7 +98,6 @@ class BxPersonsConfig extends BxBaseModProfileConfig
             'MENU_ITEM_TO_METHOD' => array (
             'MENU_ITEM_TO_METHOD' => array (
                 'bx_persons_view_actions' => $aMenuItems2Methods,
                 'bx_persons_view_actions' => $aMenuItems2Methods,
                 'bx_persons_view_actions_more' => $aMenuItems2Methods,
                 'bx_persons_view_actions_more' => $aMenuItems2Methods,
-                'bx_persons_view_actions_popup' => $aMenuItems2Methods,
             ),
             ),
 
 
             // informer messages
             // informer messages

+ 0 - 25
modules/boonex/persons/classes/BxPersonsMenuViewActions.php

@@ -1,25 +0,0 @@
-<?php defined('BX_DOL') or die('hack attempt');
-/**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
- *
- * @defgroup    Persons Persons
- * @ingroup     TridentModules
- *
- * @{
- */
-
-/**
- * Actions popup menu.
- */
-class BxPersonsMenuViewActions extends BxBaseModProfileMenuViewActions
-{
-
-    public function __construct($aObject, $oTemplate = false)
-    {
-        $this->MODULE = 'bx_persons';
-        parent::__construct($aObject, $oTemplate);
-    }
-}
-
-/** @} */

+ 0 - 1
modules/boonex/persons/install/langs/en.xml

@@ -90,7 +90,6 @@
     <string name="_bx_persons_menu_title_view_profile_actions"><![CDATA[Person Actions]]></string>
     <string name="_bx_persons_menu_title_view_profile_actions"><![CDATA[Person Actions]]></string>
     <string name="_bx_persons_menu_set_title_view_profile_actions_more"><![CDATA[Person More Actions]]></string>
     <string name="_bx_persons_menu_set_title_view_profile_actions_more"><![CDATA[Person More Actions]]></string>
     <string name="_bx_persons_menu_title_view_profile_actions_more"><![CDATA[Person More Actions]]></string>
     <string name="_bx_persons_menu_title_view_profile_actions_more"><![CDATA[Person More Actions]]></string>
-    <string name="_bx_persons_menu_title_view_profile_actions_popup"><![CDATA[Person Popup Actions]]></string>
     <string name="_bx_persons_menu_set_title_view_profile_submenu"><![CDATA[View Person Submenu]]></string>
     <string name="_bx_persons_menu_set_title_view_profile_submenu"><![CDATA[View Person Submenu]]></string>
     <string name="_bx_persons_menu_title_view_profile_submenu"><![CDATA[View Person Submenu]]></string>
     <string name="_bx_persons_menu_title_view_profile_submenu"><![CDATA[View Person Submenu]]></string>
     <string name="_bx_persons_menu_title_view_profile_submenu_cover"><![CDATA[Person Cover Submenu]]></string>
     <string name="_bx_persons_menu_title_view_profile_submenu_cover"><![CDATA[Person Cover Submenu]]></string>

+ 1 - 2
modules/boonex/persons/install/sql/enable.sql

@@ -138,8 +138,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- MENU: view actions
 -- MENU: view actions
 
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_persons_view_actions', '_bx_persons_menu_title_view_profile_actions', 'bx_persons_view_actions', 'bx_persons', 9, 0, 1, 'BxPersonsMenuView', 'modules/boonex/persons/classes/BxPersonsMenuView.php'),
-('bx_persons_view_actions_popup', '_bx_persons_menu_title_view_profile_actions_popup', '', 'bx_persons', 16, 0, 1, 'BxPersonsMenuViewActions', 'modules/boonex/persons/classes/BxPersonsMenuViewActions.php');
+('bx_persons_view_actions', '_bx_persons_menu_title_view_profile_actions', 'bx_persons_view_actions', 'bx_persons', 9, 0, 1, 'BxPersonsMenuView', 'modules/boonex/persons/classes/BxPersonsMenuView.php');
 
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_persons_view_actions', 'bx_persons', '_bx_persons_menu_set_title_view_profile_actions', 0);
 ('bx_persons_view_actions', 'bx_persons', '_bx_persons_menu_set_title_view_profile_actions', 0);

+ 0 - 2
modules/boonex/posts/classes/BxPostsConfig.php

@@ -78,7 +78,6 @@ class BxPostsConfig extends BxBaseModTextConfig
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => 'bx_posts_entry_edit',
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => 'bx_posts_entry_edit',
             'OBJECT_FORM_ENTRY_DISPLAY_DELETE' => 'bx_posts_entry_delete',
             'OBJECT_FORM_ENTRY_DISPLAY_DELETE' => 'bx_posts_entry_delete',
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY' => 'bx_posts_view', // actions menu on view entry page
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY' => 'bx_posts_view', // actions menu on view entry page
-            'OBJECT_MENU_ACTIONS_VIEW_ENTRY_POPUP' => 'bx_posts_view_popup', // actions menu popup on view entry page
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_posts_my', // actions menu on my entries page
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_posts_my', // actions menu on my entries page
             'OBJECT_MENU_SUBMENU' => 'bx_posts_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU' => 'bx_posts_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_posts_view_submenu', // view entry submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_posts_view_submenu', // view entry submenu
@@ -94,7 +93,6 @@ class BxPostsConfig extends BxBaseModTextConfig
                     'create-post' => 'checkAllowedAdd',
                     'create-post' => 'checkAllowedAdd',
                 ),
                 ),
                 'bx_posts_view' => $aMenuItems2Methods,
                 'bx_posts_view' => $aMenuItems2Methods,
-                'bx_posts_view_popup' => $aMenuItems2Methods,
             ),
             ),
 
 
             // some language keys
             // some language keys

+ 0 - 24
modules/boonex/posts/classes/BxPostsMenuViewActions.php

@@ -1,24 +0,0 @@
-<?php defined('BX_DOL') or die('hack attempt');
-/**
- * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
- * CC-BY License - http://creativecommons.org/licenses/by/3.0/
- *
- * @defgroup    Posts Posts
- * @ingroup     TridentModules
- *
- * @{
- */
-
-/**
- * Actions popup menu.
- */
-class BxPostsMenuViewActions extends BxBaseModTextMenuViewActions
-{
-    public function __construct($aObject, $oTemplate = false)
-    {
-        $this->MODULE = 'bx_posts';
-        parent::__construct($aObject, $oTemplate);
-    }
-}
-
-/** @} */

+ 0 - 1
modules/boonex/posts/install/langs/en.xml

@@ -100,7 +100,6 @@
 
 
     <string name="_bx_posts_menu_set_title_view_entry"><![CDATA[Post Actions]]></string>
     <string name="_bx_posts_menu_set_title_view_entry"><![CDATA[Post Actions]]></string>
     <string name="_bx_posts_menu_title_view_entry"><![CDATA[Post Actions]]></string>
     <string name="_bx_posts_menu_title_view_entry"><![CDATA[Post Actions]]></string>
-    <string name="_bx_posts_menu_title_view_entry_popup"><![CDATA[Post Popup Actions]]></string>
     <string name="_bx_posts_menu_title_submenu"><![CDATA[Posts Submenu]]></string>
     <string name="_bx_posts_menu_title_submenu"><![CDATA[Posts Submenu]]></string>
     <string name="_bx_posts_menu_set_title_submenu"><![CDATA[Posts Submenu]]></string>
     <string name="_bx_posts_menu_set_title_submenu"><![CDATA[Posts Submenu]]></string>
     <string name="_bx_posts_menu_item_title_system_create_entry"><![CDATA[New Post]]></string>
     <string name="_bx_posts_menu_item_title_system_create_entry"><![CDATA[New Post]]></string>

+ 1 - 2
modules/boonex/posts/install/sql/enable.sql

@@ -158,8 +158,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- MENU: actions menu for view entry 
 -- MENU: actions menu for view entry 
 
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_posts_view', '_bx_posts_menu_title_view_entry', 'bx_posts_view', 'bx_posts', 9, 0, 1, 'BxPostsMenuView', 'modules/boonex/posts/classes/BxPostsMenuView.php'),
-('bx_posts_view_popup', '_bx_posts_menu_title_view_entry_popup', '', 'bx_posts', 16, 0, 1, 'BxPostsMenuViewActions', 'modules/boonex/posts/classes/BxPostsMenuViewActions.php');
+('bx_posts_view', '_bx_posts_menu_title_view_entry', 'bx_posts_view', 'bx_posts', 9, 0, 1, 'BxPostsMenuView', 'modules/boonex/posts/classes/BxPostsMenuView.php');
 
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_posts_view', 'bx_posts', '_bx_posts_menu_set_title_view_entry', 0);
 ('bx_posts_view', 'bx_posts', '_bx_posts_menu_set_title_view_entry', 0);

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

@@ -49,7 +49,6 @@
 
 
     <string name="_bx_cnv_menu_set_title_view_entry"><![CDATA[Действия для сообщения]]></string>
     <string name="_bx_cnv_menu_set_title_view_entry"><![CDATA[Действия для сообщения]]></string>
     <string name="_bx_cnv_menu_title_view_entry"><![CDATA[Действия для сообщения]]></string>
     <string name="_bx_cnv_menu_title_view_entry"><![CDATA[Действия для сообщения]]></string>
-    <string name="_bx_cnv_menu_title_view_entry_popup"><![CDATA[Всплывающие действия для сообщения]]></string>
     <string name="_bx_cnv_menu_title_submenu"><![CDATA[Переписка - Подменю]]></string>
     <string name="_bx_cnv_menu_title_submenu"><![CDATA[Переписка - Подменю]]></string>
     <string name="_bx_cnv_menu_set_title_submenu"><![CDATA[Переписка - Подменю]]></string>
     <string name="_bx_cnv_menu_set_title_submenu"><![CDATA[Переписка - Подменю]]></string>
     <string name="_bx_cnv_menu_title_folders_more"><![CDATA[Переписка - Папки]]></string>
     <string name="_bx_cnv_menu_title_folders_more"><![CDATA[Переписка - Папки]]></string>

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

@@ -153,7 +153,6 @@
 
 
     <string name="_bx_market_menu_set_title_view_entry"><![CDATA[Действия для продукта]]></string>
     <string name="_bx_market_menu_set_title_view_entry"><![CDATA[Действия для продукта]]></string>
     <string name="_bx_market_menu_title_view_entry"><![CDATA[Действия для продукта]]></string>
     <string name="_bx_market_menu_title_view_entry"><![CDATA[Действия для продукта]]></string>
-    <string name="_bx_market_menu_title_view_entry_popup"><![CDATA[Всплывающие действия для продукта]]></string>
     <string name="_bx_market_menu_title_submenu"><![CDATA[Рынок - Подменю]]></string>
     <string name="_bx_market_menu_title_submenu"><![CDATA[Рынок - Подменю]]></string>
     <string name="_bx_market_menu_set_title_submenu"><![CDATA[Рынок - Подменю]]></string>
     <string name="_bx_market_menu_set_title_submenu"><![CDATA[Рынок - Подменю]]></string>
     <string name="_bx_market_menu_item_title_system_create_entry"><![CDATA[Новый продукт]]></string>
     <string name="_bx_market_menu_item_title_system_create_entry"><![CDATA[Новый продукт]]></string>

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

@@ -94,7 +94,6 @@
     <string name="_bx_orgs_menu_title_view_profile_actions"><![CDATA[Организации - Действия]]></string>
     <string name="_bx_orgs_menu_title_view_profile_actions"><![CDATA[Организации - Действия]]></string>
     <string name="_bx_orgs_menu_set_title_view_profile_actions_more"><![CDATA[Организации - Дополнительные Действия]]></string>
     <string name="_bx_orgs_menu_set_title_view_profile_actions_more"><![CDATA[Организации - Дополнительные Действия]]></string>
     <string name="_bx_orgs_menu_title_view_profile_actions_more"><![CDATA[Организации - Дополнительные Действия]]></string>
     <string name="_bx_orgs_menu_title_view_profile_actions_more"><![CDATA[Организации - Дополнительные Действия]]></string>
-    <string name="_bx_orgs_menu_title_view_profile_actions_popup"><![CDATA[Организации - Всплывающие действия]]></string>
     <string name="_bx_orgs_menu_set_title_view_profile_submenu"><![CDATA[Подменю просмотра организации]]></string>
     <string name="_bx_orgs_menu_set_title_view_profile_submenu"><![CDATA[Подменю просмотра организации]]></string>
     <string name="_bx_orgs_menu_title_view_profile_submenu"><![CDATA[Подменю просмотра организации]]></string>
     <string name="_bx_orgs_menu_title_view_profile_submenu"><![CDATA[Подменю просмотра организации]]></string>
     <string name="_bx_orgs_menu_title_view_profile_submenu_cover"><![CDATA[Подменю организации на обложке]]></string>
     <string name="_bx_orgs_menu_title_view_profile_submenu_cover"><![CDATA[Подменю организации на обложке]]></string>

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

@@ -90,7 +90,6 @@
     <string name="_bx_persons_menu_title_view_profile_actions"><![CDATA[Персоны - Действия]]></string>
     <string name="_bx_persons_menu_title_view_profile_actions"><![CDATA[Персоны - Действия]]></string>
     <string name="_bx_persons_menu_set_title_view_profile_actions_more"><![CDATA[Персоны - Дополнительные действия]]></string>
     <string name="_bx_persons_menu_set_title_view_profile_actions_more"><![CDATA[Персоны - Дополнительные действия]]></string>
     <string name="_bx_persons_menu_title_view_profile_actions_more"><![CDATA[Персоны - Дополнительные действия]]></string>
     <string name="_bx_persons_menu_title_view_profile_actions_more"><![CDATA[Персоны - Дополнительные действия]]></string>
-    <string name="_bx_persons_menu_title_view_profile_actions_popup"><![CDATA[Персоны - Всплывающие действия]]></string>
     <string name="_bx_persons_menu_set_title_view_profile_submenu"><![CDATA[Подменю просмотра персоны]]></string>
     <string name="_bx_persons_menu_set_title_view_profile_submenu"><![CDATA[Подменю просмотра персоны]]></string>
     <string name="_bx_persons_menu_title_view_profile_submenu"><![CDATA[Подменю просмотра персоны]]></string>
     <string name="_bx_persons_menu_title_view_profile_submenu"><![CDATA[Подменю просмотра персоны]]></string>
     <string name="_bx_persons_menu_title_view_profile_submenu_cover"><![CDATA[Подменю персоны на обложке]]></string>
     <string name="_bx_persons_menu_title_view_profile_submenu_cover"><![CDATA[Подменю персоны на обложке]]></string>

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

@@ -100,7 +100,6 @@
 
 
     <string name="_bx_posts_menu_set_title_view_entry"><![CDATA[Действия для публикации]]></string>
     <string name="_bx_posts_menu_set_title_view_entry"><![CDATA[Действия для публикации]]></string>
     <string name="_bx_posts_menu_title_view_entry"><![CDATA[Действия для публикации]]></string>
     <string name="_bx_posts_menu_title_view_entry"><![CDATA[Действия для публикации]]></string>
-    <string name="_bx_posts_menu_title_view_entry_popup"><![CDATA[Всплывающие действия для публикации]]></string>
     <string name="_bx_posts_menu_title_submenu"><![CDATA[Публикации - Подменю]]></string>
     <string name="_bx_posts_menu_title_submenu"><![CDATA[Публикации - Подменю]]></string>
     <string name="_bx_posts_menu_set_title_submenu"><![CDATA[Публикации - Подменю]]></string>
     <string name="_bx_posts_menu_set_title_submenu"><![CDATA[Публикации - Подменю]]></string>
     <string name="_bx_posts_menu_item_title_system_create_entry"><![CDATA[Новая публикация]]></string>
     <string name="_bx_posts_menu_item_title_system_create_entry"><![CDATA[Новая публикация]]></string>

+ 8 - 6
template/scripts/BxBaseMenuSubmenu.php

@@ -122,12 +122,14 @@ class BxBaseMenuSubmenu extends BxTemplMenu
         if ($this->_aSocialSharingService) {
         if ($this->_aSocialSharingService) {
             $sPopupContent = BxDolService::call($this->_aSocialSharingService['module'], $this->_aSocialSharingService['method'], isset($this->_aSocialSharingService['params']) ? $this->_aSocialSharingService['params'] : array(), isset($this->_aSocialSharingService['class']) ? $this->_aSocialSharingService['class'] : 'Module');
             $sPopupContent = BxDolService::call($this->_aSocialSharingService['module'], $this->_aSocialSharingService['method'], isset($this->_aSocialSharingService['params']) ? $this->_aSocialSharingService['params'] : array(), isset($this->_aSocialSharingService['class']) ? $this->_aSocialSharingService['class'] : 'Module');
 
 
-            $aVars['bx_if:sharing']['condition'] = true;
-            $aVars['bx_if:sharing']['content'] = array (
-                'id' => 'bx-menu-social-sharing-menu',
-                'icon' => 'share',
-                'popup' => BxTemplFunctions::getInstance()->transBox('bx-menu-social-sharing-menu', '<div class="bx-def-padding">' . $sPopupContent . '</div>', true),
-            );
+            if ($sPopupContent) {
+                $aVars['bx_if:sharing']['condition'] = $sPopupContent;
+                $aVars['bx_if:sharing']['content'] = array (
+                    'id' => 'bx-menu-social-sharing-menu',
+                    'icon' => 'share',
+                    'popup' => BxTemplFunctions::getInstance()->transBox('bx-menu-social-sharing-menu', '<div class="bx-def-padding">' . $sPopupContent . '</div>', true),
+                );
+            }
         }
         }
 
 
         if (!$aVars['bx_if:sharing']['condition'] && !$aMenuItemSelected)
         if (!$aVars['bx_if:sharing']['condition'] && !$aMenuItemSelected)