Browse Source

Ticket #2496 - Point №1

AntonLV 6 years ago
parent
commit
12ffebfaec
30 changed files with 168 additions and 164 deletions
  1. 7 5
      inc/js/classes/BxDolMenuMoreAuto.js
  2. 2 1
      install/sql/system.sql
  3. 1 1
      modules/boonex/ads/install/sql/enable.sql
  4. 1 1
      modules/boonex/albums/install/sql/enable.sql
  5. 1 1
      modules/boonex/channels/install/sql/enable.sql
  6. 1 1
      modules/boonex/chat_plus/install/sql/enable.sql
  7. 1 1
      modules/boonex/courses/install/sql/enable.sql
  8. 1 1
      modules/boonex/credits/install/sql/enable.sql
  9. 45 43
      modules/boonex/english/data/langs/system/en.xml
  10. 1 1
      modules/boonex/events/install/sql/enable.sql
  11. 1 1
      modules/boonex/files/install/sql/enable.sql
  12. 1 1
      modules/boonex/forum/install/sql/enable.sql
  13. 1 1
      modules/boonex/glossary/install/sql/enable.sql
  14. 1 1
      modules/boonex/groups/install/sql/enable.sql
  15. 11 25
      modules/boonex/lucid/data/template/system/css/general.css
  16. 7 9
      modules/boonex/lucid/data/template/system/css/menu.less
  17. 28 15
      modules/boonex/lucid/data/template/system/scripts/BxTemplMenuSite.php
  18. 1 1
      modules/boonex/market/install/sql/enable.sql
  19. 1 1
      modules/boonex/organizations/install/sql/enable.sql
  20. 1 1
      modules/boonex/persons/install/sql/enable.sql
  21. 1 1
      modules/boonex/photos/install/sql/enable.sql
  22. 1 1
      modules/boonex/polls/install/sql/enable.sql
  23. 1 1
      modules/boonex/posts/install/sql/enable.sql
  24. 1 1
      modules/boonex/reviews/install/sql/enable.sql
  25. 45 43
      modules/boonex/russian/data/langs/system/ru.xml
  26. 1 1
      modules/boonex/shopify/install/sql/enable.sql
  27. 1 1
      modules/boonex/snipcart/install/sql/enable.sql
  28. 1 1
      modules/boonex/spaces/install/sql/enable.sql
  29. 1 1
      modules/boonex/videos/install/sql/enable.sql
  30. 1 1
      modules/boonex/wiki/install/sql/enable.sql

+ 7 - 5
inc/js/classes/BxDolMenuMoreAuto.js

@@ -22,6 +22,7 @@ function BxDolMenuMoreAuto(options)
     this._sClassItemStatic = 'bx-menu-item-static';
 
     this._bStaticMode = this._bItemsStaticOnly && this._iItemsStatic > 0;
+    this._bTrackContainerResize = false;
 }
 
 BxDolMenuMoreAuto.prototype.init = function() {
@@ -57,11 +58,12 @@ BxDolMenuMoreAuto.prototype.init = function() {
            $this.update();
         });
 
-        setTimeout(function () {
-            oMenu.find(this._sClassItem).on('resize', function() {
-                $this.update(true);
-            });
-        }, 200);
+        if(this._bTrackContainerResize)
+            setTimeout(function () {
+                oMenu.find(this._sClassItem).on('resize', function() {
+                    $this.update(true);
+                });
+            }, 200);
     }
 };
 

+ 2 - 1
install/sql/system.sql

@@ -4084,7 +4084,8 @@ CREATE TABLE IF NOT EXISTS `sys_menu_items` (
 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', '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),
-('sys_site', 'system', 'search', '_sys_menu_item_title_system_search', '_sys_menu_item_title_search', 'javascript:void(0);', 'bx_menu_slide_inline(\'#bx-sliding-menu-search\', this, \'site\');', '', 'search', '', 2147483647, 1, 1, 3);
+('sys_site', 'system', 'search', '_sys_menu_item_title_system_search', '_sys_menu_item_title_search', 'javascript:void(0);', 'bx_menu_slide_inline(\'#bx-sliding-menu-search\', this, \'site\');', '', 'search', '', 2147483647, 1, 1, 3),
+('sys_site', 'system', 'more-auto', '_sys_menu_item_title_system_more_auto', '_sys_menu_item_title_more_auto', 'javascript:void(0)', '', '', 'ellipsis-v', '', 2147483647, 1, 0, 9999);
 
 -- homepage submenu
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `visibility_custom`, `active`, `copyable`, `order`) VALUES

+ 1 - 1
modules/boonex/ads/install/sql/enable.sql

@@ -169,7 +169,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system` , `
 
 
 -- MENU: add to site menu
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_ads', 'ads-home', '_bx_ads_menu_item_title_system_entries_home', '_bx_ads_menu_item_title_entries_home', 'page.php?i=ads-home', '', '', 'ad col-green2', 'bx_ads_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/albums/install/sql/enable.sql

@@ -207,7 +207,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `
 ('', 0, 'bx_albums', '_bx_albums_page_block_title_sys_featured_media_view_showcase', '_bx_albums_page_block_title_featured_media_view_showcase', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:9:"bx_albums";s:6:"method";s:21:"browse_featured_media";s:6:"params";a:3:{s:9:"unit_view";s:8:"showcase";s:13:"empty_message";b:1;s:13:"ajax_paginate";b:0;}}', 0, 1, 1,@iBlockOrder + 8);
 
 -- MENU: add to site menu
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_albums', 'albums-home', '_bx_albums_menu_item_title_system_entries_home', '_bx_albums_menu_item_title_entries_home', 'page.php?i=albums-home', '', '', 'far image col-blue1', 'bx_albums_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/channels/install/sql/enable.sql

@@ -149,7 +149,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designb
 
 -- MENU: add to site menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_channels', 'channels-home', '_bx_channels_menu_item_title_system_entries_home', '_bx_channels_menu_item_title_entries_home', 'page.php?i=channels-home', '', '', 'hashtag col-red2', 'bx_channels_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/chat_plus/install/sql/enable.sql

@@ -17,7 +17,7 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `c
 
 -- Menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_chat_plus', 'chat-plus', '_bx_chat_plus_menu_item_title_system_entries_home', '_bx_chat_plus_menu_item_title_entries_home', 'page.php?i=chat-plus', '', '', 'comment-alt col-blue3', '', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/courses/install/sql/enable.sql

@@ -190,7 +190,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `
 
 -- MENU: add to site menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_courses', 'courses-home', '_bx_courses_menu_item_title_system_entries_home', '_bx_courses_menu_item_title_entries_home', 'page.php?i=courses-home', '', '', 'book-reader col-blue3-dark', 'bx_courses_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/credits/install/sql/enable.sql

@@ -68,7 +68,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 
 
 -- MENU: add to site menu
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_credits', 'credits-home', '_bx_credits_menu_item_title_system_credits', '_bx_credits_menu_item_title_credits', 'page.php?i=credits-home', '', '', 'copyright col-green3', 'bx_credits_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 45 - 43
modules/boonex/english/data/langs/system/en.xml

@@ -2506,49 +2506,50 @@ If it is not enabled then please consider implement this optimization, since it
     <string name="_sys_macros_method_or_class_not_found"><![CDATA[Error: no such macros]]></string>
     <string name="_sys_macros_required_args_missing"><![CDATA[Error: required arguments are missing]]></string>
     <string name="_sys_macros_too_many_args"><![CDATA[Error: too many arguments]]></string>
-	<string name="_sys_menu_item_title_about"><![CDATA[About]]></string>
-        <string name="_sys_menu_item_title_copyright"><![CDATA[Copyright]]></string>
-	<string name="_sys_menu_item_title_privacy"><![CDATA[Privacy]]></string>
-	<string name="_sys_menu_item_title_search"><![CDATA[Search]]></string>
-	<string name="_sys_menu_item_title_switch_language"><![CDATA[Language]]></string>
-	<string name="_sys_menu_item_title_switch_language_mask"><![CDATA[{1} {0}]]></string>
-	<string name="_sys_menu_item_title_switch_template"><![CDATA[Design]]></string>
-	<string name="_sys_menu_item_title_switch_template_mask"><![CDATA[{0}]]></string>
-	<string name="_sys_menu_item_title_terms"><![CDATA[Terms]]></string>
-	<string name="_sys_menu_item_title_account_menu"><![CDATA[{member_display_name}]]></string>
-	<string name="_sys_menu_item_title_account_profile_context"><![CDATA[Profiles]]></string>
-	<string name="_sys_menu_item_title_account_dashboard"><![CDATA[Dashboard]]></string>
-	<string name="_sys_menu_item_title_account_dashboard_administration"><![CDATA[Administration]]></string>
-	<string name="_sys_menu_item_title_account_settings"><![CDATA[Settings]]></string>
-	<string name="_sys_menu_item_title_account_settings_delete"><![CDATA[Delete]]></string>
-	<string name="_sys_menu_item_title_account_settings_email"><![CDATA[Email]]></string>
-	<string name="_sys_menu_item_title_account_settings_info"><![CDATA[Account]]></string>
-	<string name="_sys_menu_item_title_account_settings_pwd"><![CDATA[Password]]></string>
-	<string name="_sys_menu_item_title_add_content"><![CDATA[Add...]]></string>
-	<string name="_sys_menu_item_title_cart"><![CDATA[Shopping Cart]]></string>
-  <string name="_sys_menu_item_title_cmts_administration"><![CDATA[Comments]]></string>
-  <string name="_sys_menu_item_title_audit_administration"><![CDATA[Audit]]></string>
-	<string name="_sys_menu_item_title_cmts_item_delete"><![CDATA[Delete]]></string>
-	<string name="_sys_menu_item_title_cmts_item_edit"><![CDATA[Edit]]></string>
-        <string name="_sys_menu_item_title_cmts_item_pin"><![CDATA[Pin]]></string>
-        <string name="_sys_menu_item_title_cmts_item_unpin"><![CDATA[Unpin]]></string>
-        <string name="_sys_menu_item_title_cmts_item_quote"><![CDATA[]]></string>
-        <string name="_sys_menu_item_title_cmts_item_reaction"><![CDATA[]]></string>
-	<string name="_sys_menu_item_title_cmts_item_reply"><![CDATA[]]></string>
-	<string name="_sys_menu_item_title_cmts_item_score"><![CDATA[]]></string>
-	<string name="_sys_menu_item_title_cmts_item_vote"><![CDATA[]]></string>
-	<string name="_sys_menu_item_title_cmts_item_more"><![CDATA[]]></string>
-	<string name="_sys_menu_item_title_dashboard"><![CDATA[Dash]]></string>
-	<string name="_sys_menu_item_title_home"><![CDATA[Home]]></string>
-	<string name="_sys_menu_item_title_logout"><![CDATA[Sign out]]></string>
-	<string name="_sys_menu_item_title_more"><![CDATA[More]]></string>
-	<string name="_sys_menu_item_title_orders"><![CDATA[Orders]]></string>
-	<string name="_sys_menu_item_title_profile"><![CDATA[Profile]]></string>
-	<string name="_sys_menu_item_title_set_acl_level"><![CDATA[Set membership]]></string>
-  <string name="_sys_menu_item_title_set_badges"><![CDATA[Set badges]]></string>
-	<string name="_sys_menu_item_title_studio"><![CDATA[Studio]]></string>
-	<string name="_sys_menu_item_title_subscriptions"><![CDATA[Subscriptions]]></string>
-	<string name="_sys_menu_item_title_social_sharing_facebook"><![CDATA[Share in Facebook]]></string>
+    <string name="_sys_menu_item_title_about"><![CDATA[About]]></string>
+    <string name="_sys_menu_item_title_copyright"><![CDATA[Copyright]]></string>
+    <string name="_sys_menu_item_title_privacy"><![CDATA[Privacy]]></string>
+    <string name="_sys_menu_item_title_search"><![CDATA[Search]]></string>
+    <string name="_sys_menu_item_title_switch_language"><![CDATA[Language]]></string>
+    <string name="_sys_menu_item_title_switch_language_mask"><![CDATA[{1} {0}]]></string>
+    <string name="_sys_menu_item_title_switch_template"><![CDATA[Design]]></string>
+    <string name="_sys_menu_item_title_switch_template_mask"><![CDATA[{0}]]></string>
+    <string name="_sys_menu_item_title_terms"><![CDATA[Terms]]></string>
+    <string name="_sys_menu_item_title_account_menu"><![CDATA[{member_display_name}]]></string>
+    <string name="_sys_menu_item_title_account_profile_context"><![CDATA[Profiles]]></string>
+    <string name="_sys_menu_item_title_account_dashboard"><![CDATA[Dashboard]]></string>
+    <string name="_sys_menu_item_title_account_dashboard_administration"><![CDATA[Administration]]></string>
+    <string name="_sys_menu_item_title_account_settings"><![CDATA[Settings]]></string>
+    <string name="_sys_menu_item_title_account_settings_delete"><![CDATA[Delete]]></string>
+    <string name="_sys_menu_item_title_account_settings_email"><![CDATA[Email]]></string>
+    <string name="_sys_menu_item_title_account_settings_info"><![CDATA[Account]]></string>
+    <string name="_sys_menu_item_title_account_settings_pwd"><![CDATA[Password]]></string>
+    <string name="_sys_menu_item_title_add_content"><![CDATA[Add...]]></string>
+    <string name="_sys_menu_item_title_cart"><![CDATA[Shopping Cart]]></string>
+    <string name="_sys_menu_item_title_cmts_administration"><![CDATA[Comments]]></string>
+    <string name="_sys_menu_item_title_audit_administration"><![CDATA[Audit]]></string>
+    <string name="_sys_menu_item_title_cmts_item_delete"><![CDATA[Delete]]></string>
+    <string name="_sys_menu_item_title_cmts_item_edit"><![CDATA[Edit]]></string>
+    <string name="_sys_menu_item_title_cmts_item_pin"><![CDATA[Pin]]></string>
+    <string name="_sys_menu_item_title_cmts_item_unpin"><![CDATA[Unpin]]></string>
+    <string name="_sys_menu_item_title_cmts_item_quote"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_cmts_item_reaction"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_cmts_item_reply"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_cmts_item_score"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_cmts_item_vote"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_cmts_item_more"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_dashboard"><![CDATA[Dash]]></string>
+    <string name="_sys_menu_item_title_home"><![CDATA[Home]]></string>
+    <string name="_sys_menu_item_title_logout"><![CDATA[Sign out]]></string>
+    <string name="_sys_menu_item_title_more"><![CDATA[More]]></string>
+    <string name="_sys_menu_item_title_more_auto"><![CDATA[More]]></string>
+    <string name="_sys_menu_item_title_orders"><![CDATA[Orders]]></string>
+    <string name="_sys_menu_item_title_profile"><![CDATA[Profile]]></string>
+    <string name="_sys_menu_item_title_set_acl_level"><![CDATA[Set membership]]></string>
+    <string name="_sys_menu_item_title_set_badges"><![CDATA[Set badges]]></string>
+    <string name="_sys_menu_item_title_studio"><![CDATA[Studio]]></string>
+    <string name="_sys_menu_item_title_subscriptions"><![CDATA[Subscriptions]]></string>
+    <string name="_sys_menu_item_title_social_sharing_facebook"><![CDATA[Share in Facebook]]></string>
     <string name="_sys_menu_item_title_social_sharing_twitter"><![CDATA[Share in Twitter]]></string>
     <string name="_sys_menu_item_title_social_sharing_pinterest"><![CDATA[Share in Pinterest]]></string>
     <string name="_sys_menu_item_title_sm_author"><![CDATA[Author]]></string>
@@ -2616,6 +2617,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_item_title_system_logout"><![CDATA[Log out]]></string>
 	<string name="_sys_menu_item_title_system_main_menu"><![CDATA[Main Menu]]></string>
 	<string name="_sys_menu_item_title_system_more"><![CDATA[More]]></string>
+        <string name="_sys_menu_item_title_system_more_auto"><![CDATA[More]]></string>
 	<string name="_sys_menu_item_title_system_orders"><![CDATA[Orders]]></string>
 	<string name="_sys_menu_item_title_system_powered_by"><![CDATA[Powered By]]></string>
 	<string name="_sys_menu_item_title_system_profile"><![CDATA[Profile]]></string>

+ 1 - 1
modules/boonex/events/install/sql/enable.sql

@@ -250,7 +250,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designb
 
 -- MENU: add to site menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_events', 'events-home', '_bx_events_menu_item_title_system_entries_home', '_bx_events_menu_item_title_entries_home', 'page.php?i=events-home', '', '', 'calendar col-red2', 'bx_events_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/files/install/sql/enable.sql

@@ -192,7 +192,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 
 -- MENU: add to site menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_files', 'files-home', '_bx_files_menu_item_title_system_entries_home', '_bx_files_menu_item_title_entries_home', 'page.php?i=files-home', '', '', 'far file col-red3', 'bx_files_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/forum/install/sql/enable.sql

@@ -209,7 +209,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbo
 
 
 -- MENU: add to site menu
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', @sName, 'discussions-home', '_bx_forum_menu_item_title_system_entries_home', '_bx_forum_menu_item_title_entries_home', 'page.php?i=discussions-home', '', '', 'far comments col-blue2', 'bx_forum_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/glossary/install/sql/enable.sql

@@ -197,7 +197,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system` , `
 
 -- MENU: add to site menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_glossary', 'glossary-home', '_bx_glossary_menu_item_title_system_entries_home', '_bx_glossary_menu_item_title_entries_home', 'page.php?i=glossary-home', '', '', 'fa-book col-red3', 'bx_glossary_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/groups/install/sql/enable.sql

@@ -230,7 +230,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designb
 
 -- MENU: add to site menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_groups', 'groups-home', '_bx_groups_menu_item_title_system_entries_home', '_bx_groups_menu_item_title_entries_home', 'page.php?i=groups-home', '', '', 'users col-red2', 'bx_groups_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 11 - 25
modules/boonex/lucid/data/template/system/css/general.css

@@ -18,35 +18,21 @@
 }
 
 /*---Toolbar ---*/
-.bx-toolbar-content .bx-toolbar-item.bx-ti-menu {
-	height: 100%;
-
-	margin: 0px 20px;
-	margin: 0px 1.25rem;
-
-	overflow-x: auto;
-	overflow-y: hidden;
-
-	-webkit-overflow-scrolling: touch;
+.bx-toolbar-content {
+    position: relative;
 }
-#bx-toolbar-content .bx-toolbar-item.bx-ti-menu::-webkit-scrollbar {
-    width: 12px;
+.bx-toolbar-content::before,
+.bx-toolbar-content::after {
+    display: none;
 }
-#bx-toolbar-content .bx-toolbar-item.bx-ti-menu::-webkit-scrollbar-track {
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    
-    background-color: rgba(0, 0, 0, 0.4); 
+.bx-toolbar-content .bx-toolbar-item {
+    display: inline-block;
 }
-#bx-toolbar-content .bx-toolbar-item.bx-ti-menu::-webkit-scrollbar-thumb {
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
+.bx-toolbar-content .bx-toolbar-item.bx-ti-menu {
+    margin: 0;
+    padding: 0 1.25rem;
 
-    background: rgba(255, 255, 255, 0.9); 
-    -webkit-box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.5); 
-}
-#bx-toolbar-content .bx-toolbar-item.bx-ti-menu::-webkit-scrollbar-thumb:window-inactive {
-    background: rgba(255, 255, 255, 0.4); 
+    -webkit-overflow-scrolling: touch;
 }
 
 /*--- Page Submenu bar ---*/

+ 7 - 9
modules/boonex/lucid/data/template/system/css/menu.less

@@ -8,7 +8,7 @@
 
 /*--- Main (Top) Menu ---*/
 #bx-sliding-menu-sys_site.bx-sliding-smenu-main ul.bx-menu-object-sys_site {
-	display: block;
+    display: block;
     white-space: normal;
 }
 
@@ -16,7 +16,7 @@
     display: block;
     width: auto;
     height: auto;
-    margin: 0px 0.25rem;
+    margin: 0;
 }
 
 #bx-sliding-menu-sys_site.bx-sliding-smenu-main ul.bx-menu-object-sys_site > li > a {
@@ -24,7 +24,7 @@
 }
 
 #bx-sliding-menu-sys_site.bx-sliding-smenu-main ul.bx-menu-object-sys_site li:hover {
-	opacity: 1.0;
+    opacity: 1.0;
 }
 	
 
@@ -104,14 +104,12 @@
 @media only screen and (min-width: 720px) {
     #bx-sliding-menu-sys_site.bx-sliding-smenu-main {
         position: relative;
-        height: 100%;
-        overflow-x: auto;
+        height: 2.125rem;
     }
 
     #bx-sliding-menu-sys_site.bx-sliding-smenu-main .bx-sliding-menu-main-cnt {
-    	position: relative;
-        display: inline-block;
-    	height: 100%;
+    	position: absolute;
+    	width: 100%;
     }
 
     #bx-sliding-menu-sys_site.bx-sliding-smenu-main ul.bx-menu-object-sys_site {
@@ -127,7 +125,7 @@
 
     #bx-sliding-menu-sys_site.bx-sliding-smenu-main ul.bx-menu-object-sys_site li {
         position: relative;
-    	display: inline-block;
+    	display: block;
 
     	height: 2.125rem;
         border: 1px solid transparent;

+ 28 - 15
modules/boonex/lucid/data/template/system/scripts/BxTemplMenuSite.php

@@ -8,9 +8,9 @@
  */
 
 /**
- * @see BxDolMenu
+ * @see BxTemplMenuMoreAuto
  */
-class BxTemplMenuSite extends BxTemplMenu
+class BxTemplMenuSite extends BxTemplMenuMoreAuto
 {
     protected $_bSiteMenu;
     protected $_bSiteMenuSubmenu;
@@ -36,10 +36,10 @@ class BxTemplMenuSite extends BxTemplMenu
     }
 
     protected function _getMenuItem ($a)
-	{
-	    $aResult = parent::_getMenuItem($a);
-	    if(empty($aResult) || !is_array($aResult))
-	        return $aResult;
+    {
+        $aResult = parent::_getMenuItem($a);
+        if(empty($aResult) || !is_array($aResult))
+            return $aResult;
 
         $aTmplVarsSubmenu = array();
         $bTmplVarsSubmenu = $this->_bSiteMenu && $this->_bSiteMenuSubmenu && !empty($aResult['submenu_object']) && (int)$aResult['submenu_popup'] == 1;
@@ -50,22 +50,35 @@ class BxTemplMenuSite extends BxTemplMenu
         }
 
         $aResult['bx_if:show_arrow'] = array (
-        	'condition' => false && $bTmplVarsSubmenu,
-			'content' => array(),
+            'condition' => false && $bTmplVarsSubmenu,
+            'content' => array(),
         );
 
         $aResult['bx_if:show_line'] = array (
-        	'condition' => true,
-			'content' => array(),
+            'condition' => true,
+            'content' => array(),
         );
 
         $aResult['bx_if:show_submenu'] = array (
-			'condition' => $bTmplVarsSubmenu,
-			'content' => $aTmplVarsSubmenu,
-		);
+            'condition' => $bTmplVarsSubmenu,
+            'content' => $aTmplVarsSubmenu,
+        );
+
+        return $aResult;
+    }
 
-		return $aResult;
-	}
+    protected function _getJsCodeMoreAuto()
+    {
+        $sJsObject = $this->_getJsObjectMoreAuto();
+        $aJsParams = array(
+            'sObject' => $this->_sObject,
+            'iItemsStatic' => $this->_iMoreAutoItemsStatic,
+            'bItemsStaticOnly' => $this->_bMoreAutoItemsStaticOnly ? 1 : 0,
+            'aHtmlIds' => $this->_getHtmlIds()
+        );
+
+        return $this->_oTemplate->_wrapInTagJsCode("if(!" . $sJsObject . ") {var " . $sJsObject . " = new BxDolMenuMoreAuto(" . json_encode($aJsParams) . "); $(document).ready(function(){" . $sJsObject . ".init();});}");
+    }
 }
 
 /** @} */

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

@@ -235,7 +235,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 
 
 -- MENU: add to site menu
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_market', 'products-home', '_bx_market_menu_item_title_system_entries_home', '_bx_market_menu_item_title_entries_home', 'page.php?i=products-home', '', '', 'shopping-cart col-green3', 'bx_market_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

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

@@ -245,7 +245,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `
 -- MENU
 
 -- MENU: add to site menu
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_organizations', 'organizations-home', '_bx_orgs_menu_item_title_system_entries_home', '_bx_orgs_menu_item_title_entries_home', 'page.php?i=organizations-home', '', '', 'briefcase col-red2', 'bx_organizations_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

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

@@ -203,7 +203,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 
 -- MENU: add to site menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_persons', 'persons-home', '_bx_persons_menu_item_title_system_entries_home', '_bx_persons_menu_item_title_entries_home', 'page.php?i=persons-home', '', '', 'user col-blue3', 'bx_persons_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/photos/install/sql/enable.sql

@@ -187,7 +187,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 
 
 -- MENU: add to site menu
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_photos', 'photos-home', '_bx_photos_menu_item_title_system_entries_home', '_bx_photos_menu_item_title_entries_home', 'page.php?i=photos-home', '', '', 'camera-retro col-blue1', 'bx_photos_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/polls/install/sql/enable.sql

@@ -184,7 +184,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 
 
 -- MENU: add to site menu
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_polls', 'polls-home', '_bx_polls_menu_item_title_system_entries_home', '_bx_polls_menu_item_title_entries_home', 'page.php?i=polls-home', '', '', 'tasks col-green1', 'bx_polls_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

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

@@ -198,7 +198,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system` , `
 
 -- MENU: add to site menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_posts', 'posts-home', '_bx_posts_menu_item_title_system_entries_home', '_bx_posts_menu_item_title_entries_home', 'page.php?i=posts-home', '', '', 'file-alt col-red3', 'bx_posts_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/reviews/install/sql/enable.sql

@@ -207,7 +207,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system` , `
 
 -- MENU: add to site menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_reviews', 'reviews-home', '_bx_reviews_menu_item_title_system_entries_home', '_bx_reviews_menu_item_title_entries_home', 'page.php?i=reviews-home', '', '', 'address-card col-red3', 'bx_reviews_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 45 - 43
modules/boonex/russian/data/langs/system/ru.xml

@@ -2463,49 +2463,50 @@
     <string name="_sys_macros_method_or_class_not_found"><![CDATA[Ошибка: нет такого макроса]]></string>
     <string name="_sys_macros_required_args_missing"><![CDATA[Ошибка: остутствуют обязательные аргументы]]></string>
     <string name="_sys_macros_too_many_args"><![CDATA[Ошибка: слишком много аргументов]]></string>
-	<string name="_sys_menu_item_title_about"><![CDATA[О нас]]></string>
-        <string name="_sys_menu_item_title_copyright"><![CDATA[Копирайт]]></string>
-	<string name="_sys_menu_item_title_privacy"><![CDATA[Конфиденциальность]]></string>
-	<string name="_sys_menu_item_title_search"><![CDATA[Поиск]]></string>
-	<string name="_sys_menu_item_title_switch_language"><![CDATA[Язык]]></string>
-	<string name="_sys_menu_item_title_switch_language_mask"><![CDATA[{1} {0}]]></string>
-	<string name="_sys_menu_item_title_switch_template"><![CDATA[Дизайн]]></string>
-	<string name="_sys_menu_item_title_switch_template_mask"><![CDATA[{0}]]></string>
-	<string name="_sys_menu_item_title_terms"><![CDATA[Правила]]></string>
-	<string name="_sys_menu_item_title_account_menu"><![CDATA[{member_display_name}]]></string>
-	<string name="_sys_menu_item_title_account_profile_context"><![CDATA[Профили]]></string>
-	<string name="_sys_menu_item_title_account_dashboard"><![CDATA[Панель]]></string>
-	<string name="_sys_menu_item_title_account_dashboard_administration"><![CDATA[Администрация]]></string>
-	<string name="_sys_menu_item_title_account_settings"><![CDATA[Настройки]]></string>
-	<string name="_sys_menu_item_title_account_settings_delete"><![CDATA[Удалить]]></string>
-	<string name="_sys_menu_item_title_account_settings_email"><![CDATA[Email]]></string>
-	<string name="_sys_menu_item_title_account_settings_info"><![CDATA[Аккаунт]]></string>
-	<string name="_sys_menu_item_title_account_settings_pwd"><![CDATA[Пароль]]></string>
-	<string name="_sys_menu_item_title_add_content"><![CDATA[Добавить...]]></string>
-	<string name="_sys_menu_item_title_cart"><![CDATA[Корзина]]></string>
-	<string name="_sys_menu_item_title_cmts_administration"><![CDATA[Комментарии]]></string>
-  <string name="_sys_menu_item_title_audit_administration"><![CDATA[Аудит]]></string>
-	<string name="_sys_menu_item_title_cmts_item_delete"><![CDATA[Удалить]]></string>
-	<string name="_sys_menu_item_title_cmts_item_edit"><![CDATA[Редактировать]]></string>
-        <string name="_sys_menu_item_title_cmts_item_pin"><![CDATA[Закрепить]]></string>
-        <string name="_sys_menu_item_title_cmts_item_unpin"><![CDATA[Открепить]]></string>
-        <string name="_sys_menu_item_title_cmts_item_quote"><![CDATA[]]></string>
-        <string name="_sys_menu_item_title_cmts_item_reaction"><![CDATA[]]></string>
-	<string name="_sys_menu_item_title_cmts_item_reply"><![CDATA[]]></string>
-	<string name="_sys_menu_item_title_cmts_item_score"><![CDATA[]]></string>
-	<string name="_sys_menu_item_title_cmts_item_vote"><![CDATA[]]></string>
-	<string name="_sys_menu_item_title_cmts_item_more"><![CDATA[]]></string>
-	<string name="_sys_menu_item_title_dashboard"><![CDATA[Панель]]></string>
-	<string name="_sys_menu_item_title_home"><![CDATA[Домой]]></string>
-	<string name="_sys_menu_item_title_logout"><![CDATA[Выйти]]></string>
-	<string name="_sys_menu_item_title_more"><![CDATA[Ещё]]></string>
-	<string name="_sys_menu_item_title_orders"><![CDATA[Заказы]]></string>
-	<string name="_sys_menu_item_title_profile"><![CDATA[Профиль]]></string>
-	<string name="_sys_menu_item_title_set_acl_level"><![CDATA[Назначить членство]]></string>
-  <string name="_sys_menu_item_title_set_badges"><![CDATA[Назначить бейджи]]></string>
-	<string name="_sys_menu_item_title_studio"><![CDATA[Студия]]></string>
-	<string name="_sys_menu_item_title_subscriptions"><![CDATA[Подписки]]></string>
-	<string name="_sys_menu_item_title_social_sharing_facebook"><![CDATA[Поделиться в Facebook]]></string>
+    <string name="_sys_menu_item_title_about"><![CDATA[О нас]]></string>
+    <string name="_sys_menu_item_title_copyright"><![CDATA[Копирайт]]></string>
+    <string name="_sys_menu_item_title_privacy"><![CDATA[Конфиденциальность]]></string>
+    <string name="_sys_menu_item_title_search"><![CDATA[Поиск]]></string>
+    <string name="_sys_menu_item_title_switch_language"><![CDATA[Язык]]></string>
+    <string name="_sys_menu_item_title_switch_language_mask"><![CDATA[{1} {0}]]></string>
+    <string name="_sys_menu_item_title_switch_template"><![CDATA[Дизайн]]></string>
+    <string name="_sys_menu_item_title_switch_template_mask"><![CDATA[{0}]]></string>
+    <string name="_sys_menu_item_title_terms"><![CDATA[Правила]]></string>
+    <string name="_sys_menu_item_title_account_menu"><![CDATA[{member_display_name}]]></string>
+    <string name="_sys_menu_item_title_account_profile_context"><![CDATA[Профили]]></string>
+    <string name="_sys_menu_item_title_account_dashboard"><![CDATA[Панель]]></string>
+    <string name="_sys_menu_item_title_account_dashboard_administration"><![CDATA[Администрация]]></string>
+    <string name="_sys_menu_item_title_account_settings"><![CDATA[Настройки]]></string>
+    <string name="_sys_menu_item_title_account_settings_delete"><![CDATA[Удалить]]></string>
+    <string name="_sys_menu_item_title_account_settings_email"><![CDATA[Email]]></string>
+    <string name="_sys_menu_item_title_account_settings_info"><![CDATA[Аккаунт]]></string>
+    <string name="_sys_menu_item_title_account_settings_pwd"><![CDATA[Пароль]]></string>
+    <string name="_sys_menu_item_title_add_content"><![CDATA[Добавить...]]></string>
+    <string name="_sys_menu_item_title_cart"><![CDATA[Корзина]]></string>
+    <string name="_sys_menu_item_title_cmts_administration"><![CDATA[Комментарии]]></string>
+    <string name="_sys_menu_item_title_audit_administration"><![CDATA[Аудит]]></string>
+    <string name="_sys_menu_item_title_cmts_item_delete"><![CDATA[Удалить]]></string>
+    <string name="_sys_menu_item_title_cmts_item_edit"><![CDATA[Редактировать]]></string>
+    <string name="_sys_menu_item_title_cmts_item_pin"><![CDATA[Закрепить]]></string>
+    <string name="_sys_menu_item_title_cmts_item_unpin"><![CDATA[Открепить]]></string>
+    <string name="_sys_menu_item_title_cmts_item_quote"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_cmts_item_reaction"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_cmts_item_reply"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_cmts_item_score"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_cmts_item_vote"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_cmts_item_more"><![CDATA[]]></string>
+    <string name="_sys_menu_item_title_dashboard"><![CDATA[Панель]]></string>
+    <string name="_sys_menu_item_title_home"><![CDATA[Домой]]></string>
+    <string name="_sys_menu_item_title_logout"><![CDATA[Выйти]]></string>
+    <string name="_sys_menu_item_title_more"><![CDATA[Ещё]]></string>
+    <string name="_sys_menu_item_title_more_auto"><![CDATA[Ещё]]></string>
+    <string name="_sys_menu_item_title_orders"><![CDATA[Заказы]]></string>
+    <string name="_sys_menu_item_title_profile"><![CDATA[Профиль]]></string>
+    <string name="_sys_menu_item_title_set_acl_level"><![CDATA[Назначить членство]]></string>
+    <string name="_sys_menu_item_title_set_badges"><![CDATA[Назначить бейджи]]></string>
+    <string name="_sys_menu_item_title_studio"><![CDATA[Студия]]></string>
+    <string name="_sys_menu_item_title_subscriptions"><![CDATA[Подписки]]></string>
+    <string name="_sys_menu_item_title_social_sharing_facebook"><![CDATA[Поделиться в Facebook]]></string>
     <string name="_sys_menu_item_title_social_sharing_twitter"><![CDATA[Поделиться в Twitter]]></string>
     <string name="_sys_menu_item_title_social_sharing_pinterest"><![CDATA[Поделиться в Pinterest]]></string>
     <string name="_sys_menu_item_title_sm_author"><![CDATA[Автор]]></string>
@@ -2572,6 +2573,7 @@
 	<string name="_sys_menu_item_title_system_logout"><![CDATA[Выйти]]></string>
 	<string name="_sys_menu_item_title_system_main_menu"><![CDATA[Главное Меню]]></string>
 	<string name="_sys_menu_item_title_system_more"><![CDATA[Ещё]]></string>
+        <string name="_sys_menu_item_title_system_more_auto"><![CDATA[Ещё]]></string>
     <string name="_sys_menu_item_title_system_orders"><![CDATA[Заказы]]></string>
     <string name="_sys_menu_item_title_system_powered_by"><![CDATA[Сделано с помощью]]></string>
 	<string name="_sys_menu_item_title_system_profile"><![CDATA[Профиль]]></string>

+ 1 - 1
modules/boonex/shopify/install/sql/enable.sql

@@ -158,7 +158,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 
 
 -- MENU: add to site menu
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_shopify', 'shopify-home', '_bx_shopify_menu_item_title_system_entries_home', '_bx_shopify_menu_item_title_entries_home', 'page.php?i=shopify-home', '', '', 'shopping-cart col-green1', 'bx_shopify_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/snipcart/install/sql/enable.sql

@@ -160,7 +160,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system` , `
 
 
 -- MENU: add to site menu
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_snipcart', 'snipcart-home', '_bx_snipcart_menu_item_title_system_entries_home', '_bx_snipcart_menu_item_title_entries_home', 'page.php?i=snipcart-home', '', '', 'shopping-cart col-green2', 'bx_snipcart_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/spaces/install/sql/enable.sql

@@ -193,7 +193,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `
 
 -- MENU: add to site menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_spaces', 'spaces-home', '_bx_spaces_menu_item_title_system_entries_home', '_bx_spaces_menu_item_title_entries_home', 'page.php?i=spaces-home', '', '', 'object-group col-red2', 'bx_spaces_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/videos/install/sql/enable.sql

@@ -177,7 +177,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 ('', 0, 'bx_videos', '_bx_videos_page_block_title_sys_by_categoriers_entries_view_showcase', '_bx_videos_page_block_title_by_categoriers_entries_view_showcase', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:9:\"bx_videos\";s:6:\"method\";s:20:\"browse_by_categories\";s:6:\"params\";a:5:{s:9:\"unit_view\";s:8:\"showcase\";s:13:\"empty_message\";b:0;s:13:\"ajax_paginate\";b:0;s:6:\"browse\";s:7:\"popular\";s:12:\"per_category\";i:3;}}', 0, 1, IFNULL(@iBlockOrder, 0) + 10);
 
 -- MENU: add to site menu
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_videos', 'videos-home', '_bx_videos_menu_item_title_system_entries_home', '_bx_videos_menu_item_title_entries_home', 'page.php?i=videos-home', '', '', 'film col-gray', 'bx_videos_submenu', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);
 

+ 1 - 1
modules/boonex/wiki/install/sql/enable.sql

@@ -31,7 +31,7 @@ INSERT INTO `sys_rewrite_rules` (`preg`, `service`, `active`) VALUES
 
 -- MENU: add to site menu
 
-SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
+SET @iSiteMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_site' AND `active` = 1 AND `order` < 9999 ORDER BY `order` DESC LIMIT 1);
 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', 'bx_wiki', 'wiki-home', '', '_bx_wiki_menu_item_title_system_home', 'r.php?_q=wiki/wiki-home', '', '', 'far file-word', '', 2147483647, 1, 1, IFNULL(@iSiteMenuOrder, 0) + 1);