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

install/sql/v70.sql

@@ -2834,8 +2834,7 @@ INSERT INTO `sys_menu_templates` (`id`, `template`, `title`) VALUES
 (6, 'menu_vertical.html', '_sys_menu_template_title_ver'),
 (7, 'menu_floating_blocks.html', '_sys_menu_template_title_floating_blocks'),
 (8, 'menu_main_submenu.html', '_sys_menu_template_title_main_submenu'),
-(9, 'menu_action.html', '_sys_menu_template_title_action'),
-(10, 'menu_floating_circles.html', '_sys_menu_template_title_floating_circles');
+(9, 'menu_buttons_hor.html', '_sys_menu_template_title_buttons_hor');
 
 CREATE TABLE IF NOT EXISTS `sys_objects_menu` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -2856,7 +2855,6 @@ INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `templa
 ('sys_site', '_sys_menu_title_main', 'sys_site', 'system', 7, 0, 1, '', ''),
 ('sys_site_submenu', '_sys_menu_title_submenu', 'sys_site', 'system', 1, 0, 1, 'BxTemplMenuSubmenu', ''),
 ('sys_site_submenu_main', '_sys_menu_title_submenu_main', 'sys_site', 'system', 8, 0, 1, '', ''),
-('sys_site_action', '_sys_menu_title_action', 'sys_site_action', 'system', 9, 0, 1, 'BxTemplMenuAction', ''),
 ('sys_footer', '_sys_menu_title_footer', 'sys_footer', 'system', 2, 0, 1, '', ''),
 ('sys_toolbar_site', '_sys_menu_title_toolbar_site', 'sys_toolbar_site', 'system', 5, 0, 1, '', ''),
 ('sys_toolbar_member', '_sys_menu_title_toolbar_member', 'sys_toolbar_member', 'system', 5, 0, 1, 'BxTemplMenuToolbar', ''),
@@ -2875,7 +2873,6 @@ CREATE TABLE IF NOT EXISTS `sys_menu_sets` (
 
 INSERT INTO `sys_menu_sets` (`set_name`, `module`, `title`, `deletable`) VALUES
 ('sys_site', 'system', '_sys_menu_set_title_site', 0),
-('sys_site_action', 'system', '_sys_menu_set_title_action', 0),
 ('sys_footer', 'system', '_sys_menu_set_title_footer', 0),
 ('sys_toolbar_site', 'system', '_sys_menu_set_title_toolbar_site', 0),
 ('sys_toolbar_member', 'system', '_sys_menu_set_title_toolbar_member', 0),
@@ -2908,10 +2905,6 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 ('sys_site', 'system', 'home', '_sys_menu_item_title_system_home', '_sys_menu_item_title_home', 'index.php', '', '', 'home col-gray-dark', '', 2147483647, 1, 1, 1),
 ('sys_site', 'system', 'about', '_sys_menu_item_title_system_about', '_sys_menu_item_title_about', 'page.php?i=about', '', '', 'info-circle col-blue3-dark', '', 2147483647, 1, 1, 2);
 
--- action menu
-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 
-('sys_site_action', 'system', 'action', '_sys_menu_item_title_system_action', '', 'javascript:void(0);', 'bx_menu_action_toggle (this);', '', 'caret-left', '', 2147483647, 1, 0, 0);
-
 -- footer menu
 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
 ('sys_footer', 'system', 'about', '_sys_menu_item_title_system_about', '_sys_menu_item_title_about', 'page.php?i=about', '', '', '', '', 2147483647, 1, 1, 1);

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

@@ -3311,7 +3311,6 @@ More info about URI DNSBL: <br />
     <string name="_sys_menu_title_account_settings"><![CDATA[Account Settings Menu]]></string>
     <string name="_sys_menu_title_add_content"><![CDATA[Add Content Menu]]></string>
     <string name="_sys_menu_title_profiles_create"><![CDATA[Create Profiles]]></string>
-    <string name="_sys_menu_title_action"><![CDATA[Action Menu]]></string>
 
     <string name="_sys_menu_item_title_system_home"><![CDATA[Home]]></string>
     <string name="_sys_menu_item_title_system_about"><![CDATA[About]]></string>
@@ -3356,7 +3355,6 @@ More info about URI DNSBL: <br />
     <string name="_sys_menu_set_title_add_content"><![CDATA[Add Content]]></string>
     <string name="_sys_menu_set_title_account_settings"><![CDATA[Account Settings]]></string>
     <string name="_sys_menu_set_title_profile_create_links"><![CDATA[Create Profile Links]]></string>
-    <string name="_sys_menu_set_title_action"><![CDATA[Action]]></string>
 
 	<string name="_sys_menu_template_title_main"><![CDATA[Site Navigation]]></string>
     <string name="_sys_menu_template_title_main_submenu"><![CDATA[Site Navigation Submenu]]></string>
@@ -3366,8 +3364,7 @@ More info about URI DNSBL: <br />
     <string name="_sys_menu_template_title_ver_lite"><![CDATA[Vertical Links (lite)]]></string>
     <string name="_sys_menu_template_title_toolbar"><![CDATA[Toolbar Buttons]]></string>
     <string name="_sys_menu_template_title_floating_blocks"><![CDATA[Floating Blocks]]></string>
-    <string name="_sys_menu_template_title_floating_circles"><![CDATA[Floating Circles]]></string>
-    <string name="_sys_menu_template_title_action"><![CDATA[Action Menu]]></string>
+    <string name="_sys_menu_template_title_buttons_hor"><![CDATA[Horizontal Buttons]]></string>
 
     <string name="_sys_designbox_0"><![CDATA[Content only]]></string>
     <string name="_sys_designbox_1"><![CDATA[Content + title + background]]></string>

modules/boonex/notes/classes/BxNotesModule.php

@@ -153,7 +153,7 @@ class BxNotesModule extends BxDolModule {
 		if(!$oCmts->isEnabled())
 			return false;
 
-        return $oCmts->getCommentsBlock();
+        return $oCmts->getCommentsBlock(0, 0, false);
     }
 
     public function serviceEntityAuthor ($iContentId = 0) {
@@ -172,6 +172,17 @@ class BxNotesModule extends BxDolModule {
         return $this->_oTemplate->entryAuthor ($aContentInfo, $oProfile);
     }
 
+    public function serviceEntityActions ($iContentId = 0) {
+        if (!$iContentId)
+            $iContentId = bx_process_input(bx_get('id'), BX_DATA_INT);
+        if (!$iContentId)
+            return false;
+
+        bx_import('BxTemplMenu');
+        $oMenu = BxTemplMenu::getObjectInstance('bx_notes_view');
+        return $oMenu ? $oMenu->getCode() : false;
+    }
+
 	public function serviceGetTimelineData()
     {
         return array(

modules/boonex/notes/classes/BxNotesPageAuthor.php

@@ -41,13 +41,13 @@ class BxNotesPageAuthor extends BxTemplPage {
             'link' => $this->_oProfile->getUrl(),
             'icon' => $this->_oProfile->getIcon(),
         ));
-
+/*
         // set actions menu
         if (bx_get_logged_profile_id() == $iProfileId) {
             $oMenuAction = BxDolMenu::getObjectInstance('sys_site_action');
             $oMenuAction->setActionsMenu('bx_notes_my');
         }
-
+*/
         // add replaceable markers
         $this->addMarkers($this->_aProfileInfo); // every profile field can be used as marker
         $this->addMarkers(array('profile_id' => $this->_oProfile->id())); // profile id field is also suported

modules/boonex/notes/classes/BxNotesPageNote.php

@@ -34,10 +34,6 @@ class BxNotesPageNote extends BxTemplPage {
         $oMenuSumbemu = BxDolMenu::getObjectInstance('sys_site_submenu');
         $oMenuSumbemu->setObjectSubmenu('bx_notes_view_submenu', 'notes-home');
 
-        // set actions menu
-        $oMenuAction = BxDolMenu::getObjectInstance('sys_site_action');
-        $oMenuAction->setActionsMenu('bx_notes_view');
-
         $iContentId = bx_process_input(bx_get('id'), BX_DATA_INT);
         if ($iContentId)
             $this->_aContentInfo = $this->_oModule->_oDb->getContentInfoById($iContentId);

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

@@ -60,6 +60,7 @@
     <string name="_bx_notes_page_block_title_recent_notes"><![CDATA[Recent Notes]]></string>
     <string name="_bx_notes_page_block_title_note_social_sharing"><![CDATA[Share]]></string>
     <string name="_bx_notes_page_block_title_note_author"><![CDATA[Author]]></string>
+    <string name="_bx_notes_page_block_title_note_actions"><![CDATA[Actions]]></string>
     <string name="_bx_notes_page_block_title_note_comments"><![CDATA[Comments]]></string>
     <string name="_bx_notes_page_title_sys_notes_featured"><![CDATA[Featured Notes]]></string>
     <string name="_bx_notes_page_title_notes_featured"><![CDATA[Featured Notes]]></string>

modules/boonex/notes/install/sql/enable.sql

@@ -67,9 +67,10 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
 ('bx_notes_view_note', 1, 'bx_notes', '_bx_notes_page_block_title_note_author', 0, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_notes\";s:6:\"method\";s:13:\"entity_author\";}', 0, 0, 0),
-('bx_notes_view_note', 1, 'bx_notes', '_bx_notes_page_block_title_note_text', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_notes\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1),
-('bx_notes_view_note', 1, 'bx_notes', '_bx_notes_page_block_title_note_social_sharing', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_notes\";s:6:\"method\";s:21:\"entity_social_sharing\";}', 0, 0, 2),
-('bx_notes_view_note', 1, 'bx_notes', '_bx_notes_page_block_title_note_comments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_notes\";s:6:\"method\";s:15:\"entity_comments\";}', 0, 0, 3);
+('bx_notes_view_note', 1, 'bx_notes', '_bx_notes_page_block_title_note_actions', 0, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_notes\";s:6:\"method\";s:14:\"entity_actions\";}', 0, 0, 1),
+('bx_notes_view_note', 1, 'bx_notes', '_bx_notes_page_block_title_note_text', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_notes\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 2),
+('bx_notes_view_note', 1, 'bx_notes', '_bx_notes_page_block_title_note_social_sharing', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_notes\";s:6:\"method\";s:21:\"entity_social_sharing\";}', 0, 0, 3),
+('bx_notes_view_note', 1, 'bx_notes', '_bx_notes_page_block_title_note_comments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_notes\";s:6:\"method\";s:15:\"entity_comments\";}', 0, 0, 4);
 
 --
 -- Dumping data for 'bx_notes_view_note_comments' page
@@ -122,7 +123,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- Dumping data for 'bx_notes_view' menu
 --
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_notes_view', '_bx_notes_menu_title_view_note', 'bx_notes_view', 'bx_notes', 10, 0, 1, 'BxNotesMenuView', 'modules/boonex/notes/classes/BxNotesMenuView.php');
+('bx_notes_view', '_bx_notes_menu_title_view_note', 'bx_notes_view', 'bx_notes', 9, 0, 1, 'BxNotesMenuView', 'modules/boonex/notes/classes/BxNotesMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_notes_view', 'bx_notes', '_bx_notes_menu_set_title_view_note', 0);
@@ -136,7 +137,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- Dumping data for 'bx_notes_my' menu
 --
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_notes_my', '_bx_notes_menu_title_notes_my', 'bx_notes_my', 'bx_notes', 10, 0, 1, 'BxNotesMenuMy', 'modules/boonex/notes/classes/BxNotesMenuMy.php');
+('bx_notes_my', '_bx_notes_menu_title_notes_my', 'bx_notes_my', 'bx_notes', 9, 0, 1, 'BxNotesMenuMy', 'modules/boonex/notes/classes/BxNotesMenuMy.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_notes_my', 'bx_notes', '_bx_notes_menu_set_title_notes_my', 0);

modules/boonex/persons/classes/BxPersonsModule.php

@@ -168,6 +168,17 @@ class BxPersonsModule extends BxDolModule implements iBxDolProfileService {
         return $this->_oTemplate->cover($aContentInfo);
     }
 
+    public function serviceProfileActions ($iContentId = 0) {
+       if (!$iContentId)
+            $iContentId = bx_process_input(bx_get('id'), BX_DATA_INT);
+        if (!$iContentId)
+            return false;
+
+        bx_import('BxTemplMenu');
+        $oMenu = BxTemplMenu::getObjectInstance('bx_persons_view');
+        return $oMenu ? $oMenu->getCode() : false;
+    }
+
     public function serviceProfileFriends ($iContentId = 0) {
         if (!$iContentId)
             $iContentId = bx_process_input(bx_get('id'), BX_DATA_INT);

modules/boonex/persons/classes/BxPersonsPageProfile.php

@@ -56,10 +56,6 @@ class BxPersonsPageProfile extends BxTemplPage {
             'icon' => $this->_oProfile->getIcon(),
         ));
 
-        // set actions menu
-        $oMenuAction = BxDolMenu::getObjectInstance('sys_site_action');
-        $oMenuAction->setActionsMenu('bx_persons_view');        
-
         // add replaceable markers
         $this->addMarkers($this->_aProfileInfo); // every content field can be used as marker
         $this->addMarkers(array('profile_id' => $this->_oProfile->id())); // profile id field is also suported

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

@@ -63,6 +63,7 @@
 	<string name="_bx_persons_page_block_title_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_persons_page_block_title_profile_cover"><![CDATA[Profile Cover]]></string>
 	<string name="_bx_persons_page_block_title_profile_menu"><![CDATA[Menu]]></string>
+	<string name="_bx_persons_page_block_title_profile_actions"><![CDATA[Actions]]></string>
 	<string name="_bx_persons_page_block_title_latest_persons"><![CDATA[Recent Persons]]></string>
 
     <string name="_bx_persons_menu_set_title_view_person"><![CDATA[View Person]]></string>

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

@@ -68,6 +68,7 @@ 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`, `order`) VALUES 
 ('bx_persons_view_profile', 3, 'bx_persons', '_bx_persons_page_block_title_profile_friends', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:15:\"profile_friends\";}', 0, 0, 0),
 ('bx_persons_view_profile', 1, 'bx_persons', '_bx_persons_page_block_title_profile_cover', 3, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:13:\"profile_cover\";}', 0, 0, 0),
+('bx_persons_view_profile', 1, 'bx_persons', '_bx_persons_page_block_title_profile_actions', 3, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:15:\"profile_actions\";}', 0, 0, 1),
 ('bx_persons_view_profile', 2, 'bx_persons', '_bx_persons_page_block_title_profile_info', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:12:\"profile_info\";}', 0, 0, 0);
 
 --
@@ -127,7 +128,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- Dumping data for 'bx_persons_view' menu
 --
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_persons_view', '_bx_persons_menu_title_view_person', 'bx_persons_view', 'bx_persons', 10, 0, 1, 'BxPersonsMenuViewPerson', 'modules/boonex/persons/classes/BxPersonsMenuViewPerson.php');
+('bx_persons_view', '_bx_persons_menu_title_view_person', 'bx_persons_view', 'bx_persons', 9, 0, 1, 'BxPersonsMenuViewPerson', 'modules/boonex/persons/classes/BxPersonsMenuViewPerson.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_persons_view', 'bx_persons', '_bx_persons_menu_set_title_view_person', 0);

modules/boonex/uni/data/template/system/scripts/BxTemplMenuAction.php

@@ -1,22 +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    DolphinCore Dolphin Core
- * @{
- */
-
-bx_import('BxBaseMenuAction');
-
-/**
- * @see BxDolMenu
- */
-class BxTemplMenuAction extends BxBaseMenuAction {
-
-    public function __construct ($aObject, $oTemplate = false) {
-        parent::__construct ($aObject, $oTemplate);
-    }
-}
-
-/** @} */

samples/buttons.php

@@ -9,9 +9,26 @@
 
 /** 
  * @page samples
- * @section cut_strings Cut strings
+ * @section button Buttons
  */
 
+/**
+ * There are default css classes for buttons.
+ *
+ * .bx-btn - standard button
+ * .bx-btn .bx-btn-small - small buttom 
+ * 
+ * To make button with font icon, add icon before text and wrap text in 'u' tag:
+ * @code
+ *   <i class="sys-icon fire-extinguisher"></i><u>Button text</u>
+ * @endcode
+ *
+ * To make button with image, add 'img' tag before text and wrap text in 'u' tag:
+ * @code
+ *   <img src="clock.png" /><u>Button text</u>
+ * @endcode
+ */ 
+
 $aPathInfo = pathinfo(__FILE__);
 require_once ($aPathInfo['dirname'] . '/../inc/header.inc.php');
 require_once(BX_DIRECTORY_PATH_INC . "params.inc.php");
@@ -32,25 +49,31 @@ $oTemplate->getPageCode();
  */
 function PageCompMainCode() {
 
+    ob_start();
+?>
+    <button class="bx-btn bx-def-margin-right">Button text</button>
+    <button class="bx-btn bx-btn-img bx-def-margin-right"><img src="template/images/icons/clock.png" /></button>
+    <button class="bx-btn bx-btn-img bx-def-margin-right"><img src="template/images/icons/clock.png"><u>Button text</u></button>
 
-    echo '<button class="bx-btn">Button 1</button>';
-    echo '<div class="bx-clear"></div><hr class="bx-def-hr" />';
+    <div class="bx-clear"></div><hr class="bx-def-hr bx-def-margin-topbottom" />
 
-    echo '<button class="bx-btn bx-btn-img"><i style="background-image:url(template/images/icons/clock.png)"></i></button>';
-    echo '<div class="bx-clear"></div><hr class="bx-def-hr" />';
+    <button class="bx-btn bx-btn-small bx-def-margin-right">Button text</button>
+    <button class="bx-btn bx-btn-small bx-btn-img bx-def-margin-right"><img src="template/images/icons/clock.png" /></button>
+    <button class="bx-btn bx-btn-small bx-btn-img bx-def-margin-right"><img src="template/images/icons/clock.png" /><u>Button text</u></button>
 
-    echo '<button class="bx-btn bx-btn-img"><u style="background-image:url(template/images/icons/clock.png)">Button 1</u></button>';
-    echo '<div class="bx-clear"></div><hr class="bx-def-hr" />';
+    <div class="bx-clear"></div><hr class="bx-def-hr bx-def-margin-topbottom" />
 
+    <button class="bx-btn bx-def-margin-right"><i class="sys-icon fire-extinguisher"></i></button>
+    <button class="bx-btn bx-def-margin-right"><i class="sys-icon fire-extinguisher sys-icon-bigger"></i></button>
+    <button class="bx-btn bx-def-margin-right"><i class="sys-icon fire-extinguisher sys-icon-bigger col-red1"></i></button>
+    <button class="bx-btn bx-def-margin-right"><i class="sys-icon fire-extinguisher"></i><u>Button text</u></button>
 
-    echo '<button class="bx-btn bx-btn-small">Button 1</button>';
-    echo '<div class="bx-clear"></div><hr class="bx-def-hr" />';
+    <div class="bx-clear"></div><hr class="bx-def-hr bx-def-margin-topbottom" />
 
-    echo '<button class="bx-btn bx-btn-small bx-btn-img"><i style="background-image:url(template/images/icons/clock.png)"></i></button>';
-    echo '<div class="bx-clear"></div><hr class="bx-def-hr" />';
+    <button class="bx-btn bx-btn-small bx-def-margin-right"><i class="sys-icon fire-extinguisher"></i></button>
+    <button class="bx-btn bx-btn-small bx-def-margin-right"><i class="sys-icon fire-extinguisher"></i><u>Button text</u></button>
 
-    echo '<button class="bx-btn bx-btn-small bx-btn-img"><u style="background-image:url(template/images/icons/clock.png)">Button 1</u></button>';
-    echo '<div class="bx-clear"></div><hr class="bx-def-hr" />';
+<?php
 
     return DesignBoxContent("Buttons", ob_get_clean(), BX_DB_PADDING_DEF);
 }

studio/classes/BxDolStudioMenuTop.php

@@ -59,7 +59,7 @@ class BxDolStudioMenuTop extends BxDol {
             ),
             'logout' => array(
                 'name' => 'logout',
-            	'icon' => 'off',
+            	'icon' => 'power-off',
 				'link' => BX_DOL_URL_ROOT . 'logout.php',
                 'onclick' => $this->getJsObject() . ".clickLogout(this);",
                 'title' => '_adm_tmi_cpt_logout'
@@ -79,4 +79,4 @@ class BxDolStudioMenuTop extends BxDol {
         );
     }
 }
-/** @} */
+/** @} */

template/css/common.css

@@ -82,6 +82,10 @@ blockquote {
     text-decoration:underline;
 }
 
+.bx-db-menu-tab-btn a {
+    text-decoration:none;
+}
+
 /* --------------- popup boxes */
 
 .bx-popup-width {
@@ -245,15 +249,19 @@ blockquote {
 .bx-btn:first-child {
     margin-left:0;
 }
-.bx-btn i {
-    display:block;
-    min-width:16px;
-    min-height:16px;
-	font-style:normal;	
-    background-repeat:no-repeat;
-    background-position:0px 0px;
+.bx-btn img,
+.bx-btn i.sys-icon {
+    margin-right:3px;
+    vertical-align:middle;
+}
+.bx-btn img {
+    width:16px;
+    height:16px;
+}
+.bx-btn u {
+    text-decoration:none;
+    vertical-align:middle;
 }
-
 .bx-btn .sys-icon {
     vertical-align:middle;
     font-size:16px;
@@ -262,15 +270,6 @@ blockquote {
     font-size:20px;
 }
 
-.bx-btn u {
-    display:block;
-    min-width:16px;
-    min-height:16px;
-    padding-left:20px;
-    text-decoration:none;
-    background-repeat:no-repeat;
-    background-position:0px center;
-}
 
 button.bx-btn,
 input.bx-btn {    
@@ -280,6 +279,7 @@ input.bx-btn {
 }
 .bx-btn:hover {	
     color:#000;
+    text-decoration:none;
 
     border-color:#aaa #999 #888 #999;
 

template/css/default.css

@@ -312,28 +312,6 @@
 	-webkit-border-radius:3px;	
 }
 
-/* circle */
-.bx-def-circle {
-    background-color:#fff;
-/*    
-    border:2px solid #fff;
-*/
-    border-radius:50%;
-	-moz-border-radius:50%;
-	-webkit-border-radius:50%;
-/*
-    -webkit-box-shadow: 0 1px 3px rgba(51, 51, 51, 0.5);
-    -moz-box-shadow: 0 1px 3px rgba(51, 51, 51, 0.5);
-    box-shadow: 0 0px 2px rgba(51, 51, 51, 0.5);
-*/
-    overflow:hidden;
-
-    border: 1px solid #999999;
-    -webkit-box-shadow: 0 0px 3px rgba(51, 51, 51, 0.3);
-    -moz-box-shadow: 0 0px 3px rgba(51, 51, 51, 0.3);
-    box-shadow: 0 0px 3px rgba(51, 51, 51, 0.3);
-}
-
 /* fonts */
 
 /* NOTE: bx-def-font, h1, h2, h3 styles were copied to editor.css */
@@ -370,7 +348,7 @@ h1,
 
 h2,
 .bx-def-font-h2 {
-    font-size:1.7em;
+    font-size:1.6em;
     font-weight:bold;
 }
 

template/css/icons.css

@@ -1,8 +1,8 @@
 
 @font-face {
   font-family: 'sys-user';
-  src: url('../fonts/fontawesome-webfont.eot?v=4.0.1');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.1') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.1') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.1') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.1#fontawesomeregular') format('svg');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.0.2');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.0.2#iefix') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.2') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.2') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.2#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }

template/css/menu.css

@@ -322,54 +322,6 @@ ul.bx-menu-floating-blocks {
     text-align:center;
 }
 
-
-/* --------------- floating circles menu */
-
-ul.bx-menu-floating-circles {
-    padding:0;
-    margin:0;
-    list-style:none;    
-}
-
-.bx-menu-floating-circles li {
-    display:inline;
-    display:inline-block;
-    width:44px;
-    height:44px;
-    vertical-align:top;
-    opacity:0.8;
-}
-
-.bx-menu-floating-circles li:hover,
-.bx-menu-floating-circles li:active {
-    opacity:1.0;
-}
-
-.bx-menu-floating-circles li a {
-    display:block;
-    width:100%;
-    height:100%;
-    text-decoration:none;
-}
-
-.bx-menu-floating-circles li .sys-icon {
-    display:block;
-    padding:10px;
-    width:24px;
-    height:24px;
-    line-height:24px;
-    font-size:24px;
-    text-align:center;
-    vertical-align:middle;
-}
-
-.bx-menu-floating-circles li img {
-    width:100%;
-    height:100%;
-    background-position:center center;
-    background-repeat:no-repeat;
-}
-
 /* --------------- action menu */
 
 .bx-menu-action-wrapper {
@@ -444,3 +396,17 @@ li.bx-menu-inter-hidden {
 	display: none;
 }
 
+/* --------------- horizontal buttons menu */
+
+ul.bx-menu-btns-hor {
+	padding:0;
+    margin:0;
+	list-style:none;
+    text-align:center;
+}
+ul.bx-menu-btns-hor li {
+    display:inline;
+    display:inline-block;
+}
+
+

template/fonts/fontawesome-webfont.svg

@@ -280,8 +280,8 @@
 <glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
 <glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
 <glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf117;" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" />
+<glyph unicode="&#xf116;" horiz-adv-x="1792" />
+<glyph unicode="&#xf117;" horiz-adv-x="1792" />
 <glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
@@ -400,7 +400,7 @@
 <glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
 <glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf196;" horiz-adv-x="1792" />
+<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf197;" horiz-adv-x="1792" />
 <glyph unicode="&#xf198;" horiz-adv-x="1792" />
 <glyph unicode="&#xf199;" horiz-adv-x="1792" />

template/menu_action.html

@@ -1,32 +0,0 @@
-<div class="bx-menu-action-wrapper bx-clearfix">
-    <ul id="bx-menu-action" class="bx-menu-action bx-menu-object-__object__ bx-def-font-h3 bx-def-margin-sec-left bx-clearfix">
-        <bx_repeat:menu_items>
-            <li class="bx-def-circle __class_add__"><a class="bx-menu-action-toggle" href="__link__" target="__target__" onclick="__onclick__"><i class="sys-icon __icon__"></i><span>__title__</span></a></li>
-        </bx_repeat:menu_items>
-    </ul>
-    <div class="bx-menu-action-buttons">
-        __buttons__
-    </div>
-</div>
-<script language="javascript">
-    var sBxMenuActionHide = 'bx-menu-action-hide-__buttons_object__';
-
-    $(document).ready(function () {
-        if ($.cookie(sBxMenuActionHide))
-            bx_menu_action_toggle($('.bx-menu-action-toggle'), true);
-    });
-
-    function bx_menu_action_toggle (e, bForceHide) {
-        if ($('.bx-menu-action-buttons').is(':visible') || ('undefined' != typeof(bForceHide) && bForceHide)) {
-            $(e).addClass('bx-menu-action-hidden');
-            $('.bx-menu-action-buttons').animate({left:'100%', opacity:0}, bForceHide ? 0 : 1000, 'easeInOutCubic', function () {
-                $(this).hide();
-            });
-            $.cookie(sBxMenuActionHide, 1);
-        } else {
-            $(e).removeClass('bx-menu-action-hidden');
-            $('.bx-menu-action-buttons').show().animate({left:'0px', opacity:1}, 1000, 'easeInOutCubic');
-            $.removeCookie(sBxMenuActionHide);
-        }
-    }
-</script>

template/menu_buttons_hor.html

@@ -0,0 +1,11 @@
+<ul class="bx-menu-btns-hor bx-menu-object-__object__ bx-clearfix">
+    <bx_repeat:menu_items>
+        <li class="__class_add__">
+            <a class="bx-btn bx-def-margin-sec-right" href="__link__" target="__target__" onclick="__onclick__">
+                <bx_if:image><i style="background-image:url(__icon_url__)"></i></bx_if:image>
+                <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
+                <u>__title__</u>
+            </a>
+        </li>
+    </bx_repeat:menu_items>
+</ul>

template/menu_floating_circles.html

@@ -1,18 +0,0 @@
-<ul class="bx-menu-floating-circles bx-menu-object-__object__ bx-clearfix">
-    <bx_repeat:menu_items>
-        <li class="bx-def-circle bx-def-margin-sec-left __class_add__">
-            <a href="__link__" target="__target__" onclick="__onclick__" title="__title_attr__" class="bx-def-color-bg-hl-hover">
-                    <div class="bx-menu-floating-circles-icon">
-                        <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>
-            </a>                
-        </li>                
-    </bx_repeat:menu_items>
-</ul>
-<script language="javascript">
-    $(document).ready(function () {
-        // add default class to active menu items
-        $('.bx-menu-floating-circles > li.bx-menu-tab-active').not('.bx-def-color-bg-active').addClass('bx-def-color-bg-active');
-    });
-</script>

template/scripts/BxBaseCmtsView.php

@@ -94,7 +94,12 @@ class BxBaseCmtsView extends BxDolCmts {
     		'script' => $this->getScript()
     	));
 
-    	return $bInDesignbox ? DesignBoxContent($sCaption, $sContent, BX_DB_PADDING_DEF, $this->_getControlsBox()) : $sContent;
+    	return $bInDesignbox ? DesignBoxContent($sCaption, $sContent, BX_DB_PADDING_DEF, $this->_getControlsBox()) : array(
+            'title' => $sCaption, 
+            'content' => $sContent,
+            'designbox_id' => BX_DB_PADDING_DEF,
+            'menu' => $this->_getControlsBox(),
+        ); 
     }
 
     /**

template/scripts/BxBaseFunctions.php

@@ -585,12 +585,12 @@ EOF;
                     $aAttrs['onclick'] = $aButton['onclick'];
                 if (!empty($aButton['class']))
                     $aAttrs['class'] = $aButton['class'];
-                $sAttrs = bx_convert_array2attrs ($aAttrs, 'bx-btn bx-def-margin-sec-left');
+                $sAttrs = bx_convert_array2attrs ($aAttrs, 'bx-def-margin-sec-left');
 
-                $sCode .= '<button ' . $sAttrs . '>';
-                $sCode .= !empty($aButton['icon']) ? '<i class="sys-icon sys-icon-bigger ' . $aButton['icon'] . '"></i>' : '';
+                $sCode .= '<a href="javascript:void(0);" ' . $sAttrs . '>';
+                $sCode .= !empty($aButton['icon']) ? '<i class="sys-icon ' . $aButton['icon'] . ' bx-def-font-h2"></i>' : '';
                 $sCode .= !empty($aButton['title']) ? $aButton['title'] : '';
-                $sCode .= '</button>';
+                $sCode .= '</a>';
             }
             $sCode .= '</div></div>';
         }

template/scripts/BxBaseMenuAction.php

@@ -1,54 +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    DolphinCore Dolphin Core
- * @{
- */
-
-bx_import('BxTemplMenu');
-
-/**
- * Actions menu for displaying some contex actions.
- * @see BxDolMenu
- */
-class BxBaseMenuAction extends BxTemplMenu 
-{
-    protected $_sMenu = false;
-
-    public function __construct ($aObject, $oTemplate) 
-    {
-        parent::__construct ($aObject, $oTemplate);
-    }
-
-    /**
-     * Set current submenu object
-     * @param $sMenuObject menu object name
-     * @param $sForceMainMenuSelection force main menu item selection by meni item name
-     */
-    public function setActionsMenu ($sMenu)
-    { 
-        $this->_sMenu = $sMenu;
-    }
-
-    protected function _getTemplateVars () {
-        if (!$this->_sMenu)
-            return false;
-
-        $a = parent::_getTemplateVars ();
-
-        $oMenu = BxTemplMenu::getObjectInstance($this->_sMenu);
-        $sMenu = $oMenu ? $oMenu->getCode () : '';
-        if (!$sMenu)
-            return false;
-
-        $a['buttons'] = $sMenu;
-        $a['buttons_object'] = $this->_sMenu;
-        
-        return $a;
-    }
-    
-}
-
-/** @} */