Merge branch 'master' of https://github.com/unaio/una

install/sql/system.sql

@@ -114,6 +114,7 @@ CREATE TABLE `sys_objects_captcha` (
 );
 
 INSERT INTO `sys_objects_captcha` (`object`, `title`, `override_class_name`, `override_class_file`) VALUES
+('sys_recaptcha', 'reCAPTCHA', 'BxTemplCaptchaReCAPTCHA', ''),
 ('sys_recaptcha_new', 'reCAPTCHA New', 'BxTemplCaptchaReCAPTCHANew', ''),
 ('sys_recaptcha_invisible', 'reCAPTCHA Invisible', 'BxTemplCaptchaReCAPTCHAInvisible', '');
 
@@ -4041,7 +4042,7 @@ INSERT INTO `sys_menu_templates` (`id`, `template`, `title`, `visible`) VALUES
 (5, 'menu_toolbar.html', '_sys_menu_template_title_toolbar', 0),
 (6, 'menu_vertical.html', '_sys_menu_template_title_ver', 1),
 (7, 'menu_floating_blocks.html', '_sys_menu_template_title_floating_blocks', 1),
-(8, 'menu_main_submenu.html', '_sys_menu_template_title_main_submenu', 8),
+(8, 'menu_main_submenu.html', '_sys_menu_template_title_main_submenu', 0),
 (9, 'menu_buttons_hor.html', '_sys_menu_template_title_buttons_hor', 1),
 (10, 'menu_inline.html', '_sys_menu_template_title_inline', 1),
 (11, 'menu_interactive_vertical.html', '_sys_menu_template_title_interactive_vertical', 0),
@@ -4051,7 +4052,7 @@ INSERT INTO `sys_menu_templates` (`id`, `template`, `title`, `visible`) VALUES
 (15, 'menu_custom_hor.html', '_sys_menu_template_title_custom_hor', 0),
 (16, 'menu_buttons_ver.html', '_sys_menu_template_title_buttons_ver', 1),
 (17, 'menu_inline_sbtn.html', '_sys_menu_template_title_inline_sbtn', 1),
-(18, 'menu_main_submenu_more_auto.html', '_sys_menu_template_title_main_submenu_more_auto', 8),
+(18, 'menu_main_submenu_more_auto.html', '_sys_menu_template_title_main_submenu_more_auto', 0),
 (19, 'menu_floating_blocks_wide.html', '_sys_menu_template_title_floating_blocks_wide', 0),
 (20, 'menu_custom_ver.html', '_sys_menu_template_title_custom_ver', 0),
 (21, 'menu_profile_stats.html', '_sys_menu_template_title_profile_stats', 0),
@@ -4060,7 +4061,9 @@ INSERT INTO `sys_menu_templates` (`id`, `template`, `title`, `visible`) VALUES
 (24, 'menu_floating_blocks_dash.html', '_sys_menu_template_title_floating_blocks_dash', 0),
 (25, 'menu_block_submenu_hor.html', '_sys_menu_template_title_block_submenu_hor', 1),
 (26, 'menu_block_submenu_ver.html', '_sys_menu_template_title_block_submenu_ver', 1),
-(27, 'menu_profile_followings.html', '_sys_menu_template_title_profile_followings', 0);
+(27, 'menu_profile_followings.html', '_sys_menu_template_title_profile_followings', 0),
+(28, 'menu_main.html', '_sys_menu_template_title_main', 0),
+(29, 'menu_add_content.html', '_sys_menu_template_title_add_content', 0);
 
 CREATE TABLE IF NOT EXISTS `sys_objects_menu` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -4078,14 +4081,14 @@ CREATE TABLE IF NOT EXISTS `sys_objects_menu` (
 );
 
 INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES
-('sys_site', '_sys_menu_title_main', 'sys_site', 'system', 7, 0, 1, 'BxTemplMenuSite', ''),
+('sys_site', '_sys_menu_title_main', 'sys_site', 'system', 28, 0, 1, 'BxTemplMenuSite', ''),
 ('sys_homepage', '_sys_menu_title_homepage', 'sys_homepage', 'system', 7, 0, 1, 'BxTemplMenuHomepage', ''),
 ('sys_homepage_submenu', '_sys_menu_title_homepage_submenu', 'sys_homepage_submenu', 'system', 8, 0, 1, '', ''),
 ('sys_site_submenu', '_sys_menu_title_submenu', 'sys_site', 'system', 1, 0, 1, 'BxTemplMenuSubmenu', ''),
 ('sys_footer', '_sys_menu_title_footer', 'sys_footer', 'system', 2, 0, 1, 'BxTemplMenuFooter', ''),
 ('sys_toolbar_site', '_sys_menu_title_toolbar_site', 'sys_toolbar_site', 'system', 5, 0, 1, 'BxTemplMenuToolbar', ''),
 ('sys_toolbar_member', '_sys_menu_title_toolbar_member', 'sys_toolbar_member', 'system', 5, 0, 1, 'BxTemplMenuToolbar', ''),
-('sys_add_content', '_sys_menu_title_add_content', 'sys_add_content_links', 'system', 7, 0, 1, 'BxTemplMenuSite', ''),
+('sys_add_content', '_sys_menu_title_add_content', 'sys_add_content_links', 'system', 29, 0, 1, 'BxTemplMenuSite', ''),
 ('sys_add_profile', '_sys_menu_title_add_profile', 'sys_add_profile_links', 'system', 14, 0, 1, 'BxTemplMenuProfileAdd', ''),
 ('sys_add_profile_vertical', '_sys_menu_title_add_profile_vertical', 'sys_add_profile_links', 'system', 6, 0, 1, 'BxTemplMenuProfileAdd', ''),
 ('sys_account_dashboard', '_sys_menu_title_account_dashboard', 'sys_account_dashboard', 'system', 8, 0, 1, 'BxTemplMenuAccountDashboard', ''),

modules/base/payment/classes/BxBaseModPaymentGridOrders.php

@@ -206,7 +206,7 @@ class BxBaseModPaymentGridOrders extends BxTemplGrid
             )
         );
 
-        $oForm = new BxTemplStudioFormView(array());
+        $oForm = new BxTemplFormView(array());
         return $oForm->genRow($aInput);
     }
 }

modules/base/profile/classes/BxBaseModProfileTemplate.php

@@ -402,14 +402,10 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
         // generate html
         $aVars = array (
             'module' => $this->_oConfig->getName(),
-
             'id' => $aData[$CNF['FIELD_ID']],
             'content_url' => $sUrl,
             'title' => $sTitle,
-            //'menu' => BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_SUBMENU_VIEW_ENTRY_COVER'])->getCode(), // TODO: check if menu is used somewhere
-
             'action_menu' => $sActionsMenu,
-
             'bx_if:show_avatar' => array(
                 'condition' => $bShowAvatar,
                 'content' => $aShowAvatar

modules/boonex/artificer/data/template/bx_timeline/css/view.css

@@ -16,8 +16,6 @@ div.bx-tl-view-timeline div.bx-tl-items:before {
     left: 0.875rem;
     width: 4px;
     height: 100%;
-
-    background: #dddddd;
 }
 
 div.bx-tl-view-timeline div.bx-tl-item-type {
@@ -38,12 +36,10 @@ div.bx-tl-view-timeline div.bx-tl-item-circle {
     width: 2rem;
     height: 2rem;
 
-    background-color: #dddddd;
     background-clip: padding-box;
     border-radius: 2rem;
 
     text-align: center;
-    color: #999999;
 
     overflow: hidden;
 }

modules/boonex/artificer/data/template/bx_timeline/item_timeline.html

@@ -1,11 +1,11 @@
 <div id="__html_id__" class="__style_prefix__-item __class__ bx-def-thumb-size-min-height relative pb-3 md:pb-4 lg:pb-6 bx-clearfix">
     <a name="timeline-event-__id__"></a>
     <div class="__style_prefix__-item-type bx-def-media-phone-hide">
-        <div class="__style_prefix__-item-circle">
+        <div class="__style_prefix__-item-circle bg-gray-200 dark:bg-gray-700 text-gray-900 dark:text-gray-300">
             <i class="sys-icon __item_icon__"></i>
         </div>
     </div>
-    <div class="__style_prefix__-item-cnt flex flex-col rounded ring-1 ring-gray-200 dark:ring-gray-700  overflow-hidden bg-white dark:bg-gray-800 __class_content__">
+    <div class="__style_prefix__-item-cnt flex flex-col rounded ring-1 ring-gray-200 dark:ring-gray-700 overflow-hidden bg-white dark:bg-gray-800 __class_content__">
         <div class="__style_prefix__-blink-plate"></div>
         <bx_if:show_note>
             <bx_repeat:notes>

modules/boonex/artificer/data/template/system/css/default.less

@@ -15,7 +15,9 @@
 }
 
 /*--- Unit ---*/
-.bx-def-unit-alert {
+.bx-def-unit-alert,
+.bx-def-unit-alert-small,
+.bx-def-unit-alert-middle {
     .font-size(@bx-font-size-small - 2);
 }
 

modules/boonex/artificer/data/template/system/css/menu.css

@@ -9,6 +9,10 @@ import url(../../../../../../../template/css/menu.css);
     color: #000;
 }
 
+.bx-menu-custom.bx-menu-custom-hor.bx-menu-more-auto .bx-menu-item {
+    padding: 0 0.5rem;
+}
+
 /* --- Vertical, Vertical lite, Custom Vertical Menus ---*/
 .bx-menu-ver li,
 .bx-menu-verlit li,
@@ -41,9 +45,9 @@ li.bx-menu-inter-hidden {
     text-decoration:none;
 }
 
-/*--- Top Menu ---*/
-.bx-sliding-smenu-main .bx-arr-menu-floating-blocks {
-    flex-wrap: nowrap;
+/*--- Toolbar Menu ---*/
+.bx-menu-toolbar .bx-menu-toolbar-item.bx-menu-item-account {
+    padding: 0;
 }
 
 /*--- Account Popup ---*/

modules/boonex/artificer/data/template/system/menu_add_content.html

@@ -0,0 +1 @@
+<bx_include_auto:menu_main.html />

modules/boonex/artificer/data/template/system/menu_floating_blocks.html

@@ -1,11 +1,11 @@
-<ul id="__html_id__" class="bx-arr-menu-floating-blocks<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-wrap">
-    <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ rounded __class_add__">
-        <a href="__link__" onclick="__onclick__" class="flex flex-row items-center text-gray-600 dark:text-gray-300 dark:hover:bg-gray-700 hover:bg-gray-100 hover:text-gray-700 dark:hover:text-white px-3 py-2 rounded text-sm font-medium"__attrs__>
-            <div class="bx-menu-floating-blocks-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>
+<ul id="__html_id__" class="bx-menu-floating-blocks<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-wrap">
+    <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ w-20 rounded __class_add__">
+        <a href="__link__" onclick="__onclick__" class="flex flex-col items-center text-gray-600 dark:text-gray-300 dark:hover:bg-gray-700 hover:bg-gray-100 hover:text-gray-700 dark:hover:text-white px-3 py-2 rounded text-sm font-medium"__attrs__>
+            <div class="bx-menu-floating-blocks-icon m-2">
+                <bx_if:icon><i class="sys-icon __icon__ block w-8 h-8 leading-8 text-3xl text-center"></i></bx_if:icon>
+                <bx_if:image><img class="block w-8 h-8" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
             </div>
-            <div class="bx-menu-floating-blocks-title ml-1">__title__</div>
+            <div class="bx-menu-floating-blocks-title">__title__</div>
         </a>__popup__
     </li></bx_repeat:menu_items>
 </ul>

modules/boonex/artificer/data/template/system/menu_item_addon.html

@@ -1 +1 @@
-<span class="bx-menu-item-addon bx-def-unit-alert w-4 h-4 leading-4 p-1 bg-red-600 box-content">__content__</span>
+<span class="bx-menu-item-addon bx-def-unit-alert w-4 h-4 -top-1.5 -right-1.5 leading-4 p-0.5 bg-red-600 box-content">__content__</span>

modules/boonex/artificer/data/template/system/menu_loading.html

@@ -1,4 +1,4 @@
-<div id="bx-sliding-menu-loading" class="bx-sliding-menu bx-sliding-menu-fullheight bx-def-z-index-nav bx-def-color-bg-block" style="display:none; opacity:1;">
+<div id="bx-sliding-menu-loading" class="bx-sliding-menu bx-sliding-menu-fullheight bx-def-z-index-nav bg-gray-50 dark:bg-gray-800" style="display:none; opacity:1;">
     <div class="bx-def-centered">
         <a class="bx-sliding-menu-close mt-2 mr-4 text-3xl" href="javascript:void(0);" onclick="bx_menu_slide_inline($(this).parents('.bx-sliding-menu:visible:first'))"><i class="sys-icon times"></i></a>
         <div class="bx-sliding-menu-cnt p-4">

modules/boonex/artificer/data/template/system/menu_main.html

@@ -0,0 +1,18 @@
+<ul id="__html_id__" class="bx-menu-main<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex flex-nowrap">
+    <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ rounded __class_add__">
+        <a href="__link__" onclick="__onclick__" class="flex flex-row items-center text-gray-600 dark:text-gray-300 dark:hover:bg-gray-700 hover:bg-gray-100 hover:text-gray-700 dark:hover:text-white px-3 py-2 rounded text-sm font-medium"__attrs__>
+            <div class="bx-menu-floating-blocks-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>
+            <div class="bx-menu-floating-blocks-title ml-1">__title__</div>
+        </a>__popup__
+    </li></bx_repeat:menu_items>
+</ul>
+<script language="javascript">
+    $(document).ready(function () {
+        // add default class to active menu items
+        $('.bx-menu-floating-blocks > li.bx-menu-tab-active').not('.bx-def-color-bg-active').addClass('bx-def-color-bg-active');
+    });
+</script>
+__js_code__

modules/boonex/artificer/data/template/system/menu_main_submenu.html

@@ -1,5 +1,5 @@
-<ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-menu-object-__object__ flex">
+<ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-menu-object-__object__ flex py-2 overflow-x-auto">
     <bx_repeat:menu_items>
-        <li class="bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover __class_add__"><a href="__link__" onclick="__onclick__"__attrs__>__title__</a></li>
+        <li class="bx-menu-item bx-menu-item-__name__ __class_add__ text-gray-600 dark:text-gray-300 hover:text-gray-700 dark:hover:text-white hover:bg-gray-100 dark:hover:bg-gray-700 px-3 py-2 rounded text-sm font-medium whitespace-nowrap"><a href="__link__" onclick="__onclick__"__attrs__>__title__</a></li>
     </bx_repeat:menu_items>
 </ul>

modules/boonex/artificer/data/template/system/menu_main_submenu_bar.html

@@ -1,6 +1,6 @@
 <div id="bx-menu-main-bar-wrapper">
     <div id="bx-menu-main-bar" class="bx-menu-main-bar __class__ bg-white dark:bg-gray-800 shadow-sm ring-1 ring-gray-200 dark:ring-gray-800">
-        <div class="bx-def-page-width mx-auto px-3 md:px-4 lg:px-6 py-2 box-border">
+        <div class="bx-def-page-width mx-auto px-3 md:px-4 lg:px-6 box-border">
             <bx_injection:injection_top_menu_before />
             __code__
             <bx_injection:injection_top_menu_after />

modules/boonex/artificer/data/template/system/menu_main_submenu_more_auto.html

@@ -0,0 +1,6 @@
+<ul id="__html_id__" class="bx-menu-main-submenu<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex py-2 bx-clearfix">
+    <bx_repeat:menu_items>
+        <li class="bx-menu-item bx-menu-item-__name__ __class_add__ text-gray-600 dark:text-gray-300 hover:text-gray-700 dark:hover:text-white hover:bg-gray-100 dark:hover:bg-gray-700 px-3 py-2 rounded text-sm font-medium whitespace-nowrap"><a href="__link__" onclick="__onclick__"__attrs__>__title__</a>__popup__</li>
+    </bx_repeat:menu_items>
+</ul>
+__js_code__

modules/boonex/artificer/data/template/system/menu_toolbar.html

@@ -1,6 +1,6 @@
 <ul class="bx-menu-toolbar bx-menu-object-__object__ flex items-center pr-2 sm:pr-0">
     <bx_repeat:menu_items>
-        <li id="bx-menu-toolbar-item-__name__" class="bx-menu-toolbar-item bx-menu-item-__name__ dark:bg-gray-800 dark:hover:bg-gray-700 hover:bg-gray-100 p-1.5 rounded-full text-gray-400 hover:text-gray-600 dark:hover:text-gray-100 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-white __class_add__">
+        <li id="bx-menu-toolbar-item-__name__" class="bx-menu-toolbar-item bx-menu-item-__name__ group relative flex items-center justify-center w-8 h-8 mx-1 bg-gray-100 hover:bg-gray-200 dark:bg-gray-700 dark:hover:bg-gray-600 rounded-full text-gray-400 hover:text-gray-600 dark:hover:text-gray-100 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-white __class_add__">
             <a href="__link__" onclick="__onclick__" class=""__attrs__><bx_if:icon><span class="relative block h-6 w-6 text-center"><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:icon-a><i class="sys-icon-a" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a><bx_if:image><img class="" src="__icon_url__" /></bx_if:image><bx_if:unit><div class="bx-menu-toolbar-item-unit">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon><bx_if:title><span class="bx-menu-toolbar-item-title sr-only">__title__</span></bx_if:title></a>
         </li>
     </bx_repeat:menu_items>

modules/boonex/artificer/template/css/tailwind.css

@@ -4,20 +4,35 @@
 @tailwind utilities;
 
 @layer components {
+    /* defaults */
+    .bx-def-hr {
+        @apply m-0 p-0 border-t border-gray-200 dark:border-gray-700;
+    }
+
+    /* common elements */
     .bx-btn {
-        @apply group block flex items-center box-border w-min h-8 px-4 rounded ring-1 ring-gray-200 dark:ring-gray-800 bg-white dark:bg-gray-900 dark:hover:bg-gray-700 shadow-sm text-gray-900 dark:text-white leading-8 text-base font-normal whitespace-nowrap;
+        @apply group relative inline-flex items-center box-border w-min h-8 px-2.5 rounded border border-gray-300 dark:border-gray-700 bg-white dark:bg-gray-800 text-base font-medium whitespace-nowrap text-gray-400 hover:text-gray-700 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-600 focus:border-blue-600;
     }
 
     .bx-btn i, 
     .bx-btn u {
-        @apply inline-block align-top;
+        @apply inline-block align-middle;
     }
 
     .bx-btn u {
-        @apply ml-2;
+        @apply ml-2 first:ml-0 no-underline;
+    }
+
+    .bx-btn.bx-btn-disabled {
+        @apply bg-gray-200 dark:bg-gray-600 hover:bg-gray-200 dark:hover:bg-gray-600 text-gray-400 hover:text-gray-400 dark:hover:text-gray-400;
     }
 
     .bx-btn.bx-btn-small {
-        @apply group block flex items-center box-border w-min h-7 px-2 rounded ring-1 ring-gray-200 dark:ring-gray-800 bg-white dark:bg-gray-900 dark:hover:bg-gray-700 shadow-sm text-gray-900 dark:text-white leading-7 text-xs font-normal whitespace-nowrap;
+        @apply group relative inline-flex items-center box-border w-min h-7 px-2 rounded border border-gray-300 dark:border-gray-700 bg-white dark:bg-gray-800 text-xs font-medium whitespace-nowrap text-gray-400 hover:text-gray-700 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-600 focus:border-blue-600;
+    }
+
+    /* Timeline */
+    .bx-tl-view.bx-tl-view-timeline .bx-tl-cnt .bx-tl-items:before {
+        @apply bg-gray-200 dark:bg-gray-700;
     }
 }

modules/boonex/channels/classes/BxCnlConfig.php

@@ -98,7 +98,6 @@ class BxCnlConfig extends BxBaseModGroupsConfig
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_channels_my', // actions menu on profile entries page
             'OBJECT_MENU_SUBMENU' => 'bx_channels_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => '',  // view entry submenu
-            'OBJECT_MENU_SUBMENU_VIEW_ENTRY_COVER' => '',  // view entry submenu displayed in cover
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_MAIN_SELECTION' => 'channels-home', // first item in view entry submenu from main module submenu
             'OBJECT_MENU_SNIPPET_META' => 'bx_channels_snippet_meta', // menu for snippet meta info
             'OBJECT_MENU_MANAGE_TOOLS' => 'bx_channels_menu_manage_tools', //manage menu in content administration tools

modules/boonex/courses/classes/BxCoursesConfig.php

@@ -124,7 +124,6 @@ class BxCoursesConfig extends BxBaseModGroupsConfig
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_courses_my', // actions menu on profile entries page
             'OBJECT_MENU_SUBMENU' => 'bx_courses_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_courses_view_submenu',  // view entry submenu
-            'OBJECT_MENU_SUBMENU_VIEW_ENTRY_COVER' => 'bx_courses_view_submenu_cover',  // view entry submenu displayed in cover
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_MAIN_SELECTION' => 'courses-home', // first item in view entry submenu from main module submenu
             'OBJECT_MENU_SNIPPET_META' => 'bx_courses_snippet_meta', // menu for snippet meta info
             'OBJECT_MENU_MANAGE_TOOLS' => 'bx_courses_menu_manage_tools', //manage menu in content administration tools

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

@@ -203,7 +203,6 @@
     <string name="_bx_courses_menu_title_view_profile_actions_more"><![CDATA[Course More Actions]]></string>
     <string name="_bx_courses_menu_set_title_view_profile_submenu"><![CDATA[View Course Submenu]]></string>
     <string name="_bx_courses_menu_title_view_profile_submenu"><![CDATA[View Course Submenu]]></string>
-    <string name="_bx_courses_menu_title_view_profile_submenu_cover"><![CDATA[Course Cover Submenu]]></string>
     <string name="_bx_courses_menu_title_entries_my"><![CDATA[Profile Courses Action Menu]]></string>
     <string name="_bx_courses_menu_set_title_entries_my"><![CDATA[Profile Courses Menu]]></string>
     <string name="_bx_courses_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>

modules/boonex/courses/install/sql/enable.sql

@@ -328,8 +328,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: view submenu
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_courses_view_submenu', '_bx_courses_menu_title_view_profile_submenu', 'bx_courses_view_submenu', 'bx_courses', 18, 0, 1, 'BxCoursesMenuView', 'modules/boonex/courses/classes/BxCoursesMenuView.php'),
-('bx_courses_view_submenu_cover', '_bx_courses_menu_title_view_profile_submenu_cover', 'bx_courses_view_submenu', 'bx_courses', 7, 0, 1, 'BxCoursesMenuView', 'modules/boonex/courses/classes/BxCoursesMenuView.php');
+('bx_courses_view_submenu', '_bx_courses_menu_title_view_profile_submenu', 'bx_courses_view_submenu', 'bx_courses', 18, 0, 1, 'BxCoursesMenuView', 'modules/boonex/courses/classes/BxCoursesMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_courses_view_submenu', 'bx_courses', '_bx_courses_menu_set_title_view_profile_submenu', 0);

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

@@ -2869,6 +2869,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_set_title_snippet_meta"><![CDATA[Snippet Meta Info]]></string>
+        <string name="_sys_menu_template_title_add_content"><![CDATA[Add Content Menu]]></string>
         <string name="_sys_menu_template_title_block_submenu_hor"><![CDATA[Horizontal Block Submenu]]></string>
         <string name="_sys_menu_template_title_block_submenu_ver"><![CDATA[Vertical Block Submenu]]></string>
 	<string name="_sys_menu_template_title_buttons_hor"><![CDATA[Horizontal Buttons]]></string>
@@ -2885,6 +2886,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_template_title_interactive"><![CDATA[Interactive Horizontal Links]]></string>
 	<string name="_sys_menu_template_title_interactive_vertical"><![CDATA[Interactive Vertical Links]]></string>
 	<string name="_sys_menu_template_title_empty"><![CDATA[Empty Menu]]></string>
+        <string name="_sys_menu_template_title_main"><![CDATA[Site Navigation Menu]]></string>
 	<string name="_sys_menu_template_title_main_submenu"><![CDATA[Site Navigation Submenu]]></string>
         <string name="_sys_menu_template_title_main_submenu_more_auto"><![CDATA[Site Navigation Submenu (with Auto More)]]></string>
 	<string name="_sys_menu_template_title_toolbar"><![CDATA[Toolbar Buttons]]></string>

modules/boonex/events/classes/BxEventsConfig.php

@@ -130,7 +130,6 @@ class BxEventsConfig extends BxBaseModGroupsConfig
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_events_my', // actions menu on profile entries page
             'OBJECT_MENU_SUBMENU' => 'bx_events_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_events_view_submenu',  // view entry submenu
-            'OBJECT_MENU_SUBMENU_VIEW_ENTRY_COVER' => 'bx_events_view_submenu_cover',  // view entry submenu displayed in cover
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_MAIN_SELECTION' => 'events-home', // first item in view entry submenu from main module submenu
             'OBJECT_MENU_SNIPPET_META' => 'bx_events_snippet_meta', // menu for snippet meta info
             'OBJECT_MENU_MANAGE_TOOLS' => 'bx_events_menu_manage_tools', //manage menu in content administration tools

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

@@ -255,10 +255,9 @@
     <string name="_bx_events_menu_title_view_profile_actions_more"><![CDATA[Event More Actions]]></string>
     <string name="_bx_events_menu_set_title_view_profile_submenu"><![CDATA[View Event Submenu]]></string>
     <string name="_bx_events_menu_title_view_profile_submenu"><![CDATA[View Event Submenu]]></string>
-    <string name="_bx_events_menu_title_view_profile_submenu_cover"><![CDATA[Event Cover Submenu]]></string>
     <string name="_bx_events_menu_title_entries_my"><![CDATA[Profile Events Action Menu]]></string>
     <string name="_bx_events_menu_set_title_entries_my"><![CDATA[Profile Events Menu]]></string>
-	<string name="_bx_events_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
+    <string name="_bx_events_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_events_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_events_menu_item_title_system_delete"><![CDATA[Delete]]></string>
     <string name="_bx_events_menu_item_title_delete"><![CDATA[Delete]]></string>

modules/boonex/events/install/sql/enable.sql

@@ -378,8 +378,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: view submenu
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_events_view_submenu', '_bx_events_menu_title_view_profile_submenu', 'bx_events_view_submenu', 'bx_events', 18, 0, 1, 'BxEventsMenuView', 'modules/boonex/events/classes/BxEventsMenuView.php'),
-('bx_events_view_submenu_cover', '_bx_events_menu_title_view_profile_submenu_cover', 'bx_events_view_submenu', 'bx_events', 7, 0, 1, 'BxEventsMenuView', 'modules/boonex/events/classes/BxEventsMenuView.php');
+('bx_events_view_submenu', '_bx_events_menu_title_view_profile_submenu', 'bx_events_view_submenu', 'bx_events', 18, 0, 1, 'BxEventsMenuView', 'modules/boonex/events/classes/BxEventsMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_events_view_submenu', 'bx_events', '_bx_events_menu_set_title_view_profile_submenu', 0);

modules/boonex/groups/classes/BxGroupsConfig.php

@@ -125,7 +125,6 @@ class BxGroupsConfig extends BxBaseModGroupsConfig
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_groups_my', // actions menu on profile entries page
             'OBJECT_MENU_SUBMENU' => 'bx_groups_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_groups_view_submenu',  // view entry submenu
-            'OBJECT_MENU_SUBMENU_VIEW_ENTRY_COVER' => 'bx_groups_view_submenu_cover',  // view entry submenu displayed in cover
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_MAIN_SELECTION' => 'groups-home', // first item in view entry submenu from main module submenu
             'OBJECT_MENU_SNIPPET_META' => 'bx_groups_snippet_meta', // menu for snippet meta info
             'OBJECT_MENU_MANAGE_TOOLS' => 'bx_groups_menu_manage_tools', //manage menu in content administration tools

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

@@ -210,10 +210,9 @@
     <string name="_bx_groups_menu_title_view_profile_actions_more"><![CDATA[Group More Actions]]></string>
     <string name="_bx_groups_menu_set_title_view_profile_submenu"><![CDATA[View Group Submenu]]></string>
     <string name="_bx_groups_menu_title_view_profile_submenu"><![CDATA[View Group Submenu]]></string>
-    <string name="_bx_groups_menu_title_view_profile_submenu_cover"><![CDATA[Group Cover Submenu]]></string>
     <string name="_bx_groups_menu_title_entries_my"><![CDATA[Profile Groups Action Menu]]></string>
     <string name="_bx_groups_menu_set_title_entries_my"><![CDATA[Profile Groups Menu]]></string>
-	<string name="_bx_groups_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
+    <string name="_bx_groups_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_groups_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_groups_menu_item_title_system_delete"><![CDATA[Delete]]></string>
     <string name="_bx_groups_menu_item_title_delete"><![CDATA[Delete]]></string>

modules/boonex/groups/install/sql/enable.sql

@@ -344,8 +344,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: view submenu
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_groups_view_submenu', '_bx_groups_menu_title_view_profile_submenu', 'bx_groups_view_submenu', 'bx_groups', 18, 0, 1, 'BxGroupsMenuView', 'modules/boonex/groups/classes/BxGroupsMenuView.php'),
-('bx_groups_view_submenu_cover', '_bx_groups_menu_title_view_profile_submenu_cover', 'bx_groups_view_submenu', 'bx_groups', 7, 0, 1, 'BxGroupsMenuView', 'modules/boonex/groups/classes/BxGroupsMenuView.php');
+('bx_groups_view_submenu', '_bx_groups_menu_title_view_profile_submenu', 'bx_groups_view_submenu', 'bx_groups', 18, 0, 1, 'BxGroupsMenuView', 'modules/boonex/groups/classes/BxGroupsMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_groups_view_submenu', 'bx_groups', '_bx_groups_menu_set_title_view_profile_submenu', 0);

modules/boonex/nexus/template/styles.html

@@ -20,7 +20,7 @@ html .bx-menu-toolbar-padding {
     padding-top:0 !important;
 }
 html #bx-toolbar-content {
-    display:none;
+    display:none !important;
 }
 html .cd-side-nav,
 html .cd-main-content .content-wrapper {
@@ -53,4 +53,10 @@ html .bx-sliding-menu-main ul.bx-menu-floating-blocks-big {
 html .bx-sliding-menu-main ul.bx-menu-floating-blocks-big {
     text-align:center;
 }
+html .cd-side-nav,
+html .bx-sliding-menu, 
+html .bx-sliding-menu-main 
+{
+    top:0 !important;
+}
 </style>

modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -151,7 +151,6 @@ class BxOrgsConfig extends BxBaseModGroupsConfig
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_organizations_my', // actions menu on profile entries 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
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_MAIN_SELECTION' => 'organizations-home', // first item in view entry submenu from main module submenu
             'OBJECT_MENU_SNIPPET_META' => 'bx_organizations_snippet_meta', // menu for snippet meta info
             'OBJECT_MENU_MANAGE_TOOLS' => 'bx_organizations_menu_manage_tools', //manage menu in content administration tools

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

@@ -261,10 +261,9 @@
     <string name="_bx_orgs_menu_title_view_profile_actions_more"><![CDATA[Organization More 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>
     <string name="_bx_orgs_menu_title_entries_my"><![CDATA[Profile Organizations Action Menu]]></string>
     <string name="_bx_orgs_menu_set_title_entries_my"><![CDATA[Profile Organizations Menu]]></string>
-	<string name="_bx_orgs_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
+    <string name="_bx_orgs_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_orgs_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_orgs_menu_item_title_system_delete"><![CDATA[Delete]]></string>
     <string name="_bx_orgs_menu_item_title_delete"><![CDATA[Delete]]></string>

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

@@ -385,8 +385,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 
 -- MENU: view submenu
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_organizations_view_submenu', '_bx_orgs_menu_title_view_profile_submenu', 'bx_organizations_view_submenu', 'bx_organizations', 18, 0, 1, 'BxOrgsMenuView', 'modules/boonex/organizations/classes/BxOrgsMenuView.php'),
-('bx_organizations_view_submenu_cover', '_bx_orgs_menu_title_view_profile_submenu_cover', 'bx_organizations_view_submenu', 'bx_organizations', 7, 0, 1, 'BxOrgsMenuView', 'modules/boonex/organizations/classes/BxOrgsMenuView.php');
+('bx_organizations_view_submenu', '_bx_orgs_menu_title_view_profile_submenu', 'bx_organizations_view_submenu', 'bx_organizations', 18, 0, 1, 'BxOrgsMenuView', 'modules/boonex/organizations/classes/BxOrgsMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_organizations_view_submenu', 'bx_organizations', '_bx_orgs_menu_set_title_view_profile_submenu', 0);

modules/boonex/payment/classes/BxPaymentFormCommissions.php

@@ -9,7 +9,7 @@
  * @{
  */
 
-class BxPaymentFormCommissions extends BxTemplStudioFormView
+class BxPaymentFormCommissions extends BxTemplFormView
 {
     protected $_sModule;
     protected $_oModule;

modules/boonex/payment/classes/BxPaymentFormView.php

@@ -9,7 +9,7 @@
  * @{
  */
 
-class BxPaymentFormView extends BxTemplStudioFormView
+class BxPaymentFormView extends BxTemplFormView
 {
     function __construct($aInfo, $oTemplate = false)
     {

modules/boonex/payment/classes/BxPaymentGridCommissions.php

@@ -51,7 +51,7 @@ class BxPaymentGridCommissions extends BxBaseModPaymentGridCommissions
         $sId = $this->_oModule->_oConfig->getHtmlIds('commission', 'popup_' . $sAction);
         $sTitle = _t($this->_sLangsPrefix . 'popup_title_cms_' . $sAction);
 
-        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
             'form_id' => $oForm->aFormAttrs['id'],
             'form' => $oForm->getCode(true),
             'object' => $this->_sObject,
@@ -95,7 +95,7 @@ class BxPaymentGridCommissions extends BxBaseModPaymentGridCommissions
         $sId = $this->_oModule->_oConfig->getHtmlIds('commission', 'popup_' . $sAction);
         $sTitle = _t($this->_sLangsPrefix . 'popup_title_cms_' . $sAction);
 
-        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
             'form_id' => $oForm->aFormAttrs['id'],
             'form' => $oForm->getCode(true),
             'object' => $this->_sObject,

modules/boonex/payment/classes/BxPaymentGridInvoices.php

@@ -52,7 +52,7 @@ class BxPaymentGridInvoices extends BxBaseModPaymentGridInvoices
         $sId = $this->_oModule->_oConfig->getHtmlIds('invoice', 'popup_' . $sAction);
         $sTitle = _t($this->_sLangsPrefix . 'popup_title_cms_' . $sAction);
 
-        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
             'form_id' => $oForm->aFormAttrs['id'],
             'form' => $oForm->getCode(true),
             'object' => $this->_sObject,

modules/boonex/payment/classes/BxPaymentGridPending.php

@@ -21,7 +21,7 @@ class BxPaymentGridPending extends BxBaseModPaymentGridOrders
         $this->_sOrdersType = 'pending';
     }
 
-	public function performActionProcess()
+    public function performActionProcess()
     {
     	$aIds = bx_get('ids');
         if(!$aIds || !is_array($aIds)) {
@@ -46,13 +46,13 @@ class BxPaymentGridPending extends BxBaseModPaymentGridOrders
 
         $oForm->initChecker();
         if($oForm->isSubmittedAndValid()) {
-        	$iId = $oForm->getCleanValue('id');
+            $iId = $oForm->getCleanValue('id');
 
-			$this->_oModule->_oDb->updateOrderPending($iId, array(
-				'order' => $oForm->getCleanValue('order'),
-				'error_code' => 0,
-				'error_msg' => 'Manually processed'
-			));
+            $this->_oModule->_oDb->updateOrderPending($iId, array(
+                'order' => $oForm->getCleanValue('order'),
+                'error_code' => 0,
+                'error_msg' => 'Manually processed'
+            ));
 
             if($this->_oModule->registerPayment($iId))
                 $aRes = array('grid' => $this->getCode(false), 'blink' => $iId);
@@ -66,22 +66,22 @@ class BxPaymentGridPending extends BxBaseModPaymentGridOrders
         $sId = $this->_oModule->_oConfig->getHtmlIds('pending', $sKey);
     	$sTitle = _t($this->_sLangsPrefix . 'popup_title_ods_' . $sKey);
 
-		$sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('order_pending_process.html', array(
-			'form_id' => $oForm->aFormAttrs['id'],
-			'form' => $oForm->getCode(true),
-			'object' => $this->_sObject,
-			'action' => $sAction
-		)));
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('order_pending_process.html', array(
+            'form_id' => $oForm->aFormAttrs['id'],
+            'form' => $oForm->getCode(true),
+            'object' => $this->_sObject,
+            'action' => $sAction
+        )));
 
-		echoJson(array('popup' => array('html' => $sContent, 'options' => array('closeOnOuterClick' => false))));
+        echoJson(array('popup' => array('html' => $sContent, 'options' => array('closeOnOuterClick' => false))));
     }
 
-	protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage)
+    protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage)
     {
     	if(empty($this->_aQueryAppend['seller_id']))
-    		return array();
+            return array();
 
-		$this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `tt`.`seller_id`=?", $this->_aQueryAppend['seller_id']);
+        $this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `tt`.`seller_id`=?", $this->_aQueryAppend['seller_id']);
 
         return parent::_getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage);
     }

modules/boonex/payment/classes/BxPaymentGridProcessed.php

@@ -116,7 +116,7 @@ class BxPaymentGridProcessed extends BxBaseModPaymentGridOrders
         $sId = $this->_oModule->_oConfig->getHtmlIds('processed', $sKey);
         $sTitle = _t($this->_sLangsPrefix . 'popup_title_ods_' . $sKey);
 
-        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('order_processed_add.html', array(
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('order_processed_add.html', array(
             'js_object' => $sJsObject,
             'form_id' => $oForm->aFormAttrs['id'],
             'form' => $oForm->getCode(true),

modules/boonex/payment/classes/BxPaymentProviderRecurly.php

@@ -9,6 +9,8 @@
  * @{
  */
 
+require_once(BX_DIRECTORY_PATH_PLUGINS . 'recurly/recurly.php');
+
 define('RCRL_MODE_LIVE', 1);
 define('RCRL_MODE_TEST', 2);
 
@@ -165,23 +167,23 @@ class BxPaymentProviderRecurly extends BxBaseModPaymentProvider implements iBxBa
         
         $sId = 'bx-payment-rcrl-card-add';
     	$sTitle = _t($this->_sLangsPrefix . 'popup_title_rcrl_card_add');
-		$sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('rcrl_card_popup_add.html', array(
-			'public_key' => $this->getOption('api_key_public'),
-			'font_family' => $aTmplConfig['bx-font-family'],
-			'font_size' => $aTmplConfig['bx-font-size-default'],
-			'font_color' => $aTmplConfig['bx-font-color-default'],
-			'form_id' => $oForm->aFormAttrs['id'],
-			'form' => $oForm->getCode(true),
-		)));
-
-		return array('popup' => array(
-			'html' => $sContent, 
-			'options' => array(
-				'closeOnOuterClick' => false, 
-				'onBeforeShow' => 'bxRecurlyFieldsInit();', 
-				'onHide' => 'bxRecurlyFieldsDestroy();'
-			)
-		));
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('rcrl_card_popup_add.html', array(
+            'public_key' => $this->getOption('api_key_public'),
+            'font_family' => $aTmplConfig['bx-font-family'],
+            'font_size' => $aTmplConfig['bx-font-size-default'],
+            'font_color' => $aTmplConfig['bx-font-color-default'],
+            'form_id' => $oForm->aFormAttrs['id'],
+            'form' => $oForm->getCode(true),
+        )));
+
+        return array('popup' => array(
+            'html' => $sContent, 
+            'options' => array(
+                'closeOnOuterClick' => false, 
+                'onBeforeShow' => 'bxRecurlyFieldsInit();', 
+                'onHide' => 'bxRecurlyFieldsDestroy();'
+            )
+        ));
     }
 
 	public function createSubscription($sToken, $sItem, $aClient)

modules/boonex/payment/classes/BxPaymentSubscriptions.php

@@ -242,7 +242,7 @@ class BxPaymentSubscriptions extends BxBaseModPaymentSubscriptions
             $sId = $this->_oModule->_oConfig->getHtmlIds('cart', 'providers_select') . BX_PAYMENT_TYPE_RECURRING;
             $sTitle = _t($CNF['T']['POPUP_PROVIDERS_SELECT']);
             return array('popup' => array(
-                'html' => BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->displayProvidersSelector($aCartItem, $aSellerProviders, $sRedirect, $aCustom)), 
+                'html' => BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->displayProvidersSelector($aCartItem, $aSellerProviders, $sRedirect, $aCustom)), 
                 'options' => array('closeOnOuterClick' => true)
             ));
         }

modules/boonex/payment/classes/BxPaymentTemplate.php

@@ -389,11 +389,31 @@ class BxPaymentTemplate extends BxBaseModPaymentTemplate
     {
         $aTmplVarsItems = array();
 
+        $oForm = new BxTemplFormView(array());
+
         if(!empty($aItems) && is_array($aItems))
             foreach($aItems as $aItem) {
+                $fPrice = $this->_oConfig->getPrice($sType, $aItem);
+
+                $aInputHidden = array(
+                    'type' => 'hidden',
+                    'name' => 'item-price-' . $aItem['id'],
+                    'value' => $fPrice
+                );
+                $aInputCheckbox = array(
+                    'type' => 'checkbox',
+                    'name' => 'items[]',
+                    'value' => $aItem['id']
+                );
+                $aInputText = array(
+                    'type' => 'text',
+                    'name' => 'item-quantity-' . $aItem['id'],
+                    'value' => 1
+                );
+
                 $aTmplVarsItems[$aItem['title']] = array(
                     'id' => $aItem['id'],
-                    'price' => $this->_oConfig->getPrice($sType, $aItem),
+                    'price' => $fPrice,
                     'bx_if:link' => array(
                         'condition' => !empty($aItem['url']),
                         'content' => array(
@@ -407,6 +427,9 @@ class BxPaymentTemplate extends BxBaseModPaymentTemplate
                             'title' => $aItem['title']
                         )
                     ),
+                    'input_hidden' => $oForm->genRow($aInputHidden),
+                    'input_checkbox' => $oForm->genRow($aInputCheckbox),
+                    'input_text' => $oForm->genRow($aInputText),
                 );
             }
 
@@ -415,11 +438,11 @@ class BxPaymentTemplate extends BxBaseModPaymentTemplate
             $aTmplVarsItems = array_values($aTmplVarsItems);
         }
         else 
-        	$aTmplVarsItems = MsgBox(_t($this->_sLangsPrefix . 'msg_no_results'));
+            $aTmplVarsItems = MsgBox(_t($this->_sLangsPrefix . 'msg_no_results'));
 
         return $this->parseHtmlByName('items.html', array(
-        	'html_id' => $this->_oConfig->getHtmlIds('processed', 'order_processed_items'),
-        	'bx_repeat:items' => $aTmplVarsItems
+            'html_id' => $this->_oConfig->getHtmlIds('processed', 'order_processed_items'),
+            'bx_repeat:items' => $aTmplVarsItems
         ));
     }
 

modules/boonex/payment/template/items.html

@@ -1,23 +1,17 @@
 <div id="__html_id__" class="bx-payment-pa-items">
-	<div class="bx-payment-pa-items-cnt">
-		<bx_repeat:items>
-		    <div class="bx-payment-pa-item bx-def-margin-thd-top-auto bx-clearfix">
-		        <div class="bx-payment-pa-item-chb">
-		            <input type="checkbox" name="items[]" value="__id__" />
-		            <input type="hidden" name="item-price-__id__" value="__price__" />
-		        </div><div class="bx-payment-pa-item-title">
-		        	<div class="bx-payment-pa-item-title-cnt bx-def-padding-sec-leftright">
-			            <bx_if:link>
-			                <a href="__url__" target="_blank" title="__title__">__title__</a>
-			            </bx_if:link>
-			            <bx_if:text>__title__</bx_if:text>
-					</div>
-		        </div><div class="bx-payment-pa-item-quantity">
-		        	<div class="bx-form-input-wrapper bx-form-input-wrapper-text">
-	                    <input type="text" class="bx-def-font-inputs bx-form-input-text" name="item-quantity-__id__" value="1" />
-	                </div>
-		        </div>
-		    </div>
-		</bx_repeat:items>
-	</div>
+    <div class="bx-payment-pa-items-cnt">
+        <bx_repeat:items>
+            <div class="bx-payment-pa-item bx-def-margin-thd-top-auto bx-clearfix">
+                <div class="bx-payment-pa-item-chb">__input_hidden____input_checkbox__</div><div class="bx-payment-pa-item-title">
+                    <div class="bx-payment-pa-item-title-cnt bx-def-padding-sec-leftright">
+                        <bx_if:link>
+                            <a href="__url__" target="_blank" title="__title__">__title__</a>
+                        </bx_if:link>
+                        <bx_if:text>__title__</bx_if:text>
+                    </div>
+                </div><div class="bx-payment-pa-item-quantity">__input_text__</div>
+                </div>
+            </div>
+        </bx_repeat:items>
+    </div>
 </div>

modules/boonex/persons/classes/BxPersonsConfig.php

@@ -118,7 +118,6 @@ class BxPersonsConfig extends BxBaseModProfileConfig
             'OBJECT_MENU_ACTIONS_VIEW_ENTRY_ALL' => 'bx_persons_view_actions_all', // all actions menu 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
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_MAIN_SELECTION' => 'persons-home', // first item in view entry submenu from main module submenu
             'OBJECT_MENU_SNIPPET_META' => 'bx_persons_snippet_meta', // menu for snippet meta info
             'OBJECT_MENU_MANAGE_TOOLS' => 'bx_persons_menu_manage_tools', //manage menu in content administration tools

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

@@ -198,8 +198,7 @@
     <string name="_bx_persons_menu_title_view_profile_actions_more"><![CDATA[Person More 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>
-	<string name="_bx_persons_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
+    <string name="_bx_persons_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_persons_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_persons_menu_item_title_system_delete"><![CDATA[Delete]]></string>
     <string name="_bx_persons_menu_item_title_delete"><![CDATA[Delete]]></string>

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

@@ -307,8 +307,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: view submenu
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_persons_view_submenu', '_bx_persons_menu_title_view_profile_submenu', 'bx_persons_view_submenu', 'bx_persons', 18, 0, 1, 'BxPersonsMenuView', 'modules/boonex/persons/classes/BxPersonsMenuView.php'),
-('bx_persons_view_submenu_cover', '_bx_persons_menu_title_view_profile_submenu_cover', 'bx_persons_view_submenu', 'bx_persons', 7, 0, 1, 'BxPersonsMenuView', 'modules/boonex/persons/classes/BxPersonsMenuView.php');
+('bx_persons_view_submenu', '_bx_persons_menu_title_view_profile_submenu', 'bx_persons_view_submenu', 'bx_persons', 18, 0, 1, 'BxPersonsMenuView', 'modules/boonex/persons/classes/BxPersonsMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_persons_view_submenu', 'bx_persons', '_bx_persons_menu_set_title_view_profile_submenu', 0);

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

@@ -202,7 +202,6 @@
     <string name="_bx_courses_menu_title_view_profile_actions_more"><![CDATA[Курс - Дополнительные действия]]></string>
     <string name="_bx_courses_menu_set_title_view_profile_submenu"><![CDATA[Подменю просмотра курсов]]></string>
     <string name="_bx_courses_menu_title_view_profile_submenu"><![CDATA[Подменю просмотра курсов]]></string>
-    <string name="_bx_courses_menu_title_view_profile_submenu_cover"><![CDATA[Подменю курсов на обложке]]></string>
     <string name="_bx_courses_menu_title_entries_my"><![CDATA[Курсы профиля - Меню действий]]></string>
     <string name="_bx_courses_menu_set_title_entries_my"><![CDATA[Курсы профиля - Меню]]></string>
     <string name="_bx_courses_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>

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

@@ -222,10 +222,9 @@
     <string name="_bx_events_menu_title_view_profile_actions_more"><![CDATA[Событие - Дополнительные действия]]></string>
     <string name="_bx_events_menu_set_title_view_profile_submenu"><![CDATA[Подменю просмотра события]]></string>
     <string name="_bx_events_menu_title_view_profile_submenu"><![CDATA[Подменю просмотра события]]></string>
-    <string name="_bx_events_menu_title_view_profile_submenu_cover"><![CDATA[Подменю события на обложке]]></string>
     <string name="_bx_events_menu_title_entries_my"><![CDATA[События профиля - Меню действий]]></string>
     <string name="_bx_events_menu_set_title_entries_my"><![CDATA[События профиля - Меню]]></string>
-	<string name="_bx_events_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
+    <string name="_bx_events_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_events_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_events_menu_item_title_system_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_events_menu_item_title_delete"><![CDATA[Удалить]]></string>

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

@@ -206,10 +206,9 @@
     <string name="_bx_groups_menu_title_view_profile_actions_more"><![CDATA[Группа - Дополнительные действия]]></string>
     <string name="_bx_groups_menu_set_title_view_profile_submenu"><![CDATA[Подменю просмотра группы]]></string>
     <string name="_bx_groups_menu_title_view_profile_submenu"><![CDATA[Подменю просмотра группы]]></string>
-    <string name="_bx_groups_menu_title_view_profile_submenu_cover"><![CDATA[Подменю группы на обложке]]></string>
     <string name="_bx_groups_menu_title_entries_my"><![CDATA[Группы профиля - Меню действий]]></string>
     <string name="_bx_groups_menu_set_title_entries_my"><![CDATA[Группы профиля - Меню]]></string>
-	<string name="_bx_groups_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
+    <string name="_bx_groups_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_groups_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_groups_menu_item_title_system_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_groups_menu_item_title_delete"><![CDATA[Удалить]]></string>

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

@@ -256,10 +256,9 @@
     <string name="_bx_orgs_menu_title_view_profile_actions_more"><![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>
     <string name="_bx_orgs_menu_title_entries_my"><![CDATA[Организации профиля - Меню действий]]></string>
     <string name="_bx_orgs_menu_set_title_entries_my"><![CDATA[Организации профиля - Меню]]></string>
-	<string name="_bx_orgs_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
+    <string name="_bx_orgs_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_orgs_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_orgs_menu_item_title_system_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_orgs_menu_item_title_delete"><![CDATA[Удалить]]></string>

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

@@ -179,7 +179,7 @@
     <string name="_bx_persons_page_block_title_sys_active_entries_view_showcase"><![CDATA[Активные профили (Витринный просмотр)]]></string>
     <string name="_bx_persons_page_block_title_active_entries_view_showcase"><![CDATA[Активные профили]]></string>
 
-	<string name="_bx_persons_menu_title_submenu"><![CDATA[Персоны - Подменю]]></string>
+    <string name="_bx_persons_menu_title_submenu"><![CDATA[Персоны - Подменю]]></string>
     <string name="_bx_persons_menu_set_title_submenu"><![CDATA[Персоны - Подменю]]></string>
     <string name="_bx_persons_menu_set_title_view_profile_actions"><![CDATA[Персоны - Действия]]></string>
     <string name="_bx_persons_menu_title_view_profile_actions"><![CDATA[Персоны - Действия]]></string>
@@ -187,8 +187,7 @@
     <string name="_bx_persons_menu_title_view_profile_actions_more"><![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>
-	<string name="_bx_persons_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
+    <string name="_bx_persons_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_persons_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_persons_menu_item_title_system_delete"><![CDATA[Удалить]]></string>
     <string name="_bx_persons_menu_item_title_delete"><![CDATA[Удалить]]></string>

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

@@ -198,7 +198,6 @@
     <string name="_bx_spaces_menu_title_view_profile_actions_more"><![CDATA[Пространство - Дополнительные действия]]></string>
     <string name="_bx_spaces_menu_set_title_view_profile_submenu"><![CDATA[Подменю просмотра пространства]]></string>
     <string name="_bx_spaces_menu_title_view_profile_submenu"><![CDATA[Подменю просмотра пространства]]></string>
-    <string name="_bx_spaces_menu_title_view_profile_submenu_cover"><![CDATA[Подменю пространства на обложке]]></string>
     <string name="_bx_spaces_menu_title_entries_my"><![CDATA[Пространства профиля - Меню действий]]></string>
     <string name="_bx_spaces_menu_set_title_entries_my"><![CDATA[Пространства профиля - Меню]]></string>
     <string name="_bx_spaces_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>

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

@@ -2852,6 +2852,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_set_title_snippet_meta"><![CDATA[Мета информация в карточке]]></string>
+        <string name="_sys_menu_template_title_add_content"><![CDATA[Добавить содержимое - Меню]]></string>
         <string name="_sys_menu_template_title_block_submenu_hor"><![CDATA[Горизонтальное подменю блолка]]></string>
         <string name="_sys_menu_template_title_block_submenu_ver"><![CDATA[Вертикальное подменю блолка]]></string>
 	<string name="_sys_menu_template_title_buttons_hor"><![CDATA[Горизонтальные кнопки]]></string>
@@ -2868,6 +2869,7 @@
 	<string name="_sys_menu_template_title_interactive"><![CDATA[Интерактивные горизонтальные ссылки]]></string>
 	<string name="_sys_menu_template_title_interactive_vertical"><![CDATA[Интерактивные вертикальные ссылки]]></string>
 	<string name="_sys_menu_template_title_empty"><![CDATA[Пустое меню]]></string>
+        <string name="_sys_menu_template_title_main"><![CDATA[Навигация по сайту - Меню]]></string>
 	<string name="_sys_menu_template_title_main_submenu"><![CDATA[Навигация по сайту - Подменю]]></string>
         <string name="_sys_menu_template_title_main_submenu_more_auto"><![CDATA[Навигация по сайту - Подменю (перестраиваемое)]]></string>
 	<string name="_sys_menu_template_title_toolbar"><![CDATA[Панель инструментов - Кнопки]]></string>

modules/boonex/spaces/classes/BxSpacesConfig.php

@@ -125,7 +125,6 @@ class BxSpacesConfig extends BxBaseModGroupsConfig
             'OBJECT_MENU_ACTIONS_MY_ENTRIES' => 'bx_spaces_my', // actions menu on profile entries page
             'OBJECT_MENU_SUBMENU' => 'bx_spaces_submenu', // main module submenu
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY' => 'bx_spaces_view_submenu',  // view entry submenu
-            'OBJECT_MENU_SUBMENU_VIEW_ENTRY_COVER' => 'bx_spaces_view_submenu_cover',  // view entry submenu displayed in cover
             'OBJECT_MENU_SUBMENU_VIEW_ENTRY_MAIN_SELECTION' => 'spaces-home', // first item in view entry submenu from main module submenu
             'OBJECT_MENU_SNIPPET_META' => 'bx_spaces_snippet_meta', // menu for snippet meta info
             'OBJECT_MENU_MANAGE_TOOLS' => 'bx_spaces_menu_manage_tools', //manage menu in content administration tools

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

@@ -179,7 +179,7 @@
 	<string name="_bx_spaces_page_block_title_system_manage_administration"><![CDATA[Manage All Spaces]]></string>
 	<string name="_bx_spaces_page_block_title_manage"><![CDATA[Manage Spaces]]></string>
 	<string name="_bx_spaces_page_block_title_top_profiles"><![CDATA[Top Spaces]]></string>
-  <string name="_bx_spaces_page_block_title_joined_profiles"><![CDATA[Joined Spaces]]></string>
+        <string name="_bx_spaces_page_block_title_joined_profiles"><![CDATA[Joined Spaces]]></string>
         <string name="_bx_spaces_page_block_title_entry_all_actions"><![CDATA[All Actions]]></string>
 	<string name="_bx_spaces_page_block_title_entry_social_sharing"><![CDATA[Share]]></string>
 	<string name="_bx_spaces_page_block_title_categories"><![CDATA[Spaces Categories]]></string>
@@ -192,9 +192,9 @@
 	<string name="_bx_spaces_page_block_title_featured_entries_view_showcase"><![CDATA[Featured Spaces]]></string>
 	<string name="_bx_spaces_page_block_title_sys_recommended_entries_view_showcase"><![CDATA[Recommended Spaces (Showcase View)]]></string>
 	<string name="_bx_spaces_page_block_title_recommended_entries_view_showcase"><![CDATA[Recommended Spaces]]></string>
-  <string name="_bx_spaces_page_block_title_top_level_spaces"><![CDATA[Top Level Spaces]]></string>
+        <string name="_bx_spaces_page_block_title_top_level_spaces"><![CDATA[Top Level Spaces]]></string>
 
-  <string name="_bx_spaces_menu_title_submenu"><![CDATA[Spaces Submenu]]></string>
+        <string name="_bx_spaces_menu_title_submenu"><![CDATA[Spaces Submenu]]></string>
 	<string name="_bx_spaces_menu_set_title_submenu"><![CDATA[Spaces Submenu]]></string>
 	<string name="_bx_spaces_menu_set_title_view_profile_actions"><![CDATA[Space Actions]]></string>
 	<string name="_bx_spaces_menu_title_view_profile_actions"><![CDATA[Space Actions]]></string>
@@ -202,7 +202,6 @@
 	<string name="_bx_spaces_menu_title_view_profile_actions_more"><![CDATA[Space More Actions]]></string>
 	<string name="_bx_spaces_menu_set_title_view_profile_submenu"><![CDATA[View Space Submenu]]></string>
 	<string name="_bx_spaces_menu_title_view_profile_submenu"><![CDATA[View Space Submenu]]></string>
-	<string name="_bx_spaces_menu_title_view_profile_submenu_cover"><![CDATA[Space Cover Submenu]]></string>
 	<string name="_bx_spaces_menu_title_entries_my"><![CDATA[Profile Spaces Action Menu]]></string>
 	<string name="_bx_spaces_menu_set_title_entries_my"><![CDATA[Profile Spaces Menu]]></string>
 	<string name="_bx_spaces_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
@@ -211,8 +210,8 @@
 	<string name="_bx_spaces_menu_item_title_delete"><![CDATA[Delete]]></string>
 	<string name="_bx_spaces_menu_item_title_system_delete_with_content"><![CDATA[Delete With Content]]></string>
 	<string name="_bx_spaces_menu_item_title_delete_with_content"><![CDATA[Delete With Content]]></string>
-  <string name="_bx_spaces_menu_item_title_system_clear_reports"><![CDATA[Clear reports]]></string>
-  <string name="_bx_spaces_menu_item_title_clear_reports"><![CDATA[Clear reports]]></string>
+        <string name="_bx_spaces_menu_item_title_system_clear_reports"><![CDATA[Clear reports]]></string>
+        <string name="_bx_spaces_menu_item_title_clear_reports"><![CDATA[Clear reports]]></string>
 	<string name="_bx_spaces_menu_item_title_system_edit_cover"><![CDATA[Edit Cover]]></string>
 	<string name="_bx_spaces_menu_item_title_edit_cover"><![CDATA[Edit Cover]]></string>
         <string name="_bx_spaces_menu_item_title_system_edit_pricing"><![CDATA[Edit Pricing]]></string>

modules/boonex/spaces/install/sql/enable.sql

@@ -332,8 +332,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: view submenu
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_spaces_view_submenu', '_bx_spaces_menu_title_view_profile_submenu', 'bx_spaces_view_submenu', 'bx_spaces', 18, 0, 1, 'BxSpacesMenuView', 'modules/boonex/spaces/classes/BxSpacesMenuView.php'),
-('bx_spaces_view_submenu_cover', '_bx_spaces_menu_title_view_profile_submenu_cover', 'bx_spaces_view_submenu', 'bx_spaces', 7, 0, 1, 'BxSpacesMenuView', 'modules/boonex/spaces/classes/BxSpacesMenuView.php');
+('bx_spaces_view_submenu', '_bx_spaces_menu_title_view_profile_submenu', 'bx_spaces_view_submenu', 'bx_spaces', 18, 0, 1, 'BxSpacesMenuView', 'modules/boonex/spaces/classes/BxSpacesMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_spaces_view_submenu', 'bx_spaces', '_bx_spaces_menu_set_title_view_profile_submenu', 0);

template/menu_add_content.html

@@ -0,0 +1 @@
+<bx_include_auto:menu_floating_blocks.html />

template/menu_main.html

@@ -0,0 +1 @@
+<bx_include_auto:menu_floating_blocks.html />