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

modules/base/profile/classes/BxBaseModProfileModule.php

@@ -137,10 +137,12 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolCon
 		bx_import('SearchResult', $this->_aModule);
         $sClass = $this->_aModule['class_prefix'] . 'SearchResult';
         $o = new $sClass();
+        $o->unsetPaginate();
+        $iNumTotal = $o->getNum();
+        
         $o->fillFilters(array(
 			'perofileStatus' => BX_PROFILE_STATUS_PENDING
         ));
-        $o->unsetPaginate();
         $iNum1 = $o->getNum();
         
         $iNum2 = 0;
@@ -150,7 +152,7 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolCon
             $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'));
+        return array('counter1_value' => $iNum1, 'counter2_value' => $iNum2, 'counter3_value' => $iNumTotal, 'counter1_caption' => _t('_sys_menu_dashboard_manage_tools_addon_counter1_caption_profile_default'));
 	}
 
 	public function serviceGetMenuAddonManageToolsProfileStats()

modules/base/text/classes/BxBaseModTextModule.php

@@ -98,10 +98,12 @@ class BxBaseModTextModule extends BxBaseModGeneralModule implements iBxDolConten
 		bx_import('SearchResult', $this->_aModule);
         $sClass = $this->_aModule['class_prefix'] . 'SearchResult';
         $o = new $sClass();
+        $o->unsetPaginate();
+        $iNumTotal = $o->getNum();
+        
         $o->fillFilters(array(
 			'status' => 'hidden'
-        ));
-        $o->unsetPaginate();
+        )); 
         $iNum1 = $o->getNum();
         
         $iNum2 = 0;
@@ -111,7 +113,7 @@ class BxBaseModTextModule extends BxBaseModGeneralModule implements iBxDolConten
             $o->fillFiltersByObjects(array('reported' => array('value' => '0', 'field' => 'reports', 'operator' => '>')));
             $iNum2 = $o->getNum();
         }
-        return array('counter1_value' => $iNum1, 'counter2_value' => $iNum2);
+        return array('counter1_value' => $iNum1, 'counter2_value' => $iNum2, 'counter3_value' => $iNumTotal );
 	}
 
 	public function serviceGetMenuAddonManageToolsProfileStats()

modules/boonex/accounts/classes/BxAccntModule.php

@@ -43,12 +43,14 @@ class BxAccntModule extends BxBaseModGeneralModule
 		bx_import('SearchResult', $this->_aModule);
         $sClass = $this->_aModule['class_prefix'] . 'SearchResult';
         $o = new $sClass();
+        $o->unsetPaginate();
+        $iNumTotal = $o->getNum();
+        
         $o->fillFilters(array(
 			'unconfirmed' => 1
         ));
-        $o->unsetPaginate();
-
-        return array('counter1_value' => $o->getNum(), 'counter1_caption' => _t('_bx_accnt_menu_dashboard_manage_tools_addon_counter1_caption'));
+      
+        return array('counter1_value' => $o->getNum(),'counter3_value' => $iNumTotal, 'counter1_caption' => _t('_bx_accnt_menu_dashboard_manage_tools_addon_counter1_caption'));
 	}
 
     public function checkAllowedDelete(&$aDataEntry, $isPerformAction = false)

modules/boonex/invites/classes/BxInvModule.php

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

template/css/menu.css

@@ -391,7 +391,7 @@ ul.bx-menu-floating-blocks {
     height:3.35rem;
 }
 .bx-media-phone .bx-menu-floating-blocks-dash li {
-    width:50%;
+    width:49.5%;
 }
 .bx-menu-floating-blocks-dash-item {
      height:3.35rem;
@@ -514,6 +514,8 @@ ul.bx-menu-floating-blocks {
 .bx-menu-floating-blocks-dash li .sys-icon {
     line-height:2rem;
     font-size:2rem;
+	width: 2.2rem;
+    display: inline-block;
 }
 .bx-menu-floating-blocks-dash .bx-menu-floating-blocks-icon {
     float:left;

template/menu_item_dashboard_manage_tools_addon.html

@@ -1,4 +1,7 @@
 <div class="bx-menu-floating-blocks-info bx-def-font-grayed bx-def-font-small">
+    <bx_if:counter3>
+        <strong>__value__ __caption__ &bull;</strong>
+    </bx_if:counter3>
     <bx_if:counter1>
         __value__ __caption__
     </bx_if:counter1>

template/scripts/BxBaseMenuDashboardManageTools.php

@@ -28,7 +28,11 @@ class BxBaseMenuDashboardManageTools extends BxTemplMenu
     
     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'));
+        $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'),
+            'counter3_value' => 0, 'counter3_caption' => ''
+        );
         if (is_array($mixedAddon)){
             $aValues = array_merge($aValues, $mixedAddon);
         }
@@ -51,6 +55,13 @@ class BxBaseMenuDashboardManageTools extends BxTemplMenu
                     'caption' => $aValues['counter2_caption']
                 )
             ),
+            'bx_if:counter3' => array(
+                'condition' => $aValues['counter3_value'] > 0,
+                'content' => array(
+                    'value' => $aValues['counter3_value'],
+                    'caption' => $aValues['counter3_caption']
+                )
+            ),
             'bx_if:counter1and2' => array(
                 'condition' => ($aValues['counter1_value'] > 0 && $aValues['counter2_value'] > 0),
                 'content' => array()