Browse Source

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

roman.lesnikov@gmail.com 4 years ago
parent
commit
dd9c963a24

+ 0 - 5
modules/boonex/lucid/data/template/system/css/menu.less

@@ -270,11 +270,6 @@
         margin-top: 0px;
         vertical-align: middle;
     }
-    #bx-menu-toolbar-1-container .bx-menu-toolbar li .sys-icon,
-    #bx-menu-toolbar-2-container .bx-menu-toolbar li .sys-icon {
-        width: auto;
-        height: auto;
-    }
 
     #bx-menu-toolbar-2-container .bx-menu-toolbar .bx-menu-toolbar-item a .bx-def-thumb-size {
         width: 2rem;

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

@@ -297,6 +297,8 @@
     <string name="_bx_market_menu_item_title_entries_top"><![CDATA[Top]]></string>
     <string name="_bx_market_menu_item_title_system_entries_updated"><![CDATA[Updated Products]]></string>
     <string name="_bx_market_menu_item_title_entries_updated"><![CDATA[Updated]]></string>
+    <string name="_bx_market_menu_item_title_system_more_auto"><![CDATA[More]]></string>
+    <string name="_bx_market_menu_item_title_more_auto"><![CDATA[More]]></string>
     <string name="_bx_market_menu_title_view_entry_submenu"><![CDATA[View Product Submenu]]></string>
     <string name="_bx_market_menu_set_title_view_entry_submenu"><![CDATA[View Product Submenu]]></string>
     <string name="_bx_market_menu_item_title_system_view_entry_submenu_entry"><![CDATA[Overview]]></string>

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

@@ -375,7 +375,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_market_submenu', 'bx_market', 'products-categories', '_bx_market_menu_item_title_system_entries_categories', '_bx_market_menu_item_title_entries_categories', 'page.php?i=products-categories', '', '', '', '', 2147483647, 1, 1, 7),
 ('bx_market_submenu', 'bx_market', 'products-search', '_bx_market_menu_item_title_system_entries_search', '_bx_market_menu_item_title_entries_search', 'page.php?i=products-search', '', '', '', '', 2147483647, 1, 1, 8),
 ('bx_market_submenu', 'bx_market', 'products-manage', '_bx_market_menu_item_title_system_entries_manage', '_bx_market_menu_item_title_entries_manage', 'page.php?i=products-manage', '', '', '', '', 2147483646, 1, 1, 9),
-('bx_market_submenu', 'bx_market', 'more-auto', '_sys_menu_item_title_system_more_auto', '_sys_menu_item_title_more_auto', 'javascript:void(0)', '', '', '', '', 2147483647, 1, 0, 9999);
+('bx_market_submenu', 'bx_market', 'more-auto', '_bx_market_menu_item_title_system_more_auto', '_bx_market_menu_item_title_more_auto', 'javascript:void(0)', '', '', 'ellipsis-v', '', 2147483647, 1, 0, 9999);
 
 -- MENU: sub-menu for view entry
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 

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

@@ -293,6 +293,8 @@
     <string name="_bx_market_menu_item_title_entries_top"><![CDATA[Топ]]></string>
     <string name="_bx_market_menu_item_title_system_entries_updated"><![CDATA[Обновленные продукты]]></string>
     <string name="_bx_market_menu_item_title_entries_updated"><![CDATA[Обновленные]]></string>
+    <string name="_bx_market_menu_item_title_system_more_auto"><![CDATA[Ещё]]></string>
+    <string name="_bx_market_menu_item_title_more_auto"><![CDATA[Ещё]]></string>
     <string name="_bx_market_menu_title_view_entry_submenu"><![CDATA[Просмотреть продукт - Подменю]]></string>
     <string name="_bx_market_menu_set_title_view_entry_submenu"><![CDATA[Просмотреть продукт - Подменю]]></string>
     <string name="_bx_market_menu_item_title_system_view_entry_submenu_entry"><![CDATA[Обзор]]></string>