Răsfoiți Sursa

Ticket #2105 - Unified thumbnail sizing in Profile based modules.

AntonLV 7 ani în urmă
părinte
comite
aabbc6dc12

+ 5 - 1
modules/base/profile/classes/BxBaseModProfileModule.php

@@ -236,6 +236,7 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolCon
         $bCheckPrivateContent = isset($aParams['check_private_content']) ? (bool)$aParams['check_private_content'] : true;
 
         $sTemplate = 'unit.html';
+        $sTemplateSize = false;
         $aTemplateVars = array();
         if(!empty($aParams['template'])) {
             if(is_string($aParams['template']))
@@ -244,12 +245,15 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolCon
                 if(!empty($aParams['template']['name']))
                     $sTemplate = $aParams['template']['name'] . '.html';
 
+                if(!empty($aParams['template']['size']))
+                    $sTemplateSize = $aParams['template']['size'];
+
                 if(!empty($aParams['template']['vars']))
                     $aTemplateVars = $aParams['template']['vars'];
             }
         }
 
-        return $this->_oTemplate->unit($aContentInfo, $bCheckPrivateContent, array($sTemplate, $aTemplateVars));
+        return $this->_oTemplate->unit($aContentInfo, $bCheckPrivateContent, array($sTemplate, $sTemplateSize, $aTemplateVars));
     }
 
     public function serviceHasImage ($iContentId)

+ 45 - 11
modules/base/profile/classes/BxBaseModProfileTemplate.php

@@ -14,6 +14,9 @@
  */
 class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
 {
+    protected $_sUnitDefault;    
+    protected $_sUnitSizeDefault;
+
     protected $_sUnitClass;
     protected $_sUnitClassWithCover;
     protected $_sUnitClassWoInfo;
@@ -26,6 +29,9 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
     {
         parent::__construct($oConfig, $oDb);
 
+        $this->_sUnitDefault = 'unit.html';
+        $this->_sUnitSizeDefault = 'thumb';
+                
         $this->_sUnitClass = 'bx-base-pofile-unit';
         $this->_sUnitClassWithCover = 'bx-base-pofile-unit-with-cover';
         $this->_sUnitClassWoInfo = 'bx-base-pofile-unit-wo-info';
@@ -38,21 +44,30 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
     /**
      * Get profile unit
      */
-    function unit ($aData, $isCheckPrivateContent = true, $mixedTemplate = 'unit.html')
+    function unit ($aData, $isCheckPrivateContent = true, $mixedTemplate = false)
     {
-        list($sTemplate, $aTemplateVars) = is_array($mixedTemplate) ? $mixedTemplate : array($mixedTemplate, array());
-
-        $aVars = $this->unitVars($aData, $isCheckPrivateContent, $sTemplate);
-        if(!empty($aTemplateVars) && is_array($aTemplateVars))
-            $aVars = array_merge($aVars, $aTemplateVars);
+        list($sTemplate) = is_array($mixedTemplate) ? $mixedTemplate : array($mixedTemplate);
+        if(empty($sTemplate))
+            $sTemplate = $this->_sUnitDefault;
 
+        $aVars = $this->unitVars($aData, $isCheckPrivateContent, $mixedTemplate);
+ 
         return $this->parseHtmlByName($sTemplate, $aVars);
     }
 
-    function unitVars ($aData, $isCheckPrivateContent = true, $sTemplateName = 'unit.html')
+    function unitVars ($aData, $isCheckPrivateContent = true, $mixedTemplate = false)
     {
         $CNF = &$this->_oConfig->CNF;
 
+        list($sTemplate, $sTemplateSize, $aTemplateVars) = is_array($mixedTemplate) ? $mixedTemplate : array($mixedTemplate, false, array());
+
+        if(empty($sTemplate))
+            $sTemplate = $this->_sUnitDefault;
+        if(empty($sTemplateSize))
+            $sTemplateSize = $this->_getUnitSize($aData, $sTemplate);
+        if(empty($aTemplateVars) || !is_array($aTemplateVars))
+            $aTemplateVars = array();
+
         $oModule = $this->getModule();
         $iContentId = (int)$aData[$CNF['FIELD_ID']];
 
@@ -90,18 +105,21 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
                 'bx_if:show_thumb_image' => array(
                     'condition' => $bThumbUrl,
                     'content' => array(
+                        'size' => $sTemplateSize,
                         'thumb_url' => $sThumbUrl
                     )
                 ),
                 'bx_if:show_avatar_image' => array(
                     'condition' => $bAvatarUrl,
                     'content' => array(
+                        'size' => $sTemplateSize,
                         'avatar_url' => $sAvatarUrl
                     )
                 ),
                 'bx_if:show_thumb_letter' => array(
                     'condition' => !$bThumbUrl && !$bAvatarUrl,
                     'content' => array(
+                        'size' => $sTemplateSize,
                         'color' => implode(', ', BxDolTemplate::getColorCode($iProfile, 1.0)),
                         'letter' => mb_strtoupper(mb_substr($sTitle, 0, 1))
                     )
@@ -110,6 +128,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
                     'condition' => $oProfile->isOnline(),
                     'content' => array()
                 ),
+                'size' => $sTemplateSize,
                 'thumb_url' => $bThumbUrl ? $sThumbUrl : $this->getImageUrl('no-picture-thumb.png'),
                 'avatar_url' => $bAvatarUrl ? $sAvatarUrl : $this->getImageUrl('no-picture-thumb.png'),
             );
@@ -122,10 +141,8 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
         
         $aTmplVarsMeta = $this->getSnippetMenuVars ($iProfile, $bPublic);
 
-        
-        // generate html
         return array_merge(array (
-            'class' => $this->_getUnitClass($aData, $sTemplateName),
+            'class' => $this->_getUnitClass($aData, $sTemplate),
             'id' => $iContentId,
             'public' => $bPublic,
             'bx_if:show_thumbnail' => array(
@@ -144,7 +161,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
                 'condition' => !empty($aTmplVarsMeta),
                 'content' => $aTmplVarsMeta
             )
-        ), $aTmplVarsThumbnail);
+        ), $aTmplVarsThumbnail, $aTemplateVars);
     }
 
     function isProfilePublic($aData)
@@ -455,6 +472,23 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
 
         return $sResult;
     }
+
+    protected function _getUnitSize($aData, $sTemplateName = 'unit.html')
+    {
+        $sResult = '';
+
+        switch($sTemplateName) {
+            case 'unit_with_cover.html':
+                $sResult = 'ava';
+                break;
+
+            default:
+                $sResult = $this->_sUnitSizeDefault;
+                break;
+        }
+
+        return $sResult;
+    }
 }
 
 /** @} */

+ 2 - 2
modules/base/profile/template/cover.html

@@ -13,10 +13,10 @@
                         <div class="bx-base-pofile-cover-thumb">
                             <a class="bx-base-pofile-cover-thumb" href="__picture_href__" onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();">
                                 <bx_if:show_ava_image>
-                                    <img class="bx-base-pofile-unit-ava bx-def-ava-big bx-def-ava-big-size" src="__ava_url__" />
+                                    <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size" src="__ava_url__" />
                                 </bx_if:show_ava_image>
                                 <bx_if:show_ava_letter>
-                                    <p class="bx-base-pofile-unit-ava bx-def-ava-big bx-def-ava-big-size bx-def-border" style="background-color:rgba(__color__)">__letter__</p>
+                                    <p class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size bx-def-border" style="background-color:rgba(__color__)">__letter__</p>
                                 </bx_if:show_ava_letter>
                             </a>
                             <bx_if:show_online>

+ 45 - 28
modules/base/profile/template/css/main.css

@@ -1,4 +1,3 @@
-
 @import url(../../../general/template/css/main.css);
 
 /* browse unit */
@@ -10,8 +9,8 @@
 }
 
 .bx-base-pofile-unit-wo-info {
-	position: relative;
-	display: block;
+    position: relative;
+    display: block;
 }
 
 .bx-search-result-block {
@@ -21,17 +20,26 @@
 .bx-base-pofile-unit .bx-def-unit-img,
 .bx-base-pofile-unit-wo-info .bx-def-unit-img,
 .bx-base-pofile-unit-with-cover .bx-def-unit-img {
-	position: relative;
-	overflow: visible;
+    position: relative;
+    overflow: visible;
 }
 
+.bx-def-unit-img .bx-base-pofile-unit-thumb {
+    background: rgba(255, 255, 255, 1.0);
+    background-clip: padding-box;
+    border-width: 2px;
+    border-color: rgba(255, 255, 255, 1.0);
+    box-shadow: inset 0px 0px 4px rgba(0, 0, 0, 0.2);
+}
+
+
 /* unit meta */
 .sys-author ul.bx-menu-custom li .bx-base-profile-unit-meta-item,
 .bx-base-general-unit-meta ul.bx-menu-custom li .bx-base-profile-unit-meta-item {
-	height: 1.625rem;
-	padding-left: 0.5rem;
+    height: 1.625rem;
+    padding-left: 0.5rem;
 
-	line-height: 1.625rem;	
+    line-height: 1.625rem;
 }
 
 .sys-author ul.bx-menu-custom li:first-child .bx-base-profile-unit-meta-item,
@@ -39,14 +47,14 @@
     padding-left: 0px;
 }
 
-/* browse unit with cover */
 
+/* browse unit with cover */
 .bx-base-pofile-unit-cover {
     display:block;
 
-    height:7.5rem;
+    height: 10.0rem;
 
-    line-height:7.5rem;
+    line-height:10.0rem;
     text-align:center;
 
     background-repeat:no-repeat;
@@ -58,29 +66,34 @@
 }
 
 img.bx-base-pofile-unit-thumb {
-	display: block;
+    display: block;
 
-    background-color: #fff;
+    background-color: #ffffff;
 }
 
-p.bx-base-pofile-unit-thumb,
-p.bx-base-pofile-unit-ava {
+p.bx-base-pofile-unit-thumb {
     display: block;
     margin: 0px;
 
     line-height: 48px;
     line-height: 3.2rem;
+    text-align: center;
 
     font-size: 30px;
     font-size: 2.0rem;
     font-weight: 700;
     color: #ffffff;
 }
-p.bx-base-pofile-unit-ava {
-    line-height: 100px;
-    line-height: 6.6875rem;
+p.bx-base-pofile-unit-thumb.bx-def-icon-size {
+    line-height: 28px;
+    line-height: 1.8125rem;
+    font-size: 24px;
+    font-size: 1.6rem;
+}
+p.bx-base-pofile-unit-thumb.bx-def-ava-size {
+    line-height: 96px;
+    line-height: 6.4rem;
 
-    text-align: center;
     font-size: 45px;
     font-size: 3.0rem;
     font-weight: 700;
@@ -99,11 +112,9 @@ p.bx-base-pofile-unit-ava {
     display:inline-block;
     overflow:hidden;
 }
-.bx-base-pofile-unit-with-cover .bx-def-unit-img,
-.bx-base-pofile-unit-with-cover .bx-base-pofile-unit-thumb,
-.bx-base-pofile-unit-with-cover .bx-base-pofile-unit-ava {
-	display: inline-block;
-	vertical-align: middle;
+.bx-base-pofile-unit-with-cover div.bx-def-unit-img {
+    display: inline-block;
+    vertical-align: middle;
 }
 
 .bx-layout-column-thin .bx-base-pofile-unit-with-cover {
@@ -223,13 +234,17 @@ a.bx-base-pofile-cover-thumb img {
     background-color: #fff;
 }
 
-a.bx-base-pofile-cover-thumb p.bx-base-pofile-unit-ava,
-a.bx-base-pofile-cover-thumb img.bx-base-pofile-unit-ava {
-    border: 5px solid #fff;
+a.bx-base-pofile-cover-thumb p.bx-base-pofile-unit-thumb,
+a.bx-base-pofile-cover-thumb img.bx-base-pofile-unit-thumb {
+    background-color: rgba(255, 255, 255, 1.0);
+    background-clip: padding-box;
+    border: 5px solid rgba(255, 255, 255, 1.0);
+    box-shadow: inset 0px 0px 4px rgba(0, 0, 0, 0.2);
 }
-a.bx-base-pofile-cover-thumb p.bx-base-pofile-unit-ava {
+a.bx-base-pofile-cover-thumb p.bx-base-pofile-unit-thumb.bx-def-ava-big-size {
     line-height: 200px;
     line-height: 13.375rem;
+
     font-size: 5.0rem;
 }
 
@@ -245,6 +260,8 @@ a.bx-base-pofile-cover-thumb p.bx-base-pofile-unit-ava {
     flex-direction: column;
     -webkit-align-items: flex-start;
     align-items: flex-start;
+    -webkit-align-self: center;
+    align-self: center;
 
     height: 100%;
 }

+ 6 - 6
modules/base/profile/template/unit.html

@@ -1,18 +1,18 @@
 <div class="__class__ bx-def-unit absolute bx-def-margin-bottom bx-def-margin-sec-right">
-    <div class="bx-def-unit-img bx-def-thumb bx-def-thumb-size">
+    <div class="bx-def-unit-img bx-def-__size__ bx-def-__size__-size">
         <a class="bx-def-font-align-center" href="__content_url__" onclick="__content_click__">
             <bx_if:show_thumb_image>
-                <img class="bx-base-pofile-unit-thumb bx-def-thumb bx-def-thumb-size" src="__thumb_url__" />
+                <img class="bx-base-pofile-unit-thumb bx-def-__size__ bx-def-__size__-size bx-def-border bx-def-box-sizing" src="__thumb_url__" />
             </bx_if:show_thumb_image>
             <bx_if:show_thumb_letter>
-                <p class="bx-base-pofile-unit-thumb bx-def-thumb bx-def-thumb-size bx-def-border bx-def-box-sizing" style="background-color:rgba(__color__)">__letter__</p>
+                <p class="bx-base-pofile-unit-thumb bx-def-__size__ bx-def-__size__-size bx-def-border bx-def-box-sizing" style="background-color:rgba(__color__)">__letter__</p>
             </bx_if:show_thumb_letter>
         </a>
         <bx_if:show_online>
-			<div class="bx-base-pofile-unit-online"></div>
-		</bx_if:show_online>
+            <div class="bx-base-pofile-unit-online"></div>
+        </bx_if:show_online>
     </div>
-    <div class="bx-def-unit-info bx-def-thumb-size-min-height bx-def-thumb-size-max-height bx-def-thumb-size-left-indent">
+    <div class="bx-def-unit-info bx-def-__size__-size-min-height bx-def-__size__-size-max-height bx-def-__size__-size-left-indent">
         <div class="bx-def-unit-info-cnt bx-def-box-sizing">
             <div class="bx-def-unit-line">
                 <a class="bx-def-unit-info-title" href="__content_url__" onclick="__content_click__">__title__</a>

+ 3 - 3
modules/base/profile/template/unit_with_cover.html

@@ -2,12 +2,12 @@
     <div class="bx-base-pofile-unit-cnt bx-def-box bx-def-border bx-def-round-corners bx-def-color-bg-box">
         <a class="bx-base-pofile-unit-cover" style="background-image:url(__cover_url__);" href="__content_url__" onclick="__content_click__">
             <bx_if:show_thumbnail>
-                <div class="bx-def-unit-img bx-def-thumb-size">
+                <div class="bx-def-unit-img bx-def-__size__-size">
                     <bx_if:show_thumb_image>
-                        <img class="bx-base-pofile-unit-thumb bx-def-thumb bx-def-thumb-size bx-def-border" src="__thumb_url__" />
+                        <img class="bx-base-pofile-unit-thumb bx-def-__size__ bx-def-__size__-size bx-def-border bx-def-box-sizing" src="__thumb_url__" />
                     </bx_if:show_thumb_image>
                     <bx_if:show_thumb_letter>
-                        <p class="bx-base-pofile-unit-thumb bx-def-thumb bx-def-thumb-size bx-def-border bx-def-box-sizing" style="background-color:rgba(__color__)">__letter__</p>
+                        <p class="bx-base-pofile-unit-thumb bx-def-__size__ bx-def-__size__-size bx-def-border bx-def-box-sizing" style="background-color:rgba(__color__)">__letter__</p>
                     </bx_if:show_thumb_letter>
                     <bx_if:show_online>
                         <div class="bx-base-pofile-unit-online"></div>

+ 14 - 14
modules/base/profile/template/unit_wo_info.html

@@ -1,15 +1,15 @@
-<div class="__class__ bx-def-thumb-size">
-	<div class="bx-def-unit-img bx-def-thumb-size">
-    	<a class="bx-def-font-align-center" href="__content_url__" onclick="__content_click__" title="__title_attr__">
-			<bx_if:show_thumb_image>
-			    <img class="bx-base-pofile-unit-thumb bx-def-thumb bx-def-thumb-size bx-def-border bx-def-box-sizing" src="__thumb_url__" />
-			</bx_if:show_thumb_image>
-			<bx_if:show_thumb_letter>
-			    <p class="bx-base-pofile-unit-thumb bx-def-thumb bx-def-thumb-size bx-def-border bx-def-box-sizing" style="background-color:rgba(__color__)">__letter__</p>
-			</bx_if:show_thumb_letter>
-    	</a>
-    	<bx_if:show_online>
-			<div class="bx-base-pofile-unit-online"></div>
-		</bx_if:show_online>
-	</div>
+<div class="__class__ bx-def-__size__-size">
+    <div class="bx-def-unit-img bx-def-__size__-size">
+        <a class="bx-def-font-align-center" href="__content_url__" onclick="__content_click__" title="__title_attr__">
+            <bx_if:show_thumb_image>
+                <img class="bx-base-pofile-unit-thumb bx-def-__size__ bx-def-__size__-size bx-def-border bx-def-box-sizing" src="__thumb_url__" />
+            </bx_if:show_thumb_image>
+            <bx_if:show_thumb_letter>
+                <p class="bx-base-pofile-unit-thumb bx-def-__size__ bx-def-__size__-size bx-def-border bx-def-box-sizing" style="background-color:rgba(__color__)">__letter__</p>
+            </bx_if:show_thumb_letter>
+        </a>
+        <bx_if:show_online>
+            <div class="bx-base-pofile-unit-online"></div>
+        </bx_if:show_online>
+    </div>
 </div>

+ 4 - 4
modules/base/profile/template/unit_wo_info_links.html

@@ -1,10 +1,10 @@
-<div class="__class__ bx-def-thumb-size bx-def-font-align-center">
-    <div class="bx-def-unit-img bx-def-thumb-size">
+<div class="__class__ bx-def-__size__-size bx-def-font-align-center">
+    <div class="bx-def-unit-img bx-def-__size__-size">
         <bx_if:show_thumb_image>
-            <img class="bx-base-pofile-unit-thumb bx-def-thumb bx-def-thumb-size bx-def-border bx-def-box-sizing" src="__thumb_url__" />
+            <img class="bx-base-pofile-unit-thumb bx-def-__size__ bx-def-__size__-size bx-def-border bx-def-box-sizing" src="__thumb_url__" />
         </bx_if:show_thumb_image>
         <bx_if:show_thumb_letter>
-            <p class="bx-base-pofile-unit-thumb bx-def-thumb bx-def-thumb-size bx-def-border bx-def-box-sizing" style="background-color:rgba(__color__)">__letter__</p>
+            <p class="bx-base-pofile-unit-thumb bx-def-__size__ bx-def-__size__-size bx-def-border bx-def-box-sizing" style="background-color:rgba(__color__)">__letter__</p>
         </bx_if:show_thumb_letter>
         <bx_if:show_online>
             <div class="bx-base-pofile-unit-online"></div>

+ 5 - 5
modules/base/profile/template/unit_wo_links.html

@@ -1,14 +1,14 @@
 <div class="bx-base-pofile-unit bx-def-unit bx-def-margin-bottom bx-def-margin-sec-right">
     <div class="bx-def-unit-img bx-def-font-align-center">
         <bx_if:show_thumb_image>
-            <img class="bx-base-pofile-unit-thumb bx-def-thumb bx-def-thumb-size bx-def-border bx-def-box-sizing" src="__thumb_url__" />
+            <img class="bx-base-pofile-unit-thumb bx-def-__size__ bx-def-__size__-size bx-def-border bx-def-box-sizing" src="__thumb_url__" />
         </bx_if:show_thumb_image>
         <bx_if:show_thumb_letter>
-            <p class="bx-base-pofile-unit-thumb bx-def-thumb bx-def-thumb-size bx-def-border bx-def-box-sizing" style="background-color:rgba(__color__)">__letter__</p>
+            <p class="bx-base-pofile-unit-thumb bx-def-__size__ bx-def-__size__-size bx-def-border bx-def-box-sizing" style="background-color:rgba(__color__)">__letter__</p>
         </bx_if:show_thumb_letter>
         <bx_if:show_online>
-			<div class="bx-base-pofile-unit-online"></div>
-		</bx_if:show_online>
+            <div class="bx-base-pofile-unit-online"></div>
+        </bx_if:show_online>
     </div>
-    <div class="bx-def-unit-info bx-def-thumb-size-max-height bx-def-padding-sec-left"><span class="bx-def-unit-info-title">__title__</span></div>
+    <div class="bx-def-unit-info bx-def-__size__-size-max-height bx-def-padding-sec-left"><span class="bx-def-unit-info-title">__title__</span></div>
 </div>

+ 1 - 2
modules/boonex/lucid/data/template/bx_timeline/css/view.css

@@ -141,8 +141,7 @@ div.bx-tl-view div.bx-tl-item div.bx-tl-owner-actions {
 	height: 1.875rem;
 	line-height: 1.875rem;
 }
-.bx-tl-item-context-owner .bx-tl-ico-icon .bx-base-pofile-unit-wo-info p.bx-base-pofile-unit-thumb, 
-.bx-tl-item-context-owner .bx-tl-ico-icon .bx-base-pofile-unit-wo-info p.bx-base-pofile-unit-ava {
+.bx-tl-item-context-owner .bx-tl-ico-icon .bx-base-pofile-unit-wo-info p.bx-base-pofile-unit-thumb {
     display: block;
     margin: 0px;
     border-width: 0;

+ 1 - 2
modules/boonex/lucid/data/template/system/css/common.css

@@ -20,7 +20,6 @@
 }
 
 /* --- Profile Thumbnails/Avatars --- */
-img.bx-base-pofile-unit-ava,
 img.bx-base-pofile-unit-thumb {
     background-color: #fff;
 }
@@ -36,7 +35,7 @@ div.bx-base-pofile-unit-wo-info div.bx-def-unit-img p.bx-base-pofile-unit-thumb
 	font-size: 1.5rem;
 }
 
-div.bx-def-unit-img p.bx-base-pofile-unit-ava {
+div.bx-def-unit-img p.bx-base-pofile-unit-thumb.bx-def-ava-size {
 	line-height: 92px;
 	line-height: 5.8rem;
 }

+ 1 - 1
modules/boonex/lucid/install/sql/install.sql

@@ -741,7 +741,7 @@ INSERT INTO `sys_options_mixes2options` (`option`, `mix_id`, `value`) VALUES
 ('bx_lucid_cover_height', @iMixId, '8rem'),
 ('bx_lucid_body_icon_color_hover', @iMixId, 'rgba(20, 80, 160, 1)'),
 ('bx_lucid_body_link_color_hover', @iMixId, 'rgba(20, 80, 160, 1)'),
-('bx_lucid_cover_bg_color', @iMixId, 'rgba(50, 150, 250, 1)'),
+('bx_lucid_cover_bg_color', @iMixId, 'rgba(255, 255, 255, 1)'),
 ('bx_lucid_body_link_color', @iMixId, 'rgba(50, 150, 250, 1)'),
 ('bx_lucid_font_color_link_h1_hover', @iMixId, 'rgba(50, 100, 180, 1)'),
 ('bx_lucid_button_lg_font_shadow', @iMixId, 'none'),

+ 5 - 1
template/scripts/BxBaseMenuToolbar.php

@@ -13,9 +13,13 @@
  */
 class BxBaseMenuToolbar extends BxTemplMenu
 {
+    protected $_sUnitSize;
+
     public function __construct ($aObject, $oTemplate)
     {
         parent::__construct ($aObject, $oTemplate);
+        
+        $this->_sUnitSize = 'icon';
     }
 
     public function getMenuItems ()
@@ -34,7 +38,7 @@ class BxBaseMenuToolbar extends BxTemplMenu
 
             $oProfile = BxDolProfile::getInstance(bx_get_logged_profile_id());
 
-            $sUnit = $oProfile->getUnit(0, array('template' => 'unit_wo_info_links'));
+            $sUnit = $oProfile->getUnit(0, array('template' => array('name' => 'unit_wo_info_links', 'size' => $this->_sUnitSize)));
             if(!empty($sUnit)) {
                 $a[$k]['bx_if:icon']['condition'] = false;
                 $a[$k]['bx_if:unit'] = array (