Просмотр исходного кода

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

AntonLV 7 лет назад
Родитель
Сommit
fa713b178c
91 измененных файлов с 413 добавлено и 163 удалено
  1. 1 1
      inc/classes/BxDolPaginate.php
  2. 1 1
      inc/classes/BxDolTemplate.php
  3. 8 7
      install/sql/system.sql
  4. 10 2
      modules/base/profile/classes/BxBaseModProfileModule.php
  5. 10 2
      modules/base/text/classes/BxBaseModTextModule.php
  6. 1 1
      modules/boonex/accounts/classes/BxAccntModule.php
  7. 2 1
      modules/boonex/accounts/install/langs/en.xml
  8. 1 1
      modules/boonex/accounts/install/sql/enable.sql
  9. 1 1
      modules/boonex/albums/install/langs/en.xml
  10. 1 1
      modules/boonex/albums/install/sql/enable.sql
  11. 1 1
      modules/boonex/channels/install/langs/en.xml
  12. 1 1
      modules/boonex/channels/install/sql/enable.sql
  13. 21 0
      modules/boonex/decorous/data/template/system/scripts/BxTemplMenuDashboardManageTools.php
  14. 1 1
      modules/boonex/directory/install/langs/en.xml
  15. 1 1
      modules/boonex/directory/install/sql/enable.sql
  16. 6 2
      modules/boonex/english/data/langs/system/en.xml
  17. 1 1
      modules/boonex/events/install/langs/en.xml
  18. 1 1
      modules/boonex/events/install/sql/enable.sql
  19. 1 1
      modules/boonex/files/install/langs/en.xml
  20. 1 1
      modules/boonex/files/install/sql/enable.sql
  21. 1 1
      modules/boonex/forum/install/langs/en.xml
  22. 1 1
      modules/boonex/forum/install/sql/enable.sql
  23. 1 1
      modules/boonex/glossary/install/langs/en.xml
  24. 1 1
      modules/boonex/glossary/install/sql/enable.sql
  25. 1 1
      modules/boonex/groups/classes/BxGroupsSearchResult.php
  26. 1 2
      modules/boonex/groups/install/langs/en.xml
  27. 1 1
      modules/boonex/groups/install/sql/enable.sql
  28. 1 1
      modules/boonex/invites/classes/BxInvModule.php
  29. 3 2
      modules/boonex/invites/install/langs/en.xml
  30. 1 1
      modules/boonex/invites/install/sql/enable.sql
  31. 7 0
      modules/boonex/lucid/data/template/system/css/menu.css
  32. 21 0
      modules/boonex/lucid/data/template/system/scripts/BxTemplMenuDashboardManageTools.php
  33. 1 1
      modules/boonex/market/install/langs/en.xml
  34. 1 1
      modules/boonex/market/install/sql/enable.sql
  35. 2 2
      modules/boonex/massmailer/install/sql/enable.sql
  36. 21 0
      modules/boonex/ocean/updates/8.0.3_8.0.4/source/data/template/system/scripts/BxTemplMenuDashboardManageTools.php
  37. 1 1
      modules/boonex/organizations/install/langs/en.xml
  38. 1 1
      modules/boonex/organizations/install/sql/enable.sql
  39. 1 1
      modules/boonex/persons/install/langs/en.xml
  40. 1 1
      modules/boonex/persons/install/sql/enable.sql
  41. 1 1
      modules/boonex/photos/install/langs/en.xml
  42. 1 1
      modules/boonex/photos/install/sql/enable.sql
  43. 1 1
      modules/boonex/polls/install/langs/en.xml
  44. 1 1
      modules/boonex/polls/install/sql/enable.sql
  45. 1 1
      modules/boonex/posts/install/langs/en.xml
  46. 1 1
      modules/boonex/posts/install/sql/enable.sql
  47. 21 0
      modules/boonex/protean/data/template/system/scripts/BxTemplMenuDashboardManageTools.php
  48. 1 1
      modules/boonex/quoteofday/install/langs/en.xml
  49. 2 1
      modules/boonex/quoteofday/install/sql/enable.sql
  50. 19 19
      modules/boonex/quoteofday/template/manage_item.html
  51. 0 1
      modules/boonex/ribbons/template/snippet_view.html
  52. 2 1
      modules/boonex/russian/data/langs/bx_accounts/ru.xml
  53. 1 1
      modules/boonex/russian/data/langs/bx_albums/ru.xml
  54. 1 1
      modules/boonex/russian/data/langs/bx_channels/ru.xml
  55. 1 1
      modules/boonex/russian/data/langs/bx_events/ru.xml
  56. 1 1
      modules/boonex/russian/data/langs/bx_files/ru.xml
  57. 1 1
      modules/boonex/russian/data/langs/bx_forum/ru.xml
  58. 1 1
      modules/boonex/russian/data/langs/bx_glossary/ru.xml
  59. 5 6
      modules/boonex/russian/data/langs/bx_groups/ru.xml
  60. 2 1
      modules/boonex/russian/data/langs/bx_invites/ru.xml
  61. 1 1
      modules/boonex/russian/data/langs/bx_market/ru.xml
  62. 1 1
      modules/boonex/russian/data/langs/bx_organizations/ru.xml
  63. 1 1
      modules/boonex/russian/data/langs/bx_persons/ru.xml
  64. 1 1
      modules/boonex/russian/data/langs/bx_photos/ru.xml
  65. 1 1
      modules/boonex/russian/data/langs/bx_polls/ru.xml
  66. 1 1
      modules/boonex/russian/data/langs/bx_posts/ru.xml
  67. 1 1
      modules/boonex/russian/data/langs/bx_quoteofday/ru.xml
  68. 1 1
      modules/boonex/russian/data/langs/bx_shopify/ru.xml
  69. 1 1
      modules/boonex/russian/data/langs/bx_snipcart/ru.xml
  70. 1 1
      modules/boonex/russian/data/langs/bx_spaces/ru.xml
  71. 1 1
      modules/boonex/russian/data/langs/bx_timeline/ru.xml
  72. 1 1
      modules/boonex/russian/data/langs/bx_videos/ru.xml
  73. 6 2
      modules/boonex/russian/data/langs/system/ru.xml
  74. 1 1
      modules/boonex/shopify/install/langs/en.xml
  75. 1 1
      modules/boonex/shopify/install/sql/enable.sql
  76. 1 1
      modules/boonex/snipcart/install/langs/en.xml
  77. 1 1
      modules/boonex/snipcart/install/sql/enable.sql
  78. 1 1
      modules/boonex/spaces/install/langs/en.xml
  79. 1 1
      modules/boonex/spaces/install/sql/enable.sql
  80. 1 1
      modules/boonex/timeline/install/langs/en.xml
  81. 2 2
      modules/boonex/timeline/install/sql/enable.sql
  82. 1 1
      modules/boonex/videos/install/langs/en.xml
  83. 1 1
      modules/boonex/videos/install/sql/enable.sql
  84. 15 13
      template/chart_stats.html
  85. 51 2
      template/css/menu.css
  86. 23 0
      template/menu_floating_blocks_dash.html
  87. 11 0
      template/menu_item_dashboard_manage_tools_addon.html
  88. 2 32
      template/scripts/BxBaseChartServices.php
  89. 2 1
      template/scripts/BxBaseMenu.php
  90. 66 0
      template/scripts/BxBaseMenuDashboardManageTools.php
  91. 10 0
      template/scripts/BxBaseSearchResult.php

+ 1 - 1
inc/classes/BxDolPaginate.php

@@ -196,7 +196,7 @@ abstract class BxDolPaginate extends BxDol
     public function setPerPage($i)
     {
         if ((int)$i > 0) {
-            $this->_iPerPage = $iPerPage;
+            $this->_iPerPage = $i;
             return true;
         }
         return false;

+ 1 - 1
inc/classes/BxDolTemplate.php

@@ -274,7 +274,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
         $this->_sFolderCss = 'css/';
         $this->_sFolderImages = 'images/';
         $this->_sFolderIcons = 'images/icons/';
-        $this->_aTemplates = array('html_tags', 'menu_item_addon', 'menu_item_addon_small', 'menu_item_addon_middle');
+        $this->_aTemplates = array('html_tags', 'menu_item_addon', 'menu_item_addon_small', 'menu_item_addon_middle', 'menu_item_dashboard_manage_tools_addon');
 
         $this->addLocation('system', $this->_sRootPath, $this->_sRootUrl);
 

+ 8 - 7
install/sql/system.sql

@@ -3475,7 +3475,8 @@ INSERT INTO `sys_menu_templates` (`id`, `template`, `title`, `visible`) VALUES
 (20, 'menu_custom_ver.html', '_sys_menu_template_title_custom_ver', 0),
 (21, 'menu_profile_stats.html', '_sys_menu_template_title_profile_stats', 0),
 (22, 'menu_interactive.html', '_sys_menu_template_title_interactive', 1),
-(23, 'menu_buttons_icon_hor.html', '_sys_menu_template_title_buttons_icon_hor', 1);
+(23, 'menu_buttons_icon_hor.html', '_sys_menu_template_title_buttons_icon_hor', 1),
+(24, 'menu_floating_blocks_dash.html', '_sys_menu_template_title_floating_blocks_dash', 0);
 
 CREATE TABLE IF NOT EXISTS `sys_objects_menu` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -3503,7 +3504,7 @@ INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `templa
 ('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', ''),
-('sys_account_dashboard_manage_tools', '_sys_menu_title_account_dashboard_manage_tools', 'sys_account_dashboard_manage_tools', 'system', 4, 0, 1, '', ''),
+('sys_account_dashboard_manage_tools', '_sys_menu_title_account_dashboard_manage_tools', 'sys_account_dashboard_manage_tools', 'system', 24, 0, 1, 'BxTemplMenuDashboardManageTools', ''),
 ('sys_account_settings_submenu', '_sys_menu_title_account_settings', 'sys_account_settings', 'system', 8, 0, 1, '', ''),
 ('sys_account_settings_more', '_sys_menu_title_account_settings_more', 'sys_account_settings_more', 'system', 4, 0, 1, '', ''),
 ('sys_profiles_create', '_sys_menu_title_profiles_create', 'sys_profiles_create', 'system', 4, 0, 1, '', ''),
@@ -3658,7 +3659,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 
 -- dashboard manage tools
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'system', 'cmts-administration', '_sys_menu_item_title_system_cmts_administration', '_sys_menu_item_title_cmts_administration', 'page.php?i=cmts-administration', '', '', '', 'a:2:{s:6:"module";s:6:"system";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, 1);
+('sys_account_dashboard_manage_tools', 'system', 'cmts-administration', '_sys_menu_item_title_system_cmts_administration', '_sys_menu_item_title_cmts_administration', 'page.php?i=cmts-administration', '', '', 'comments', 'a:2:{s:6:"module";s:6:"system";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, 1);
 
 -- profile stats
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES
@@ -4221,7 +4222,7 @@ INSERT INTO `sys_objects_page` (`object`, `uri`, `title_system`, `title`, `modul
 ('sys_about', 'about', '_sys_page_title_system_about', '_sys_page_title_about', 'system', 5, 2147483647, 1, 'page.php?i=about', '', '', '', 0, 1, 0, '', ''),
 ('sys_terms', 'terms', '_sys_page_title_system_terms', '_sys_page_title_terms', 'system', 5, 2147483647, 1, 'page.php?i=terms', '', '', '', 0, 1, 0, '', ''),
 ('sys_privacy', 'privacy', '_sys_page_title_system_privacy', '_sys_page_title_privacy', 'system', 5, 2147483647, 1, 'page.php?i=privacy', '', '', '', 0, 1, 0, '', ''),
-('sys_dashboard', 'dashboard', '_sys_page_title_system_dashboard', '_sys_page_title_dashboard', 'system', 12, 2147483646, 1, 'page.php?i=dashboard', '', '', '', 0, 1, 0, 'BxTemplPageDashboard', ''),
+('sys_dashboard', 'dashboard', '_sys_page_title_system_dashboard', '_sys_page_title_dashboard', 'system', 10, 2147483646, 1, 'page.php?i=dashboard', '', '', '', 0, 1, 0, 'BxTemplPageDashboard', ''),
 ('sys_create_account', 'create-account', '_sys_page_title_system_create_account', '_sys_page_title_create_account', 'system', 5, 2147483647, 1, 'page.php?i=create-account', '', '', '', 0, 1, 0, '', ''),
 ('sys_login', 'login', '_sys_page_title_system_login', '_sys_page_title_login', 'system', 5, 2147483647, 1, 'page.php?i=login', '', '', '', 0, 1, 0, '', ''),
 ('sys_login_step2', 'login-step2', '_sys_page_title_system_login_step2', '_sys_page_title_login_step2', 'system', 5, 2147483647, 1, 'page.php?i=login-step2', '', '', '', 0, 1, 0, '', ''),
@@ -4348,13 +4349,13 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `
 
 ('sys_privacy', 1, 'system', '', '_sys_page_block_title_privacy', 11, 2147483647, 'lang', '_sys_page_lang_block_privacy', 0, 1, 1, 1),
 
-('sys_dashboard', 3, 'system', '', '_sys_page_block_title_profile_stats', 3, 2147483644, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:13:"profile_stats";s:6:"params";a:0:{}s:5:"class";s:20:"TemplServiceProfiles";}', 0, 1, 1, 1),
+('sys_dashboard', 3, 'system', '', '_sys_page_block_title_profile_stats', 3, 2147483644, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:13:"profile_stats";s:6:"params";a:0:{}s:5:"class";s:20:"TemplServiceProfiles";}', 0, 1, 0, 1),
 
 ('sys_dashboard', 3, 'system', '', '_sys_page_block_title_profile_membership', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:18:"profile_membership";s:6:"params";a:0:{}s:5:"class";s:20:"TemplServiceProfiles";}', 0, 1, 0, 0),
 
-('sys_dashboard', 3, 'system', '', '_sys_page_block_title_manage_tools', 11, 192, 'menu', 'sys_account_dashboard_manage_tools', 0, 1, 1, 3),
+('sys_dashboard', 1, 'system', '', '_sys_page_block_title_manage_tools', 11, 192, 'menu', 'sys_account_dashboard_manage_tools', 0, 1, 1, 3),
 
-('sys_dashboard', 2, 'system', '', '_sys_page_block_title_chart_growth', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:16:"get_chart_growth";s:6:"params";a:0:{}s:5:"class";s:18:"TemplChartServices";}', 0, 1, 1, 4),
+('sys_dashboard', 3, 'system', '', '_sys_page_block_title_chart_growth', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:16:"get_chart_growth";s:6:"params";a:0:{}s:5:"class";s:18:"TemplChartServices";}', 0, 1, 1, 0),
 
 ('sys_dashboard', 2, 'system', '', '_sys_page_block_title_chart_stats', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"get_chart_stats";s:6:"params";a:0:{}s:5:"class";s:18:"TemplChartServices";}', 0, 1, 1, 3),
 

+ 10 - 2
modules/base/profile/classes/BxBaseModProfileModule.php

@@ -141,8 +141,16 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolCon
 			'perofileStatus' => BX_PROFILE_STATUS_PENDING
         ));
         $o->unsetPaginate();
-
-        return $o->getNum();
+        $iNum1 = $o->getNum();
+        
+        $iNum2 = 0;
+        $CNF = &$this->_oConfig->CNF;
+        if (isset($CNF['OBJECT_REPORTS'])){
+            $o->fillFilters(array('perofileStatus' => ''));
+            $o->fillFiltersByObjects(array('reported' => array('value' => '0', 'field' => 'reports', 'operator' => '>', 'table' => $CNF['TABLE_ENTRIES'])));
+            $iNum2 = $o->getNum();
+        }
+        return array('counter1_value' => $iNum1, 'counter2_value' => $iNum2, 'counter1_caption' => _t('_sys_menu_dashboard_manage_tools_addon_counter1_caption_profile_default'));
 	}
 
 	public function serviceGetMenuAddonManageToolsProfileStats()

+ 10 - 2
modules/base/text/classes/BxBaseModTextModule.php

@@ -102,8 +102,16 @@ class BxBaseModTextModule extends BxBaseModGeneralModule implements iBxDolConten
 			'status' => 'hidden'
         ));
         $o->unsetPaginate();
-
-        return $o->getNum();
+        $iNum1 = $o->getNum();
+        
+        $iNum2 = 0;
+        $CNF = &$this->_oConfig->CNF;
+        if (isset($CNF['OBJECT_REPORTS'])){
+            $o->fillFilters(array('status' => ''));
+            $o->fillFiltersByObjects(array('reported' => array('value' => '0', 'field' => 'reports', 'operator' => '>')));
+            $iNum2 = $o->getNum();
+        }
+        return array('counter1_value' => $iNum1, 'counter2_value' => $iNum2);
 	}
 
 	public function serviceGetMenuAddonManageToolsProfileStats()

+ 1 - 1
modules/boonex/accounts/classes/BxAccntModule.php

@@ -48,7 +48,7 @@ class BxAccntModule extends BxBaseModGeneralModule
         ));
         $o->unsetPaginate();
 
-        return $o->getNum();
+        return array('counter1_value' => $o->getNum(), 'counter1_caption' => _t('_bx_accnt_menu_dashboard_manage_tools_addon_counter1_caption'));
 	}
 
     public function checkAllowedDelete(&$aDataEntry, $isPerformAction = false)

+ 2 - 1
modules/boonex/accounts/install/langs/en.xml

@@ -32,8 +32,9 @@
     <string name="_bx_accnt_menu_item_title_system_unmake_operator"><![CDATA[Unmake Operator]]></string>
     <string name="_bx_accnt_menu_item_title_unmake_operator"><![CDATA[Unmake Operator]]></string>
     <string name="_bx_accnt_menu_item_title_system_admt_accounts"><![CDATA[Accounts]]></string>
-    <string name="_bx_accnt_menu_item_title_admt_accounts"><![CDATA[Accounts - {addon} unconfirmed]]></string>
+    <string name="_bx_accnt_menu_item_title_admt_accounts"><![CDATA[Accounts]]></string>
     <string name="_bx_accnt_menu_item_title_manage"><![CDATA[Manage]]></string>
+    <string name="_bx_accnt_menu_dashboard_manage_tools_addon_counter1_caption"><![CDATA[unconfirmed]]></string>
 
     <string name="_bx_accnt_acl_action_edit_any_account"><![CDATA[Edit Any Account]]></string>
 

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

@@ -29,7 +29,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', @sName, 'accounts-administration', '_bx_accnt_menu_item_title_system_admt_accounts', '_bx_accnt_menu_item_title_admt_accounts', 'page.php?i=accounts-administration', '', '_self', '', 'a:2:{s:6:"module";s:11:"bx_accounts";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', @sName, 'accounts-administration', '_bx_accnt_menu_item_title_system_admt_accounts', '_bx_accnt_menu_item_title_admt_accounts', 'page.php?i=accounts-administration', '', '_self', 'at', 'a:2:{s:6:"module";s:11:"bx_accounts";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 
 -- ACL

+ 1 - 1
modules/boonex/albums/install/langs/en.xml

@@ -207,7 +207,7 @@
     <string name="_bx_albums_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_albums_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
 	<string name="_bx_albums_menu_item_title_system_admt_albums"><![CDATA[Albums]]></string>
-	<string name="_bx_albums_menu_item_title_admt_albums"><![CDATA[Albums - {addon} hidden]]></string>
+	<string name="_bx_albums_menu_item_title_admt_albums"><![CDATA[Albums]]></string>
 	<string name="_bx_albums_menu_item_title_manage_my"><![CDATA[My Albums]]></string>
 	<string name="_bx_albums_menu_item_title_manage_all"><![CDATA[All Albums]]></string>
         <string name="_bx_albums_menu_item_title_system_sm_items"><![CDATA[Items]]></string>

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

@@ -349,7 +349,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_albums', 'albums-administration', '_bx_albums_menu_item_title_system_admt_albums', '_bx_albums_menu_item_title_admt_albums', 'page.php?i=albums-administration', '', '_self', '', 'a:2:{s:6:"module";s:9:"bx_albums";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_albums', 'albums-administration', '_bx_albums_menu_item_title_system_admt_albums', '_bx_albums_menu_item_title_admt_albums', 'page.php?i=albums-administration', '', '_self', 'far image', 'a:2:{s:6:"module";s:9:"bx_albums";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 

+ 1 - 1
modules/boonex/channels/install/langs/en.xml

@@ -186,7 +186,7 @@
 	<string name="_bx_channels_menu_item_title_system_entries_home"><![CDATA[Channels]]></string>
 	<string name="_bx_channels_menu_item_title_entries_home"><![CDATA[Channels]]></string>
 	<string name="_bx_channels_menu_item_title_system_admt_channels"><![CDATA[Channels]]></string>
-	<string name="_bx_channels_menu_item_title_admt_channels"><![CDATA[Channels - {addon} unapproved]]></string>
+	<string name="_bx_channels_menu_item_title_admt_channels"><![CDATA[Channels]]></string>
 	<string name="_bx_channels_menu_item_title_manage_my"><![CDATA[My Channels]]></string>
 	<string name="_bx_channels_menu_item_title_manage_all"><![CDATA[All Channels]]></string>
 	<string name="_bx_channels_menu_item_title_system_entries_top"><![CDATA[Top]]></string>

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

@@ -270,7 +270,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_channels', 'channels-administration', '_bx_channels_menu_item_title_system_admt_channels', '_bx_channels_menu_item_title_admt_channels', 'page.php?i=channels-administration', '', '_self', '', 'a:2:{s:6:"module";s:11:"bx_channels";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 128, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_channels', 'channels-administration', '_bx_channels_menu_item_title_system_admt_channels', '_bx_channels_menu_item_title_admt_channels', 'page.php?i=channels-administration', '', '_self', 'hashtag', 'a:2:{s:6:"module";s:11:"bx_channels";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 128, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 

+ 21 - 0
modules/boonex/decorous/data/template/system/scripts/BxTemplMenuDashboardManageTools.php

@@ -0,0 +1,21 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaTemplate UNA Template Classes
+ * @{
+ */
+
+/**
+ * @see BxDolMenu
+ */
+class BxTemplMenuDashboardManageTools extends BxBaseMenuDashboardManageTools
+{
+    public function __construct ($aObject, $oTemplate = false)
+    {
+        parent::__construct ($aObject, $oTemplate);
+    }
+}
+
+/** @} */

+ 1 - 1
modules/boonex/directory/install/langs/en.xml

@@ -249,7 +249,7 @@
     <string name="_bx_directory_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_directory_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_directory_menu_item_title_system_admt_posts"><![CDATA[Ads]]></string>
-    <string name="_bx_directory_menu_item_title_admt_posts"><![CDATA[Ads - {addon} hidden]]></string>
+    <string name="_bx_directory_menu_item_title_admt_posts"><![CDATA[Ads]]></string>
     <string name="_bx_directory_menu_item_title_manage_my"><![CDATA[My Ads]]></string>
     <string name="_bx_directory_menu_item_title_manage_all"><![CDATA[All Ads]]></string>
     <string name="_bx_directory_menu_item_title_categories"><![CDATA[Categories]]></string>

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

@@ -319,7 +319,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_directory', 'ads-administration', '_bx_directory_menu_item_title_system_admt_ads', '_bx_directory_menu_item_title_admt_ads', 'page.php?i=ads-administration', '', '_self', '', 'a:2:{s:6:"module";s:12:"bx_directory";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_directory', 'ads-administration', '_bx_directory_menu_item_title_system_admt_ads', '_bx_directory_menu_item_title_admt_ads', 'page.php?i=ads-administration', '', '_self', 'folder-open', 'a:2:{s:6:"module";s:12:"bx_directory";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 

+ 6 - 2
modules/boonex/english/data/langs/system/en.xml

@@ -2201,7 +2201,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<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[Manage Comments]]></string>
+  <string name="_sys_menu_item_title_cmts_administration"><![CDATA[Comments]]></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_reply"><![CDATA[]]></string>
@@ -2265,7 +2265,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_item_title_system_account_settings_pwd"><![CDATA[Password]]></string>
 	<string name="_sys_menu_item_title_system_add_content"><![CDATA[Add Content]]></string>
 	<string name="_sys_menu_item_title_system_cart"><![CDATA[Shopping Cart]]></string>
-  <string name="_sys_menu_item_title_system_cmts_administration"><![CDATA[Manage Comments]]></string>
+  <string name="_sys_menu_item_title_system_cmts_administration"><![CDATA[Comments]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_delete"><![CDATA[Delete]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_edit"><![CDATA[Edit]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_reply"><![CDATA[Reply]]></string>
@@ -2351,6 +2351,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_template_title_floating_blocks"><![CDATA[Floating Blocks]]></string>
 	<string name="_sys_menu_template_title_floating_blocks_wide"><![CDATA[Wide Floating Blocks with Notifications]]></string>
 	<string name="_sys_menu_template_title_floating_blocks_big"><![CDATA[Floating Blocks Big]]></string>
+	<string name="_sys_menu_template_title_floating_blocks_dash"><![CDATA[Floating Blocks with icons & captions]]></string>
 	<string name="_sys_menu_template_title_footer"><![CDATA[Footer Links]]></string>
 	<string name="_sys_menu_template_title_hor"><![CDATA[Horizontal Links]]></string>
 	<string name="_sys_menu_template_title_icon_buttons_hor"><![CDATA[Horizontal Icon Buttons]]></string>
@@ -2397,6 +2398,9 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_title_switch_language_inline"><![CDATA[Language Switch (inline)]]></string>
 	<string name="_sys_menu_title_switch_template"><![CDATA[Switch Template]]></string>
 	<string name="_sys_menu_title_snippet_meta"><![CDATA[Snippet Meta Info]]></string>
+  <string name="_sys_menu_dashboard_manage_tools_addon_counter1_caption_default"><![CDATA[hidden]]></string>
+  <string name="_sys_menu_dashboard_manage_tools_addon_counter1_caption_profile_default"><![CDATA[unapproved]]></string>
+  <string name="_sys_menu_dashboard_manage_tools_addon_counter2_caption_default"><![CDATA[reported]]></string>
 	<string name="_sys_metatags_mention_added"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b> mentioned <b class="bx-ntfs-content-entry">{entry_caption}</b>]]></string>
 	<string name="_sys_mobile_friends"><![CDATA[Friends]]></string>
 	<string name="_sys_mobile_info"><![CDATA[Info]]></string>

+ 1 - 1
modules/boonex/events/install/langs/en.xml

@@ -254,7 +254,7 @@
     <string name="_bx_events_menu_item_title_system_entries_home"><![CDATA[Events]]></string>
     <string name="_bx_events_menu_item_title_entries_home"><![CDATA[Events]]></string>
     <string name="_bx_events_menu_item_title_system_admt_groups"><![CDATA[Events]]></string>
-	<string name="_bx_events_menu_item_title_admt_groups"><![CDATA[Events - {addon} unapproved]]></string>
+	<string name="_bx_events_menu_item_title_admt_groups"><![CDATA[Events]]></string>
 	<string name="_bx_events_menu_item_title_manage_my"><![CDATA[My Events]]></string>
 	<string name="_bx_events_menu_item_title_manage_all"><![CDATA[All Events]]></string>
 	<string name="_bx_events_menu_item_title_system_entries_top"><![CDATA[Top]]></string>

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

@@ -360,7 +360,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_events', 'events-administration', '_bx_events_menu_item_title_system_admt_groups', '_bx_events_menu_item_title_admt_groups', 'page.php?i=events-administration', '', '_self', '', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_events', 'events-administration', '_bx_events_menu_item_title_system_admt_groups', '_bx_events_menu_item_title_admt_groups', 'page.php?i=events-administration', '', '_self', 'calendar', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 

+ 1 - 1
modules/boonex/files/install/langs/en.xml

@@ -176,7 +176,7 @@
     <string name="_bx_files_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_files_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
 	<string name="_bx_files_menu_item_title_system_admt_files"><![CDATA[Files]]></string>
-	<string name="_bx_files_menu_item_title_admt_files"><![CDATA[Files - {addon} hidden]]></string>
+	<string name="_bx_files_menu_item_title_admt_files"><![CDATA[Files]]></string>
 	<string name="_bx_files_menu_item_title_manage_my"><![CDATA[My Files]]></string>
 	<string name="_bx_files_menu_item_title_manage_all"><![CDATA[All Files]]></string>
 	<string name="_bx_files_menu_item_title_system_download_file"><![CDATA[Download]]></string>

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

@@ -307,7 +307,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_files', 'files-administration', '_bx_files_menu_item_title_system_admt_files', '_bx_files_menu_item_title_admt_files', 'page.php?i=files-administration', '', '_self', '', 'a:2:{s:6:"module";s:8:"bx_files";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_files', 'files-administration', '_bx_files_menu_item_title_system_admt_files', '_bx_files_menu_item_title_admt_files', 'page.php?i=files-administration', '', '_self', 'far file', 'a:2:{s:6:"module";s:8:"bx_files";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profile & group based modules (trigger* menu sets are processed separately upon modules enable/disable)
 

+ 1 - 1
modules/boonex/forum/install/langs/en.xml

@@ -218,7 +218,7 @@
     <string name="_bx_forum_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_forum_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_forum_menu_item_title_system_admt_discussions"><![CDATA[Discussions]]></string>
-    <string name="_bx_forum_menu_item_title_admt_discussions"><![CDATA[Discussions - {addon} hidden]]></string>
+    <string name="_bx_forum_menu_item_title_admt_discussions"><![CDATA[Discussions]]></string>
     <string name="_bx_forum_menu_item_title_manage_my"><![CDATA[My Discussions]]></string>
     <string name="_bx_forum_menu_item_title_manage_all"><![CDATA[All Discussions]]></string>
     <string name="_bx_forum_menu_item_title_system_discussions"><![CDATA[Discussions number]]></string>

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

@@ -339,7 +339,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', @sName, 'discussions-administration', '_bx_forum_menu_item_title_system_admt_discussions', '_bx_forum_menu_item_title_admt_discussions', 'page.php?i=discussions-administration', '', '_self', '', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', @sName, 'discussions-administration', '_bx_forum_menu_item_title_system_admt_discussions', '_bx_forum_menu_item_title_admt_discussions', 'page.php?i=discussions-administration', '', '_self', 'far comments', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 

+ 1 - 1
modules/boonex/glossary/install/langs/en.xml

@@ -175,7 +175,7 @@
     <string name="_bx_glossary_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_glossary_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
 	<string name="_bx_glossary_menu_item_title_system_admt_glossary"><![CDATA[Glossary]]></string>
-	<string name="_bx_glossary_menu_item_title_admt_glossary"><![CDATA[Glossary - {addon} hidden]]></string>
+	<string name="_bx_glossary_menu_item_title_admt_glossary"><![CDATA[Glossary]]></string>
 	<string name="_bx_glossary_menu_item_title_manage_my"><![CDATA[My Terms]]></string>
 	<string name="_bx_glossary_menu_item_title_manage_all"><![CDATA[All Terms]]></string>
 

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

@@ -300,7 +300,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_glossary', 'glossary-administration', '_bx_glossary_menu_item_title_system_admt_glossary', '_bx_glossary_menu_item_title_admt_glossary', 'page.php?i=glossary-administration', '', '_self', '', 'a:2:{s:6:"module";s:11:"bx_glossary";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', @iAdministratorModeratorAccess, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_glossary', 'glossary-administration', '_bx_glossary_menu_item_title_system_admt_glossary', '_bx_glossary_menu_item_title_admt_glossary', 'page.php?i=glossary-administration', '', '_self', 'book', 'a:2:{s:6:"module";s:11:"bx_glossary";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', @iAdministratorModeratorAccess, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 

+ 1 - 1
modules/boonex/groups/classes/BxGroupsSearchResult.php

@@ -32,7 +32,7 @@ class BxGroupsSearchResult extends BxBaseModGroupsSearchResult
         		'featured' => array('value' => '', 'field' => 'featured', 'operator' => '<>', 'table' => 'bx_groups_data'),
             ),
             'join' => array (
-                'profile' => array(
+				'profile' => array(
                     'type' => 'INNER',
                     'table' => 'bx_groups_data',
                     'mainField' => 'content_id',

+ 1 - 2
modules/boonex/groups/install/langs/en.xml

@@ -218,12 +218,11 @@
     <string name="_bx_groups_menu_item_title_system_entries_home"><![CDATA[Groups]]></string>
     <string name="_bx_groups_menu_item_title_entries_home"><![CDATA[Groups]]></string>
     <string name="_bx_groups_menu_item_title_system_admt_groups"><![CDATA[Groups]]></string>
-    <string name="_bx_groups_menu_item_title_admt_groups"><![CDATA[Groups - {addon} unapproved]]></string>
+    <string name="_bx_groups_menu_item_title_admt_groups"><![CDATA[Groups]]></string>
     <string name="_bx_groups_menu_item_title_manage_my"><![CDATA[My Groups]]></string>
     <string name="_bx_groups_menu_item_title_manage_all"><![CDATA[All Groups]]></string>
     <string name="_bx_groups_menu_item_title_system_entries_top"><![CDATA[Top]]></string>
     <string name="_bx_groups_menu_item_title_entries_top"><![CDATA[Top]]></string>
-
     <string name="_bx_groups_menu_item_title_system_sm_privacy"><![CDATA[Privacy]]></string>
     <string name="_bx_groups_menu_item_title_sm_privacy"><![CDATA[Privacy]]></string>
 

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

@@ -332,7 +332,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_groups', 'groups-administration', '_bx_groups_menu_item_title_system_admt_groups', '_bx_groups_menu_item_title_admt_groups', 'page.php?i=groups-administration', '', '_self', '', 'a:2:{s:6:"module";s:9:"bx_groups";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_groups', 'groups-administration', '_bx_groups_menu_item_title_system_admt_groups', '_bx_groups_menu_item_title_admt_groups', 'page.php?i=groups-administration', '', '_self', 'users', 'a:2:{s:6:"module";s:9:"bx_groups";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 

+ 1 - 1
modules/boonex/invites/classes/BxInvModule.php

@@ -246,7 +246,7 @@ class BxInvModule extends BxDolModule
      */
     public function serviceGetMenuAddonRequests()
     {
-        return $this->_oDb->getRequests(array('type' => 'count_all'));
+        return array('counter1_value' => $this->_oDb->getRequests(array('type' => 'count_all')), 'counter1_caption' => _t('_bx_invites_menu_dashboard_manage_tools_addon_counter1_caption'));
     }
 
     /**

+ 3 - 2
modules/boonex/invites/install/langs/en.xml

@@ -69,11 +69,12 @@
 
 	<!-- Menus -->
 	<string name="_bx_invites_menu_item_title_system_admt_requests"><![CDATA[Invitation requests]]></string>
-	<string name="_bx_invites_menu_item_title_admt_requests"><![CDATA[Invitation requests - {addon} awaiting]]></string>
+	<string name="_bx_invites_menu_item_title_admt_requests"><![CDATA[Invitations]]></string>
 	<string name="_bx_invites_menu_item_title_requests"><![CDATA[Requests]]></string>
+  <string name="_bx_invites_menu_dashboard_manage_tools_addon_counter1_caption"><![CDATA[awaiting]]></string>
 
 
-	<!-- Options -->
+  <!-- Options -->
 	<string name="_bx_invites_option_count_per_user"><![CDATA[How many invitations one user can send]]></string>
 	<string name="_bx_invites_option_key_lifetime"><![CDATA[Invitation key lifetime (in days)]]></string>
 	<string name="_bx_invites_option_enable_request_invite"><![CDATA[Enable invitation requests by email]]></string>

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

@@ -31,7 +31,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designb
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', @sName, 'invites-requests', '_bx_invites_menu_item_title_system_admt_requests', '_bx_invites_menu_item_title_admt_requests', 'page.php?i=invites-requests', '', '_self', '', 'a:2:{s:6:"module";s:10:"bx_invites";s:6:"method";s:23:"get_menu_addon_requests";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', @sName, 'invites-requests', '_bx_invites_menu_item_title_system_admt_requests', '_bx_invites_menu_item_title_admt_requests', 'page.php?i=invites-requests', '', '_self', 'envelope-open-text', 'a:2:{s:6:"module";s:10:"bx_invites";s:6:"method";s:23:"get_menu_addon_requests";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 
 -- SETTINGS

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

@@ -559,6 +559,13 @@ ul.bx-menu-toolbar li a .bx-menu-item-addon {
 .bx-menu-floating-blocks-wide.bx-menu-object-sys_account_notifications li .bx-menu-item-addon {
 	top: 0.375rem;
 }
+.bx-menu-floating-blocks-dash li {
+    width:12.5%;
+}
+
+.bx-media-tablet .bx-menu-floating-blocks-dash li {
+    width:25%;
+}
 
 /* --------------- profile stats menu */
 .bx-menu-ver.bx-menu-object-sys_profile_stats li .bx-menu-addon-cnt.bx-def-color-bg-hl {

+ 21 - 0
modules/boonex/lucid/data/template/system/scripts/BxTemplMenuDashboardManageTools.php

@@ -0,0 +1,21 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaTemplate UNA Template Classes
+ * @{
+ */
+
+/**
+ * @see BxDolMenu
+ */
+class BxTemplMenuDashboardManageTools extends BxBaseMenuDashboardManageTools
+{
+    public function __construct ($aObject, $oTemplate = false)
+    {
+        parent::__construct ($aObject, $oTemplate);
+    }
+}
+
+/** @} */

+ 1 - 1
modules/boonex/market/install/langs/en.xml

@@ -295,7 +295,7 @@
     <string name="_bx_market_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_market_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
 	<string name="_bx_market_menu_item_title_system_admt_products"><![CDATA[Products]]></string>
-	<string name="_bx_market_menu_item_title_admt_products"><![CDATA[Products - {addon} hidden]]></string>
+	<string name="_bx_market_menu_item_title_admt_products"><![CDATA[Products]]></string>
 	<string name="_bx_market_menu_item_title_manage_my"><![CDATA[My Products]]></string>
 	<string name="_bx_market_menu_item_title_manage_all"><![CDATA[All Products]]></string>
 	<string name="_bx_market_menu_item_title_system_licenses"><![CDATA[Licenses]]></string>

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

@@ -401,7 +401,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_market', 'products-administration', '_bx_market_menu_item_title_system_admt_products', '_bx_market_menu_item_title_admt_products', 'page.php?i=products-administration', '', '_self', '', 'a:2:{s:6:"module";s:9:"bx_market";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_market', 'products-administration', '_bx_market_menu_item_title_system_admt_products', '_bx_market_menu_item_title_admt_products', 'page.php?i=products-administration', '', '_self', 'shopping-cart', 'a:2:{s:6:"module";s:9:"bx_market";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 

+ 2 - 2
modules/boonex/massmailer/install/sql/enable.sql

@@ -61,12 +61,12 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', @sName, 'massmailer-campaigns', '_bx_massmailer_menu_item_title_system_admt_mailer', '_bx_massmailer_menu_item_title_admt_mailer', 'page.php?i=massmailer-campaigns', '', '_self', '', 'a:2:{s:6:"module";s:13:"bx_massmailer";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 128, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', @sName, 'massmailer-campaigns', '_bx_massmailer_menu_item_title_system_admt_mailer', '_bx_massmailer_menu_item_title_admt_mailer', 'page.php?i=massmailer-campaigns', '', '_self', 'mail-bulk', 'a:2:{s:6:"module";s:13:"bx_massmailer";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 128, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: account dashboard
 SET @iMoAccountDashboard = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard' LIMIT 1);
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `editable`, `order`) VALUES
-('sys_account_dashboard', @sName, 'dashboard-massmailer', '_bx_massmailer_menu_item_title_system_admt_mailer', '_bx_massmailer_menu_item_title_admt_mailer', 'page.php?i=massmailer-campaigns', '', '', 'envelope col-red', '', '', 128, 1, 0, 1, @iMoAccountDashboard + 1);
+('sys_account_dashboard', @sName, 'dashboard-massmailer', '_bx_massmailer_menu_item_title_system_admt_mailer', '_bx_massmailer_menu_item_title_admt_mailer', 'page.php?i=massmailer-campaigns', '', '', 'mail-bulk col-red', '', '', 128, 1, 0, 1, @iMoAccountDashboard + 1);
 
 -- GRIDS: campaigns administration
 INSERT INTO `sys_objects_grid` (`object`, `source_type`, `source`, `table`, `field_id`, `field_order`, `field_active`, `paginate_url`, `paginate_per_page`, `paginate_simple`, `paginate_get_start`, `paginate_get_per_page`, `filter_fields`, `filter_fields_translatable`, `filter_mode`, `sorting_fields`, `sorting_fields_translatable`, `visible_for_levels`, `override_class_name`, `override_class_file`) VALUES

+ 21 - 0
modules/boonex/ocean/updates/8.0.3_8.0.4/source/data/template/system/scripts/BxTemplMenuDashboardManageTools.php

@@ -0,0 +1,21 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaTemplate UNA Template Classes
+ * @{
+ */
+
+/**
+ * @see BxDolMenu
+ */
+class BxTemplMenuDashboardManageTools extends BxBaseMenuDashboardManageTools
+{
+    public function __construct ($aObject, $oTemplate = false)
+    {
+        parent::__construct ($aObject, $oTemplate);
+    }
+}
+
+/** @} */

+ 1 - 1
modules/boonex/organizations/install/langs/en.xml

@@ -297,7 +297,7 @@
     <string name="_bx_orgs_menu_item_title_system_entries_home"><![CDATA[Orgs]]></string>
     <string name="_bx_orgs_menu_item_title_entries_home"><![CDATA[Orgs]]></string>
     <string name="_bx_orgs_menu_item_title_system_admt_organizations"><![CDATA[Organizations]]></string>
-	<string name="_bx_orgs_menu_item_title_admt_organizations"><![CDATA[Organizations - {addon} unapproved]]></string>
+	<string name="_bx_orgs_menu_item_title_admt_organizations"><![CDATA[Organizations]]></string>
 	<string name="_bx_orgs_menu_item_title_manage_my"><![CDATA[My Organizations]]></string>
 	<string name="_bx_orgs_menu_item_title_manage_all"><![CDATA[All Organizations]]></string>
 	<string name="_bx_orgs_menu_item_title_system_entries_active"><![CDATA[Active]]></string>

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

@@ -417,7 +417,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_organizations', 'organizations-administration', '_bx_orgs_menu_item_title_system_admt_organizations', '_bx_orgs_menu_item_title_admt_organizations', 'page.php?i=organizations-administration', '', '_self', '', 'a:2:{s:6:"module";s:16:"bx_organizations";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_organizations', 'organizations-administration', '_bx_orgs_menu_item_title_system_admt_organizations', '_bx_orgs_menu_item_title_admt_organizations', 'page.php?i=organizations-administration', '', '_self', 'briefcase', 'a:2:{s:6:"module";s:16:"bx_organizations";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 

+ 1 - 1
modules/boonex/persons/install/langs/en.xml

@@ -256,7 +256,7 @@
     <string name="_bx_persons_menu_item_title_system_entries_home"><![CDATA[Persons]]></string>
     <string name="_bx_persons_menu_item_title_entries_home"><![CDATA[People]]></string>
 	<string name="_bx_persons_menu_item_title_system_admt_persons"><![CDATA[Profiles]]></string>
-	<string name="_bx_persons_menu_item_title_admt_persons"><![CDATA[Profiles - {addon} unapproved]]></string>
+	<string name="_bx_persons_menu_item_title_admt_persons"><![CDATA[Profiles]]></string>
 	<string name="_bx_persons_menu_item_title_manage_my"><![CDATA[My Profiles]]></string>
 	<string name="_bx_persons_menu_item_title_manage_all"><![CDATA[All Profiles]]></string>   
 	<string name="_bx_persons_menu_item_title_system_entries_active"><![CDATA[Active]]></string>

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

@@ -367,7 +367,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_persons', 'persons-administration', '_bx_persons_menu_item_title_system_admt_persons', '_bx_persons_menu_item_title_admt_persons', 'page.php?i=persons-administration', '', '_self', '', 'a:2:{s:6:"module";s:10:"bx_persons";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_persons', 'persons-administration', '_bx_persons_menu_item_title_system_admt_persons', '_bx_persons_menu_item_title_admt_persons', 'page.php?i=persons-administration', '', '_self', 'user', 'a:2:{s:6:"module";s:10:"bx_persons";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 
 -- ACL

+ 1 - 1
modules/boonex/photos/install/langs/en.xml

@@ -183,7 +183,7 @@
     <string name="_bx_photos_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_photos_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
 	<string name="_bx_photos_menu_item_title_system_admt_photos"><![CDATA[Photos]]></string>
-	<string name="_bx_photos_menu_item_title_admt_photos"><![CDATA[Photos - {addon} hidden]]></string>
+	<string name="_bx_photos_menu_item_title_admt_photos"><![CDATA[Photos]]></string>
 	<string name="_bx_photos_menu_item_title_manage_my"><![CDATA[My Photos]]></string>
 	<string name="_bx_photos_menu_item_title_manage_all"><![CDATA[All Photos]]></string>
 

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

@@ -283,7 +283,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_photos', 'photos-administration', '_bx_photos_menu_item_title_system_admt_photos', '_bx_photos_menu_item_title_admt_photos', 'page.php?i=photos-administration', '', '_self', '', 'a:2:{s:6:"module";s:9:"bx_photos";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_photos', 'photos-administration', '_bx_photos_menu_item_title_system_admt_photos', '_bx_photos_menu_item_title_admt_photos', 'page.php?i=photos-administration', '', '_self', 'camera-retro', 'a:2:{s:6:"module";s:9:"bx_photos";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 

+ 1 - 1
modules/boonex/polls/install/langs/en.xml

@@ -175,7 +175,7 @@
     <string name="_bx_polls_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_polls_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
 	<string name="_bx_polls_menu_item_title_system_admt_polls"><![CDATA[Polls]]></string>
-	<string name="_bx_polls_menu_item_title_admt_polls"><![CDATA[Polls - {addon} hidden]]></string>
+	<string name="_bx_polls_menu_item_title_admt_polls"><![CDATA[Polls]]></string>
 	<string name="_bx_polls_menu_item_title_manage_my"><![CDATA[My Polls]]></string>
 	<string name="_bx_polls_menu_item_title_manage_all"><![CDATA[All Polls]]></string>
 	<string name="_bx_polls_menu_item_view_subentries"><![CDATA[View Poll]]></string>

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

@@ -281,7 +281,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_polls', 'polls-administration', '_bx_polls_menu_item_title_system_admt_polls', '_bx_polls_menu_item_title_admt_polls', 'page.php?i=polls-administration', '', '_self', '', 'a:2:{s:6:"module";s:8:"bx_polls";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_polls', 'polls-administration', '_bx_polls_menu_item_title_system_admt_polls', '_bx_polls_menu_item_title_admt_polls', 'page.php?i=polls-administration', '', '_self', 'tasks', 'a:2:{s:6:"module";s:8:"bx_polls";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 

+ 1 - 1
modules/boonex/posts/install/langs/en.xml

@@ -215,7 +215,7 @@
     <string name="_bx_posts_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_posts_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
 	<string name="_bx_posts_menu_item_title_system_admt_posts"><![CDATA[Posts]]></string>
-	<string name="_bx_posts_menu_item_title_admt_posts"><![CDATA[Posts - {addon} hidden]]></string>
+	<string name="_bx_posts_menu_item_title_admt_posts"><![CDATA[Posts]]></string>
 	<string name="_bx_posts_menu_item_title_manage_my"><![CDATA[My Posts]]></string>
 	<string name="_bx_posts_menu_item_title_manage_all"><![CDATA[All Posts]]></string>
 

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

@@ -320,7 +320,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_posts', 'posts-administration', '_bx_posts_menu_item_title_system_admt_posts', '_bx_posts_menu_item_title_admt_posts', 'page.php?i=posts-administration', '', '_self', '', 'a:2:{s:6:"module";s:8:"bx_posts";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_posts', 'posts-administration', '_bx_posts_menu_item_title_system_admt_posts', '_bx_posts_menu_item_title_admt_posts', 'page.php?i=posts-administration', '', '_self', 'file-alt', 'a:2:{s:6:"module";s:8:"bx_posts";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 

+ 21 - 0
modules/boonex/protean/data/template/system/scripts/BxTemplMenuDashboardManageTools.php

@@ -0,0 +1,21 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaTemplate UNA Template Classes
+ * @{
+ */
+
+/**
+ * @see BxDolMenu
+ */
+class BxTemplMenuDashboardManageTools extends BxBaseMenuDashboardManageTools
+{
+    public function __construct ($aObject, $oTemplate = false)
+    {
+        parent::__construct ($aObject, $oTemplate);
+    }
+}
+
+/** @} */

+ 1 - 1
modules/boonex/quoteofday/install/langs/en.xml

@@ -29,7 +29,7 @@
 	<string name="_bx_quoteofday_page_block_title_manage"><![CDATA[Quote of the Day management]]></string>
 	<string name="_bx_quoteofday_page_block_title"><![CDATA[Quote of the Day]]></string>
 	
-	<string name="_bx_quoteofday_menu_item_title_system_admt_manage"><![CDATA[Quotes of the day - {addon} hidden]]></string>
+	<string name="_bx_quoteofday_menu_item_title_system_admt_manage"><![CDATA[Quotes of the day]]></string>
 	<string name="_bx_quoteofday_adm_stg_cpt_type"><![CDATA[Quote of the Day]]></string>
 	
 	<string name="_bx_quoteofday_selection_mode"><![CDATA[Quote of the Day selected by]]></string>

+ 2 - 1
modules/boonex/quoteofday/install/sql/enable.sql

@@ -46,7 +46,8 @@ INSERT INTO `sys_pages_blocks` (object, `cell_id`, `module`, `title_system`, `ti
 
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
-INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `active`, `copyable`, `editable`, `order`) VALUES('sys_account_dashboard_manage_tools', @sName, 'quoteofday-manage', '_bx_quoteofday_menu_item_title_system_admt_manage', '_bx_quoteofday_menu_item_title_system_admt_manage', 'page.php?i=quoteofday-manage', '', '_self', '', 'a:2:{s:6:"module";s:13:"bx_quoteofday";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 0, 2147483647, 1, 0, 1, 6);
+INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `active`, `copyable`, `editable`, `order`) 
+VALUES('sys_account_dashboard_manage_tools', @sName, 'quoteofday-manage', '_bx_quoteofday_menu_item_title_system_admt_manage', '_bx_quoteofday_menu_item_title_system_admt_manage', 'page.php?i=quoteofday-manage', '', '_self', 'quote-right', 'a:2:{s:6:"module";s:13:"bx_quoteofday";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 0, 2147483647, 1, 0, 1, 6);
 
 -- ALERTS
 INSERT INTO `sys_alerts_handlers` (`name`, `class`, `file`, `service_call`) VALUES 

+ 19 - 19
modules/boonex/quoteofday/template/manage_item.html

@@ -1,19 +1,19 @@
-<div class="bx-pgt-new-key bx-def-color-bg-block">
-    <div class="bx-pgt-new-key-cnt">
-        __form__
-        <script type="text/javascript">
-            $(document).ready(function () {
-                $("#__form_id__").ajaxForm({ 
-                    dataType: "json",
-                    beforeSubmit: function (formData, jqForm, options) {
-                        bx_loading($("#__form_id__"), true);
-                    },
-                    success: function (data) {
-                        $(".bx-popup-applied:visible").dolPopupHide();
-                        glGrids.__object__.processJson(data, '__action__');
-                    }
-                });
-            });
-        </script>
-    </div>
-</div>
+<div class="bx-pgt-new-key bx-def-color-bg-block">
+    <div class="bx-pgt-new-key-cnt">
+        __form__
+        <script type="text/javascript">
+            $(document).ready(function () {
+                $("#__form_id__").ajaxForm({ 
+                    dataType: "json",
+                    beforeSubmit: function (formData, jqForm, options) {
+                        bx_loading($("#__form_id__"), true);
+                    },
+                    success: function (data) {
+                        $(".bx-popup-applied:visible").dolPopupHide();
+                        glGrids.__object__.processJson(data, '__action__');
+                    }
+                });
+            });
+        </script>
+    </div>
+</div>

+ 0 - 1
modules/boonex/ribbons/template/snippet_view.html

@@ -9,7 +9,6 @@
             </bx_if:image>
             <bx_if:text>
                 __text__
-        </div>
             </bx_if:text>
         </div>
     </bx_repeat:items>

+ 2 - 1
modules/boonex/russian/data/langs/bx_accounts/ru.xml

@@ -28,8 +28,9 @@
     <string name="_bx_accnt_menu_item_title_system_delete_with_content"><![CDATA[Удалить вместе с содержимым]]></string>
     <string name="_bx_accnt_menu_item_title_delete_with_content"><![CDATA[Удалить вместе с содержимым]]></string>
     <string name="_bx_accnt_menu_item_title_system_admt_accounts"><![CDATA[Аккаунты]]></string>
-    <string name="_bx_accnt_menu_item_title_admt_accounts"><![CDATA[Аккаунты - {addon} неподтверждено]]></string>
+    <string name="_bx_accnt_menu_item_title_admt_accounts"><![CDATA[Аккаунты]]></string>
     <string name="_bx_accnt_menu_item_title_manage"><![CDATA[Управление]]></string>
+    <string name="_bx_accnt_menu_dashboard_manage_tools_addon_counter1_caption"><![CDATA[неподтверждено]]></string>
 
     <string name="_bx_accnt_acl_action_edit_any_account"><![CDATA[Редактировать мой аккаунт]]></string>
 

+ 1 - 1
modules/boonex/russian/data/langs/bx_albums/ru.xml

@@ -205,7 +205,7 @@
     <string name="_bx_albums_menu_set_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
     <string name="_bx_albums_menu_title_manage_tools"><![CDATA[Инструменты управления - Подменю]]></string>
 	<string name="_bx_albums_menu_item_title_system_admt_albums"><![CDATA[Альбомы]]></string>
-	<string name="_bx_albums_menu_item_title_admt_albums"><![CDATA[Альбомы - {addon} спрятан]]></string>
+	<string name="_bx_albums_menu_item_title_admt_albums"><![CDATA[Альбомы]]></string>
 	<string name="_bx_albums_menu_item_title_manage_my"><![CDATA[Мои альбомы]]></string>
 	<string name="_bx_albums_menu_item_title_manage_all"><![CDATA[Все альбомы]]></string>
         <string name="_bx_albums_menu_item_title_system_sm_items"><![CDATA[Элементы]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_channels/ru.xml

@@ -185,7 +185,7 @@
     <string name="_bx_channels_menu_item_title_system_entries_home"><![CDATA[Каналы]]></string>
     <string name="_bx_channels_menu_item_title_entries_home"><![CDATA[Каналы]]></string>
 	<string name="_bx_channels_menu_item_title_system_admt_channels"><![CDATA[Каналы]]></string>
-	<string name="_bx_channels_menu_item_title_admt_channels"><![CDATA[Каналы - {addon} неодобрено]]></string>
+	<string name="_bx_channels_menu_item_title_admt_channels"><![CDATA[Каналы]]></string>
     <string name="_bx_channels_menu_item_title_manage_my"><![CDATA[Мои каналы]]></string>
 	<string name="_bx_channels_menu_item_title_manage_all"><![CDATA[Все каналы]]></string>
 	<string name="_bx_channels_menu_item_title_system_entries_top"><![CDATA[Популярные]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_events/ru.xml

@@ -255,7 +255,7 @@
     <string name="_bx_events_menu_item_title_system_entries_home"><![CDATA[События]]></string>
     <string name="_bx_events_menu_item_title_entries_home"><![CDATA[События]]></string>
     <string name="_bx_events_menu_item_title_system_admt_groups"><![CDATA[События]]></string>
-	<string name="_bx_events_menu_item_title_admt_groups"><![CDATA[События - {addon} неодобрено]]></string>
+	<string name="_bx_events_menu_item_title_admt_groups"><![CDATA[События]]></string>
 	<string name="_bx_events_menu_item_title_manage_my"><![CDATA[Мой события]]></string>
 	<string name="_bx_events_menu_item_title_manage_all"><![CDATA[Все события]]></string>
 	<string name="_bx_events_menu_item_title_system_entries_top"><![CDATA[Популярные]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_files/ru.xml

@@ -175,7 +175,7 @@
     <string name="_bx_files_menu_item_title_system_manage_account"><![CDATA[Управление учетной записью]]></string>
     <string name="_bx_files_menu_item_title_manage_account"><![CDATA[Управление учетной записью]]></string>
 	<string name="_bx_files_menu_item_title_system_admt_files"><![CDATA[Файлы]]></string>
-	<string name="_bx_files_menu_item_title_admt_files"><![CDATA[Файлы - {addon} спрятанных]]></string>
+	<string name="_bx_files_menu_item_title_admt_files"><![CDATA[Файлы]]></string>
 	<string name="_bx_files_menu_item_title_manage_my"><![CDATA[Мой файлы]]></string>
 	<string name="_bx_files_menu_item_title_manage_all"><![CDATA[Все файлы]]></string>
 	<string name="_bx_files_menu_item_title_system_download_file"><![CDATA[Скачать]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_forum/ru.xml

@@ -219,7 +219,7 @@
     <string name="_bx_forum_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_forum_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_forum_menu_item_title_system_admt_discussions"><![CDATA[Обсуждения]]></string>
-    <string name="_bx_forum_menu_item_title_admt_discussions"><![CDATA[Обсуждения - {addon} спрятано]]></string>
+    <string name="_bx_forum_menu_item_title_admt_discussions"><![CDATA[Обсуждения]]></string>
     <string name="_bx_forum_menu_item_title_manage_my"><![CDATA[Мои обсуждения]]></string>
     <string name="_bx_forum_menu_item_title_manage_all"><![CDATA[Все обсуждения]]></string>
     <string name="_bx_forum_menu_item_title_system_discussions"><![CDATA[Количество дискуссий]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_glossary/ru.xml

@@ -178,7 +178,7 @@
     <string name="_bx_glossary_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_glossary_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
 	<string name="_bx_glossary_menu_item_title_system_admt_posts"><![CDATA[Глоссарий]]></string>
-	<string name="_bx_glossary_menu_item_title_admt_posts"><![CDATA[Глоссарий - {addon} спрятано]]></string>
+	<string name="_bx_glossary_menu_item_title_admt_posts"><![CDATA[Глоссарий]]></string>
 	<string name="_bx_glossary_menu_item_title_manage_my"><![CDATA[Мои Глоссарий]]></string>
 	<string name="_bx_glossary_menu_item_title_manage_all"><![CDATA[Все Глоссарий]]></string>
 

+ 5 - 6
modules/boonex/russian/data/langs/bx_groups/ru.xml

@@ -219,12 +219,11 @@
     <string name="_bx_groups_menu_item_title_system_entries_home"><![CDATA[Группы]]></string>
     <string name="_bx_groups_menu_item_title_entries_home"><![CDATA[Группы]]></string>
     <string name="_bx_groups_menu_item_title_system_admt_groups"><![CDATA[Группы]]></string>
-    <string name="_bx_groups_menu_item_title_admt_groups"><![CDATA[Группы - {addon} неодобрено]]></string>
-    <string name="_bx_groups_menu_item_title_manage_my"><![CDATA[Мои группы]]></string>
-    <string name="_bx_groups_menu_item_title_manage_all"><![CDATA[Все группы]]></string>
-    <string name="_bx_groups_menu_item_title_system_entries_top"><![CDATA[Популярные]]></string>
-    <string name="_bx_groups_menu_item_title_entries_top"><![CDATA[Популярные]]></string>
-
+	  <string name="_bx_groups_menu_item_title_admt_groups"><![CDATA[Группы]]></string>
+	  <string name="_bx_groups_menu_item_title_manage_my"><![CDATA[Мои группы]]></string>
+	  <string name="_bx_groups_menu_item_title_manage_all"><![CDATA[Все группы]]></string>
+	  <string name="_bx_groups_menu_item_title_system_entries_top"><![CDATA[Популярные]]></string>
+	  <string name="_bx_groups_menu_item_title_entries_top"><![CDATA[Популярные]]></string>
     <string name="_bx_groups_menu_item_title_system_sm_privacy"><![CDATA[Конфиденциальность]]></string>
     <string name="_bx_groups_menu_item_title_sm_privacy"><![CDATA[Конфиденциальность]]></string>
 

+ 2 - 1
modules/boonex/russian/data/langs/bx_invites/ru.xml

@@ -61,8 +61,9 @@
 
 	<!-- Menus -->
 	<string name="_bx_invites_menu_item_title_system_admt_requests"><![CDATA[Запросы на приглашение]]></string>
-	<string name="_bx_invites_menu_item_title_admt_requests"><![CDATA[Запросы на приглашение - {addon} в ожидании]]></string>
+	<string name="_bx_invites_menu_item_title_admt_requests"><![CDATA[Приглашения]]></string>
 	<string name="_bx_invites_menu_item_title_requests"><![CDATA[Запросы]]></string>
+  <string name="_bx_invites_menu_dashboard_manage_tools_addon_counter1_caption"><![CDATA[в ожидании]]></string>
 
 
 	<!-- Options -->

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

@@ -294,7 +294,7 @@
     <string name="_bx_market_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_market_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
 	<string name="_bx_market_menu_item_title_system_admt_products"><![CDATA[Продукты]]></string>
-	<string name="_bx_market_menu_item_title_admt_products"><![CDATA[Продукты - {addon} спрятано]]></string>
+	<string name="_bx_market_menu_item_title_admt_products"><![CDATA[Продукты]]></string>
 	<string name="_bx_market_menu_item_title_manage_my"><![CDATA[Мои продукты]]></string>
 	<string name="_bx_market_menu_item_title_manage_all"><![CDATA[Все продукты]]></string>
 	<string name="_bx_market_menu_item_title_system_licenses"><![CDATA[Лицензии]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_organizations/ru.xml

@@ -297,7 +297,7 @@
     <string name="_bx_orgs_menu_item_title_system_entries_home"><![CDATA[Организации]]></string>
     <string name="_bx_orgs_menu_item_title_entries_home"><![CDATA[Организации]]></string>
     <string name="_bx_orgs_menu_item_title_system_admt_organizations"><![CDATA[Организации]]></string>
-	<string name="_bx_orgs_menu_item_title_admt_organizations"><![CDATA[Организации - {addon} неодобрено]]></string>
+	<string name="_bx_orgs_menu_item_title_admt_organizations"><![CDATA[Организации]]></string>
 	<string name="_bx_orgs_menu_item_title_manage_my"><![CDATA[Мои организации]]></string>
 	<string name="_bx_orgs_menu_item_title_manage_all"><![CDATA[Все организации]]></string>
 	<string name="_bx_orgs_menu_item_title_system_entries_active"><![CDATA[Активные]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_persons/ru.xml

@@ -257,7 +257,7 @@
     <string name="_bx_persons_menu_item_title_system_entries_home"><![CDATA[Персоны]]></string>
     <string name="_bx_persons_menu_item_title_entries_home"><![CDATA[Люди]]></string>
 	<string name="_bx_persons_menu_item_title_system_admt_persons"><![CDATA[Профили]]></string>
-	<string name="_bx_persons_menu_item_title_admt_persons"><![CDATA[Профили - {addon} неодобрено]]></string>
+	<string name="_bx_persons_menu_item_title_admt_persons"><![CDATA[Профили]]></string>
 	<string name="_bx_persons_menu_item_title_manage_my"><![CDATA[Мои профили]]></string>
 	<string name="_bx_persons_menu_item_title_manage_all"><![CDATA[Все профили]]></string>   
 	<string name="_bx_persons_menu_item_title_system_entries_active"><![CDATA[Активные]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_photos/ru.xml

@@ -185,7 +185,7 @@
     <string name="_bx_photos_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_photos_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
 	<string name="_bx_photos_menu_item_title_system_admt_photos"><![CDATA[Фото]]></string>
-	<string name="_bx_photos_menu_item_title_admt_photos"><![CDATA[Фото - {addon} спрятано]]></string>
+	<string name="_bx_photos_menu_item_title_admt_photos"><![CDATA[Фото]]></string>
 	<string name="_bx_photos_menu_item_title_manage_my"><![CDATA[Мои фото]]></string>
 	<string name="_bx_photos_menu_item_title_manage_all"><![CDATA[Все фото]]></string>
 

+ 1 - 1
modules/boonex/russian/data/langs/bx_polls/ru.xml

@@ -175,7 +175,7 @@
     <string name="_bx_polls_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_polls_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
 	<string name="_bx_polls_menu_item_title_system_admt_polls"><![CDATA[Голосования]]></string>
-	<string name="_bx_polls_menu_item_title_admt_polls"><![CDATA[Голосования - {addon} спрятано]]></string>
+	<string name="_bx_polls_menu_item_title_admt_polls"><![CDATA[Голосования]]></string>
 	<string name="_bx_polls_menu_item_title_manage_my"><![CDATA[Мои голосования]]></string>
 	<string name="_bx_polls_menu_item_title_manage_all"><![CDATA[Все голосования]]></string>
 	<string name="_bx_polls_menu_item_view_subentries"><![CDATA[Показать голосование]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_posts/ru.xml

@@ -215,7 +215,7 @@
     <string name="_bx_posts_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_posts_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
 	<string name="_bx_posts_menu_item_title_system_admt_posts"><![CDATA[Публикации]]></string>
-	<string name="_bx_posts_menu_item_title_admt_posts"><![CDATA[Публикации - {addon} спрятано]]></string>
+	<string name="_bx_posts_menu_item_title_admt_posts"><![CDATA[Публикации]]></string>
 	<string name="_bx_posts_menu_item_title_manage_my"><![CDATA[Мои публикации]]></string>
 	<string name="_bx_posts_menu_item_title_manage_all"><![CDATA[Все публикации]]></string>
 

+ 1 - 1
modules/boonex/russian/data/langs/bx_quoteofday/ru.xml

@@ -29,7 +29,7 @@
   <string name="_bx_quoteofday_page_block_title_manage"><![CDATA[Управление Цитатами дня]]></string>
   <string name="_bx_quoteofday_page_block_title"><![CDATA[Цитата дня]]></string>
   
-  <string name="_bx_quoteofday_menu_item_title_system_admt_manage"><![CDATA[Цитаты дня - {addon} скрыто]]></string>
+  <string name="_bx_quoteofday_menu_item_title_system_admt_manage"><![CDATA[Цитаты дня]]></string>
   <string name="_bx_quoteofday_adm_stg_cpt_type"><![CDATA[Цитата дня]]></string>
   
   <string name="_bx_quoteofday_selection_mode"><![CDATA[Выбирать цитату дня]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_shopify/ru.xml

@@ -189,7 +189,7 @@
     <string name="_bx_shopify_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_shopify_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
 	<string name="_bx_shopify_menu_item_title_system_admt_entries"><![CDATA[Товары]]></string>
-	<string name="_bx_shopify_menu_item_title_admt_entries"><![CDATA[Товары - {addon} спрятано]]></string>
+	<string name="_bx_shopify_menu_item_title_admt_entries"><![CDATA[Товары]]></string>
 	<string name="_bx_shopify_menu_item_title_manage_my"><![CDATA[Мои товары]]></string>
 	<string name="_bx_shopify_menu_item_title_manage_all"><![CDATA[Все товары]]></string>
 	<string name="_bx_shopify_menu_item_title_buy_for"><![CDATA[Купить за {price}]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_snipcart/ru.xml

@@ -203,7 +203,7 @@
     <string name="_bx_snipcart_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_snipcart_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
 	<string name="_bx_snipcart_menu_item_title_system_admt_entries"><![CDATA[Товары]]></string>
-	<string name="_bx_snipcart_menu_item_title_admt_entries"><![CDATA[Товары - {addon} спрятано]]></string>
+	<string name="_bx_snipcart_menu_item_title_admt_entries"><![CDATA[Товары]]></string>
 	<string name="_bx_snipcart_menu_item_title_manage_my"><![CDATA[Мои товары]]></string>
 	<string name="_bx_snipcart_menu_item_title_manage_all"><![CDATA[Все товары]]></string>
         <string name="_bx_snipcart_menu_item_title_system_buy_for"><![CDATA[Купить]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_spaces/ru.xml

@@ -224,7 +224,7 @@
     <string name="_bx_spaces_menu_item_title_system_entries_home"><![CDATA[Пространства]]></string>
     <string name="_bx_spaces_menu_item_title_entries_home"><![CDATA[Пространства]]></string>
     <string name="_bx_spaces_menu_item_title_system_admt_groups"><![CDATA[Пространства]]></string>
-	<string name="_bx_spaces_menu_item_title_admt_groups"><![CDATA[Пространства - {addon} неодобрено]]></string>
+	<string name="_bx_spaces_menu_item_title_admt_groups"><![CDATA[Пространства]]></string>
 	<string name="_bx_spaces_menu_item_title_manage_my"><![CDATA[Мои пространства]]></string>
 	<string name="_bx_spaces_menu_item_title_manage_all"><![CDATA[Все пространства]]></string>
 	<string name="_bx_spaces_menu_item_title_system_entries_top"><![CDATA[Популярные]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_timeline/ru.xml

@@ -136,7 +136,7 @@
     <string name="_bx_timeline_menu_item_title_system_item_send"><![CDATA[Послать]]></string>
     <string name="_bx_timeline_menu_item_title_item_send"><![CDATA[Послать другу]]></string>
     <string name="_bx_timeline_menu_item_title_system_admt_timeline"><![CDATA[Лента]]></string>
-    <string name="_bx_timeline_menu_item_title_admt_timeline"><![CDATA[Лента - {addon} скрытых]]></string>
+    <string name="_bx_timeline_menu_item_title_admt_timeline"><![CDATA[Лента]]></string>
 
     <string name="_bx_timeline_menu_title_item_manage"><![CDATA[Элемент - Управление]]></string>
     <string name="_bx_timeline_menu_set_title_item_manage"><![CDATA[Элемент - Управление]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/bx_videos/ru.xml

@@ -180,7 +180,7 @@
     <string name="_bx_videos_menu_item_title_system_manage_account"><![CDATA[Управление аккаунтом]]></string>
     <string name="_bx_videos_menu_item_title_manage_account"><![CDATA[Управление аккаунтом]]></string>
 	<string name="_bx_videos_menu_item_title_system_admt_videos"><![CDATA[Видео]]></string>
-	<string name="_bx_videos_menu_item_title_admt_videos"><![CDATA[Видео - {addon} спрятано]]></string>
+	<string name="_bx_videos_menu_item_title_admt_videos"><![CDATA[Видео]]></string>
 	<string name="_bx_videos_menu_item_title_manage_my"><![CDATA[Мои видео]]></string>
 	<string name="_bx_videos_menu_item_title_manage_all"><![CDATA[Все видео]]></string>
 

+ 6 - 2
modules/boonex/russian/data/langs/system/ru.xml

@@ -2202,7 +2202,7 @@
 	<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_cmts_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_reply"><![CDATA[]]></string>
@@ -2265,7 +2265,7 @@
 	<string name="_sys_menu_item_title_system_account_settings_pwd"><![CDATA[Пароль]]></string>
 	<string name="_sys_menu_item_title_system_add_content"><![CDATA[Добавить Содержимое]]></string>
 	<string name="_sys_menu_item_title_system_cart"><![CDATA[Корзина]]></string>
-  <string name="_sys_menu_item_title_system_cmts_administration"><![CDATA[Управление комментариями]]></string>
+  <string name="_sys_menu_item_title_system_cmts_administration"><![CDATA[Комментарии]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_delete"><![CDATA[Удалить]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_edit"><![CDATA[Редактировать]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_reply"><![CDATA[Ответить]]></string>
@@ -2350,6 +2350,7 @@
 	<string name="_sys_menu_template_title_floating_blocks"><![CDATA[Подвесные блоки]]></string>
 	<string name="_sys_menu_template_title_floating_blocks_wide"><![CDATA[Широкие подвесные блоки с оповещениями]]></string>
 	<string name="_sys_menu_template_title_floating_blocks_big"><![CDATA[Подвесные блоки - Большие]]></string>
+	<string name="_sys_menu_template_title_floating_blocks_dash"><![CDATA[Подвесные блоки с иконками и подписями]]></string>
 	<string name="_sys_menu_template_title_footer"><![CDATA[Основание - Ссылки]]></string>
 	<string name="_sys_menu_template_title_hor"><![CDATA[Горизонтальные ссылки]]></string>
 	<string name="_sys_menu_template_title_icon_buttons_hor"><![CDATA[Горизонтальные кнопки с иконками]]></string>
@@ -2396,6 +2397,9 @@
 	<string name="_sys_menu_title_switch_language_inline"><![CDATA[Переключатель языка (встроенный)]]></string>
 	<string name="_sys_menu_title_switch_template"><![CDATA[Переключить тему]]></string>
 	<string name="_sys_menu_title_snippet_meta"><![CDATA[Мета информация в карточке]]></string>
+  <string name="_sys_menu_dashboard_manage_tools_addon_counter1_caption_default"><![CDATA[спрятано]]></string>
+  <string name="_sys_menu_dashboard_manage_tools_addon_counter1_caption_profile_default"><![CDATA[неодобрено]]></string>
+  <string name="_sys_menu_dashboard_manage_tools_addon_counter2_caption_default"><![CDATA[жалоб]]></string>
 	<string name="_sys_metatags_mention_added"><![CDATA[<b class="bx-ntfs-content-profile">{owner_name}</b> упомянул <b class="bx-ntfs-content-entry">{entry_caption}</b>]]></string>
 	<string name="_sys_mobile_friends"><![CDATA[Друзья]]></string>
 	<string name="_sys_mobile_info"><![CDATA[Инфо]]></string>

+ 1 - 1
modules/boonex/shopify/install/langs/en.xml

@@ -188,7 +188,7 @@
     <string name="_bx_shopify_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_shopify_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
 	<string name="_bx_shopify_menu_item_title_system_admt_entries"><![CDATA[Goods]]></string>
-	<string name="_bx_shopify_menu_item_title_admt_entries"><![CDATA[Goods - {addon} hidden]]></string>
+	<string name="_bx_shopify_menu_item_title_admt_entries"><![CDATA[Goods]]></string>
 	<string name="_bx_shopify_menu_item_title_manage_my"><![CDATA[My Goods]]></string>
 	<string name="_bx_shopify_menu_item_title_manage_all"><![CDATA[All Goods]]></string>
 	<string name="_bx_shopify_menu_item_title_buy_for"><![CDATA[Buy for {price}]]></string>

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

@@ -274,7 +274,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_shopify', 'shopify-administration', '_bx_shopify_menu_item_title_system_admt_entries', '_bx_shopify_menu_item_title_admt_entries', 'page.php?i=shopify-administration', '', '_self', '', 'a:2:{s:6:"module";s:10:"bx_shopify";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_shopify', 'shopify-administration', '_bx_shopify_menu_item_title_system_admt_entries', '_bx_shopify_menu_item_title_admt_entries', 'page.php?i=shopify-administration', '', '_self', 'shopping-cart', 'a:2:{s:6:"module";s:10:"bx_shopify";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 

+ 1 - 1
modules/boonex/snipcart/install/langs/en.xml

@@ -203,7 +203,7 @@
     <string name="_bx_snipcart_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_snipcart_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
 	<string name="_bx_snipcart_menu_item_title_system_admt_entries"><![CDATA[Goods]]></string>
-	<string name="_bx_snipcart_menu_item_title_admt_entries"><![CDATA[Goods - {addon} hidden]]></string>
+	<string name="_bx_snipcart_menu_item_title_admt_entries"><![CDATA[Goods]]></string>
 	<string name="_bx_snipcart_menu_item_title_manage_my"><![CDATA[My Goods]]></string>
 	<string name="_bx_snipcart_menu_item_title_manage_all"><![CDATA[All Goods]]></string>
         <string name="_bx_snipcart_menu_item_title_system_buy_for"><![CDATA[Buy]]></string>

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

@@ -276,7 +276,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_snipcart', 'snipcart-administration', '_bx_snipcart_menu_item_title_system_admt_entries', '_bx_snipcart_menu_item_title_admt_entries', 'page.php?i=snipcart-administration', '', '_self', '', 'a:2:{s:6:"module";s:11:"bx_snipcart";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_snipcart', 'snipcart-administration', '_bx_snipcart_menu_item_title_system_admt_entries', '_bx_snipcart_menu_item_title_admt_entries', 'page.php?i=snipcart-administration', '', '_self', 'shopping-cart', 'a:2:{s:6:"module";s:11:"bx_snipcart";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 

+ 1 - 1
modules/boonex/spaces/install/langs/en.xml

@@ -223,7 +223,7 @@
 	<string name="_bx_spaces_menu_item_title_system_entries_home"><![CDATA[Spaces]]></string>
 	<string name="_bx_spaces_menu_item_title_entries_home"><![CDATA[Spaces]]></string>
 	<string name="_bx_spaces_menu_item_title_system_admt_spaces"><![CDATA[Spaces]]></string>
-	<string name="_bx_spaces_menu_item_title_admt_spaces"><![CDATA[Spaces - {addon} unapproved]]></string>
+	<string name="_bx_spaces_menu_item_title_admt_spaces"><![CDATA[Spaces]]></string>
 	<string name="_bx_spaces_menu_item_title_manage_my"><![CDATA[My Spaces]]></string>
 	<string name="_bx_spaces_menu_item_title_manage_all"><![CDATA[All Spaces]]></string>
 	<string name="_bx_spaces_menu_item_title_system_entries_top"><![CDATA[Top]]></string>

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

@@ -335,7 +335,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_spaces', 'spaces-administration', '_bx_spaces_menu_item_title_system_admt_spaces', '_bx_spaces_menu_item_title_admt_spaces', 'page.php?i=spaces-administration', '', '_self', '', 'a:2:{s:6:"module";s:9:"bx_spaces";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_spaces', 'spaces-administration', '_bx_spaces_menu_item_title_system_admt_spaces', '_bx_spaces_menu_item_title_admt_spaces', 'page.php?i=spaces-administration', '', '_self', 'object-group', 'a:2:{s:6:"module";s:9:"bx_spaces";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 

+ 1 - 1
modules/boonex/timeline/install/langs/en.xml

@@ -136,7 +136,7 @@
     <string name="_bx_timeline_menu_item_title_system_item_send"><![CDATA[Send]]></string>
     <string name="_bx_timeline_menu_item_title_item_send"><![CDATA[Send to Friend]]></string>
     <string name="_bx_timeline_menu_item_title_system_admt_timeline"><![CDATA[Timeline]]></string>
-    <string name="_bx_timeline_menu_item_title_admt_timeline"><![CDATA[Timeline - {addon} hidden]]></string>
+    <string name="_bx_timeline_menu_item_title_admt_timeline"><![CDATA[Timeline]]></string>
     
     <string name="_bx_timeline_menu_title_item_manage"><![CDATA[Manage Item]]></string>
     <string name="_bx_timeline_menu_set_title_item_manage"><![CDATA[Manage Item]]></string>

+ 2 - 2
modules/boonex/timeline/install/sql/enable.sql

@@ -28,7 +28,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `
 
 
 -- PAGES: add page block on dashboard
-SET @iPBCellDashboard = 2;
+SET @iPBCellDashboard = 4;
 SET @iPBOrderDashboard = 1; --(SELECT IFNULL(MAX(`order`), 0) FROM `sys_pages_blocks` WHERE `object` = 'sys_dashboard' AND `cell_id` = @iPBCellDashboard LIMIT 1);
 INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES
 ('sys_dashboard', @iPBCellDashboard, 'bx_timeline', '_bx_timeline_page_block_title_system_post_account', '_bx_timeline_page_block_title_post_account', 11, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:22:"get_block_post_account";}', 0, 1, 1, @iPBOrderDashboard),
@@ -147,7 +147,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_timeline', 'timeline-administration', '_bx_timeline_menu_item_title_system_admt_timeline', '_bx_timeline_menu_item_title_admt_timeline', 'page.php?i=timeline-administration', '', '_self', '', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_timeline', 'timeline-administration', '_bx_timeline_menu_item_title_system_admt_timeline', '_bx_timeline_menu_item_title_admt_timeline', 'page.php?i=timeline-administration', '', '_self', 'clock', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- SETTINGS
 SET @iTypeOrder = (SELECT MAX(`order`) FROM `sys_options_types` WHERE `group` = 'modules');

+ 1 - 1
modules/boonex/videos/install/langs/en.xml

@@ -180,7 +180,7 @@
     <string name="_bx_videos_menu_item_title_system_manage_account"><![CDATA[Manage account]]></string>
     <string name="_bx_videos_menu_item_title_manage_account"><![CDATA[Manage account]]></string>
 	<string name="_bx_videos_menu_item_title_system_admt_videos"><![CDATA[Videos]]></string>
-	<string name="_bx_videos_menu_item_title_admt_videos"><![CDATA[Videos - {addon} hidden]]></string>
+	<string name="_bx_videos_menu_item_title_admt_videos"><![CDATA[Videos]]></string>
 	<string name="_bx_videos_menu_item_title_manage_my"><![CDATA[My Videos]]></string>
 	<string name="_bx_videos_menu_item_title_manage_all"><![CDATA[All Videos]]></string>
 

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

@@ -273,7 +273,7 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('sys_account_dashboard_manage_tools', 'bx_videos', 'videos-administration', '_bx_videos_menu_item_title_system_admt_videos', '_bx_videos_menu_item_title_admt_videos', 'page.php?i=videos-administration', '', '_self', '', 'a:2:{s:6:"module";s:9:"bx_videos";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
+('sys_account_dashboard_manage_tools', 'bx_videos', 'videos-administration', '_bx_videos_menu_item_title_system_admt_videos', '_bx_videos_menu_item_title_admt_videos', 'page.php?i=videos-administration', '', '_self', 'film', 'a:2:{s:6:"module";s:9:"bx_videos";s:6:"method";s:27:"get_menu_addon_manage_tools";}', '', 192, 1, 0, @iManageMenuOrder + 1);
 
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 

+ 15 - 13
template/chart_stats.html

@@ -1,22 +1,24 @@
 <div class="bx-chart-stats bx-def-font-align-center">
-    <div class="bx-chart-stats-items bx-def-margin-bottom">
-        <bx_repeat:items>
-            <div class="bx-cs-item bx-def-padding-thd-leftright bx-def-box-sizing">
-                <bx_if:show_link>
-                    <a href="__link__" title="__title_attr__"><span class="bx-def-font-h3">__value__</span> __title__</a>
-                </bx_if:show_link>
-                <bx_if:show_text><span title="__title_attr__"><span class="bx-def-font-h3">__value__</span> __title__</span></bx_if:show_text>
-            </div>
-        </bx_repeat:items>
-    </div>
-    <div class="bx-chart-stats-graph bx-def-border">
-	    <canvas id="bx_chart_stats_graph" width="100%"></canvas>
+    <div class="bx-chart-stats-graph">
+        <canvas id="bx_chart_stats_graph" width="100%"></canvas>
 	    <script type="text/javascript">
 	    	var oStatsChart = new Chart($("#bx_chart_stats_graph"), {
 	    		type: 'doughnut',
 	    		data: __chart_data__,
-	    		options: {}
+	    		options: {
+	    		    legend: {
+	    		        position: 'right'
+	    		    },
+	    		    padding: {
+	    		        left: 0,
+	    		        right: 0,
+	    		        top: 0,
+	    		        bottom: 0
+	    		    },
+	    		    maintainAspectRatio: false
+	    		},
 	    	});
+	    	$("#bx_chart_stats_graph").height(450);
 	    </script>
     </div>
 </div>

+ 51 - 2
template/css/menu.css

@@ -351,16 +351,22 @@ ul.bx-menu-toolbar li a .bx-def-unit-alert-middle {
     max-width:800px;
     max-width:50rem;
 }
-
+ul.bx-menu-floating-blocks-dash{
+    display: flex;
+    flex-wrap: wrap;
+    align-content: space-between;
+}
 ul.bx-menu-floating-blocks-wide,
 ul.bx-menu-floating-blocks-big,
+ul.bx-menu-floating-blocks-dash,
 ul.bx-menu-floating-blocks {
     padding:0;
     margin:0;
     list-style:none;
-}
+}  
 
 .bx-menu-floating-blocks-big li,
+
 .bx-menu-floating-blocks-wide li,
 .bx-menu-floating-blocks li {
     display: inline-block;
@@ -380,6 +386,17 @@ ul.bx-menu-floating-blocks {
     height:128px;
     height:8rem;
 }
+.bx-menu-floating-blocks-dash li {
+    display: block;
+    width:25%;
+    height:3.35rem;
+}
+.bx-media-phone .bx-menu-floating-blocks-dash li {
+    width:50%;
+}
+.bx-menu-floating-blocks-dash-item {
+     height:3.35rem;
+}
 .bx-menu-floating-blocks-wide li {
     position:relative;
     width:100px;
@@ -393,6 +410,7 @@ ul.bx-menu-floating-blocks {
 }
 
 .bx-menu-floating-blocks-big li:hover,
+.bx-menu-floating-blocks-dash li:hover,
 .bx-menu-floating-blocks-wide li:hover,
 .bx-menu-floating-blocks li:hover {
     opacity:0.8;
@@ -400,6 +418,8 @@ ul.bx-menu-floating-blocks {
 
 .bx-menu-floating-blocks-big li:active,
 .bx-menu-floating-blocks-big li.bx-menu-tab-active,
+.bx-menu-floating-blocks-dash li:active,
+.bx-menu-floating-blocks-dash li.bx-menu-tab-active,
 .bx-menu-floating-blocks-wide li:active,
 .bx-menu-floating-blocks-wide li.bx-menu-tab-active,
 .bx-menu-floating-blocks li:active,
@@ -408,6 +428,7 @@ ul.bx-menu-floating-blocks {
 }
 
 .bx-menu-floating-blocks-big li a,
+.bx-menu-floating-blocks-dash li a,
 .bx-menu-floating-blocks-wide li a,
 .bx-menu-floating-blocks li a {
     display:block;
@@ -415,6 +436,7 @@ ul.bx-menu-floating-blocks {
 }
 
 .bx-menu-floating-blocks-big li.bx-menu-tab-active a,
+.bx-menu-floating-blocks-dash li.bx-menu-tab-active a,
 .bx-menu-floating-blocks-wide li.bx-menu-tab-active a,
 .bx-menu-floating-blocks li.bx-menu-tab-active a {
     color:#000;
@@ -465,6 +487,7 @@ ul.bx-menu-floating-blocks {
 }
 
 .bx-menu-floating-blocks-big li img,
+.bx-menu-floating-blocks-dash li img,
 .bx-menu-floating-blocks-wide li img,
 .bx-menu-floating-blocks li img {
     background-position:center center;
@@ -472,6 +495,7 @@ ul.bx-menu-floating-blocks {
 }
 
 .bx-menu-floating-blocks-big li .sys-icon,
+.bx-menu-floating-blocks-dash li .sys-icon,
 .bx-menu-floating-blocks-wide li .sys-icon,
 .bx-menu-floating-blocks li .sys-icon {
     text-align:center;
@@ -488,6 +512,14 @@ ul.bx-menu-floating-blocks {
     font-size:4rem;
 }
 
+.bx-menu-floating-blocks-dash li .sys-icon {
+    line-height:2rem;
+    font-size:2rem;
+}
+.bx-menu-floating-blocks-dash .bx-menu-floating-blocks-icon {
+    float:left;
+}
+
 .bx-menu-floating-blocks-big li .bx-menu-floating-blocks-title,
 .bx-menu-floating-blocks-wide li .bx-menu-floating-blocks-title,
 .bx-menu-floating-blocks li .bx-menu-floating-blocks-title {
@@ -497,6 +529,23 @@ ul.bx-menu-floating-blocks {
     white-space:nowrap;
 }
 
+.bx-menu-floating-blocks-dash li .bx-menu-floating-blocks-title {
+    text-align:left;
+    font-weight:bold;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+}
+.bx-menu-floating-blocks-dash li .bx-menu-floating-blocks-info {
+    text-align:left;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+}
+.bx-menu-floating-blocks-dash li .bx-menu-floating-blocks-info {
+}
+
+
 /* --------------- interactive block menu */
 ul.bx-menu-inter,
 ul.bx-menu-inter-vert {

+ 23 - 0
template/menu_floating_blocks_dash.html

@@ -0,0 +1,23 @@
+<ul class="bx-menu-floating-blocks-dash bx-menu-object-__object__ bx-clearfix bx-def-margin-sec-leftright-neg">
+    <bx_repeat:menu_items>
+        <li class=" bx-def-margin-bottom">
+            <div class="bx-menu-floating-blocks-dash-item bx-def-padding-sec bx-def-margin-sec-leftright bx-def-round-corners bx-def-color-bg-hl-hover bx-def-box bx-def-box-sizing __class_add__">
+                <a href="__link__" target="__target__" onclick="__onclick__">
+                    <div class="bx-menu-floating-blocks-icon bx-def-margin-sec-right">
+                        <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">__title__</div>
+                    <bx_if:addon>__addonf__</bx_if:addon>
+                </a>
+            </div>
+        </li>
+    </bx_repeat:menu_items>
+</ul>
+
+<script language="javascript">
+    $(document).ready(function () {
+        // add default class to active menu items
+        $('.bx-menu-floating-blocks-big > li.bx-menu-tab-active').not('.bx-def-color-bg-active').addClass('bx-def-color-bg-active');
+    });
+</script>

+ 11 - 0
template/menu_item_dashboard_manage_tools_addon.html

@@ -0,0 +1,11 @@
+<div class="bx-menu-floating-blocks-info bx-def-font-grayed bx-def-font-small">
+    <bx_if:counter1>
+        __value__ __caption__
+    </bx_if:counter1>
+    <bx_if:counter1and2>
+        &bull;
+    </bx_if:counter1and2>
+    <bx_if:counter2>
+        <span class="col-red1">__value__ __caption__</span>
+    </bx_if:counter2>
+</div>

+ 2 - 32
template/scripts/BxBaseChartServices.php

@@ -113,7 +113,6 @@ class BxBaseChartServices extends BxDol
         $aItems = $oDb->getAll($sQuery);
 
         foreach($aItems as $aItem) {
-            $sTitle = _t($aItem['title']);
             $sTitleAttr = bx_html_attribute(_t($aItem['title']));
 
             $iValue = 0;
@@ -121,36 +120,8 @@ class BxBaseChartServices extends BxDol
                 $iValue = (int)$oDb->getOne($aItem['query']);
             else if(BxDolRequest::serviceExists($aItem['module'], 'get_query_statistics'))
                 $iValue = (int)BxDolService::call($aItem['module'], 'get_query_statistics', array($aItem));
-
-            $sLink = '';
-            if(!empty($aItem['link']))
-                $sLink = BxDolPermalinks::getInstance()->permalink($aItem['link']);
-            $bLink = !empty($sLink);
-
-            $aTmplVarsItems[] = array(
-            	'title' => $sTitle,
-            	'title_attr' => $sTitleAttr,
-                'value' => $iValue,
-                'bx_if:show_link' => array(
-                    'condition' => $bLink,
-                    'content' => array(
-                        'link' => $sLink,
-                        'title' => $sTitle,
-            			'title_attr' => $sTitleAttr,
-                		'value' => $iValue,
-                    )
-                ),
-                'bx_if:show_text' => array(
-                    'condition' => !$bLink,
-                    'content' => array(
-                        'title' => $sTitle,
-                		'title_attr' => $sTitleAttr,
-                		'value' => $iValue,
-                    )
-                )
-            );
-
-            $aTmplVarsDataLabels[] = $sTitle;
+            
+            $aTmplVarsDataLabels[] = $sTitleAttr . ' - ' . $iValue;
 
             $aTmplVarsDataSet['data'][] = $iValue;
             $aTmplVarsDataSet['backgroundColor'][] = '#' . dechex(rand(0x000000, 0xFFFFFF));
@@ -161,7 +132,6 @@ class BxBaseChartServices extends BxDol
         $oTemplate->addCss(array('chart.css'));
 
         return $oTemplate->parseHtmlByName('chart_stats.html', array(
-        	'bx_repeat:items' => $aTmplVarsItems,
             'chart_data' => json_encode(array(
                 'labels' => $aTmplVarsDataLabels,
                 'datasets' => array($aTmplVarsDataSet)

+ 2 - 1
template/scripts/BxBaseMenu.php

@@ -149,7 +149,8 @@ class BxBaseMenu extends BxDolMenu
 		$a = $this->_replaceMarkers($a);
 
 		$mixedAddon = $this->_getMenuAddon($a);
-		$this->addMarkers(array('addon' => $mixedAddon));
+        if (!is_array($mixedAddon))
+		    $this->addMarkers(array('addon' => $mixedAddon));
 
 		$a = $this->_replaceMarkers($a);
 

+ 66 - 0
template/scripts/BxBaseMenuDashboardManageTools.php

@@ -0,0 +1,66 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaBaseView UNA Base Representation Classes
+ * @{
+ */
+
+/**
+ * Menu representation.
+ * @see BxDolMenu
+ */
+class BxBaseMenuDashboardManageTools extends BxTemplMenu
+{
+    public function __construct ($aObject, $oTemplate)
+    {
+        parent::__construct ($aObject, $oTemplate);
+    }
+    
+    protected function _getMenuIcon ($a)
+    {
+         $aTmp = parent::_getMenuIcon ($a);
+         if (trim($aTmp[0]) == '')
+             $aTmp[0] = 'user-cog';
+         return $aTmp;
+    }
+    
+    protected function _getTmplVarsAddon($mixedAddon, $aMenuItem)
+    {
+        $aValues = array('counter1_value' => 0, 'counter1_caption' => _t('_sys_menu_dashboard_manage_tools_addon_counter1_caption_default'), 'counter2_value' => 0, 'counter2_caption' => _t('_sys_menu_dashboard_manage_tools_addon_counter2_caption_default'));
+        if (is_array($mixedAddon)){
+            $aValues = array_merge($aValues, $mixedAddon);
+        }
+        else{
+            $aValues['counter1_value'] = $mixedAddon;
+        }
+        
+        $aTmp = array(
+            'bx_if:counter1' => array(
+                'condition' => $aValues['counter1_value'] > 0,
+                'content' => array(
+                    'value' => $aValues['counter1_value'],
+                    'caption' => $aValues['counter1_caption']
+                )
+            ),
+            'bx_if:counter2' => array(
+                'condition' => $aValues['counter2_value'] > 0,
+                'content' => array(
+                    'value' => $aValues['counter2_value'],
+                    'caption' => $aValues['counter2_caption']
+                )
+            ),
+            'bx_if:counter1and2' => array(
+                'condition' => ($aValues['counter1_value'] > 0 && $aValues['counter2_value'] > 0),
+                'content' => array()
+            )
+        );
+        return array(
+            'addon' => (trim($aValues['counter1_value']) != '' || trim($aValues['counter2_value']) != ''),
+            'addonf' => $this->_oTemplate->parseHtmlByTemplateName('menu_item_dashboard_manage_tools_addon', $aTmp)
+        );
+    }
+}
+
+/** @} */

+ 10 - 0
template/scripts/BxBaseSearchResult.php

@@ -306,6 +306,16 @@ class BxBaseSearchResult extends BxDolSearchResult
             }
         }
     }
+    
+    function fillFiltersByObjects ($aParams)
+    {
+        // transform all given values to fields values
+        if (is_array($aParams)) {
+            foreach ($aParams as $sKey => $mixedValue) {
+                $this->aCurrent['restriction'][$sKey] = $mixedValue;
+            }
+        }
+    }
 
     /**
      * Set design box template id to use to wrap search results in