Robert Vogel has submitted this change and it was merged.
Change subject: BS223 Facelift UserMenu
......................................................................
BS223 Facelift UserMenu
* rearranged some html elements for better floating
* added new element for image display
Change-Id: Ica31fdc5b304a9695501a5563a122f6304451ea4
---
M includes/BsBaseTemplate.php
1 file changed, 17 insertions(+), 12 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/BsBaseTemplate.php b/includes/BsBaseTemplate.php
index dacf7f2..b26abc3 100644
--- a/includes/BsBaseTemplate.php
+++ b/includes/BsBaseTemplate.php
@@ -518,20 +518,14 @@
$aOut[] = '<div id="bs-user-container">';
$aOut[] = ' <div id="bs-button-user">';
$aOut[] = ' <h3 id="p-personal-label">'.$this->getMsg(
'personaltools' )->text().'</h3>';
+ if ( !$oUser->isAnon() ) {
+ $aOut[] = "<div id='bs-personal-name'>";
+ $aOut[] = BsCore::getUserDisplayName();
+ $aOut[] = "</div>";
+ }
+
$aOut[] = BsCore::getInstance()->getUserMiniProfile( $oUser,
array( "width" => "24", "height" => "24" ) )->execute();
- if ( !$oUser->isAnon() ) {
- $aOut[] = BsCore::getUserDisplayName();
- }
-
- $personalTools = $this->getPersonalTools();
- $aOut[] = ' <ul id="bs-personal-menu"
'.$this->data['userlangattributes'].'>';
- foreach ( $personalTools as $key => $item ) {
- $aOut[] = $this->makeListItem( $key, $item );
- }
- $aOut[] = ' </ul>';
- $aOut[] = ' </div>';
- $aOut[] = '</div>';
$aOut[] = '<ul id="bs-personal-info">';
foreach( $this->data['bs_personal_info'] as $item ) {
$sActiveClass = $item['active'] ? 'active' : '';
@@ -553,6 +547,17 @@
}
$aOut[] = '</ul>';
+ $personalTools = $this->getPersonalTools();
+ $aOut[] = ' <div id="bs-personal-menu-container">';
+ $aOut[] = ' <ul id="bs-personal-menu"
'.$this->data['userlangattributes'].'>';
+ foreach ( $personalTools as $key => $item ) {
+ $aOut[] = $this->makeListItem( $key, $item );
+ }
+ $aOut[] = ' </ul>';
+ $aOut[] = ' </div>';
+ $aOut[] = ' </div>';
+ $aOut[] = '</div>';
+
echo implode("\n", $aOut);
}
--
To view, visit https://gerrit.wikimedia.org/r/151043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica31fdc5b304a9695501a5563a122f6304451ea4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart <weich...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Smuggli <mug...@hallowelt.biz>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
