golem
/
VectorGOLEM
9
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Extract PersonalMenu,mustache component from VectorTemplate 

PersonalMenu is the login/logout notifications etc. menu at the very
top of the Vector skin.

Bug: T239248, T240062
Change-Id: Iae224cbd838e44669a9f27e6dd303c6c3b402d41
This commit is contained in:
Jan Drewniak 2020-01-09 11:59:09 +01:00
parent 05aab42559
commit 4f471bfa5e
2 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
includes/VectorTemplate.php
View File

@ -284,7 +284,7 @@ class VectorTemplate extends BaseTemplate {
$this->renderActionsComponent();
break;
case 'PERSONAL':
$this->renderPersonalComponent();
$this->renderPersonalComponent( $templateParser );
break;
case 'SEARCH':
$this->renderSearchComponent( $templateParser );
@ -417,45 +417,39 @@ class VectorTemplate extends BaseTemplate {
<?php
}
private function renderPersonalComponent() {
?>
<div id="p-personal" role="navigation"<?php
if ( count( $this->data['personal_urls'] ) == 0 ) {
echo ' class="emptyPortlet"';
/**
* @param TemplateParser $templateParser
*/
private function renderPersonalComponent( TemplateParser $templateParser ) {
$personalTools = $this->getPersonalTools();
$props = [
'empty-portlet' => ( count( $this->data['personal_urls'] ) == 0 ) ? 'emptyPortlet' : '',
'msg-label' => $this->getMsg( 'personaltools' )->text(),
'html-userlangattributes' => $this->html( 'userlangattributes' ),
'html-loggedin' => '',
'html-personal-tools' => '',
'html-lang-selector' => '',
];
if ( !$this->getSkin()->getUser()->isLoggedIn() && User::groupHasPermission( '*', 'edit' ) ) {
$props['html-loggedin'] =
Html::element( 'li',
[ 'id' => 'pt-anonuserpage' ],
$this->getMsg( 'notloggedin' )->text()
);
};
if ( array_key_exists( 'uls', $personalTools ) ) {
$props['html-lang-selector'] = $this->makeListItem( 'uls', $personalTools[ 'uls' ] );
unset( $personalTools[ 'uls' ] );
}
?> aria-labelledby="p-personal-label">
<h3 id="p-personal-label"><?php $this->msg( 'personaltools' ) ?></h3>
<ul<?php $this->html( 'userlangattributes' ) ?>>
<?php
$notLoggedIn = '';
if ( !$this->getSkin()->getUser()->isLoggedIn() &&
User::groupHasPermission( '*', 'edit' )
) {
$notLoggedIn =
Html::element( 'li',
[ 'id' => 'pt-anonuserpage' ],
$this->getMsg( 'notloggedin' )->text()
);
}
foreach ( $personalTools as $key => $item ) {
$props['html-personal-tools'] .= $this->makeListItem( $key, $item );
}
$personalTools = $this->getPersonalTools();
$langSelector = '';
if ( array_key_exists( 'uls', $personalTools ) ) {
$langSelector = $this->makeListItem( 'uls', $personalTools[ 'uls' ] );
unset( $personalTools[ 'uls' ] );
}
echo $langSelector;
echo $notLoggedIn;
foreach ( $personalTools as $key => $item ) {
echo $this->makeListItem( $key, $item );
}
?>
</ul>
</div>
<?php
echo $templateParser->processTemplate( 'PersonalMenu', $props );
}
/**

17
includes/templates/PersonalMenu.mustache Normal file
View File

@ -0,0 +1,17 @@
{{!
string|null empty-portlet
string msg-label
string|null html-userlangattributes
string|null html-lang-selector
string|null html-loggedin
string|null html-personal-tools
}}
<div id="p-personal" role="navigation" {{#empty-portlet}}class="{{empty-portlet}}"{{/empty-portlet}} aria-labelledby="p-personal-label">
<h3 id="p-personal-label">{{msg-label}}</h3>
<ul {{{html-userlangattributes}}}>
{{{html-lang-selector}}}
{{{html-loggedin}}}
{{{html-personal-tools}}}
</ul>
</div>