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

#2113 Dashboard page realign - changes

RomanL 7 лет назад
Родитель
Сommit
fbdce6b161

+ 3 - 8
template/menu_item_dashboard_manage_tools_addon.html

@@ -1,14 +1,9 @@
 <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>
+    <strong>__total_value__ __total_caption__ </strong>
     <bx_if:counter1>
-        __value__ __caption__
+        &bull; __value__ __caption__
     </bx_if:counter1>
-    <bx_if:counter1and2>
-        &bull;
-    </bx_if:counter1and2>
     <bx_if:counter2>
-        <span class="col-red1">__value__ __caption__</span>
+        &bull; <span class="col-red1">__value__ __caption__</span>
     </bx_if:counter2>
 </div>

+ 2 - 11
template/scripts/BxBaseMenuDashboardManageTools.php

@@ -55,17 +55,8 @@ 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()
-            )
+            'total_value' => $aValues['counter3_value'],
+            'total_caption' => $aValues['counter3_caption']     
         );
         return array(
             'addon' => (trim($aValues['counter1_value']) != '' || trim($aValues['counter2_value']) != ''),