diff --git a/Pivot.skin.php b/Pivot.skin.php
index 4f5c972..200c333 100644
--- a/Pivot.skin.php
+++ b/Pivot.skin.php
@@ -8,7 +8,7 @@
*/
-class Skinpivot extends SkinTemplate {
+class SkinPivot extends SkinTemplate {
public $skinname = 'pivot', $stylename = 'pivot', $template = 'pivotTemplate', $useHeadElement = true;
public function setupSkinUserCss(OutputPage $out) {
@@ -17,6 +17,7 @@ class Skinpivot extends SkinTemplate {
$wgPivotFeaturesDefaults = array(
'showActionsForAnon' => true,
'fixedNavBar' => false,
+ 'usePivotTabs' => false,
'showHelpUnderTools' => true,
'showRecentChangesUnderTools' => true,
'wikiName' => &$GLOBALS['wgSitename'],
@@ -42,7 +43,7 @@ class Skinpivot extends SkinTemplate {
header('X-UA-Compatible: IE=edge');
break;
}
- $out->addModuleStyles('skins.pivot');
+ $out->addModuleStyles('skins.pivot.styles');
}
public function initPage(OutputPage $out) {
@@ -51,7 +52,7 @@ class Skinpivot extends SkinTemplate {
$viewport_meta = 'width=device-width, user-scalable=yes, initial-scale=1.0';
$out->addMeta('viewport', $viewport_meta);
- $out->addModuleScripts('skins.pivot');
+ $out->addModuleScripts('skins.pivot.js');
}
}
@@ -61,12 +62,12 @@ class pivotTemplate extends BaseTemplate {
public function execute() {
global $wgUser;
global $wgPivotFeatures;
- wfSuppressWarnings();
+ //wfSuppressWarnings();
$this->html('headelement');
switch ($wgPivotFeatures['usePivotTabs']) {
case true:
ob_start();
- $this->html('bodytext');
+ $this->html('bodytext');
$out = ob_get_contents();
ob_end_clean();
$markers = array("<a", "</a", ">");
@@ -126,7 +127,7 @@ class pivotTemplate extends BaseTemplate {
-
+ renderSidebar() ?>
@@ -171,7 +172,7 @@ class pivotTemplate extends BaseTemplate {
-
+ renderSidebar() ?>
@@ -219,13 +220,12 @@ class pivotTemplate extends BaseTemplate {
switch ($wgPivotFeatures['usePivotTabs']) {
case true:
echo $body;
- ob_flush();
break;
default:
- $this->html('bodytext');
+ $this->html('bodytext');
break;
- }
- ?>
+ }
+ ?>
@@ -280,7 +280,7 @@ class pivotTemplate extends BaseTemplate {
printTrail(); ?>
-
+
@@ -288,6 +288,21 @@ class pivotTemplate extends BaseTemplate {
getSidebar();
+ $toolbox = $this->getToolbox();
+ foreach ($sidebar as $boxName => $box) { if ( ($box['header'] != wfMessage( 'toolbox' )->text()) ) {
+ echo '