#22 - pictures sizes and names(preview is now named avatar) are changed

inc/classes/BxDol.php

@@ -45,6 +45,7 @@ interface iBxDolProfile {
     public function getDisplayName();
     public function getUrl();
     public function getUnit();
+    public function getAvatar();
     public function getThumb();
     public function getIcon();
     public function isActive();
@@ -55,7 +56,9 @@ interface iBxDolProfile {
  */
 interface iBxDolProfileService {
     public function serviceProfileUnit ($iContentId);
+    public function serviceProfileAvatar ($iContentId);
     public function serviceProfileThumb ($iContentId);
+    public function serviceProfileIcon ($iContentId);
     public function serviceProfileName ($iContentId);
     public function serviceProfileUrl ($iContentId);
 }

inc/classes/BxDolAccount.php

@@ -168,12 +168,26 @@ class BxDolAccount extends BxDol {
     }
 
     /**
-     * Get account url
+     * Get avatar picture url
+     */
+    public function getAvatar($iAccountId = false) {
+        return '';
+    }
+
+    /**
+     * Get thumb picture url
      */
     public function getThumb($iAccountId = false) {
         return '';
     }
 
+    /**
+     * Get icon picture url
+     */
+    public function getIcon($iAccountId = false) {
+        return '';
+    }
+
     /**
      * Validate account. 
      * @param $s - account identifier (id or email) 

inc/classes/BxDolProfile.php

@@ -171,6 +171,14 @@ class BxDolProfile extends BxDol implements iBxDolProfile {
         return BxDolService::call($aInfo['type'], 'profile_unit', array($aInfo['content_id']));
     }
 
+    /**
+     * Get thumbnail url
+     */
+    public function getAvatar($iProfileId = 0) {
+        $aInfo = $this->getInfo($iProfileId);
+        return BxDolService::call($aInfo['type'], 'profile_avatar', array($aInfo['content_id']));
+    }
+
     /**
      * Get thumbnail url
      */

inc/classes/BxDolProfileUndefined.php

@@ -80,6 +80,13 @@ class BxDolProfileUndefined extends BxDol implements iBxDolSingleton, iBxDolProf
         return '<div>' . $this->getDisplayName() . '</div>';
     }
 
+    /**
+     * Get profile avatar
+     */
+    public function getAvatar() {
+        return '';
+    }
+
     /**
      * Get profile thumb
      */

install/sql/v70.sql

@@ -75,7 +75,6 @@ INSERT INTO `sys_objects_social_sharing` (`object`, `type`, `content`, `order`,
 ('pinterest', 'html', '<a target="_blank" href="http://pinterest.com/pin/create/button/?url={url_encoded}&media={img_url_encoded}&description={title_encoded}" class="pin-it-button" count-layout="horizontal"><i class="sys-icon pinterest-square"></i></a>', 4, 1);
 
 
-
 -- --------------------------------------------------------
 
 

modules/boonex/persons/classes/BxPersonsConfig.php

@@ -27,7 +27,7 @@ class BxPersonsConfig extends BxDolModuleConfig {
     public static $OBJECT_STORAGE_COVER = 'bx_persons_pictures';
     public static $OBJECT_IMAGES_TRANSCODER_THUMB = 'bx_persons_thumb';
     public static $OBJECT_IMAGES_TRANSCODER_ICON = 'bx_persons_icon';
-    public static $OBJECT_IMAGES_TRANSCODER_PREVIEW = 'bx_persons_preview';
+    public static $OBJECT_IMAGES_TRANSCODER_AVATAR = 'bx_persons_avatar';
     public static $OBJECT_IMAGES_TRANSCODER_PICTURE = 'bx_persons_picture';
     public static $OBJECT_IMAGES_TRANSCODER_COVER = 'bx_persons_cover';
     public static $OBJECT_IMAGES_TRANSCODER_COVER_THUMB = 'bx_persons_cover_thumb';

modules/boonex/persons/classes/BxPersonsModule.php

@@ -30,32 +30,29 @@ class BxPersonsModule extends BxDolModule implements iBxDolProfileService {
 
     // ====== SERVICE METHODS
 
-
     public function serviceProfileUnit ($iContentId) {
-        if (!$iContentId)
-            return false;
-        $aContentInfo = $this->_oDb->getContentInfoById($iContentId);
-        if (!$aContentInfo)
-            return false;        
-        return $this->_oTemplate->unit($aContentInfo);
+        return $this->_serviceTemplateFunc('unit', $iContentId);
+    }
+
+    public function serviceProfileAvatar ($iContentId) {
+        return $this->_serviceTemplateFunc('urlAvatar', $iContentId);
     }
 
     public function serviceProfileThumb ($iContentId) {
-        if (!$iContentId)
-            return false;
-        $aContentInfo = $this->_oDb->getContentInfoById($iContentId);
-        if (!$aContentInfo)
-            return false;        
-        return $this->_oTemplate->thumb($aContentInfo);
+        return $this->_serviceTemplateFunc('thumb', $iContentId);
     }
 
     public function serviceProfileIcon ($iContentId) {
+        return $this->_serviceTemplateFunc('icon', $iContentId);
+    }
+
+    protected function _serviceTemplateFunc ($sFunc, $iContentId) {
         if (!$iContentId)
             return false;
         $aContentInfo = $this->_oDb->getContentInfoById($iContentId);
         if (!$aContentInfo)
             return false;        
-        return $this->_oTemplate->icon($aContentInfo);
+        return $this->_oTemplate->$sFunc($aContentInfo);
     }
 
     public function serviceProfileName ($iContentId) {
@@ -93,7 +90,7 @@ class BxPersonsModule extends BxDolModule implements iBxDolProfileService {
         );
     }
 
-    public function _serviceBrowse ($sMode, $aParams = false, $iDesignBox = BX_DB_PADDING_DEF) {
+    protected function _serviceBrowse ($sMode, $aParams = false, $iDesignBox = BX_DB_PADDING_DEF) {
         bx_import('SearchResult', $this->_aModule);
         $sClass = $this->_aModule['class_prefix'] . 'SearchResult';
         $o = new $sClass($sMode, $aParams);

modules/boonex/persons/classes/BxPersonsTemplate.php

@@ -58,7 +58,7 @@ class BxPersonsTemplate extends BxDolModuleTemplate {
         $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=view-persons-profile&id=' . $aData['id']);
 
         $sUrlPicture = $this->urlPicture ($aData);
-        $sUrlPreview = $this->urlPreview ($aData);
+        $sUrlAvatar = $this->urlAvatar ($aData);
         $sUrlPictureChange = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=edit-persons-profile&id=' . $aData['id']);
 
         $sUrlCover = $this->urlCover ($aData);
@@ -98,7 +98,7 @@ class BxPersonsTemplate extends BxDolModuleTemplate {
             'content_url' => $sUrl,
             'title' => $aData[BxPersonsConfig::$FIELD_NAME],
 
-            'picture_preview_url' => $sUrlPreview,
+            'picture_avatar_url' => $sUrlAvatar,
             'picture_url' => $sUrlPicture,
             'picture_popup' => $sPicturePopup,
             'picture_href' => !$aData[BxPersonsConfig::$FIELD_PICTURE] && CHECK_ACTION_RESULT_ALLOWED === $oModuleMain->isAllowedEdit($aData) ? $sUrlPictureChange : 'javascript:void(0);',
@@ -129,8 +129,8 @@ class BxPersonsTemplate extends BxDolModuleTemplate {
     /**
      * Get profile picture preview url
      */
-    function urlPreview ($aData, $bSubstituteNoImage = true) {
-        return $this->_image (BxPersonsConfig::$FIELD_PICTURE, BxPersonsConfig::$OBJECT_IMAGES_TRANSCODER_PREVIEW, 'no-picture-preview.png', $aData, $bSubstituteNoImage);
+    function urlAvatar ($aData, $bSubstituteNoImage = true) {
+        return $this->_image (BxPersonsConfig::$FIELD_PICTURE, BxPersonsConfig::$OBJECT_IMAGES_TRANSCODER_AVATAR, 'no-picture-preview.png', $aData, $bSubstituteNoImage);
     }
 
     /**

modules/boonex/persons/install/installer.php

@@ -14,7 +14,7 @@ bx_import('BxDolImageTranscoder');
 
 class BxPersonsInstaller extends BxDolStudioInstaller {
 
-    protected $_aTranscoders = array ('bx_persons_thumb', 'bx_persons_preview');
+    protected $_aTranscoders = array ('bx_persons_thumb', 'bx_persons_avatar');
 
     function __construct($aConfig) {
         parent::__construct($aConfig);

modules/boonex/persons/install/sql/disable.sql

@@ -12,9 +12,9 @@ DELETE FROM `sys_options_types` WHERE `id` = @iTypeId;
 DELETE FROM `sys_objects_storage` WHERE `object` IN('bx_persons_pictures', 'bx_persons_pictures_resized');
 DELETE FROM `sys_storage_tokens` WHERE `object` IN('bx_persons_pictures', 'bx_persons_pictures_resized');
 
-DELETE FROM `sys_objects_transcoder_images` WHERE `object` IN('bx_persons_icon', 'bx_persons_thumb', 'bx_persons_preview', 'bx_persons_picture', 'bx_persons_cover', 'bx_persons_cover_thumb');
-DELETE FROM `sys_transcoder_images_filters` WHERE `transcoder_object` IN('bx_persons_icon', 'bx_persons_thumb', 'bx_persons_preview', 'bx_persons_picture', 'bx_persons_cover', 'bx_persons_cover_thumb');
-DELETE FROM `sys_transcoder_images_files` WHERE `transcoder_object` IN('bx_persons_icon', 'bx_persons_thumb', 'bx_persons_preview', 'bx_persons_picture', 'bx_persons_cover', 'bx_persons_cover_thumb');
+DELETE FROM `sys_objects_transcoder_images` WHERE `object` IN('bx_persons_icon', 'bx_persons_thumb', 'bx_persons_avatar', 'bx_persons_picture', 'bx_persons_cover', 'bx_persons_cover_thumb');
+DELETE FROM `sys_transcoder_images_filters` WHERE `transcoder_object` IN('bx_persons_icon', 'bx_persons_thumb', 'bx_persons_avatar', 'bx_persons_picture', 'bx_persons_cover', 'bx_persons_cover_thumb');
+DELETE FROM `sys_transcoder_images_files` WHERE `transcoder_object` IN('bx_persons_icon', 'bx_persons_thumb', 'bx_persons_avatar', 'bx_persons_picture', 'bx_persons_cover', 'bx_persons_cover_thumb');
 -- TODO: delete resized picture files as well
 TRUNCATE TABLE `bx_persons_pictures_resized`; 
 

modules/boonex/persons/install/sql/enable.sql

@@ -29,18 +29,18 @@ INSERT INTO `sys_objects_storage` (`object`, `engine`, `params`, `token_life`, `
 INSERT INTO `sys_objects_transcoder_images` (`object`, `storage_object`, `source_type`, `source_params`, `private`, `atime_tracking`, `atime_pruning`, `ts`) VALUES 
 ('bx_persons_icon', 'bx_persons_pictures_resized', 'Storage', 'a:1:{s:6:"object";s:19:"bx_persons_pictures";}', 'no', '1', '2592000', '0'),
 ('bx_persons_thumb', 'bx_persons_pictures_resized', 'Storage', 'a:1:{s:6:"object";s:19:"bx_persons_pictures";}', 'no', '1', '2592000', '0'),
-('bx_persons_preview', 'bx_persons_pictures_resized', 'Storage', 'a:1:{s:6:"object";s:19:"bx_persons_pictures";}', 'no', '1', '2592000', '0'),
+('bx_persons_avatar', 'bx_persons_pictures_resized', 'Storage', 'a:1:{s:6:"object";s:19:"bx_persons_pictures";}', 'no', '1', '2592000', '0'),
 ('bx_persons_picture', 'bx_persons_pictures_resized', 'Storage', 'a:1:{s:6:"object";s:19:"bx_persons_pictures";}', 'no', '1', '2592000', '0'),
 ('bx_persons_cover', 'bx_persons_pictures_resized', 'Storage', 'a:1:{s:6:"object";s:19:"bx_persons_pictures";}', 'no', '1', '2592000', '0'),
 ('bx_persons_cover_thumb', 'bx_persons_pictures_resized', 'Storage', 'a:1:{s:6:"object";s:19:"bx_persons_pictures";}', 'no', '1', '2592000', '0');
 
 INSERT INTO `sys_transcoder_images_filters` (`transcoder_object`, `filter`, `filter_params`, `order`) VALUES 
 ('bx_persons_icon', 'Resize', 'a:4:{s:1:"w";s:2:"32";s:1:"h";s:2:"32";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"jpg";}', '0'),
-('bx_persons_thumb', 'Resize', 'a:4:{s:1:"w";s:2:"64";s:1:"h";s:2:"64";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"jpg";}', '0'),
-('bx_persons_preview', 'Resize', 'a:4:{s:1:"w";s:3:"150";s:1:"h";s:3:"150";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"jpg";}', '0'),
+('bx_persons_thumb', 'Resize', 'a:4:{s:1:"w";s:2:"48";s:1:"h";s:2:"48";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"jpg";}', '0'),
+('bx_persons_avatar', 'Resize', 'a:4:{s:1:"w";s:2:"96";s:1:"h";s:2:"96";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"jpg";}', '0'),
 ('bx_persons_picture', 'Resize', 'a:4:{s:1:"w";s:4:"1024";s:1:"h";s:4:"1024";s:13:"square_resize";s:1:"0";s:10:"force_type";s:3:"jpg";}', '0'),
 ('bx_persons_cover', 'Resize', 'a:4:{s:1:"w";s:4:"1024";s:1:"h";s:4:"1024";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"jpg";}', '0'),
-('bx_persons_cover_thumb', 'Resize', 'a:4:{s:1:"w";s:2:"64";s:1:"h";s:2:"64";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"jpg";}', '0');
+('bx_persons_cover_thumb', 'Resize', 'a:4:{s:1:"w";s:2:"48";s:1:"h";s:2:"48";s:13:"square_resize";s:1:"1";s:10:"force_type";s:3:"jpg";}', '0');
 
 -- UPLOADERS
 

modules/boonex/persons/template/cover.html

@@ -1,9 +1,9 @@
 
 <div class="bx-persons-cover">
     <a class="bx-persons-cover-image bx-def-round-corners bx-def-border" href="__cover_href__" onclick="bx_persons_popup('bx-persons-popup-cover', '__cover_url__')" style="background-image:url(__cover_url__)">&nbsp;</a>
-    <div class="bx-persons-cover-info bx-def-padding">
-        <a href="__picture_href__" onclick="bx_persons_popup('bx-persons-popup-picture', '__picture_url__')"><img class="bx-def-margin-right bx-def-round-corners" src="__picture_preview_url__" /></a>
-        <h1 class="bx-def-margin-sec-bottom bx-def-margin-sec-top">__title__</h1>
+    <div class="bx-persons-cover-info bx-def-unit bx-def-padding">
+        <a href="__picture_href__" onclick="bx_persons_popup('bx-persons-popup-picture', '__picture_url__')"><img class="bx-def-margin-right bx-def-ava bx-def-ava-size" src="__picture_avatar_url__" /></a>
+        <h1 class="bx-def-unit-info bx-def-margin-sec-bottom bx-def-margin-sec-top bx-def-font-contrasted">__title__</h1>
     </div>
 </div>
 

modules/boonex/persons/template/css/main.css

@@ -3,34 +3,21 @@
 /* browse unit */
 
 .bx-persons-unit {
-    width:169px;    
+    width:188px;
+    width:11.8rem;
     float:left;
 }
 
-.bx-persons-unit img {
-    display:inline;
-    display:inline-block;
-
-    vertical-align:middle;
-}
-
 .bx-persons-unit div {
-    display:inline;
-    display:inline-block;
-    
-    width:95px;
-    padding-left:10px;
-    
-    text-overflow:ellipsis;
-    overflow:hidden;
-
-    vertical-align:middle;
+    width:140px;
+    width:8.8rem;
 }
 
 /* view content */
 
 .bx-persons-preview {
     max-width:278px;
+    max-width:17.375rem;
     text-align:center;
 }
 .bx-persons-preview img {
@@ -41,7 +28,8 @@
 
 .bx-persons-cover {
     position:relative;
-    height:300px;
+    height:320px;
+    height:20rem;
 
     -moz-box-sizing: border-box;
     -ms-box-sizing: border-box;
@@ -72,21 +60,20 @@ a.bx-persons-cover-image:hover,
 
 .bx-persons-cover-info img,
 .bx-persons-cover-info h1 {
-    display:inline-block;
     vertical-align:bottom;
 }
 
 .bx-persons-cover-info img {
     border:3px solid #fff;
-	-moz-box-shadow:0px 0px 0px 1px #000;
-	-webkit-box-shadow:0px 0px 0px 1px #000;
-    box-shadow:0px 0px 0px 1px #000;
+    border:0.2rem solid #fff;
+	-moz-box-shadow:0px 0px 0px 0.0625rem #000;
+	-webkit-box-shadow:0px 0px 0px 0.0625rem #000;
+    box-shadow:0px 0px 0px 0.0625rem #000;
 }
 
 .bx-persons-cover-info h1 {
     padding:0;
-    color:#fff;
-    text-shadow: 0px 0px 2px #000;
+    text-shadow: 0px 0px 0.125rem #000;
 }
 
 .bx-persons-popup-wrapper {

modules/boonex/persons/template/unit.html

@@ -1,5 +1,5 @@
 
-<div class="bx-persons-unit bx-def-margin-bottom bx-def-margin-sec-right">
-    <a href="__content_url__"><img class="bx-def-thumb bx-def-thumb-size" src="__thumb_url__" /></a><div class="bx-def-thumb-size-max-height"><a href="__content_url__">__title__</a></div>
+<div class="bx-persons-unit bx-def-unit bx-def-margin-bottom bx-def-margin-sec-right">
+    <a href="__content_url__"><img class="bx-def-thumb bx-def-thumb-size" src="__thumb_url__" /></a><div class="bx-def-unit-info bx-def-thumb-size-max-height bx-def-padding-sec-left"><a href="__content_url__">__title__</a></div>
 </div>
 

template/css/default.css

@@ -325,6 +325,10 @@
     color:#999;
 }
 
+.bx-def-font-contrasted {
+    color:#fff;
+}
+
 .bx-def-font-small {
     font-size:12px;
     font-size:0.8rem;
@@ -362,48 +366,78 @@ h3,
 }
 
 /* image/thumbnail default styles */
-.bx-def-thumb {
-	border-radius:3px;
-	-moz-border-radius:3px;
-	-webkit-border-radius:3px;
 
-    overflow:hidden;
-}
+.bx-def-ava,
+.bx-def-thumb,
 .bx-def-icon {
-	border-radius:3px;
-	-moz-border-radius:3px;
-	-webkit-border-radius:3px;
+	border-radius:0.2rem;
+	-moz-border-radius:0.2rem;
+	-webkit-border-radius:0.2rem;
 
     overflow:hidden;
 }
 
+
+.bx-def-ava-size {
+    width:96px;
+    width:6rem;
+    height:96px;
+    height:6rem;
+}
+.bx-def-ava-size-max-height {
+    max-height:96px;
+    max-height:6rem;
+}
+.bx-def-ava-size-min-height {
+    min-height:96px;
+    min-height:6rem;
+}
+
+
 .bx-def-thumb-size {
-    width:64px;
-    height:64px;
+    width:48px;
+    width:3rem;
+    height:48px;
+    height:3rem;
 }
 .bx-def-thumb-size-max-height {
-    max-height:64px;
+    max-height:48px;
+    max-height:3rem;
 }
 .bx-def-thumb-size-min-height {
     min-height:64px;
+    min-height:3rem;
 }
+
+
 .bx-def-icon-size {
     width:32px;
+    width:2rem;
     height:32px;
+    height:2rem;
 }
 .bx-def-icon-size-max-height {
     max-height:32px;
+    max-height:2rem;
 }
 .bx-def-icon-size-min-height {
     min-height:32px;
+    min-height:2rem;
 }
 
+
 .bx-def-unit .bx-def-unit-info,
 .bx-def-unit img {
+    display:inline;
     display:inline-block;
     vertical-align:middle;
 }
 .bx-def-unit-info {
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+
     text-overflow:ellipsis;
     overflow:hidden;
 }

template/css/general.css

@@ -8,15 +8,16 @@
 #bx-toolbar {
     position:fixed;
     width:100%;
-    height:50px;
+    height:48px;
+    height:3rem;
     z-index:900;
 
     background-color:#3B8686;
 
     opacity:0;
 
-    transition: opacity .3s;
-    -webkit-transition: opacity .3s;
+    -webkit-transition: opacity .2s;
+   transition: opacity .2s;
 }
 
 #bx-toolbar-content {
@@ -27,7 +28,6 @@
 #bx-menu-toolbar-2-container {
     position:absolute;
     top:0px;
-    padding-top:5px;
 }
 
 #bx-menu-toolbar-1-container {
@@ -45,27 +45,27 @@
     -ms-box-sizing: border-box;
     box-sizing: border-box;
 
-    padding-top: 5px; 
-    margin:0 50px 0 50px;
+    margin:0 48px;
+    margin:0 3rem;
 
     vertical-align: middle;
-    text-align: center; 
-    color: #fff;
+    text-align: center;
 
     overflow:hidden;
     text-overflow:ellipsis;
 }
 
-#bx-logo-container a {  
-    color: #fff;
+#bx-logo-container a {
     text-decoration:none;
-    font-size:2em;
+    font-size:32px;
+    font-size:2rem;
 }  
 
 /* --------------- menu bar */
 
 #bx-menu-main-bar-wrapper {
-    padding-top:50px;
+    padding-top:48px;
+    padding-top:3rem;
 }
 
 /* --------------- content */

template/css/menu.css

@@ -186,7 +186,9 @@ ul.bx-menu-main {
 
 #bx-popup-ajax-wrapper-sys_site .bx-popup-content-wrapped {
     padding:12px;
+    padding:0.75rem;
     width:140px;
+    width:8.75rem;
 }
 
 #bx-menu-toolbar-1-container .bx-menu-toolbar {
@@ -210,15 +212,17 @@ ul.bx-menu-toolbar li {
 ul.bx-menu-toolbar li a {
     position:relative;
     display:block;
-    padding-top:4px;
     min-width:48px;
-    height:36px;
+    min-width:3rem;
+    height:48px;
+    height:3rem;
 
-    line-height:32px;
-    font-size: 16px;
+    line-height:48px;
+    line-height:3rem;
+    font-size:16px;
+    font-size:1rem;
     text-align: center;
     vertical-align:middle;
-    color: #fff;
     text-decoration:none;
 }
 
@@ -226,36 +230,17 @@ ul.bx-menu-toolbar li a .sys-icon,
 ul.bx-menu-toolbar li a img,
 ul.bx-menu-toolbar li a span {
     vertical-align:middle;
-    margin:0 5px 0 5px;
+    margin:0 5px;
+    margin:0 0.3125rem;
 }
 ul.bx-menu-toolbar li a span {
-    margin-right:0px;
+    margin-right:0;
 }
 
 ul.bx-menu-toolbar li:first-child a {
     margin-left:0;
 }
 
-ul.bx-menu-toolbar li:hover a {
-    background-color:rgba(255, 255, 255, 0.05);
-
-    -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.3), 0px -1px 0px 0px rgba(255, 255, 255, 0.3);
-    -webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.3), 0px -1px 0px 0px rgba(255, 255, 255, 0.3);
-    box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.3), 0px -1px 0px 0px rgba(255, 255, 255, 0.3);
-}
-
-ul.bx-menu-toolbar li.bx-menu-tab-active a,
-ul.bx-menu-toolbar li:active a {
-    height:35px;
-    padding-top:5px;
-
-    background-color:rgba(0, 0, 0, 0.05);
-
-    -moz-box-shadow: inset 0px 1px 1px 0px rgba(0, 0, 0, 0.3), 0px 1px 0px 0px rgba(255, 255, 255, 0.3);
-    -webkit-box-shadow: inset 0px 1px 1px 0px rgba(0, 0, 0, 0.3), 0px 1px 0px 0px rgba(255, 255, 255, 0.3);
-    box-shadow: inset 0px 1px 1px 0px rgba(0, 0, 0, 0.3), 0px 1px 0px 0px rgba(255, 255, 255, 0.3);
-}
-
 ul.bx-menu-toolbar li img {
     background-position:center center;
     background-repeat:no-repeat;
@@ -265,6 +250,7 @@ ul.bx-menu-toolbar li .sys-icon {
     display:inline-block;
     vertical-align:middle;
     font-size:32px;
+    font-size:2rem;
     text-align:center;
 }
 

template/menu_toolbar.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-toolbar bx-menu-object-__object__">
     <bx_repeat:menu_items>
-        <li class="__class_add__">
-            <a href="__link__" target="__target__" onclick="__onclick__" class="bx-def-round-corners bx-def-margin-sec-left"><bx_if:title><span>__title__</span></bx_if:title><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img class="bx-def-icon bx-def-icon-size" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image></a>
+        <li class="bx-def-color-bg-hl-hover __class_add__">
+            <a href="__link__" target="__target__" onclick="__onclick__" class="bx-def-margin-sec-left bx-def-font-contrasted"><bx_if:title><span>__title__</span></bx_if:title><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img class="bx-def-thumb-size" src="__icon_url__" /></bx_if:image></a>
         </li>
     </bx_repeat:menu_items>
 </ul>

template/scripts/BxBaseFunctions.php

@@ -617,7 +617,7 @@ EOF;
                 $sLogo = '<img src="' . $sFileUrl . '" id="bx-logo" class="bx-def-margin-sec" alt="' . bx_html_attribute($sAlt, BX_ESCAPE_STR_QUOTE) . '" />';
         }
 
-        return '<a href="' . BX_DOL_URL_ROOT . '" title="' . bx_html_attribute($sAlt, BX_ESCAPE_STR_QUOTE) . '">' . $sLogo . '</a>';
+        return '<a class="bx-def-font-contrasted" href="' . BX_DOL_URL_ROOT . '" title="' . bx_html_attribute($sAlt, BX_ESCAPE_STR_QUOTE) . '">' . $sLogo . '</a>';
     }
 
     /**

template/scripts/BxBaseMenuToolbar.php

@@ -32,7 +32,7 @@ class BxBaseMenuToolbar extends BxTemplMenu
 
             bx_import('BxDolProfile');
             $oProfile = BxDolProfile::getInstance(bx_get_logged_profile_id ());
-            $sUrlIcon = $oProfile->getIcon();
+            $sUrlIcon = $oProfile->getThumb();
             if (!$sUrlIcon) 
                 break;
 

template/scripts/BxBaseServices.php

@@ -16,37 +16,36 @@ class BxBaseServices extends BxDol implements iBxDolProfileService {
     }
 
     public function serviceProfileUnit ($iContentId) {
-        if (!$iContentId)
-            return false;
-        if (!($oAccount = BxDolAccount::getInstance($iContentId)))
-            return false;        
-        return $oAccount->getUnit();
+        return $this->_serviceProfileFunc('getUnit', $iContentId);
+    }
+
+    public function serviceProfileAvatar ($iContentId) {
+        return $this->_serviceProfileFunc('getAvatar', $iContentId);
     }
 
     public function serviceProfileThumb ($iContentId) {
-        if (!$iContentId)
-            return false;
-        if (!($oAccount = BxDolAccount::getInstance($iContentId)))
-            return false;        
-        return $oAccount->getThumb();
+        return $this->_serviceProfileFunc('getThumb', $iContentId);
+    }
+
+    public function serviceProfileIcon ($iContentId) {
+        return $this->_serviceProfileFunc('getIcon', $iContentId);
     }
 
     public function serviceProfileName ($iContentId) {
-        if (!$iContentId)
-            return false;
-        if (!($oAccount = BxDolAccount::getInstance($iContentId)))
-            return false;        
-        return $oAccount->getDisplayName();
+        return $this->_serviceProfileFunc('getDisplayName', $iContentId);
     }
 
     public function serviceProfileUrl ($iContentId) {
+        return $this->_serviceProfileFunc('getUrl', $iContentId);
+    }
+
+    public function _serviceProfileFunc ($sFunc, $iContentId) {
         if (!$iContentId)
             return false;
         if (!($oAccount = BxDolAccount::getInstance($iContentId)))
             return false;        
-        return $oAccount->getUrl();
+        return $oAccount->$sFunc();
     }
-
 }
 
 /** @} */