StarCitizenTools/mediawiki-skins-Citizen
1
0
Fork 0
mirror of https://github.com/StarCitizenTools/mediawiki-skins-Citizen.git synced 2024-09-24 02:38:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up search props function

Browse source
This commit is contained in:
alistair3149 2020-08-08 16:22:27 -04:00
parent 4583a49383
commit 5b33a497e4
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
includes/CitizenTemplate.php
View file

@ -35,6 +35,13 @@ class CitizenTemplate extends BaseTemplate {
'lang' => 'otherlanguages',
];
/**
* @return Config
*/
private function getConfig() {
return $this->config;
}
/**
* @return array Returns an array of data used by Citizen skin.
*/
@ -73,7 +80,7 @@ class CitizenTemplate extends BaseTemplate {
'data-header' => [
'data-drawer' => $this->buildDrawer(),
'data-extratools' => $this->getExtraTools(),
'data-searchbox' => $this->buildSearchbox(),
'data-search-box' => $this->buildSearchProps(),
],
'html-site-notice' => $this->get( 'sitenotice', null ),
@ -275,14 +282,14 @@ class CitizenTemplate extends BaseTemplate {
/**
* Render the search box
* TODO: Use standardized classes and IDs
* @return array
* @throws MWException
*/
private function buildSearchbox() : array {
$config = $this->config;
private function buildSearchProps() : array {
$config = $this->getConfig();
$skin = $this->getSkin();
$toggleMsg = $this->getMsg( 'citizen-search-toggle' )->text();
$toggleMsg = $skin->msg( 'citizen-search-toggle' )->text();
$accessKey = Linker::accesskey( 'search' );
return [
@ -290,10 +297,10 @@ class CitizenTemplate extends BaseTemplate {
'msg-citizen-search-toggle-shortcut' => $toggleMsg . ' [alt-shift-' . $accessKey . ']',
'form-action' => $config->get( 'Script' ),
'html-input' => $this->makeSearchInput( [ 'id' => 'searchInput' ] ),
'msg-search' => $this->getMsg( 'search' )->text(),
'msg-search' => $skin->msg( 'search' ),
'page-title' => SpecialPage::getTitleFor( 'Search' )->getPrefixedDBkey(),
'html-random-href' => Skin::makeSpecialUrl( 'Randompage' ),
'msg-random' => $this->getMsg( 'Randompage' )->text(),
'msg-random' => $skin->msg( 'Randompage' )->text(),
];
}
@ -308,7 +315,7 @@ class CitizenTemplate extends BaseTemplate {
* @return array html
*/
protected function buildPageTools(): array {
$config = $this->config;
$config = $this->getConfig();
$skin = $this->getSkin();
$condition = $config->get( 'CitizenShowPageTools' );
$contentNavigation = $this->data['content_navigation'];

2
includes/templates/Header.mustache
View file

@ -7,6 +7,6 @@
{{#data-drawer}}{{>Drawer}}{{/data-drawer}}
<div class="mw-header-tools">
{{#data-extratools}}{{>Menu}}{{/data-extratools}}
{{#data-searchbox}}{{>Searchbox}}{{/data-searchbox}}
{{#data-search-box}}{{>SearchBox}}{{/data-search-box}}
</div>
</header>