2014-08-07 11:38:34 +00:00
|
|
|
<?php
|
|
|
|
/**
|
|
|
|
* Vector - Modern version of MonoBook with fresh look and many usability
|
|
|
|
* improvements.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
|
|
*
|
|
|
|
* @file
|
|
|
|
* @ingroup Skins
|
|
|
|
*/
|
|
|
|
|
2022-05-23 07:32:40 +00:00
|
|
|
namespace MediaWiki\Skins\Vector;
|
2022-02-06 22:43:56 +00:00
|
|
|
|
|
|
|
use ExtensionRegistry;
|
|
|
|
use Html;
|
|
|
|
use Linker;
|
2020-04-28 21:16:21 +00:00
|
|
|
use MediaWiki\MediaWikiServices;
|
2022-02-06 22:43:56 +00:00
|
|
|
use RuntimeException;
|
|
|
|
use SkinMustache;
|
|
|
|
use SkinTemplate;
|
|
|
|
use SpecialPage;
|
|
|
|
use Title;
|
2022-03-04 01:52:44 +00:00
|
|
|
use User;
|
2020-07-07 08:59:14 +00:00
|
|
|
|
2014-08-07 11:38:34 +00:00
|
|
|
/**
|
2021-09-09 22:13:48 +00:00
|
|
|
* Skin subclass for Vector that may be the new or old version of Vector.
|
2022-01-20 22:14:19 +00:00
|
|
|
* IMPORTANT: DO NOT put new code here.
|
2021-09-09 22:13:48 +00:00
|
|
|
*
|
2014-08-07 11:38:34 +00:00
|
|
|
* @ingroup Skins
|
2020-07-09 16:42:33 +00:00
|
|
|
* Skins extending SkinVector are not supported
|
2021-09-09 22:13:48 +00:00
|
|
|
*
|
2020-08-04 00:17:53 +00:00
|
|
|
* @package Vector
|
|
|
|
* @internal
|
2021-09-09 22:13:48 +00:00
|
|
|
*
|
2022-01-20 22:14:19 +00:00
|
|
|
* @todo
|
2021-09-09 22:13:48 +00:00
|
|
|
* - Move all modern code into SkinVector22.
|
|
|
|
* - Move legacy skin code from SkinVector to SkinVectorLegacy.
|
|
|
|
* - SkinVector left as alias if necessary.
|
2014-08-07 11:38:34 +00:00
|
|
|
*/
|
2022-01-20 22:14:19 +00:00
|
|
|
abstract class SkinVector extends SkinMustache {
|
2021-02-10 19:40:47 +00:00
|
|
|
/** @var null|array for caching purposes */
|
|
|
|
private $languages;
|
2020-04-07 22:55:08 +00:00
|
|
|
/** @var int */
|
2020-04-03 20:05:22 +00:00
|
|
|
private const MENU_TYPE_DEFAULT = 0;
|
2020-04-07 22:55:08 +00:00
|
|
|
/** @var int */
|
2020-04-03 20:05:22 +00:00
|
|
|
private const MENU_TYPE_TABS = 1;
|
2020-04-07 22:55:08 +00:00
|
|
|
/** @var int */
|
2020-04-03 20:05:22 +00:00
|
|
|
private const MENU_TYPE_DROPDOWN = 2;
|
2020-04-07 23:21:20 +00:00
|
|
|
private const MENU_TYPE_PORTAL = 3;
|
2021-09-14 16:53:35 +00:00
|
|
|
private const TALK_ICON = [
|
|
|
|
'href' => '#',
|
|
|
|
'id' => 'ca-talk-sticky-header',
|
|
|
|
'event' => 'talk-sticky-header',
|
|
|
|
'icon' => 'wikimedia-speechBubbles',
|
|
|
|
'is-quiet' => true,
|
2021-09-21 16:01:33 +00:00
|
|
|
'tabindex' => '-1',
|
2021-09-14 16:53:35 +00:00
|
|
|
'class' => 'sticky-header-icon'
|
|
|
|
];
|
2022-07-22 21:21:51 +00:00
|
|
|
private const SUBJECT_ICON = [
|
|
|
|
'href' => '#',
|
|
|
|
'id' => 'ca-subject-sticky-header',
|
|
|
|
'event' => 'subject-sticky-header',
|
|
|
|
'icon' => 'wikimedia-article',
|
|
|
|
'is-quiet' => true,
|
|
|
|
'tabindex' => '-1',
|
|
|
|
'class' => 'sticky-header-icon'
|
|
|
|
];
|
2021-09-14 16:53:35 +00:00
|
|
|
private const HISTORY_ICON = [
|
|
|
|
'href' => '#',
|
|
|
|
'id' => 'ca-history-sticky-header',
|
|
|
|
'event' => 'history-sticky-header',
|
|
|
|
'icon' => 'wikimedia-history',
|
|
|
|
'is-quiet' => true,
|
2021-09-21 16:01:33 +00:00
|
|
|
'tabindex' => '-1',
|
2021-09-14 16:53:35 +00:00
|
|
|
'class' => 'sticky-header-icon'
|
|
|
|
];
|
2021-11-15 23:09:51 +00:00
|
|
|
// Event and icon will be updated depending on watchstar state
|
|
|
|
private const WATCHSTAR_ICON = [
|
|
|
|
'href' => '#',
|
|
|
|
'id' => 'ca-watchstar-sticky-header',
|
|
|
|
'event' => 'watch-sticky-header',
|
|
|
|
'icon' => 'wikimedia-star',
|
|
|
|
'is-quiet' => true,
|
|
|
|
'tabindex' => '-1',
|
|
|
|
'class' => 'sticky-header-icon mw-watchlink'
|
|
|
|
];
|
2021-09-24 21:00:32 +00:00
|
|
|
private const EDIT_VE_ICON = [
|
|
|
|
'href' => '#',
|
|
|
|
'id' => 'ca-ve-edit-sticky-header',
|
|
|
|
'event' => 've-edit-sticky-header',
|
|
|
|
'icon' => 'wikimedia-edit',
|
|
|
|
'is-quiet' => true,
|
2021-10-12 22:02:52 +00:00
|
|
|
'tabindex' => '-1',
|
2021-09-24 21:00:32 +00:00
|
|
|
'class' => 'sticky-header-icon'
|
|
|
|
];
|
|
|
|
private const EDIT_WIKITEXT_ICON = [
|
|
|
|
'href' => '#',
|
|
|
|
'id' => 'ca-edit-sticky-header',
|
|
|
|
'event' => 'wikitext-edit-sticky-header',
|
|
|
|
'icon' => 'wikimedia-wikiText',
|
|
|
|
'is-quiet' => true,
|
2021-10-12 22:02:52 +00:00
|
|
|
'tabindex' => '-1',
|
2021-09-24 21:00:32 +00:00
|
|
|
'class' => 'sticky-header-icon'
|
|
|
|
];
|
|
|
|
private const EDIT_PROTECTED_ICON = [
|
|
|
|
'href' => '#',
|
|
|
|
'id' => 'ca-viewsource-sticky-header',
|
|
|
|
'event' => 've-edit-protected-sticky-header',
|
|
|
|
'icon' => 'wikimedia-editLock',
|
|
|
|
'is-quiet' => true,
|
2021-10-12 22:02:52 +00:00
|
|
|
'tabindex' => '-1',
|
2021-09-24 21:00:32 +00:00
|
|
|
'class' => 'sticky-header-icon'
|
|
|
|
];
|
2021-12-16 03:13:56 +00:00
|
|
|
private const SEARCH_SHOW_THUMBNAIL_CLASS = 'vector-search-box-show-thumbnail';
|
|
|
|
private const SEARCH_AUTO_EXPAND_WIDTH_CLASS = 'vector-search-box-auto-expand-width';
|
2021-12-15 22:25:11 +00:00
|
|
|
private const CLASS_QUIET_BUTTON = 'mw-ui-button mw-ui-quiet';
|
|
|
|
private const CLASS_PROGRESSIVE = 'mw-ui-progressive';
|
|
|
|
private const CLASS_ICON_BUTTON = 'mw-ui-icon mw-ui-icon-element';
|
2020-04-03 20:05:22 +00:00
|
|
|
|
Add opt-out link to Sidebar for Vector/Logged-in Users Without Abstractions
This commit is singularly focused on adding a link to the sidebar for
Vector, logged-in users. It does the bare minimum to fulfill the
requirements of T243281.
Additionally, it will help to answer the question "Do we need to use
abstractions (other than maybe different templates) to separate Legacy
Vector from Vector" by intentionally leaving out any abstractions in
order to make it easier to compare with a follow-up patch
(Ib2ef15180df73360cc1de25b893e49d415d23e1a) which does use abstractions.
It is a good thing to question whether or not we need addtional
abstractions in VectorTemplate and if they will help us as unnecessary
abstractions can have the opposite effect and just lead to further
frustrations down the road.
Therefore, I urge you, the reviewer, to let me know your thoughts! If
abstractions are viewed as not making our lives any easier, the
follow-up patches may be completely discarded and that's totally okay
with me. :) I think it's a good think to talk about now though.
Important changes:
* The VectorTemplate constructor was changed to allow injecting the
config, templateParser, and isLegacy boolean (only the config was
allowed before this commit). According to MediaWiki's Stable Interface
Policy, "Constructor signatures are generally considered unstable unless
explicitly declared stable for calling" [3]. Given that VecorTemplate's
constructor is not marked as stable, it is justified to do this without
warning according to the policy.
* Due to the above, the 'setTemplate' method is no longer needed and was
marked as deprecated.
* VectorTemplateTest was made to adapt to the new VectorTemplate
constructor. Additionally, it now extends from
MediaWikiIntegrationTestCase which my intelliphense server can pick up.
I *think* MediaWikiTestCase is just an alias to
MediaWikiIntegrationTestCase [1] and MediaWikiTestCase file was renamed
to MediaWikiIntegrationTestCase in [2], but I'm willing to change it
back if there is pushback to this.
Open questions:
* What are VectorTemplate's responsibilities? To me, it acts right now
as a controller (because it echos the full HTML string from the
template), a model (because SkinTemplate::prepareQuickTemplate sets data
on it which it later retrieves through `$this->get()`), a presenter
(because it adds data tailored for a web-centric view), and a view
(because it renders HTML strings instead of letting the view/template be
solely responsible for that). Arguably, some business logic might be
mixed in there as well (because it checks to see if a User is logged
in/has necessary permissions to show x which my changes here add to).
This might not be a problem if we keep VectorTemplate relatively small,
but will it remain this way as we progress further in Desktop
Improvements?
* How do we write tests for VectorTemplate without exposing unnecessary
public methods? For example, if I want to test the `getSkinData()`
method to see what state will be sent to the template, how should I do
this? One option might be to use `TestingAccessWrapper` to expose these
private methods which is what
`VectorTemplateTest::testbuildViewsProps()` does. Another option is to
accept this method as public. Is there a better way? Keep in mind that
even with access to this method, there might be many things to mock.
[1] https://github.com/wikimedia/mediawiki/blob/0030cb525be6cabc1d63de80586b2017d4bbe354/tests/common/TestsAutoLoader.php#L64
[2] Ie717b0ecf4fcfd089d46248f14853c80b7ef4a76
[3] https://www.mediawiki.org/wiki/Stable_interface_policy
Bug: T243281
Change-Id: I0571b041bcd7f19bec9f103fa7bccdd093f6394d
2020-03-17 20:21:33 +00:00
|
|
|
/**
|
|
|
|
* T243281: Code used to track clicks to opt-out link.
|
|
|
|
*
|
|
|
|
* The "vct" substring is used to describe the newest "Vector" (non-legacy)
|
|
|
|
* feature. The "w" describes the web platform. The "1" describes the version
|
|
|
|
* of the feature.
|
|
|
|
*
|
|
|
|
* @see https://wikitech.wikimedia.org/wiki/Provenance
|
|
|
|
* @var string
|
|
|
|
*/
|
|
|
|
private const OPT_OUT_LINK_TRACKING_CODE = 'vctw1';
|
2014-08-07 11:38:34 +00:00
|
|
|
|
2021-12-15 22:25:11 +00:00
|
|
|
/**
|
|
|
|
* @param string $icon the name of the icon without wikimedia- prefix.
|
|
|
|
* @return string
|
|
|
|
*/
|
|
|
|
private function iconClass( $icon ) {
|
|
|
|
if ( $icon ) {
|
|
|
|
return 'mw-ui-icon-wikimedia-' . $icon;
|
|
|
|
}
|
|
|
|
return '';
|
|
|
|
}
|
|
|
|
|
2022-01-20 22:14:19 +00:00
|
|
|
abstract protected function isLegacy(): bool;
|
2020-04-28 20:58:19 +00:00
|
|
|
|
2021-02-10 19:40:47 +00:00
|
|
|
/**
|
|
|
|
* Calls getLanguages with caching.
|
|
|
|
* @return array
|
|
|
|
*/
|
2022-02-18 22:44:41 +00:00
|
|
|
protected function getLanguagesCached(): array {
|
2021-10-23 12:32:13 +00:00
|
|
|
if ( $this->languages === null ) {
|
|
|
|
$this->languages = $this->getLanguages();
|
2021-02-10 19:40:47 +00:00
|
|
|
}
|
|
|
|
return $this->languages;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This should be upstreamed to the Skin class in core once the logic is finalized.
|
2021-04-21 16:45:06 +00:00
|
|
|
* Returns false if the page is a special page without any languages, or if an action
|
2021-02-10 19:40:47 +00:00
|
|
|
* other than view is being used.
|
|
|
|
* @return bool
|
|
|
|
*/
|
2021-07-23 19:53:14 +00:00
|
|
|
private function canHaveLanguages(): bool {
|
2022-04-15 21:03:40 +00:00
|
|
|
if ( $this->getContext()->getActionName() !== 'view' ) {
|
2021-02-10 19:40:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
$title = $this->getTitle();
|
|
|
|
// Defensive programming - if a special page has added languages explicitly, best to show it.
|
|
|
|
if ( $title && $title->isSpecialPage() && empty( $this->getLanguagesCached() ) ) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-08-18 21:30:25 +00:00
|
|
|
/**
|
2021-12-03 23:33:21 +00:00
|
|
|
* @param string $location Either 'top' or 'bottom' is accepted.
|
2020-08-18 21:30:25 +00:00
|
|
|
* @return bool
|
|
|
|
*/
|
2022-02-18 22:44:41 +00:00
|
|
|
protected function isLanguagesInContentAt( $location ) {
|
2021-12-03 23:33:21 +00:00
|
|
|
if ( !$this->canHaveLanguages() ) {
|
|
|
|
return false;
|
|
|
|
}
|
2020-08-18 21:30:25 +00:00
|
|
|
$featureManager = VectorServices::getFeatureManager();
|
2021-12-03 23:33:21 +00:00
|
|
|
$inContent = $featureManager->isFeatureEnabled(
|
2020-08-18 21:30:25 +00:00
|
|
|
Constants::FEATURE_LANGUAGE_IN_HEADER
|
|
|
|
);
|
2021-12-03 23:33:21 +00:00
|
|
|
$isMainPage = $this->getTitle() ? $this->getTitle()->isMainPage() : false;
|
|
|
|
|
|
|
|
switch ( $location ) {
|
|
|
|
case 'top':
|
|
|
|
return $isMainPage ? $inContent && $featureManager->isFeatureEnabled(
|
|
|
|
Constants::FEATURE_LANGUAGE_IN_MAIN_PAGE_HEADER
|
|
|
|
) : $inContent;
|
|
|
|
case 'bottom':
|
|
|
|
return $inContent && $isMainPage && !$featureManager->isFeatureEnabled(
|
|
|
|
Constants::FEATURE_LANGUAGE_IN_MAIN_PAGE_HEADER
|
|
|
|
);
|
|
|
|
default:
|
|
|
|
throw new RuntimeException( 'unknown language button location' );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Whether or not the languages are out of the sidebar and in the content either at
|
|
|
|
* the top or the bottom.
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
private function isLanguagesInContent() {
|
|
|
|
return $this->isLanguagesInContentAt( 'top' ) || $this->isLanguagesInContentAt( 'bottom' );
|
2020-08-18 21:30:25 +00:00
|
|
|
}
|
|
|
|
|
2021-03-18 11:58:55 +00:00
|
|
|
/**
|
2022-01-06 21:32:20 +00:00
|
|
|
* Show the ULS button if it's modern Vector, languages in header is enabled,
|
2022-06-21 09:19:14 +00:00
|
|
|
* and the ULS extension is enabled. Hide it otherwise.
|
|
|
|
* There is no point in showing the language button if ULS extension is unavailable
|
|
|
|
* as there is no ways to add languages without it.
|
2021-03-18 11:58:55 +00:00
|
|
|
* @return bool
|
|
|
|
*/
|
2022-02-18 22:44:41 +00:00
|
|
|
protected function shouldHideLanguages() {
|
2022-06-21 09:19:14 +00:00
|
|
|
return $this->isLegacy() || !$this->isLanguagesInContent() || !$this->isULSExtensionEnabled();
|
2021-03-18 11:58:55 +00:00
|
|
|
}
|
|
|
|
|
2021-06-03 21:37:01 +00:00
|
|
|
/**
|
2021-12-14 18:12:26 +00:00
|
|
|
* Returns HTML for the create account link inside the anon user links
|
2021-06-03 21:37:01 +00:00
|
|
|
* @param string[] $returnto array of query strings used to build the login link
|
2022-04-14 16:27:31 +00:00
|
|
|
* @param bool $isDropdownItem Set true for create account link inside the user menu dropdown
|
|
|
|
* which includes icon classes and is not styled like a button
|
2021-06-03 21:37:01 +00:00
|
|
|
* @return string
|
|
|
|
*/
|
2022-04-14 16:27:31 +00:00
|
|
|
private function getCreateAccountHTML( $returnto, $isDropdownItem ) {
|
2021-06-03 21:37:01 +00:00
|
|
|
$createAccountData = $this->buildCreateAccountData( $returnto );
|
2022-04-14 16:27:31 +00:00
|
|
|
$createAccountData = array_merge( $createAccountData, [
|
|
|
|
'class' => $isDropdownItem ? [
|
|
|
|
'vector-menu-content-item',
|
|
|
|
] : '',
|
|
|
|
'collapsible' => true,
|
|
|
|
'icon' => $isDropdownItem ? $createAccountData['icon'] : null,
|
|
|
|
'button' => !$isDropdownItem,
|
|
|
|
] );
|
|
|
|
$createAccountData = Hooks::updateMenuItem( $createAccountData, true );
|
2021-12-14 18:12:26 +00:00
|
|
|
return $this->makeLink( 'create-account', $createAccountData );
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns HTML for the watchlist link inside user links
|
2022-01-12 23:44:18 +00:00
|
|
|
* @param array|null $watchlistMenuData (optional)
|
2021-12-14 18:12:26 +00:00
|
|
|
* @return string
|
|
|
|
*/
|
2022-01-12 23:44:18 +00:00
|
|
|
private function getWatchlistHTML( $watchlistMenuData = null ) {
|
|
|
|
return $watchlistMenuData ? $watchlistMenuData['html-items'] : '';
|
2021-06-03 21:37:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2021-07-22 21:20:15 +00:00
|
|
|
* Returns HTML for the create account button, login button and learn more link inside the anon user menu
|
2021-06-03 21:37:01 +00:00
|
|
|
* @param string[] $returnto array of query strings used to build the login link
|
|
|
|
* @param bool $useCombinedLoginLink if a combined login/signup link will be used
|
2022-03-04 01:52:44 +00:00
|
|
|
* @param bool $isTempUser
|
2021-06-03 21:37:01 +00:00
|
|
|
* @return string
|
|
|
|
*/
|
2022-03-04 01:52:44 +00:00
|
|
|
private function getAnonMenuBeforePortletHTML( $returnto, $useCombinedLoginLink, $isTempUser ) {
|
2022-04-14 16:27:31 +00:00
|
|
|
$templateParser = $this->getTemplateParser();
|
|
|
|
$loginLinkData = array_merge( $this->buildLoginData( $returnto, $useCombinedLoginLink ), [
|
|
|
|
'class' => [ 'vector-menu-content-item', 'vector-menu-content-item-login' ],
|
|
|
|
] );
|
|
|
|
$loginLinkData = Hooks::updateMenuItem( $loginLinkData, true );
|
2022-03-04 01:52:44 +00:00
|
|
|
$templateData = [
|
2022-04-14 16:27:31 +00:00
|
|
|
'htmlCreateAccount' => $this->getCreateAccountHTML( $returnto, true ),
|
|
|
|
'htmlLogin' => $this->makeLink( 'login', $loginLinkData ),
|
2022-03-04 01:52:44 +00:00
|
|
|
];
|
|
|
|
|
|
|
|
if ( $isTempUser ) {
|
|
|
|
$templateName = 'UserLinks__templogin';
|
|
|
|
} else {
|
|
|
|
$templateName = 'UserLinks__login';
|
|
|
|
$learnMoreLinkData = [
|
|
|
|
'text' => $this->msg( 'vector-anon-user-menu-pages-learn' )->text(),
|
|
|
|
'href' => Title::newFromText( $this->msg( 'vector-intro-page' )->text() )->getLocalURL(),
|
|
|
|
'aria-label' => $this->msg( 'vector-anon-user-menu-pages-label' )->text(),
|
|
|
|
];
|
|
|
|
$templateData['htmlLearnMoreLink'] = $this->makeLink( '', $learnMoreLinkData );
|
|
|
|
$templateData['msgLearnMore'] = $this->msg( 'vector-anon-user-menu-pages' );
|
|
|
|
}
|
|
|
|
|
|
|
|
return $templateParser->processTemplate( $templateName, $templateData );
|
2021-06-03 21:37:01 +00:00
|
|
|
}
|
|
|
|
|
2021-06-04 12:47:39 +00:00
|
|
|
/**
|
|
|
|
* Returns HTML for the logout button that should be placed in the user (personal) menu
|
|
|
|
* after the menu itself.
|
|
|
|
* @return string
|
|
|
|
*/
|
|
|
|
private function getLogoutHTML() {
|
2022-04-14 16:27:31 +00:00
|
|
|
$logoutLinkData = array_merge( $this->buildLogoutLinkData(), [
|
|
|
|
'class' => [ 'vector-menu-content-item', 'vector-menu-content-item-logout' ],
|
|
|
|
] );
|
|
|
|
$logoutLinkData = Hooks::updateMenuItem( $logoutLinkData, true );
|
2021-06-04 12:47:39 +00:00
|
|
|
|
2022-04-14 16:27:31 +00:00
|
|
|
$templateParser = $this->getTemplateParser();
|
2021-06-04 12:47:39 +00:00
|
|
|
return $templateParser->processTemplate( 'UserLinks__logout', [
|
|
|
|
'htmlLogout' => $this->makeLink( 'logout', $logoutLinkData )
|
|
|
|
] );
|
|
|
|
}
|
|
|
|
|
2021-06-03 21:37:01 +00:00
|
|
|
/**
|
|
|
|
* Returns template data for UserLinks.mustache
|
|
|
|
* @param array $menuData existing menu template data to be transformed and copied for UserLinks
|
2022-03-04 01:52:44 +00:00
|
|
|
* @param User $user the context user
|
2021-06-03 21:37:01 +00:00
|
|
|
* @return array
|
|
|
|
*/
|
2022-03-04 01:52:44 +00:00
|
|
|
private function getUserLinksTemplateData( $menuData, $user ): array {
|
|
|
|
$isAnon = !$user->isRegistered();
|
|
|
|
$isTempUser = $user->isTemp();
|
2021-06-03 21:37:01 +00:00
|
|
|
$returnto = $this->getReturnToParam();
|
|
|
|
$useCombinedLoginLink = $this->useCombinedLoginLink();
|
2022-04-14 16:27:31 +00:00
|
|
|
$htmlCreateAccount = $this->getCreateAccountHTML( $returnto, false );
|
2021-06-03 21:37:01 +00:00
|
|
|
|
2021-06-02 22:57:43 +00:00
|
|
|
$templateParser = $this->getTemplateParser();
|
2021-08-17 18:21:08 +00:00
|
|
|
// See T288428#7303233. The following conditional checks whether config is disabling account creation for
|
|
|
|
// anonymous users in modern Vector. This check excludes the use case of extensions using core and legacy hooks
|
|
|
|
// to remove the "Create account" link from the personal toolbar. Ideally this should be managed with a new hook
|
|
|
|
// that tracks account creation ability.
|
|
|
|
// Supporting removing items via hook involves unnecessary additional complexity we'd rather avoid at this time.
|
|
|
|
// (see https://gerrit.wikimedia.org/r/c/mediawiki/skins/Vector/+/713505/3)
|
|
|
|
// Account creation can be disabled by setting `$wgGroupPermissions['*']['createaccount'] = false;`
|
2022-03-04 01:52:44 +00:00
|
|
|
$isCreateAccountAllowed = ( $isAnon || $isTempUser )
|
|
|
|
&& $this->getAuthority()->isAllowed( 'createaccount' );
|
2021-06-02 22:57:43 +00:00
|
|
|
$userMoreHtmlItems = $templateParser->processTemplate( 'UserLinks__more', [
|
|
|
|
'is-anon' => $isAnon,
|
2021-08-17 18:21:08 +00:00
|
|
|
'is-create-account-allowed' => $isCreateAccountAllowed,
|
2021-06-02 22:57:43 +00:00
|
|
|
'html-create-account' => $htmlCreateAccount,
|
|
|
|
'data-user-interface-preferences' => $menuData[ 'data-user-interface-preferences' ],
|
|
|
|
'data-notifications' => $menuData[ 'data-notifications' ],
|
|
|
|
'data-user-page' => $menuData[ 'data-user-page' ],
|
2022-01-12 23:44:18 +00:00
|
|
|
'html-vector-watchlist' => $this->getWatchlistHTML( $menuData[ 'data-vector-user-menu-overflow' ] ?? null ),
|
2021-06-02 22:57:43 +00:00
|
|
|
] );
|
2022-04-18 20:10:12 +00:00
|
|
|
$userMoreData = $this->decoratePortletData( 'data-user-more', [
|
2021-10-23 12:32:13 +00:00
|
|
|
'id' => 'p-personal-more',
|
2022-04-18 20:10:12 +00:00
|
|
|
'class' => 'mw-portlet mw-portlet-personal-more vector-user-menu-more',
|
2021-10-23 12:32:13 +00:00
|
|
|
'html-items' => $userMoreHtmlItems,
|
2022-04-18 20:10:12 +00:00
|
|
|
] );
|
2021-06-02 22:57:43 +00:00
|
|
|
|
|
|
|
$userMenuData = $menuData[ 'data-user-menu' ];
|
2022-03-04 01:52:44 +00:00
|
|
|
if ( $isAnon || $isTempUser ) {
|
2021-07-22 21:20:15 +00:00
|
|
|
$userMenuData[ 'html-before-portal' ] .= $this->getAnonMenuBeforePortletHTML(
|
|
|
|
$returnto,
|
2022-03-04 01:52:44 +00:00
|
|
|
$useCombinedLoginLink,
|
|
|
|
$isTempUser
|
2021-07-22 21:20:15 +00:00
|
|
|
);
|
2021-06-14 14:33:29 +00:00
|
|
|
} else {
|
2021-06-04 12:47:39 +00:00
|
|
|
// Appending as to not override data potentially set by the onSkinAfterPortlet hook.
|
|
|
|
$userMenuData[ 'html-after-portal' ] .= $this->getLogoutHTML();
|
|
|
|
}
|
|
|
|
|
2022-04-11 21:33:40 +00:00
|
|
|
$moreItems = substr_count( $userMoreData['html-items'], '<li' );
|
2021-06-03 21:37:01 +00:00
|
|
|
return [
|
2022-04-11 21:33:40 +00:00
|
|
|
'is-wide' => $moreItems > 3,
|
2021-06-02 22:57:43 +00:00
|
|
|
'data-user-more' => $userMoreData,
|
2021-06-03 21:37:01 +00:00
|
|
|
'data-user-menu' => $userMenuData
|
|
|
|
];
|
|
|
|
}
|
|
|
|
|
2021-07-28 18:20:07 +00:00
|
|
|
/**
|
|
|
|
* @inheritDoc
|
|
|
|
*/
|
|
|
|
protected function runOnSkinTemplateNavigationHooks( SkinTemplate $skin, &$content_navigation ) {
|
|
|
|
parent::runOnSkinTemplateNavigationHooks( $skin, $content_navigation );
|
|
|
|
Hooks::onSkinTemplateNavigation( $skin, $content_navigation );
|
|
|
|
}
|
|
|
|
|
2022-06-21 09:19:14 +00:00
|
|
|
/**
|
|
|
|
* Check whether ULS is enabled
|
|
|
|
*
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
private function isULSExtensionEnabled(): bool {
|
|
|
|
return ExtensionRegistry::getInstance()->isLoaded( 'UniversalLanguageSelector' );
|
|
|
|
}
|
|
|
|
|
2021-08-30 22:44:00 +00:00
|
|
|
/**
|
|
|
|
* Generate data needed to generate the sticky header.
|
2021-09-16 19:27:10 +00:00
|
|
|
* @param array $searchBoxData
|
2021-10-26 21:34:05 +00:00
|
|
|
* @param bool $includeEditIcons
|
2021-08-30 22:44:00 +00:00
|
|
|
* @return array
|
|
|
|
*/
|
2022-04-01 15:53:03 +00:00
|
|
|
final protected function getStickyHeaderData( $searchBoxData, $includeEditIcons ): array {
|
2021-10-26 21:34:05 +00:00
|
|
|
$btns = [
|
|
|
|
self::TALK_ICON,
|
2022-07-22 21:21:51 +00:00
|
|
|
self::SUBJECT_ICON,
|
2021-10-26 21:34:05 +00:00
|
|
|
self::HISTORY_ICON,
|
2021-11-15 23:09:51 +00:00
|
|
|
self::WATCHSTAR_ICON,
|
2021-10-26 21:34:05 +00:00
|
|
|
];
|
|
|
|
if ( $includeEditIcons ) {
|
|
|
|
$btns[] = self::EDIT_WIKITEXT_ICON;
|
|
|
|
$btns[] = self::EDIT_PROTECTED_ICON;
|
|
|
|
$btns[] = self::EDIT_VE_ICON;
|
|
|
|
}
|
2022-05-05 13:43:10 +00:00
|
|
|
$btns[] = $this->getAddSectionButtonData();
|
2022-01-06 21:32:20 +00:00
|
|
|
|
|
|
|
// Show sticky ULS if the ULS extension is enabled and the ULS in header is not hidden
|
2022-06-21 09:19:14 +00:00
|
|
|
$showStickyULS = $this->isULSExtensionEnabled() && !$this->shouldHideLanguages();
|
2021-08-30 22:44:00 +00:00
|
|
|
return [
|
2022-01-06 21:32:20 +00:00
|
|
|
'data-primary-action' => $showStickyULS ?
|
2021-12-09 20:07:56 +00:00
|
|
|
$this->getULSButtonData() : null,
|
2021-09-09 21:40:06 +00:00
|
|
|
'data-button-start' => [
|
|
|
|
'label' => $this->msg( 'search' ),
|
|
|
|
'icon' => 'wikimedia-search',
|
|
|
|
'is-quiet' => true,
|
2021-09-21 16:01:33 +00:00
|
|
|
'tabindex' => '-1',
|
2021-09-09 21:40:06 +00:00
|
|
|
'class' => 'vector-sticky-header-search-toggle',
|
2021-12-07 23:20:20 +00:00
|
|
|
'event' => 'ui.' . $searchBoxData['form-id'] . '.icon'
|
2021-09-09 21:40:06 +00:00
|
|
|
],
|
2021-09-16 19:27:10 +00:00
|
|
|
'data-search' => $searchBoxData,
|
2021-10-26 21:34:05 +00:00
|
|
|
'data-buttons' => $btns,
|
2021-08-30 22:44:00 +00:00
|
|
|
];
|
|
|
|
}
|
|
|
|
|
2021-12-07 20:28:58 +00:00
|
|
|
/**
|
|
|
|
* Generate data needed to create SidebarAction item.
|
|
|
|
* @param array $htmlData data to make a link or raw html
|
|
|
|
* @param array $headingOptions optional heading for the html
|
|
|
|
* @return array keyed data for the SidebarAction template
|
|
|
|
*/
|
|
|
|
private function makeSidebarActionData( array $htmlData = [], array $headingOptions = [] ): array {
|
|
|
|
$htmlContent = '';
|
|
|
|
// Populates the sidebar as a standalone link or custom html.
|
|
|
|
if ( array_key_exists( 'link', $htmlData ) ) {
|
|
|
|
$htmlContent = $this->makeLink( 'link', $htmlData['link'] );
|
|
|
|
} elseif ( array_key_exists( 'html-content', $htmlData ) ) {
|
|
|
|
$htmlContent = $htmlData['html-content'];
|
|
|
|
}
|
|
|
|
|
2021-12-10 16:38:51 +00:00
|
|
|
return $headingOptions + [
|
2021-12-07 20:28:58 +00:00
|
|
|
'html-content' => $htmlContent,
|
|
|
|
];
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines if the language switching alert box should be in the sidebar.
|
|
|
|
*
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
private function shouldLanguageAlertBeInSidebar(): bool {
|
|
|
|
$featureManager = VectorServices::getFeatureManager();
|
2022-01-26 07:57:04 +00:00
|
|
|
$isMainPage = $this->getTitle() ? $this->getTitle()->isMainPage() : false;
|
2022-01-31 16:43:15 +00:00
|
|
|
$shouldShowOnMainPage = $isMainPage && !empty( $this->getLanguagesCached() ) &&
|
2022-01-26 07:57:04 +00:00
|
|
|
$featureManager->isFeatureEnabled( Constants::FEATURE_LANGUAGE_IN_MAIN_PAGE_HEADER );
|
2022-02-18 22:44:41 +00:00
|
|
|
return ( $this->isLanguagesInContentAt( 'top' ) && !$isMainPage && !$this->shouldHideLanguages() &&
|
2022-01-26 07:57:04 +00:00
|
|
|
$featureManager->isFeatureEnabled( Constants::FEATURE_LANGUAGE_ALERT_IN_SIDEBAR ) ) ||
|
|
|
|
$shouldShowOnMainPage;
|
2021-12-07 20:28:58 +00:00
|
|
|
}
|
|
|
|
|
2014-08-07 11:38:34 +00:00
|
|
|
/**
|
2020-04-28 21:16:21 +00:00
|
|
|
* @inheritDoc
|
2014-08-07 11:38:34 +00:00
|
|
|
*/
|
2021-07-23 19:53:14 +00:00
|
|
|
public function getTemplateData(): array {
|
2020-04-28 21:16:21 +00:00
|
|
|
$skin = $this;
|
2022-06-21 09:19:14 +00:00
|
|
|
|
2022-01-18 21:45:46 +00:00
|
|
|
$parentData = $this->decoratePortletsData( parent::getTemplateData() );
|
2022-01-24 22:44:11 +00:00
|
|
|
$featureManager = VectorServices::getFeatureManager();
|
2021-03-18 11:58:55 +00:00
|
|
|
|
2022-03-03 18:08:30 +00:00
|
|
|
// SkinVector sometimes serves new Vector as part of removing the
|
|
|
|
// skin version user preference. TCho avoid T302461 we need to unset it here.
|
|
|
|
// This shouldn't be run on SkinVector22.
|
|
|
|
if ( $this->getSkinName() === 'vector' ) {
|
|
|
|
unset( $parentData['data-toc'] );
|
|
|
|
}
|
|
|
|
|
2022-01-18 21:45:46 +00:00
|
|
|
//
|
2020-03-06 22:53:04 +00:00
|
|
|
// Naming conventions for Mustache parameters.
|
|
|
|
//
|
|
|
|
// Value type (first segment):
|
2020-04-14 22:44:33 +00:00
|
|
|
// - Prefix "is" or "has" for boolean values.
|
2020-03-06 22:53:04 +00:00
|
|
|
// - Prefix "msg-" for interface message text.
|
|
|
|
// - Prefix "html-" for raw HTML.
|
|
|
|
// - Prefix "data-" for an array of template parameters that should be passed directly
|
2020-02-17 19:49:43 +00:00
|
|
|
// to a template partial.
|
2020-03-06 22:53:04 +00:00
|
|
|
// - Prefix "array-" for lists of any values.
|
|
|
|
//
|
|
|
|
// Source of value (first or second segment)
|
|
|
|
// - Segment "page-" for data relating to the current page (e.g. Title, WikiPage, or OutputPage).
|
|
|
|
// - Segment "hook-" for any thing generated from a hook.
|
|
|
|
// It should be followed by the name of the hook in hyphenated lowercase.
|
|
|
|
//
|
|
|
|
// Conditionally used values must use null to indicate absence (not false or '').
|
2020-09-29 17:41:39 +00:00
|
|
|
$commonSkinData = array_merge( $parentData, [
|
2021-05-18 18:27:33 +00:00
|
|
|
'is-legacy' => $this->isLegacy(),
|
|
|
|
|
2020-09-30 16:02:31 +00:00
|
|
|
'input-location' => $this->getSearchBoxInputLocation(),
|
[modern] A new version of Vector with a new logo
Changes to support feature:
* ResourceLoaderSkinModule logo features are dropped
* New layout provided given the fork in layout between legacy and new.
* Legacy sidebar styles now pulled out
* breakpoint styles are not carried over from legacy Vector
The new Vector layout for now has one breakpoint.
Changes to storybook:
* The storybook script now pulls down image assets so that the logos can
be shown in storybook. The script is adjusted to make use of a static folder to
serve these images.
Note:
* The legacy mode is not touched as part of this patchset.
* The personal menu is unaffected by this patch and is out of scope.
* The alignment issue is noted, but will be solved at a later date.
* Changes to portal are out of scope.
* Adding storybook for modern descoped, given its not possible to load
both legacy layout and modern layout inside a storybook at current time.
Sample config:
$wgLogos = [
'icon' => 'https://di-logo-sandbox.firebaseapp.com/img/globe.png',
'tagline' => [
'src' => 'https://di-logo-sandbox.firebaseapp.com/img/tagline/en-tagline-117-13.svg',
'width' => 117,
'height' => 13,
],
'1x' => 'https://en.wikipedia.org/static/images/project-logos/enwiki.png',
'wordmark' => [
'src' => 'https://en.wikipedia.org/static/images/mobile/copyright/wikipedia-wordmark-en.svg',
'width' => 116,
'height' => 18,
],
];
Coauthor: Aron Manning
Bug: T246170
Change-Id: Ibc4b055150761388a6b78f9127da342c451ce0e7
2020-03-09 05:51:00 +00:00
|
|
|
|
2020-07-07 08:59:14 +00:00
|
|
|
'sidebar-visible' => $this->isSidebarVisible(),
|
2021-01-26 23:48:20 +00:00
|
|
|
|
2021-12-03 23:33:21 +00:00
|
|
|
'is-language-in-content' => $this->isLanguagesInContent(),
|
|
|
|
'is-language-in-content-top' => $this->isLanguagesInContentAt( 'top' ),
|
|
|
|
'is-language-in-content-bottom' => $this->isLanguagesInContentAt( 'bottom' ),
|
2021-09-16 19:27:10 +00:00
|
|
|
'data-search-box' => $this->getSearchData(
|
|
|
|
$parentData['data-search-box'],
|
|
|
|
!$this->isLegacy(),
|
|
|
|
// is primary mode of search
|
|
|
|
true,
|
2021-12-16 03:13:56 +00:00
|
|
|
'searchform',
|
|
|
|
true
|
2022-03-29 20:51:45 +00:00
|
|
|
)
|
2020-09-04 19:18:57 +00:00
|
|
|
] );
|
2019-02-26 18:44:10 +00:00
|
|
|
|
2022-03-04 01:52:44 +00:00
|
|
|
$user = $skin->getUser();
|
|
|
|
if ( $user->isRegistered() ) {
|
2020-07-30 20:32:13 +00:00
|
|
|
// Note: This data is also passed to legacy template where it is unused.
|
2021-12-07 20:28:58 +00:00
|
|
|
$optOutUrl = [
|
|
|
|
'text' => $this->msg( 'vector-opt-out' )->text(),
|
Add opt-out link to Sidebar for Vector/Logged-in Users Without Abstractions
This commit is singularly focused on adding a link to the sidebar for
Vector, logged-in users. It does the bare minimum to fulfill the
requirements of T243281.
Additionally, it will help to answer the question "Do we need to use
abstractions (other than maybe different templates) to separate Legacy
Vector from Vector" by intentionally leaving out any abstractions in
order to make it easier to compare with a follow-up patch
(Ib2ef15180df73360cc1de25b893e49d415d23e1a) which does use abstractions.
It is a good thing to question whether or not we need addtional
abstractions in VectorTemplate and if they will help us as unnecessary
abstractions can have the opposite effect and just lead to further
frustrations down the road.
Therefore, I urge you, the reviewer, to let me know your thoughts! If
abstractions are viewed as not making our lives any easier, the
follow-up patches may be completely discarded and that's totally okay
with me. :) I think it's a good think to talk about now though.
Important changes:
* The VectorTemplate constructor was changed to allow injecting the
config, templateParser, and isLegacy boolean (only the config was
allowed before this commit). According to MediaWiki's Stable Interface
Policy, "Constructor signatures are generally considered unstable unless
explicitly declared stable for calling" [3]. Given that VecorTemplate's
constructor is not marked as stable, it is justified to do this without
warning according to the policy.
* Due to the above, the 'setTemplate' method is no longer needed and was
marked as deprecated.
* VectorTemplateTest was made to adapt to the new VectorTemplate
constructor. Additionally, it now extends from
MediaWikiIntegrationTestCase which my intelliphense server can pick up.
I *think* MediaWikiTestCase is just an alias to
MediaWikiIntegrationTestCase [1] and MediaWikiTestCase file was renamed
to MediaWikiIntegrationTestCase in [2], but I'm willing to change it
back if there is pushback to this.
Open questions:
* What are VectorTemplate's responsibilities? To me, it acts right now
as a controller (because it echos the full HTML string from the
template), a model (because SkinTemplate::prepareQuickTemplate sets data
on it which it later retrieves through `$this->get()`), a presenter
(because it adds data tailored for a web-centric view), and a view
(because it renders HTML strings instead of letting the view/template be
solely responsible for that). Arguably, some business logic might be
mixed in there as well (because it checks to see if a User is logged
in/has necessary permissions to show x which my changes here add to).
This might not be a problem if we keep VectorTemplate relatively small,
but will it remain this way as we progress further in Desktop
Improvements?
* How do we write tests for VectorTemplate without exposing unnecessary
public methods? For example, if I want to test the `getSkinData()`
method to see what state will be sent to the template, how should I do
this? One option might be to use `TestingAccessWrapper` to expose these
private methods which is what
`VectorTemplateTest::testbuildViewsProps()` does. Another option is to
accept this method as public. Is there a better way? Keep in mind that
even with access to this method, there might be many things to mock.
[1] https://github.com/wikimedia/mediawiki/blob/0030cb525be6cabc1d63de80586b2017d4bbe354/tests/common/TestsAutoLoader.php#L64
[2] Ie717b0ecf4fcfd089d46248f14853c80b7ef4a76
[3] https://www.mediawiki.org/wiki/Stable_interface_policy
Bug: T243281
Change-Id: I0571b041bcd7f19bec9f103fa7bccdd093f6394d
2020-03-17 20:21:33 +00:00
|
|
|
'href' => SpecialPage::getTitleFor(
|
|
|
|
'Preferences',
|
|
|
|
false,
|
2022-01-20 22:14:19 +00:00
|
|
|
'mw-prefsection-rendering-skin'
|
|
|
|
)->getLinkURL( 'useskin=vector&wprov=' . self::OPT_OUT_LINK_TRACKING_CODE ),
|
2021-12-07 20:28:58 +00:00
|
|
|
'title' => $this->msg( 'vector-opt-out-tooltip' )->text(),
|
|
|
|
'active' => false,
|
Add opt-out link to Sidebar for Vector/Logged-in Users Without Abstractions
This commit is singularly focused on adding a link to the sidebar for
Vector, logged-in users. It does the bare minimum to fulfill the
requirements of T243281.
Additionally, it will help to answer the question "Do we need to use
abstractions (other than maybe different templates) to separate Legacy
Vector from Vector" by intentionally leaving out any abstractions in
order to make it easier to compare with a follow-up patch
(Ib2ef15180df73360cc1de25b893e49d415d23e1a) which does use abstractions.
It is a good thing to question whether or not we need addtional
abstractions in VectorTemplate and if they will help us as unnecessary
abstractions can have the opposite effect and just lead to further
frustrations down the road.
Therefore, I urge you, the reviewer, to let me know your thoughts! If
abstractions are viewed as not making our lives any easier, the
follow-up patches may be completely discarded and that's totally okay
with me. :) I think it's a good think to talk about now though.
Important changes:
* The VectorTemplate constructor was changed to allow injecting the
config, templateParser, and isLegacy boolean (only the config was
allowed before this commit). According to MediaWiki's Stable Interface
Policy, "Constructor signatures are generally considered unstable unless
explicitly declared stable for calling" [3]. Given that VecorTemplate's
constructor is not marked as stable, it is justified to do this without
warning according to the policy.
* Due to the above, the 'setTemplate' method is no longer needed and was
marked as deprecated.
* VectorTemplateTest was made to adapt to the new VectorTemplate
constructor. Additionally, it now extends from
MediaWikiIntegrationTestCase which my intelliphense server can pick up.
I *think* MediaWikiTestCase is just an alias to
MediaWikiIntegrationTestCase [1] and MediaWikiTestCase file was renamed
to MediaWikiIntegrationTestCase in [2], but I'm willing to change it
back if there is pushback to this.
Open questions:
* What are VectorTemplate's responsibilities? To me, it acts right now
as a controller (because it echos the full HTML string from the
template), a model (because SkinTemplate::prepareQuickTemplate sets data
on it which it later retrieves through `$this->get()`), a presenter
(because it adds data tailored for a web-centric view), and a view
(because it renders HTML strings instead of letting the view/template be
solely responsible for that). Arguably, some business logic might be
mixed in there as well (because it checks to see if a User is logged
in/has necessary permissions to show x which my changes here add to).
This might not be a problem if we keep VectorTemplate relatively small,
but will it remain this way as we progress further in Desktop
Improvements?
* How do we write tests for VectorTemplate without exposing unnecessary
public methods? For example, if I want to test the `getSkinData()`
method to see what state will be sent to the template, how should I do
this? One option might be to use `TestingAccessWrapper` to expose these
private methods which is what
`VectorTemplateTest::testbuildViewsProps()` does. Another option is to
accept this method as public. Is there a better way? Keep in mind that
even with access to this method, there might be many things to mock.
[1] https://github.com/wikimedia/mediawiki/blob/0030cb525be6cabc1d63de80586b2017d4bbe354/tests/common/TestsAutoLoader.php#L64
[2] Ie717b0ecf4fcfd089d46248f14853c80b7ef4a76
[3] https://www.mediawiki.org/wiki/Stable_interface_policy
Bug: T243281
Change-Id: I0571b041bcd7f19bec9f103fa7bccdd093f6394d
2020-03-17 20:21:33 +00:00
|
|
|
];
|
2021-12-07 20:28:58 +00:00
|
|
|
$htmlData = [
|
|
|
|
'link' => $optOutUrl,
|
|
|
|
];
|
|
|
|
$commonSkinData['data-emphasized-sidebar-action'][] = $this->makeSidebarActionData(
|
|
|
|
$htmlData,
|
|
|
|
[]
|
|
|
|
);
|
2021-06-03 21:37:01 +00:00
|
|
|
}
|
2021-05-07 21:56:29 +00:00
|
|
|
|
2021-08-24 21:34:59 +00:00
|
|
|
if ( !$this->isLegacy() ) {
|
2021-06-03 21:37:01 +00:00
|
|
|
$commonSkinData['data-vector-user-links'] = $this->getUserLinksTemplateData(
|
|
|
|
$commonSkinData['data-portlets'],
|
2022-03-04 01:52:44 +00:00
|
|
|
$user
|
2021-06-03 21:37:01 +00:00
|
|
|
);
|
2021-12-07 20:28:58 +00:00
|
|
|
|
|
|
|
// T295555 Add language switch alert message temporarily (to be removed).
|
2022-01-26 07:57:04 +00:00
|
|
|
if ( $this->shouldLanguageAlertBeInSidebar() ) {
|
2021-12-07 20:28:58 +00:00
|
|
|
$languageSwitchAlert = [
|
2022-01-27 22:25:30 +00:00
|
|
|
'html-content' => Html::noticeBox(
|
|
|
|
$this->msg( 'vector-language-redirect-to-top' )->parse(),
|
|
|
|
'vector-language-sidebar-alert'
|
2021-12-10 16:38:51 +00:00
|
|
|
),
|
2021-12-07 20:28:58 +00:00
|
|
|
];
|
|
|
|
$headingOptions = [
|
|
|
|
'heading' => $this->msg( 'vector-languages' )->plain(),
|
|
|
|
];
|
|
|
|
$commonSkinData['data-vector-language-switch-alert'][] = $this->makeSidebarActionData(
|
|
|
|
$languageSwitchAlert,
|
|
|
|
$headingOptions
|
|
|
|
);
|
|
|
|
}
|
Add opt-out link to Sidebar for Vector/Logged-in Users Without Abstractions
This commit is singularly focused on adding a link to the sidebar for
Vector, logged-in users. It does the bare minimum to fulfill the
requirements of T243281.
Additionally, it will help to answer the question "Do we need to use
abstractions (other than maybe different templates) to separate Legacy
Vector from Vector" by intentionally leaving out any abstractions in
order to make it easier to compare with a follow-up patch
(Ib2ef15180df73360cc1de25b893e49d415d23e1a) which does use abstractions.
It is a good thing to question whether or not we need addtional
abstractions in VectorTemplate and if they will help us as unnecessary
abstractions can have the opposite effect and just lead to further
frustrations down the road.
Therefore, I urge you, the reviewer, to let me know your thoughts! If
abstractions are viewed as not making our lives any easier, the
follow-up patches may be completely discarded and that's totally okay
with me. :) I think it's a good think to talk about now though.
Important changes:
* The VectorTemplate constructor was changed to allow injecting the
config, templateParser, and isLegacy boolean (only the config was
allowed before this commit). According to MediaWiki's Stable Interface
Policy, "Constructor signatures are generally considered unstable unless
explicitly declared stable for calling" [3]. Given that VecorTemplate's
constructor is not marked as stable, it is justified to do this without
warning according to the policy.
* Due to the above, the 'setTemplate' method is no longer needed and was
marked as deprecated.
* VectorTemplateTest was made to adapt to the new VectorTemplate
constructor. Additionally, it now extends from
MediaWikiIntegrationTestCase which my intelliphense server can pick up.
I *think* MediaWikiTestCase is just an alias to
MediaWikiIntegrationTestCase [1] and MediaWikiTestCase file was renamed
to MediaWikiIntegrationTestCase in [2], but I'm willing to change it
back if there is pushback to this.
Open questions:
* What are VectorTemplate's responsibilities? To me, it acts right now
as a controller (because it echos the full HTML string from the
template), a model (because SkinTemplate::prepareQuickTemplate sets data
on it which it later retrieves through `$this->get()`), a presenter
(because it adds data tailored for a web-centric view), and a view
(because it renders HTML strings instead of letting the view/template be
solely responsible for that). Arguably, some business logic might be
mixed in there as well (because it checks to see if a User is logged
in/has necessary permissions to show x which my changes here add to).
This might not be a problem if we keep VectorTemplate relatively small,
but will it remain this way as we progress further in Desktop
Improvements?
* How do we write tests for VectorTemplate without exposing unnecessary
public methods? For example, if I want to test the `getSkinData()`
method to see what state will be sent to the template, how should I do
this? One option might be to use `TestingAccessWrapper` to expose these
private methods which is what
`VectorTemplateTest::testbuildViewsProps()` does. Another option is to
accept this method as public. Is there a better way? Keep in mind that
even with access to this method, there might be many things to mock.
[1] https://github.com/wikimedia/mediawiki/blob/0030cb525be6cabc1d63de80586b2017d4bbe354/tests/common/TestsAutoLoader.php#L64
[2] Ie717b0ecf4fcfd089d46248f14853c80b7ef4a76
[3] https://www.mediawiki.org/wiki/Stable_interface_policy
Bug: T243281
Change-Id: I0571b041bcd7f19bec9f103fa7bccdd093f6394d
2020-03-17 20:21:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return $commonSkinData;
|
|
|
|
}
|
|
|
|
|
2021-06-02 22:57:43 +00:00
|
|
|
/**
|
|
|
|
* Annotates search box with Vector-specific information
|
|
|
|
*
|
|
|
|
* @param array $searchBoxData
|
2021-08-24 21:34:59 +00:00
|
|
|
* @param bool $isCollapsible
|
2021-09-16 18:00:05 +00:00
|
|
|
* @param bool $isPrimary
|
|
|
|
* @param string $formId
|
2021-12-16 03:13:56 +00:00
|
|
|
* @param bool $autoExpandWidth
|
2021-06-02 22:57:43 +00:00
|
|
|
* @return array modified version of $searchBoxData
|
|
|
|
*/
|
2022-04-01 15:53:03 +00:00
|
|
|
final protected function getSearchData(
|
2021-12-16 03:13:56 +00:00
|
|
|
array $searchBoxData,
|
|
|
|
bool $isCollapsible,
|
|
|
|
bool $isPrimary,
|
|
|
|
string $formId,
|
|
|
|
bool $autoExpandWidth
|
|
|
|
) {
|
2021-09-09 19:11:23 +00:00
|
|
|
$searchClass = 'vector-search-box-vue ';
|
2021-06-02 22:57:43 +00:00
|
|
|
|
2021-08-24 21:34:59 +00:00
|
|
|
if ( $isCollapsible ) {
|
2021-09-16 18:00:05 +00:00
|
|
|
$searchClass .= ' vector-search-box-collapses ';
|
2021-06-02 22:57:43 +00:00
|
|
|
}
|
|
|
|
|
2021-12-16 03:13:56 +00:00
|
|
|
if ( $this->doesSearchHaveThumbnails() ) {
|
|
|
|
$searchClass .= ' ' . self::SEARCH_SHOW_THUMBNAIL_CLASS .
|
|
|
|
( $autoExpandWidth ? ' ' . self::SEARCH_AUTO_EXPAND_WIDTH_CLASS : '' );
|
2021-06-02 22:57:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Annotate search box with a component class.
|
2021-09-16 18:00:05 +00:00
|
|
|
$searchBoxData['class'] = trim( $searchClass );
|
2021-08-24 21:34:59 +00:00
|
|
|
$searchBoxData['is-collapsible'] = $isCollapsible;
|
2021-09-16 18:00:05 +00:00
|
|
|
$searchBoxData['is-primary'] = $isPrimary;
|
|
|
|
$searchBoxData['form-id'] = $formId;
|
2021-06-02 22:57:43 +00:00
|
|
|
|
|
|
|
// At lower resolutions the search input is hidden search and only the submit button is shown.
|
|
|
|
// It should behave like a form submit link (e.g. submit the form with no input value).
|
|
|
|
// We'll wire this up in a later task T284242.
|
2022-04-13 19:53:46 +00:00
|
|
|
$collapseIconAttrs = Linker::tooltipAndAccesskeyAttribs( 'search' );
|
|
|
|
$searchBoxData['data-collapse-icon'] = array_merge( [
|
2021-09-03 19:00:45 +00:00
|
|
|
'href' => Title::newFromText( $searchBoxData['page-title'] )->getLocalUrl(),
|
|
|
|
'label' => $this->msg( 'search' ),
|
|
|
|
'icon' => 'wikimedia-search',
|
|
|
|
'is-quiet' => true,
|
|
|
|
'class' => 'search-toggle',
|
2022-04-13 19:53:46 +00:00
|
|
|
], $collapseIconAttrs );
|
2021-06-02 22:57:43 +00:00
|
|
|
|
|
|
|
return $searchBoxData;
|
|
|
|
}
|
|
|
|
|
2020-09-24 12:46:48 +00:00
|
|
|
/**
|
|
|
|
* Gets the value of the "input-location" parameter for the SearchBox Mustache template.
|
|
|
|
*
|
|
|
|
* @return string Either `Constants::SEARCH_BOX_INPUT_LOCATION_DEFAULT` or
|
|
|
|
* `Constants::SEARCH_BOX_INPUT_LOCATION_MOVED`
|
|
|
|
*/
|
2021-07-23 19:53:14 +00:00
|
|
|
private function getSearchBoxInputLocation(): string {
|
2020-09-24 12:46:48 +00:00
|
|
|
if ( $this->isLegacy() ) {
|
|
|
|
return Constants::SEARCH_BOX_INPUT_LOCATION_DEFAULT;
|
|
|
|
}
|
|
|
|
|
2020-09-30 16:02:31 +00:00
|
|
|
return Constants::SEARCH_BOX_INPUT_LOCATION_MOVED;
|
2020-09-24 12:46:48 +00:00
|
|
|
}
|
|
|
|
|
2021-08-13 18:21:52 +00:00
|
|
|
/**
|
|
|
|
* @inheritDoc
|
|
|
|
*/
|
|
|
|
public function isResponsive() {
|
|
|
|
// Check it's enabled by user preference and configuration
|
|
|
|
$responsive = parent::isResponsive() && $this->getConfig()->get( 'VectorResponsive' );
|
|
|
|
// For historic reasons, the viewport is added when Vector is loaded on the mobile
|
|
|
|
// domain. This is only possible for 3rd parties or by useskin parameter as there is
|
|
|
|
// no preference for changing mobile skin. Only need to check if $responsive is falsey.
|
|
|
|
if ( !$responsive && ExtensionRegistry::getInstance()->isLoaded( 'MobileFrontend' ) ) {
|
|
|
|
$mobFrontContext = MediaWikiServices::getInstance()->getService( 'MobileFrontend.Context' );
|
|
|
|
if ( $mobFrontContext->shouldDisplayMobileView() ) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return $responsive;
|
|
|
|
}
|
|
|
|
|
2021-01-26 23:48:20 +00:00
|
|
|
/**
|
2022-02-01 20:52:16 +00:00
|
|
|
* Returns `true` if Vue search is enabled to show thumbnails and `false` otherwise.
|
|
|
|
* Note this is only relevant for Vue search experience (not legacy search).
|
2021-01-26 23:48:20 +00:00
|
|
|
*
|
|
|
|
* @return bool
|
|
|
|
*/
|
2021-12-16 03:13:56 +00:00
|
|
|
private function doesSearchHaveThumbnails(): bool {
|
2021-09-09 19:11:23 +00:00
|
|
|
return $this->getConfig()->get( 'VectorWvuiSearchOptions' )['showThumbnail'];
|
2021-01-26 23:48:20 +00:00
|
|
|
}
|
|
|
|
|
2020-07-07 08:59:14 +00:00
|
|
|
/**
|
|
|
|
* Determines wheather the initial state of sidebar is visible on not
|
|
|
|
*
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
private function isSidebarVisible() {
|
|
|
|
$skin = $this->getSkin();
|
2020-12-18 02:51:28 +00:00
|
|
|
if ( $skin->getUser()->isRegistered() ) {
|
2021-11-23 13:40:35 +00:00
|
|
|
$userOptionsLookup = MediaWikiServices::getInstance()->getUserOptionsLookup();
|
|
|
|
$userPrefSidebarState = $userOptionsLookup->getOption(
|
|
|
|
$skin->getUser(),
|
2020-06-30 22:39:09 +00:00
|
|
|
Constants::PREF_KEY_SIDEBAR_VISIBLE
|
|
|
|
);
|
|
|
|
|
|
|
|
$defaultLoggedinSidebarState = $this->getConfig()->get(
|
2020-07-07 08:59:14 +00:00
|
|
|
Constants::CONFIG_KEY_DEFAULT_SIDEBAR_VISIBLE_FOR_AUTHORISED_USER
|
|
|
|
);
|
2020-06-30 22:39:09 +00:00
|
|
|
|
|
|
|
// If the sidebar user preference has been set, return that value,
|
|
|
|
// if not, then the default sidebar state for logged-in users.
|
|
|
|
return ( $userPrefSidebarState !== null )
|
|
|
|
? (bool)$userPrefSidebarState
|
|
|
|
: $defaultLoggedinSidebarState;
|
2020-07-07 08:59:14 +00:00
|
|
|
}
|
|
|
|
return $this->getConfig()->get(
|
|
|
|
Constants::CONFIG_KEY_DEFAULT_SIDEBAR_VISIBLE_FOR_ANONYMOUS_USER
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2021-03-18 11:58:55 +00:00
|
|
|
/**
|
2021-09-14 22:56:54 +00:00
|
|
|
* Returns ULS button label within the context of the translated message taking a placeholder.
|
2021-03-18 11:58:55 +00:00
|
|
|
*
|
2021-09-14 22:56:54 +00:00
|
|
|
* @param string $message
|
2022-06-21 09:19:14 +00:00
|
|
|
* @param int $count
|
2021-09-07 20:22:19 +00:00
|
|
|
* @return string
|
2021-03-18 11:58:55 +00:00
|
|
|
*/
|
2022-06-21 09:19:14 +00:00
|
|
|
private function getULSLabel( string $message, int $count ): string {
|
2022-02-06 22:48:51 +00:00
|
|
|
return $this->msg( $message )
|
2022-06-21 09:19:14 +00:00
|
|
|
->numParams( $count )
|
2021-06-08 16:14:27 +00:00
|
|
|
->escaped();
|
2021-09-07 20:22:19 +00:00
|
|
|
}
|
|
|
|
|
2022-05-05 13:43:10 +00:00
|
|
|
/**
|
|
|
|
* Creates button data for the "Add section" button in the sticky header
|
|
|
|
*
|
|
|
|
* @return array
|
|
|
|
*/
|
|
|
|
private function getAddSectionButtonData() {
|
|
|
|
return [
|
|
|
|
'href' => '#',
|
|
|
|
'id' => 'ca-addsection-sticky-header',
|
|
|
|
'event' => 'addsection-sticky-header',
|
|
|
|
'html-vector-button-icon' => Hooks::makeIcon( 'wikimedia-speechBubbleAdd-progressive' ),
|
|
|
|
'label' => $this->msg( [ 'vector-2022-action-addsection', 'skin-action-addsection' ] ),
|
|
|
|
'is-quiet' => true,
|
|
|
|
'tabindex' => '-1',
|
|
|
|
'class' => 'sticky-header-icon mw-ui-primary mw-ui-progressive'
|
|
|
|
];
|
|
|
|
}
|
|
|
|
|
2021-09-07 20:22:19 +00:00
|
|
|
/**
|
|
|
|
* Creates button data for the ULS button in the sticky header
|
|
|
|
*
|
|
|
|
* @return array
|
|
|
|
*/
|
|
|
|
private function getULSButtonData() {
|
2022-06-21 09:19:14 +00:00
|
|
|
$numLanguages = count( $this->getLanguagesCached() );
|
|
|
|
|
2021-09-07 20:22:19 +00:00
|
|
|
return [
|
|
|
|
'id' => 'p-lang-btn-sticky-header',
|
|
|
|
'class' => 'mw-interlanguage-selector',
|
|
|
|
'is-quiet' => true,
|
2021-09-21 16:01:33 +00:00
|
|
|
'tabindex' => '-1',
|
2022-06-21 09:19:14 +00:00
|
|
|
'label' => $this->getULSLabel( 'vector-language-button-label', $numLanguages ),
|
2021-09-07 20:22:19 +00:00
|
|
|
'html-vector-button-icon' => Hooks::makeIcon( 'wikimedia-language' ),
|
2021-11-19 16:38:13 +00:00
|
|
|
'event' => 'ui.dropdown-p-lang-btn-sticky-header'
|
2021-09-07 20:22:19 +00:00
|
|
|
];
|
|
|
|
}
|
2021-06-08 16:14:27 +00:00
|
|
|
|
2021-09-07 20:22:19 +00:00
|
|
|
/**
|
|
|
|
* Creates portlet data for the ULS button in the header
|
|
|
|
*
|
|
|
|
* @return array
|
|
|
|
*/
|
|
|
|
private function getULSPortletData() {
|
2022-06-21 09:19:14 +00:00
|
|
|
$numLanguages = count( $this->getLanguagesCached() );
|
|
|
|
|
2021-03-18 11:58:55 +00:00
|
|
|
$languageButtonData = [
|
|
|
|
'id' => 'p-lang-btn',
|
2022-06-21 09:19:14 +00:00
|
|
|
// No languages present for the article.
|
|
|
|
// But the page can show languages if there were languages.
|
|
|
|
'label' => $numLanguages === 0 ?
|
|
|
|
$this->msg( 'vector-no-language-button-label' )->text() :
|
|
|
|
$this->getULSLabel( 'vector-language-button-label', $numLanguages ),
|
|
|
|
'aria-label' => $numLanguages === 0 ?
|
|
|
|
$this->msg( 'vector-no-language-button-aria-label' )->text() :
|
|
|
|
$this->getULSLabel( 'vector-language-button-aria-label', $numLanguages ),
|
2021-08-13 20:56:51 +00:00
|
|
|
// ext.uls.interface attaches click handler to this selector.
|
|
|
|
'checkbox-class' => ' mw-interlanguage-selector ',
|
2021-12-01 19:49:12 +00:00
|
|
|
'html-vector-heading-icon' => Hooks::makeIcon( 'wikimedia-language-progressive' ),
|
2022-06-21 09:19:14 +00:00
|
|
|
'heading-class' => self::CLASS_QUIET_BUTTON . ' ' . self::CLASS_PROGRESSIVE .
|
|
|
|
' mw-portlet-lang-heading-' . strval( $numLanguages ),
|
2022-03-24 08:05:11 +00:00
|
|
|
];
|
2021-07-26 21:00:38 +00:00
|
|
|
|
|
|
|
// Adds class to hide language button
|
|
|
|
// Temporary solution to T287206, can be removed when ULS dialog includes interwiki links
|
|
|
|
if ( $this->shouldHideLanguages() ) {
|
|
|
|
$languageButtonData['class'] = ' mw-portlet-empty';
|
|
|
|
}
|
|
|
|
|
2021-09-07 20:22:19 +00:00
|
|
|
return $languageButtonData;
|
2021-03-18 11:58:55 +00:00
|
|
|
}
|
|
|
|
|
2014-08-07 11:38:34 +00:00
|
|
|
/**
|
2020-09-04 19:18:57 +00:00
|
|
|
* helper for applying Vector menu classes to portlets
|
2021-08-26 19:47:02 +00:00
|
|
|
*
|
2020-09-04 19:18:57 +00:00
|
|
|
* @param array $portletData returned by SkinMustache to decorate
|
|
|
|
* @param int $type representing one of the menu types (see MENU_TYPE_* constants)
|
|
|
|
* @return array modified version of portletData input
|
2014-08-07 11:38:34 +00:00
|
|
|
*/
|
2020-09-04 19:18:57 +00:00
|
|
|
private function decoratePortletClass(
|
|
|
|
array $portletData,
|
|
|
|
int $type = self::MENU_TYPE_DEFAULT
|
|
|
|
) {
|
|
|
|
$extraClasses = [
|
2022-05-04 22:20:23 +00:00
|
|
|
self::MENU_TYPE_DROPDOWN => 'vector-menu-dropdown',
|
|
|
|
self::MENU_TYPE_TABS => 'vector-menu-tabs',
|
|
|
|
self::MENU_TYPE_PORTAL => 'vector-menu-portal portal',
|
|
|
|
self::MENU_TYPE_DEFAULT => '',
|
2020-01-10 15:00:54 +00:00
|
|
|
];
|
2022-06-08 18:29:22 +00:00
|
|
|
if ( $this->isLegacy() ) {
|
|
|
|
$extraClasses[self::MENU_TYPE_TABS] .= ' vector-menu-tabs-legacy';
|
|
|
|
}
|
2022-03-24 08:05:11 +00:00
|
|
|
$portletData['heading-class'] = '';
|
2021-04-30 02:54:54 +00:00
|
|
|
// Add target class to apply different icon to personal menu dropdown for logged in users.
|
2021-05-14 15:25:48 +00:00
|
|
|
if ( $portletData['id'] === 'p-personal' ) {
|
2021-08-24 21:34:59 +00:00
|
|
|
if ( $this->isLegacy() ) {
|
|
|
|
$portletData['class'] .= ' vector-user-menu-legacy';
|
|
|
|
} else {
|
2021-05-14 15:25:48 +00:00
|
|
|
$portletData['class'] .= ' vector-user-menu';
|
2021-06-24 19:13:20 +00:00
|
|
|
$portletData['class'] .= $this->loggedin ?
|
|
|
|
' vector-user-menu-logged-in' :
|
|
|
|
' vector-user-menu-logged-out';
|
2021-12-15 22:25:11 +00:00
|
|
|
$portletData['heading-class'] .= ' ' . self::CLASS_QUIET_BUTTON . ' ' .
|
|
|
|
self::CLASS_ICON_BUTTON . ' ';
|
2022-03-04 01:52:44 +00:00
|
|
|
if ( $this->getUser()->isTemp() ) {
|
|
|
|
$icon = 'userAnonymous';
|
|
|
|
} elseif ( $this->loggedin ) {
|
|
|
|
$icon = 'userAvatar';
|
|
|
|
} else {
|
|
|
|
$icon = 'ellipsis';
|
|
|
|
}
|
|
|
|
$portletData['heading-class'] .= $this->iconClass( $icon );
|
2021-05-14 15:25:48 +00:00
|
|
|
}
|
2021-04-30 02:54:54 +00:00
|
|
|
}
|
2021-08-26 19:47:02 +00:00
|
|
|
switch ( $portletData['id'] ) {
|
|
|
|
case 'p-variants':
|
|
|
|
case 'p-cactions':
|
|
|
|
$portletData['class'] .= ' vector-menu-dropdown-noicon';
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2021-12-03 23:33:21 +00:00
|
|
|
if ( $portletData['id'] === 'p-lang' && $this->isLanguagesInContent() ) {
|
2021-09-07 20:22:19 +00:00
|
|
|
$portletData = array_merge( $portletData, $this->getULSPortletData() );
|
2021-02-01 22:51:28 +00:00
|
|
|
}
|
2020-09-04 19:18:57 +00:00
|
|
|
$class = $portletData['class'];
|
|
|
|
$portletData['class'] = trim( "$class $extraClasses[$type]" );
|
|
|
|
return $portletData;
|
2014-08-07 11:38:34 +00:00
|
|
|
}
|
|
|
|
|
2020-01-14 18:47:30 +00:00
|
|
|
/**
|
2022-01-18 21:45:46 +00:00
|
|
|
* Performs updates to all portlets.
|
|
|
|
*
|
|
|
|
* @param array $data
|
2020-02-14 20:33:54 +00:00
|
|
|
* @return array
|
2020-01-14 18:47:30 +00:00
|
|
|
*/
|
2022-01-18 21:45:46 +00:00
|
|
|
private function decoratePortletsData( array $data ) {
|
|
|
|
foreach ( $data['data-portlets'] as $key => $pData ) {
|
|
|
|
$data['data-portlets'][$key] = $this->decoratePortletData(
|
|
|
|
$key,
|
|
|
|
$pData
|
|
|
|
);
|
|
|
|
}
|
|
|
|
$sidebar = $data['data-portlets-sidebar'];
|
|
|
|
$sidebar['data-portlets-first'] = $this->decoratePortletData(
|
|
|
|
'navigation', $sidebar['data-portlets-first']
|
|
|
|
);
|
|
|
|
$rest = $sidebar['array-portlets-rest'];
|
|
|
|
foreach ( $rest as $key => $pData ) {
|
|
|
|
$rest[$key] = $this->decoratePortletData(
|
|
|
|
$pData['id'], $pData
|
|
|
|
);
|
|
|
|
}
|
|
|
|
$sidebar['array-portlets-rest'] = $rest;
|
|
|
|
$data['data-portlets-sidebar'] = $sidebar;
|
|
|
|
return $data;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Performs the following updates to portlet data:
|
|
|
|
* - Adds concept of menu types
|
|
|
|
* - Marks the selected variant in the variant portlet
|
|
|
|
* - modifies tooltips of personal and user-menu portlets
|
|
|
|
* @param string $key
|
|
|
|
* @param array $portletData
|
|
|
|
* @return array
|
|
|
|
*/
|
|
|
|
private function decoratePortletData(
|
|
|
|
string $key,
|
|
|
|
array $portletData
|
2021-07-23 19:53:14 +00:00
|
|
|
): array {
|
2022-01-18 21:45:46 +00:00
|
|
|
switch ( $key ) {
|
|
|
|
case 'data-user-menu':
|
|
|
|
case 'data-actions':
|
|
|
|
case 'data-variants':
|
2020-09-04 19:18:57 +00:00
|
|
|
$type = self::MENU_TYPE_DROPDOWN;
|
|
|
|
break;
|
2022-01-18 21:45:46 +00:00
|
|
|
case 'data-views':
|
|
|
|
case 'data-namespaces':
|
2020-09-04 19:18:57 +00:00
|
|
|
$type = self::MENU_TYPE_TABS;
|
|
|
|
break;
|
2022-01-18 21:45:46 +00:00
|
|
|
case 'data-notifications':
|
|
|
|
case 'data-personal':
|
|
|
|
case 'data-user-page':
|
2022-04-18 20:10:12 +00:00
|
|
|
case 'data-user-more':
|
2020-09-04 19:18:57 +00:00
|
|
|
$type = self::MENU_TYPE_DEFAULT;
|
|
|
|
break;
|
2022-01-18 21:45:46 +00:00
|
|
|
case 'data-languages':
|
2021-12-03 23:33:21 +00:00
|
|
|
$type = $this->isLanguagesInContent() ?
|
2020-08-18 21:30:25 +00:00
|
|
|
self::MENU_TYPE_DROPDOWN : self::MENU_TYPE_PORTAL;
|
|
|
|
break;
|
2020-09-04 19:18:57 +00:00
|
|
|
default:
|
|
|
|
$type = self::MENU_TYPE_PORTAL;
|
|
|
|
break;
|
|
|
|
}
|
2020-04-03 20:05:22 +00:00
|
|
|
|
2020-09-04 19:18:57 +00:00
|
|
|
$portletData = $this->decoratePortletClass(
|
2022-01-18 21:45:46 +00:00
|
|
|
$portletData,
|
2020-09-04 19:18:57 +00:00
|
|
|
$type
|
|
|
|
);
|
2019-11-18 20:23:48 +00:00
|
|
|
|
2020-09-23 22:29:30 +00:00
|
|
|
// Special casing for Variant to change label to selected.
|
|
|
|
// Hopefully we can revisit and possibly remove this code when the language switcher is moved.
|
2022-01-18 21:45:46 +00:00
|
|
|
if ( $key === 'data-variants' ) {
|
|
|
|
$languageConverterFactory = MediaWikiServices::getInstance()->getLanguageConverterFactory();
|
|
|
|
$pageLang = $this->getTitle()->getPageLanguage();
|
|
|
|
$converter = $languageConverterFactory->getLanguageConverter( $pageLang );
|
|
|
|
$portletData['label'] = $pageLang->getVariantname(
|
|
|
|
$converter->getPreferredVariant()
|
|
|
|
);
|
2021-09-14 22:56:54 +00:00
|
|
|
// T289523 Add aria-label data to the language variant switcher.
|
|
|
|
$portletData['aria-label'] = $this->msg( 'vector-language-variant-switcher-label' );
|
2020-04-03 20:05:22 +00:00
|
|
|
}
|
2020-04-07 23:21:20 +00:00
|
|
|
|
2021-08-25 15:24:58 +00:00
|
|
|
// T287494 We use tooltip messages to provide title attributes on hover over certain menu icons. For modern
|
|
|
|
// Vector, the "tooltip-p-personal" key is set to "User menu" which is appropriate for the user icon (dropdown
|
|
|
|
// indicator for user links menu) for logged-in users. This overrides the tooltip for the user links menu icon
|
|
|
|
// which is an ellipsis for anonymous users.
|
2022-01-18 21:45:46 +00:00
|
|
|
if ( $key === 'data-user-menu' && !$this->isLegacy() && !$this->loggedin ) {
|
2021-08-25 15:24:58 +00:00
|
|
|
$portletData['html-tooltip'] = Linker::tooltip( 'vector-anon-user-menu-title' );
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set tooltip to empty string for the personal menu for both logged-in and logged-out users to avoid showing
|
|
|
|
// the tooltip for legacy version.
|
2022-01-18 21:45:46 +00:00
|
|
|
if ( $key === 'data-personal' && $this->isLegacy() ) {
|
2021-08-25 15:24:58 +00:00
|
|
|
$portletData['html-tooltip'] = '';
|
|
|
|
}
|
|
|
|
|
2020-09-04 19:18:57 +00:00
|
|
|
return $portletData + [
|
|
|
|
'is-dropdown' => $type === self::MENU_TYPE_DROPDOWN,
|
2022-05-12 21:26:05 +00:00
|
|
|
'is-portal' => $type === self::MENU_TYPE_PORTAL,
|
2020-04-03 20:05:22 +00:00
|
|
|
];
|
2019-11-18 20:23:48 +00:00
|
|
|
}
|
2014-08-07 11:38:34 +00:00
|
|
|
}
|