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

Merge "Convert $templateParser in VectorTemplate.php into an instance variable"

This commit is contained in:
jenkins-bot 2020-01-13 19:37:56 +00:00 committed by Gerrit Code Review
parent d4bfcd02ce a706618a9d
commit 68af887faf
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
includes/VectorTemplate.php
View File

@ -28,12 +28,21 @@
*/ */
class VectorTemplate extends BaseTemplate { class VectorTemplate extends BaseTemplate {
/** @var TemplateParser */
private $templateParser;
/**
* @param Config|null $config
*/
public function __construct( Config $config = null ) {
parent::__construct( $config );
$this->templateParser = new TemplateParser( __DIR__ . '/templates' );
}
/** /**
* Outputs the entire contents of the HTML page * Outputs the entire contents of the HTML page
*/ */
public function execute() { public function execute() {
$templateParser = new TemplateParser( __DIR__ . '/templates' );
$this->data['namespace_urls'] = $this->data['content_navigation']['namespaces']; $this->data['namespace_urls'] = $this->data['content_navigation']['namespaces'];
$this->data['view_urls'] = $this->data['content_navigation']['views']; $this->data['view_urls'] = $this->data['content_navigation']['views'];
$this->data['action_urls'] = $this->data['content_navigation']['actions']; $this->data['action_urls'] = $this->data['content_navigation']['actions'];
@ -103,12 +112,12 @@ class VectorTemplate extends BaseTemplate {
<div id="mw-navigation"> <div id="mw-navigation">
<h2><?php $this->msg( 'navigation-heading' ) ?></h2> <h2><?php $this->msg( 'navigation-heading' ) ?></h2>
<div id="mw-head"> <div id="mw-head">
<?php $this->renderNavigation( $templateParser, [ 'PERSONAL' ] ); ?> <?php $this->renderNavigation( [ 'PERSONAL' ] ); ?>
<div id="left-navigation"> <div id="left-navigation">
<?php $this->renderNavigation( $templateParser, [ 'NAMESPACES', 'VARIANTS' ] ); ?> <?php $this->renderNavigation( [ 'NAMESPACES', 'VARIANTS' ] ); ?>
</div> </div>
<div id="right-navigation"> <div id="right-navigation">
<?php $this->renderNavigation( $templateParser, [ 'VIEWS', 'ACTIONS', 'SEARCH' ] ); ?> <?php $this->renderNavigation( [ 'VIEWS', 'ACTIONS', 'SEARCH' ] ); ?>
</div> </div>
</div> </div>
<div id="mw-panel"> <div id="mw-panel">
@ -165,7 +174,7 @@ class VectorTemplate extends BaseTemplate {
ob_end_clean(); ob_end_clean();
// Prepare and output the HTML response // Prepare and output the HTML response
echo $templateParser->processTemplate( 'index', $params ); echo $this->templateParser->processTemplate( 'index', $params );
} }
/** /**
@ -264,30 +273,29 @@ class VectorTemplate extends BaseTemplate {
* Render one or more navigations elements by name, automatically reversed by css * Render one or more navigations elements by name, automatically reversed by css
* when UI is in RTL mode * when UI is in RTL mode
* *
* @param TemplateParser $templateParser
* @param array $elements * @param array $elements
*/ */
protected function renderNavigation( TemplateParser $templateParser, array $elements ) { protected function renderNavigation( array $elements ) {
// Render elements // Render elements
foreach ( $elements as $name => $element ) { foreach ( $elements as $name => $element ) {
switch ( $element ) { switch ( $element ) {
case 'NAMESPACES': case 'NAMESPACES':
$this->renderNamespacesComponent( $templateParser ); $this->renderNamespacesComponent();
break; break;
case 'VARIANTS': case 'VARIANTS':
$this->renderVariantsComponent(); $this->renderVariantsComponent();
break; break;
case 'VIEWS': case 'VIEWS':
$this->renderViewsComponent( $templateParser ); $this->renderViewsComponent();
break; break;
case 'ACTIONS': case 'ACTIONS':
$this->renderActionsComponent(); $this->renderActionsComponent();
break; break;
case 'PERSONAL': case 'PERSONAL':
$this->renderPersonalComponent( $templateParser ); $this->renderPersonalComponent();
break; break;
case 'SEARCH': case 'SEARCH':
$this->renderSearchComponent( $templateParser ); $this->renderSearchComponent();
break; break;
} }
} }
@ -321,10 +329,7 @@ class VectorTemplate extends BaseTemplate {
return parent::makeListItem( $key, $item, $options ); return parent::makeListItem( $key, $item, $options );
} }
/** private function renderNamespacesComponent() {
* @param TemplateParser $templateParser
*/
private function renderNamespacesComponent( TemplateParser $templateParser ) {
$props = [ $props = [
'tabs-id' => 'p-namespaces', 'tabs-id' => 'p-namespaces',
'empty-portlet' => ( count( $this->data['namespace_urls'] ) == 0 ) ? 'emptyPortlet' : '', 'empty-portlet' => ( count( $this->data['namespace_urls'] ) == 0 ) ? 'emptyPortlet' : '',
@ -338,7 +343,7 @@ class VectorTemplate extends BaseTemplate {
$props[ 'html-items' ] .= $this->makeListItem( $key, $item ); $props[ 'html-items' ] .= $this->makeListItem( $key, $item );
} }
echo $templateParser->processTemplate( 'VectorTabs', $props ); echo $this->templateParser->processTemplate( 'VectorTabs', $props );
} }
private function renderVariantsComponent() { private function renderVariantsComponent() {
@ -373,10 +378,7 @@ class VectorTemplate extends BaseTemplate {
<?php <?php
} }
/** private function renderViewsComponent() {
* @param TemplateParser $templateParser
*/
private function renderViewsComponent( TemplateParser $templateParser ) {
$props = [ $props = [
'tabs-id' => 'p-views', 'tabs-id' => 'p-views',
'empty-portlet' => ( count( $this->data['view_urls'] ) == 0 ) ? 'emptyPortlet' : '', 'empty-portlet' => ( count( $this->data['view_urls'] ) == 0 ) ? 'emptyPortlet' : '',
@ -392,7 +394,7 @@ class VectorTemplate extends BaseTemplate {
] ); ] );
} }
echo $templateParser->processTemplate( 'VectorTabs', $props ); echo $this->templateParser->processTemplate( 'VectorTabs', $props );
} }
private function renderActionsComponent() { private function renderActionsComponent() {
@ -417,10 +419,7 @@ class VectorTemplate extends BaseTemplate {
<?php <?php
} }
/** private function renderPersonalComponent() {
* @param TemplateParser $templateParser
*/
private function renderPersonalComponent( TemplateParser $templateParser ) {
$personalTools = $this->getPersonalTools(); $personalTools = $this->getPersonalTools();
$props = [ $props = [
'empty-portlet' => ( count( $this->data['personal_urls'] ) == 0 ) ? 'emptyPortlet' : '', 'empty-portlet' => ( count( $this->data['personal_urls'] ) == 0 ) ? 'emptyPortlet' : '',
@ -449,13 +448,10 @@ class VectorTemplate extends BaseTemplate {
$props['html-personal-tools'] .= $this->makeListItem( $key, $item ); $props['html-personal-tools'] .= $this->makeListItem( $key, $item );
} }
echo $templateParser->processTemplate( 'PersonalMenu', $props ); echo $this->templateParser->processTemplate( 'PersonalMenu', $props );
} }
/** private function renderSearchComponent() {
* @param TemplateParser $templateParser
*/
private function renderSearchComponent( TemplateParser $templateParser ) {
$props = [ $props = [
'searchHeaderAttrsHTML' => $this->data[ 'userlangattributes' ] ?? '', 'searchHeaderAttrsHTML' => $this->data[ 'userlangattributes' ] ?? '',
'searchActionURL' => $this->data[ 'wgScript' ] ?? '', 'searchActionURL' => $this->data[ 'wgScript' ] ?? '',
@ -472,6 +468,6 @@ class VectorTemplate extends BaseTemplate {
), ),
'searchInputLabel' => $this->getMsg( 'search' ) 'searchInputLabel' => $this->getMsg( 'search' )
]; ];
echo $templateParser->processTemplate( 'SearchBox', $props ); echo $this->templateParser->processTemplate( 'SearchBox', $props );
} }
} }