Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148636
Change subject: BaseTemplate: TopMenuBarCustomizer
......................................................................
BaseTemplate: TopMenuBarCustomizer
* Moved "NavigationSites" handling to extension TopMenuBarCustomizer pt1
Change-Id: I703ce7d8391c44cc9619d6b3d7a494cfe35cef0c
---
M includes/BsBaseTemplate.php
1 file changed, 4 insertions(+), 23 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/36/148636/1
diff --git a/includes/BsBaseTemplate.php b/includes/BsBaseTemplate.php
index 968abec..18f717d 100644
--- a/includes/BsBaseTemplate.php
+++ b/includes/BsBaseTemplate.php
@@ -24,12 +24,7 @@
'content' => '' //Gets filled in "execute"
)
);
- $this->data['bs_navigation_sites'] = array(
- 10 => array(
- 'id' => 'nt-wiki',
- )
- );
- $this->data['bs_navigation_sites_active'] = 'nt-wiki';
+ $this->data['bs_navigation_sites'] = '';
}
/**
@@ -142,20 +137,6 @@
$this->data['bs_navigation_main']['navigation']['class'] =
'icon-menu2';
$this->sortDataArrayByPosition(
$this->data['bs_navigation_main'] );
- if( is_array($this->data['bs_navigation_sites'][10]) ) {
- $this->data['bs_navigation_sites'][10] += array(
- 'href' =>
$this->data['nav_urls']['mainpage']['href'],
- 'text' => $this->data['sitename']
- );
- foreach( $this->data['bs_navigation_sites'] as &$site )
{
- $site['active'] = false;
- if( $site['id'] ===
$this->data['bs_navigation_sites_active']) {
- $site['active'] = true;
- }
- }
- }
-
- ksort( $this->data['bs_navigation_sites'] );
ksort( $this->data['bs_personal_info'] );
}
@@ -588,9 +569,9 @@
protected function printNavigationSites() {
$aOut = array();
$aOut[] = '<div id="bs-apps">';
- $aOut[] = ' <ul>';
- $aOut[] = $this->processData(
$this->data['bs_navigation_sites'], true );
- $aOut[] = ' </ul>';
+ if($this->data['bs_navigation_sites']) {
+ $aOut[] = $this->data['bs_navigation_sites'];
+ }
$aOut[] = '</div>';
echo implode("\n", $aOut);
}
--
To view, visit https://gerrit.wikimedia.org/r/148636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I703ce7d8391c44cc9619d6b3d7a494cfe35cef0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
