Merge branch 'master' of https://github.com/boonex/dolphin

inc/classes/BxDolMenuQuery.php

@@ -7,6 +7,8 @@
  * @{
  */
 
+define('BX_MENU_LAST_ITEM_ORDER', 9999);
+
 /**
  * Database queries for menus.
  * @see BxDolMenu
@@ -47,7 +49,7 @@ class BxDolMenuQuery extends BxDolDb
             return false;
 
         if (empty($aMenuItem['order'])) {
-            $sQuery = $oDb->prepare("SELECT `order` FROM `sys_menu_items` WHERE `set_name` = ? AND `active` = 1 AND `order` != 9999 ORDER BY `order` DESC LIMIT 1", $aMenuItem['set_name']);
+            $sQuery = $oDb->prepare("SELECT `order` FROM `sys_menu_items` WHERE `set_name` = ? AND `active` = 1 AND `order` != ? ORDER BY `order` DESC LIMIT 1", $aMenuItem['set_name'], BX_MENU_LAST_ITEM_ORDER);
             $iProfileMenuOrder = (int)$oDb->getOne($sQuery);
             $aMenuItem['order'] = $iProfileMenuOrder + 1;
         }
@@ -61,10 +63,14 @@ class BxDolMenuQuery extends BxDolDb
 
     public function getMenuItems()
     {
-        $sQuery = $this->prepare("SELECT * FROM `sys_menu_items` WHERE `set_name` = ? ORDER BY `order` ASC", $this->_aObject['set_name']);
-        return $this->getAll($sQuery);
+        return $this->getMenuItemsFromSet($this->_aObject['set_name']);
     }
 
+    public function getMenuItemsFromSet($sSetName)
+    {
+        $sQuery = $this->prepare("SELECT * FROM `sys_menu_items` WHERE `set_name` = ? ORDER BY `order` ASC", $sSetName);
+        return $this->getAll($sQuery);
+    }
 }
 
 /** @} */

install/sql/system.sql

@@ -2628,7 +2628,8 @@ INSERT INTO `sys_menu_templates` (`id`, `template`, `title`) VALUES
 (12, 'menu_account_popup.html', '_sys_menu_template_title_account_popup'),
 (13, 'menu_account_notifications.html', '_sys_menu_template_title_account_notifications'),
 (14, 'menu_floating_blocks_big.html', '_sys_menu_template_title_floating_blocks_big'),
-(15, 'menu_custom.html', '_sys_menu_template_title_custom');
+(15, 'menu_custom.html', '_sys_menu_template_title_custom'),
+(16, 'menu_buttons_ver.html', '_sys_menu_template_title_buttons_ver');
 
 CREATE TABLE IF NOT EXISTS `sys_objects_menu` (
   `id` int(11) NOT NULL AUTO_INCREMENT,

modules/base/general/classes/BxBaseModGeneralMenuView.php

@@ -50,6 +50,30 @@ class BxBaseModGeneralMenuView extends BxTemplMenu
 
         return true;
     }
+
+    protected function _getMenuItemsCombined ()
+    {
+        // combile values from ACTIONS_VIEW_ENTRY and ACTIONS_VIEW_ENTRY_MORE menus
+        $CNF = $this->_oModule->_oConfig->CNF;
+
+        if (empty($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY']))
+            return array();
+
+        $aItems = $this->_oQuery->getMenuItemsFromSet($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY']);
+        
+        if (empty($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY_MORE']))
+            return $aItems;
+
+        $aItemsMore = $this->_oQuery->getMenuItemsFromSet($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY_MORE']);
+        
+        // remove "more" item from ACTIONS_VIEW_ENTRY
+        $aItems = array_filter ($aItems, function ($aItem) {
+            return $aItem['order'] != BX_MENU_LAST_ITEM_ORDER;
+        });
+
+        // return combined array
+        return array_merge($aItems, $aItemsMore);
+    }
 }
 
 /** @} */

modules/base/general/classes/BxBaseModGeneralPageEntry.php

@@ -58,8 +58,8 @@ class BxBaseModGeneralPageEntry extends BxTemplPage
         $oMenuSubmenu = BxDolMenu::getObjectInstance('sys_site_submenu');
 
         // add actions menu to submenu
-        if (isset($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY']))
-            $oMenuSubmenu->setObjectActionsMenu($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY']);
+        if (isset($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY_POPUP']))
+            $oMenuSubmenu->setObjectActionsMenu($CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY_POPUP']);
 
         // add social sharing menu to submenu
         $oMenuSubmenu->setServiceSocialSharing(array(

modules/base/profile/classes/BxBaseModProfileMenuViewActions.php

@@ -0,0 +1,23 @@
+<?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    BaseProfile Base classes for profile modules
+ * @ingroup     TridentModules
+ *
+ * @{
+ */
+
+/**
+ * View entry actions menu in popup
+ */
+class BxBaseModProfileMenuViewActions extends BxBaseModProfileMenuView
+{
+    protected function getMenuItemsRaw ()
+    {
+        return $this->_getMenuItemsCombined ();
+    }
+}
+
+/** @} */

modules/base/text/classes/BxBaseModTextMenuViewActions.php

@@ -0,0 +1,23 @@
+<?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    BaseText Base classes for text modules
+ * @ingroup     TridentModules
+ *
+ * @{
+ */
+
+/**
+ * View entry actions menu in popup
+ */
+class BxBaseModTextMenuViewActions extends BxBaseModTextMenuView
+{
+    protected function getMenuItemsRaw ()
+    {
+        return $this->_getMenuItemsCombined ();
+    }
+}
+
+/** @} */

modules/boonex/albums/classes/BxAlbumsConfig.php

@@ -15,6 +15,11 @@ class BxAlbumsConfig extends BxBaseModTextConfig
     {
         parent::__construct($aModule);
 
+        $aMenuItems2Methods = array (
+            'edit-album' => 'checkAllowedEdit',
+            'delete-album' => 'checkAllowedDelete',
+        );
+
         $this->CNF = array (
 
             // database tables
@@ -82,6 +87,7 @@ class BxAlbumsConfig extends BxBaseModTextConfig
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => 'bx_albums_entry_edit',
             'OBJECT_FORM_ENTRY_DISPLAY_DELETE' => 'bx_albums_entry_delete',
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY' => 'bx_albums_view', // actions menu on view entry page
+            'OBJECT_MENU_ACTIONS_VIEW_ENTRY_POPUP' => 'bx_albums_view_popup', // actions menu popup on view entry page
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_albums_my', // actions menu on my entries page
             'OBJECT_MENU_SUBMENU' => 'bx_albums_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_albums_view_submenu', // view entry submenu
@@ -96,10 +102,8 @@ class BxAlbumsConfig extends BxBaseModTextConfig
                 'bx_albums_my' => array (
                     'create-album' => 'checkAllowedAdd',
                 ),
-                'bx_albums_view' => array (
-                    'edit-album' => 'checkAllowedEdit',
-                    'delete-album' => 'checkAllowedDelete',
-                ),
+                'bx_albums_view' => $aMenuItems2Methods,
+                'bx_albums_view_popup' => $aMenuItems2Methods,
             ),
 
             // some language keys

modules/boonex/albums/classes/BxAlbumsMenuViewActions.php

@@ -0,0 +1,24 @@
+<?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    Albums Albums
+ * @ingroup     TridentModules
+ *
+ * @{
+ */
+
+/**
+ * Actions popup menu.
+ */
+class BxAlbumsMenuViewActions extends BxBaseModTextMenuViewActions
+{
+    public function __construct($aObject, $oTemplate = false)
+    {
+        $this->MODULE = 'bx_albums';
+        parent::__construct($aObject, $oTemplate);
+    }
+}
+
+/** @} */

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

@@ -103,8 +103,9 @@
 	<string name="_bx_albums_page_block_title_popular_keywords_media"><![CDATA[Popular Media Hashtags]]></string>
 	<string name="_bx_albums_page_block_title_popular_keywords_media_camera"><![CDATA[Popular Cameras]]></string>
 
-    <string name="_bx_albums_menu_set_title_view_entry"><![CDATA[View Album]]></string>
-    <string name="_bx_albums_menu_title_view_entry"><![CDATA[View Album]]></string>
+    <string name="_bx_albums_menu_set_title_view_entry"><![CDATA[Album Actions]]></string>
+    <string name="_bx_albums_menu_title_view_entry"><![CDATA[Album Actions]]></string>
+    <string name="_bx_albums_menu_title_view_entry_popup"><![CDATA[Album Popup Actions]]></string>
     <string name="_bx_albums_menu_title_submenu"><![CDATA[Albums Submenu]]></string>
     <string name="_bx_albums_menu_set_title_submenu"><![CDATA[Albums Submenu]]></string>
     <string name="_bx_albums_menu_item_title_system_create_entry"><![CDATA[New Album]]></string>

modules/boonex/albums/install/sql/enable.sql

@@ -173,7 +173,8 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- 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 
-('bx_albums_view', '_bx_albums_menu_title_view_entry', 'bx_albums_view', 'bx_albums', 9, 0, 1, 'BxAlbumsMenuView', 'modules/boonex/albums/classes/BxAlbumsMenuView.php');
+('bx_albums_view', '_bx_albums_menu_title_view_entry', 'bx_albums_view', 'bx_albums', 9, 0, 1, 'BxAlbumsMenuView', 'modules/boonex/albums/classes/BxAlbumsMenuView.php'),
+('bx_albums_view_popup', '_bx_albums_menu_title_view_entry_popup', '', 'bx_albums', 16, 0, 1, 'BxAlbumsMenuViewActions', 'modules/boonex/albums/classes/BxAlbumsMenuViewActions.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_albums_view', 'bx_albums', '_bx_albums_menu_set_title_view_entry', 0);

modules/boonex/convos/classes/BxCnvConfig.php

@@ -15,6 +15,11 @@ class BxCnvConfig extends BxBaseModTextConfig
     {
         parent::__construct($aModule);
 
+        $aMenuItems2Methods = array (
+            'delete-convos' => 'checkAllowedDelete',
+            'mark-unread-convo' => 'checkAllowedView',
+        );
+
         $this->CNF = array (
 
             // database tables
@@ -61,6 +66,7 @@ class BxCnvConfig extends BxBaseModTextConfig
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => '',
             '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_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_SUBMENU' => 'bx_convos_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => '', // view entry submenu
@@ -69,10 +75,8 @@ class BxCnvConfig extends BxBaseModTextConfig
 
             // menu items which visibility depends on custom visibility checking
             'MENU_ITEM_TO_METHOD' => array (
-                'bx_convos_view' => array (
-                    'delete-convos' => 'checkAllowedDelete',
-                    'mark-unread-convo' => 'checkAllowedView',
-                ),
+                'bx_convos_view' => $aMenuItems2Methods,
+                'bx_convos_view_popup' => $aMenuItems2Methods,
             ),
 
             // some language keys

modules/boonex/convos/classes/BxCnvMenuViewActions.php

@@ -0,0 +1,24 @@
+<?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);
+    }
+}
+
+/** @} */

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

@@ -47,8 +47,9 @@
     <string name="_bx_cnv_page_block_title_folder"><![CDATA[Folder: {folder}]]></string>
     <string name="_bx_cnv_page_block_title_convos"><![CDATA[Conversations]]></string>
 
-    <string name="_bx_cnv_menu_set_title_view_entry"><![CDATA[View conversation]]></string>
-    <string name="_bx_cnv_menu_title_view_entry"><![CDATA[View conversation]]></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_popup"><![CDATA[Conversation Popup Actions]]></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_title_folders_more"><![CDATA[Conversations folders]]></string>

modules/boonex/convos/install/sql/enable.sql

@@ -54,7 +54,8 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbo
 -- 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 
-('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', '_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');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_convos_view', 'bx_convos', '_bx_cnv_menu_set_title_view_entry', 0);
@@ -105,7 +106,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- MENU: add menu item to profiles modules actions menu (trigger* menu sets are processed separately upon modules enable/disable)
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('trigger_profile_view_actions', 'bx_convos', 'convos-compose', '_bx_cnv_menu_item_title_system_message', '_bx_cnv_menu_item_title_message', 'page.php?i=start-convo&profiles={profile_id}', '', '', 'envelope', '', 2147483647, 1, 0, 0);
+('trigger_profile_view_actions', 'bx_convos', 'convos-compose', '_bx_cnv_menu_item_title_system_message', '_bx_cnv_menu_item_title_message', 'page.php?i=start-convo&profiles={profile_id}', '', '', 'envelope', '', 2147483646, 1, 0, 0);
 
 -- GRID
 

modules/boonex/english/data/langs/system/en.xml

@@ -1819,6 +1819,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_set_title_toolbar_member"><![CDATA[Toolbar Member]]></string>
 	<string name="_sys_menu_set_title_toolbar_site"><![CDATA[Toolbar Site]]></string>
 	<string name="_sys_menu_template_title_buttons_hor"><![CDATA[Horizontal Buttons]]></string>
+	<string name="_sys_menu_template_title_buttons_ver"><![CDATA[Vertical Buttons]]></string>
 	<string name="_sys_menu_template_title_floating_blocks"><![CDATA[Floating Blocks]]></string>
 	<string name="_sys_menu_template_title_floating_blocks_big"><![CDATA[Floating Blocks Big]]></string>
 	<string name="_sys_menu_template_title_footer"><![CDATA[Footer Links]]></string>

modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -80,6 +80,7 @@ class BxOrgsConfig extends BxBaseModProfileConfig
             '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_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_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
@@ -95,6 +96,7 @@ class BxOrgsConfig extends BxBaseModProfileConfig
             'MENU_ITEM_TO_METHOD' => array (
                 'bx_organizations_view_actions' => $aMenuItems2Methods,
                 'bx_organizations_view_actions_more' => $aMenuItems2Methods,
+                'bx_organizations_view_actions_popup' => $aMenuItems2Methods,
             ),
 
             // informer messages

modules/boonex/organizations/classes/BxOrgsMenuViewActions.php

@@ -0,0 +1,25 @@
+<?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);
+    }
+}
+
+/** @} */

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

@@ -95,6 +95,7 @@
     <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_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_title_view_profile_submenu"><![CDATA[View Organization Submenu]]></string>
     <string name="_bx_orgs_menu_title_view_profile_submenu_cover"><![CDATA[Organization Cover Submenu]]></string>

modules/boonex/organizations/install/sql/enable.sql

@@ -143,7 +143,8 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- MENU: view actions
 
 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', '_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');
 
 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);
@@ -151,7 +152,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('bx_organizations_view_actions', 'bx_organizations', 'profile-friend-add', '_bx_orgs_menu_item_title_system_befriend', '{title_add_friend}', 'javascript:void(0)', 'bx_conn_action(this, \'sys_profiles_friends\', \'add\', \'{profile_id}\')', '', 'user-plus', '', 2147483647, 1, 0, 10),
 ('bx_organizations_view_actions', 'bx_organizations', 'profile-subscribe-add', '_bx_orgs_menu_item_title_system_subscribe', '_bx_orgs_menu_item_title_subscribe', 'javascript:void(0)', 'bx_conn_action(this, \'sys_profiles_subscriptions\', \'add\', \'{profile_id}\')', '', 'check', '', 2147483647, 1, 0, 20),
-('bx_organizations_view_actions', 'bx_organizations', 'profile-set-acl-level', '_sys_menu_item_title_system_set_acl_level', '_sys_menu_item_title_set_acl_level', 'javascript:void(0)', 'bx_menu_popup(''sys_set_acl_level'', window, {}, {profile_id: {profile_id}});', '', 'certificate', '', 192, 1, 0, 1000),
+('bx_organizations_view_actions', 'bx_organizations', 'profile-set-acl-level', '_sys_menu_item_title_system_set_acl_level', '_sys_menu_item_title_set_acl_level', 'javascript:void(0)', 'bx_menu_popup(''sys_set_acl_level'', window, {}, {profile_id: {profile_id}});', '', 'certificate', '', 192, 1, 0, 30),
 ('bx_organizations_view_actions', 'bx_organizations', 'profile-actions-more', '_bx_orgs_menu_item_title_system_more_actions', '_bx_orgs_menu_item_title_more_actions', 'javascript:void(0)', 'bx_menu_popup(''bx_organizations_view_actions_more'', this, {}, {profile_id:{profile_id}});', '', 'cog', 'bx_organizations_view_actions_more', 2147483647, 1, 0, 9999);
 
 -- MENU: view actions more

modules/boonex/persons/classes/BxPersonsConfig.php

@@ -80,6 +80,7 @@ class BxPersonsConfig extends BxBaseModProfileConfig
             '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_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_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
@@ -95,6 +96,7 @@ class BxPersonsConfig extends BxBaseModProfileConfig
             'MENU_ITEM_TO_METHOD' => array (
                 'bx_persons_view_actions' => $aMenuItems2Methods,
                 'bx_persons_view_actions_more' => $aMenuItems2Methods,
+                'bx_persons_view_actions_popup' => $aMenuItems2Methods,
             ),
 
             // informer messages

modules/boonex/persons/classes/BxPersonsMenuViewActions.php

@@ -0,0 +1,25 @@
+<?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);
+    }
+}
+
+/** @} */

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

@@ -90,6 +90,7 @@
     <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_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_title_view_profile_submenu"><![CDATA[View Person Submenu]]></string>
     <string name="_bx_persons_menu_title_view_profile_submenu_cover"><![CDATA[Person Cover Submenu]]></string>

modules/boonex/persons/install/sql/enable.sql

@@ -138,7 +138,8 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- MENU: view actions
 
 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', '_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');
 
 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);
@@ -146,7 +147,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('bx_persons_view_actions', 'bx_persons', 'profile-friend-add', '_bx_persons_menu_item_title_system_befriend', '{title_add_friend}', 'javascript:void(0)', 'bx_conn_action(this, \'sys_profiles_friends\', \'add\', \'{profile_id}\')', '', 'user-plus', '', 2147483647, 1, 0, 10),
 ('bx_persons_view_actions', 'bx_persons', 'profile-subscribe-add', '_bx_persons_menu_item_title_system_subscribe', '_bx_persons_menu_item_title_subscribe', 'javascript:void(0)', 'bx_conn_action(this, \'sys_profiles_subscriptions\', \'add\', \'{profile_id}\')', '', 'check', '', 2147483647, 1, 0, 20),
-('bx_persons_view_actions', 'bx_persons', 'profile-set-acl-level', '_sys_menu_item_title_system_set_acl_level', '_sys_menu_item_title_set_acl_level', 'javascript:void(0)', 'bx_menu_popup(''sys_set_acl_level'', window, {}, {profile_id: {profile_id}});', '', 'certificate', '', 192, 1, 0, 1000),
+('bx_persons_view_actions', 'bx_persons', 'profile-set-acl-level', '_sys_menu_item_title_system_set_acl_level', '_sys_menu_item_title_set_acl_level', 'javascript:void(0)', 'bx_menu_popup(''sys_set_acl_level'', window, {}, {profile_id: {profile_id}});', '', 'certificate', '', 192, 1, 0, 30),
 ('bx_persons_view_actions', 'bx_persons', 'profile-actions-more', '_bx_persons_menu_item_title_system_more_actions', '_bx_persons_menu_item_title_more_actions', 'javascript:void(0)', 'bx_menu_popup(''bx_persons_view_actions_more'', this, {}, {profile_id:{profile_id}});', '', 'cog', 'bx_persons_view_actions_more', 2147483647, 1, 0, 9999);
 
 -- MENU: view actions more

modules/boonex/posts/classes/BxPostsConfig.php

@@ -15,6 +15,11 @@ class BxPostsConfig extends BxBaseModTextConfig
     {
         parent::__construct($aModule);
 
+        $aMenuItems2Methods = array (
+            'edit-post' => 'checkAllowedEdit',
+            'delete-post' => 'checkAllowedDelete',
+        );
+
         $this->CNF = array (
 
             // database tables
@@ -69,6 +74,7 @@ class BxPostsConfig extends BxBaseModTextConfig
             'OBJECT_FORM_ENTRY_DISPLAY_EDIT' => 'bx_posts_entry_edit',
             '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_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_SUBMENU' => 'bx_posts_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_posts_view_submenu', // view entry submenu
@@ -83,10 +89,8 @@ class BxPostsConfig extends BxBaseModTextConfig
                 'bx_posts_my' => array (
                     'create-post' => 'checkAllowedAdd',
                 ),
-                'bx_posts_view' => array (
-                    'edit-post' => 'checkAllowedEdit',
-                    'delete-post' => 'checkAllowedDelete',
-                ),
+                'bx_posts_view' => $aMenuItems2Methods,
+                'bx_posts_view_popup' => $aMenuItems2Methods,
             ),
 
             // some language keys

modules/boonex/posts/classes/BxPostsMenuViewActions.php

@@ -0,0 +1,24 @@
+<?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);
+    }
+}
+
+/** @} */

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

@@ -94,8 +94,9 @@
 	<string name="_bx_posts_page_block_title_manage"><![CDATA[Manage Posts]]></string>    
 	<string name="_bx_posts_page_block_title_popular_keywords"><![CDATA[Popular Hashtags]]></string>
 
-    <string name="_bx_posts_menu_set_title_view_entry"><![CDATA[View Post]]></string>
-    <string name="_bx_posts_menu_title_view_entry"><![CDATA[View Post]]></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_popup"><![CDATA[Post Popup Actions]]></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_item_title_system_create_entry"><![CDATA[New Post]]></string>

modules/boonex/posts/install/sql/enable.sql

@@ -156,7 +156,8 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- 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 
-('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', '_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');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_posts_view', 'bx_posts', '_bx_posts_menu_set_title_view_entry', 0);

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

@@ -103,8 +103,9 @@
 	<string name="_bx_albums_page_block_title_popular_keywords_media"><![CDATA[Популярные Хэштеги Изображений]]></string>
 	<string name="_bx_albums_page_block_title_popular_keywords_media_camera"><![CDATA[Популярные Фотокамеры]]></string>
 
-    <string name="_bx_albums_menu_set_title_view_entry"><![CDATA[Просмотреть альбом]]></string>
-    <string name="_bx_albums_menu_title_view_entry"><![CDATA[Просмотреть альбом]]></string>
+    <string name="_bx_albums_menu_set_title_view_entry"><![CDATA[Действия для альбома]]></string>
+    <string name="_bx_albums_menu_title_view_entry"><![CDATA[Действия для альбома]]></string>
+    <string name="_bx_albums_menu_title_view_entry_popup"><![CDATA[Всплывающие действия для альбома]]></string>
     <string name="_bx_albums_menu_title_submenu"><![CDATA[Альбомы - Подменю]]></string>
     <string name="_bx_albums_menu_set_title_submenu"><![CDATA[Альбомы - Подменю]]></string>
     <string name="_bx_albums_menu_item_title_system_create_entry"><![CDATA[Новый альбом]]></string>

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

@@ -47,8 +47,9 @@
     <string name="_bx_cnv_page_block_title_folder"><![CDATA[Папка: {folder}]]></string>
     <string name="_bx_cnv_page_block_title_convos"><![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_set_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_set_title_submenu"><![CDATA[Переписка - Подменю]]></string>
     <string name="_bx_cnv_menu_title_folders_more"><![CDATA[Переписка - Папки]]></string>

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

@@ -94,6 +94,7 @@
     <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_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_title_view_profile_submenu"><![CDATA[Подменю просмотра организации]]></string>
     <string name="_bx_orgs_menu_title_view_profile_submenu_cover"><![CDATA[Подменю организации на обложке]]></string>

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

@@ -90,6 +90,7 @@
     <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_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_title_view_profile_submenu"><![CDATA[Подменю просмотра персоны]]></string>
     <string name="_bx_persons_menu_title_view_profile_submenu_cover"><![CDATA[Подменю персоны на обложке]]></string>

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

@@ -94,8 +94,9 @@
 	<string name="_bx_posts_page_block_title_manage"><![CDATA[Управление Публикациями]]></string>    
 	<string name="_bx_posts_page_block_title_popular_keywords"><![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_set_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_set_title_submenu"><![CDATA[Публикации - Подменю]]></string>
     <string name="_bx_posts_menu_item_title_system_create_entry"><![CDATA[Новая публикация]]></string>

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

@@ -1819,6 +1819,7 @@
 	<string name="_sys_menu_set_title_toolbar_member"><![CDATA[Панель Инструментов - Пользователь]]></string>
 	<string name="_sys_menu_set_title_toolbar_site"><![CDATA[Панель Инструментов - Сайт]]></string>
 	<string name="_sys_menu_template_title_buttons_hor"><![CDATA[Горизонтальные Кнопки]]></string>
+	<string name="_sys_menu_template_title_buttons_ver"><![CDATA[Вертикальные Кнопки]]></string>
 	<string name="_sys_menu_template_title_floating_blocks"><![CDATA[Подвесные Блоки]]></string>
 	<string name="_sys_menu_template_title_floating_blocks_big"><![CDATA[Подвесные Блоки - Большие]]></string>
 	<string name="_sys_menu_template_title_footer"><![CDATA[Футер - Ссылки]]></string>

template/css/menu.css

@@ -462,6 +462,7 @@ li.bx-menu-inter-hidden {
 
 /* --------------- horizontal buttons menu */
 
+ul.bx-menu-btns-ver,
 ul.bx-menu-btns-hor {
 	padding:0;
     margin:0;
@@ -473,6 +474,13 @@ ul.bx-menu-btns-hor li {
     display:inline-block;
 	vertical-align: bottom;
 }
+ul.bx-menu-btns-ver li {
+    text-align:center;
+}
+ul.bx-menu-btns-ver li .bx-btn {
+    float:none;
+    display:inline-block;
+}
 
 /* --------------- account popup menu */