@@ -42,31 +42,31 @@ |
||
| 42 | 42 | 'pivot/assets/stylesheets/pivot.css', |
| 43 | 43 | 'pivot/assets/stylesheets/pivot-print.css', |
| 44 | 44 | 'pivot/assets/stylesheets/jquery.autocomplete.css' |
| 45 | - ), |
|
| 46 | - 'scripts' => array( |
|
| 47 | - 'pivot/assets/scripts/vendor/jquery.cookie.js', |
|
| 48 | - 'pivot/assets/scripts/vendor/modernizr.js', |
|
| 49 | - 'pivot/assets/scripts/vendor/fastclick.js', |
|
| 50 | - 'pivot/assets/scripts/vendor/placeholder.js', |
|
| 51 | - 'pivot/assets/scripts/foundation/foundation.js', |
|
| 52 | - 'pivot/assets/scripts/foundation/foundation.topbar.js', |
|
| 53 | - 'pivot/assets/scripts/foundation/foundation.tooltip.js', |
|
| 54 | - 'pivot/assets/scripts/foundation/foundation.tab.js', |
|
| 55 | - 'pivot/assets/scripts/foundation/foundation.slider.js', |
|
| 56 | - 'pivot/assets/scripts/foundation/foundation.reveal.js', |
|
| 57 | - 'pivot/assets/scripts/foundation/foundation.orbit.js', |
|
| 58 | - 'pivot/assets/scripts/foundation/foundation.offcanvas.js', |
|
| 59 | - 'pivot/assets/scripts/foundation/foundation.magellan.js', |
|
| 60 | - 'pivot/assets/scripts/foundation/foundation.joyride.js', |
|
| 61 | - 'pivot/assets/scripts/foundation/foundation.interchange.js', |
|
| 62 | - 'pivot/assets/scripts/foundation/foundation.equalizer.js', |
|
| 63 | - 'pivot/assets/scripts/foundation/foundation.dropdown.js', |
|
| 64 | - 'pivot/assets/scripts/foundation/foundation.clearing.js', |
|
| 65 | - 'pivot/assets/scripts/foundation/foundation.alert.js', |
|
| 66 | - 'pivot/assets/scripts/foundation/foundation.accordion.js', |
|
| 67 | - 'pivot/assets/scripts/foundation/foundation.abide.js', |
|
| 68 | - 'pivot/assets/scripts/pivot.js', |
|
| 69 | - ), |
|
| 70 | - 'remoteBasePath' => &$GLOBALS['wgStylePath'], |
|
| 71 | - 'localBasePath' => &$GLOBALS['wgStyleDirectory'] |
|
| 45 | + ), |
|
| 46 | + 'scripts' => array( |
|
| 47 | + 'pivot/assets/scripts/vendor/jquery.cookie.js', |
|
| 48 | + 'pivot/assets/scripts/vendor/modernizr.js', |
|
| 49 | + 'pivot/assets/scripts/vendor/fastclick.js', |
|
| 50 | + 'pivot/assets/scripts/vendor/placeholder.js', |
|
| 51 | + 'pivot/assets/scripts/foundation/foundation.js', |
|
| 52 | + 'pivot/assets/scripts/foundation/foundation.topbar.js', |
|
| 53 | + 'pivot/assets/scripts/foundation/foundation.tooltip.js', |
|
| 54 | + 'pivot/assets/scripts/foundation/foundation.tab.js', |
|
| 55 | + 'pivot/assets/scripts/foundation/foundation.slider.js', |
|
| 56 | + 'pivot/assets/scripts/foundation/foundation.reveal.js', |
|
| 57 | + 'pivot/assets/scripts/foundation/foundation.orbit.js', |
|
| 58 | + 'pivot/assets/scripts/foundation/foundation.offcanvas.js', |
|
| 59 | + 'pivot/assets/scripts/foundation/foundation.magellan.js', |
|
| 60 | + 'pivot/assets/scripts/foundation/foundation.joyride.js', |
|
| 61 | + 'pivot/assets/scripts/foundation/foundation.interchange.js', |
|
| 62 | + 'pivot/assets/scripts/foundation/foundation.equalizer.js', |
|
| 63 | + 'pivot/assets/scripts/foundation/foundation.dropdown.js', |
|
| 64 | + 'pivot/assets/scripts/foundation/foundation.clearing.js', |
|
| 65 | + 'pivot/assets/scripts/foundation/foundation.alert.js', |
|
| 66 | + 'pivot/assets/scripts/foundation/foundation.accordion.js', |
|
| 67 | + 'pivot/assets/scripts/foundation/foundation.abide.js', |
|
| 68 | + 'pivot/assets/scripts/pivot.js', |
|
| 69 | + ), |
|
| 70 | + 'remoteBasePath' => &$GLOBALS['wgStylePath'], |
|
| 71 | + 'localBasePath' => &$GLOBALS['wgStyleDirectory'] |
|
| 72 | 72 | ); |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | $this->html('headelement'); |
| 66 | 66 | switch ($wgPivotFeatures['usePivotTabs']) { |
| 67 | 67 | case true: |
| 68 | - ob_start(); |
|
| 68 | + ob_start(); |
|
| 69 | 69 | $this->html('bodytext'); |
| 70 | 70 | $out = ob_get_contents(); |
| 71 | 71 | ob_end_clean(); |
@@ -38,8 +38,9 @@ discard block |
||
| 38 | 38 | $out->addHeadItem('ie-meta', '<meta http-equiv="X-UA-Compatible" content="IE=edge" />'); |
| 39 | 39 | break; |
| 40 | 40 | case 2: |
| 41 | - if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) |
|
| 42 | - header('X-UA-Compatible: IE=edge'); |
|
| 41 | + if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) { |
|
| 42 | + header('X-UA-Compatible: IE=edge'); |
|
| 43 | + } |
|
| 43 | 44 | break; |
| 44 | 45 | } |
| 45 | 46 | $out->addModuleStyles('skins.pivot'); |
@@ -92,7 +93,10 @@ discard block |
||
| 92 | 93 | <!-- START PIVOTTEMPLATE --> |
| 93 | 94 | <div class="off-canvas-wrap docs-wrap" data-offcanvas=""> |
| 94 | 95 | <div class="inner-wrap"> |
| 95 | - <?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "<div class='fixed'>"; ?> |
|
| 96 | + <?php if ($wgPivotFeatures['fixedNavBar'] != false) { |
|
| 97 | + echo "<div class='fixed'>"; |
|
| 98 | +} |
|
| 99 | +?> |
|
| 96 | 100 | <nav class="tab-bar"> |
| 97 | 101 | <section id="left-nav-aside" class="left-small show-for-small"> |
| 98 | 102 | <a class="left-off-canvas-toggle"><span id="menu-user"><i class="fa fa-navicon fa-lg"></i></span></a> |
@@ -109,10 +113,16 @@ discard block |
||
| 109 | 113 | </section> |
| 110 | 114 | |
| 111 | 115 | <section id="right-nav-aside" class="right-small"> |
| 112 | - <a class="right-off-canvas-toggle"><span id="menu-user"><i class="fa <?php if ($wgUser->isLoggedIn()): ?>fa-user<?php else: ?>fa-navicon<?php endif; ?> fa-lg"></i></span></a> |
|
| 116 | + <a class="right-off-canvas-toggle"><span id="menu-user"><i class="fa <?php if ($wgUser->isLoggedIn()): ?>fa-user<?php else { |
|
| 117 | + : ?>fa-navicon<?php endif; |
|
| 118 | +} |
|
| 119 | +?> fa-lg"></i></span></a> |
|
| 113 | 120 | </section> |
| 114 | 121 | </nav> |
| 115 | - <?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "</div>"; ?> |
|
| 122 | + <?php if ($wgPivotFeatures['fixedNavBar'] != false) { |
|
| 123 | + echo "</div>"; |
|
| 124 | +} |
|
| 125 | +?> |
|
| 116 | 126 | <aside class="left-off-canvas-menu"> |
| 117 | 127 | <ul class="off-canvas-list"> |
| 118 | 128 | |
@@ -135,19 +145,28 @@ discard block |
||
| 135 | 145 | <?php if ($wgUser->isLoggedIn()): ?> |
| 136 | 146 | <li id="personal-tools"><label>Personal</label></li> |
| 137 | 147 | <?php foreach ($this->getPersonalTools() as $key => $item) { echo $this->makeListItem($key, $item); } ?> |
| 138 | - <?php else: ?> |
|
| 148 | + <?php else { |
|
| 149 | + : ?> |
|
| 139 | 150 | <?php if (isset($this->data['personal_urls']['anonlogin'])): ?> |
| 140 | - <li><a href="<?php echo $this->data['personal_urls']['anonlogin']['href']; ?>"><?php echo wfMessage( 'login' )->text() ?></a></li> |
|
| 151 | + <li><a href="<?php echo $this->data['personal_urls']['anonlogin']['href']; |
|
| 152 | +} |
|
| 153 | +?>"><?php echo wfMessage( 'login' )->text() ?></a></li> |
|
| 141 | 154 | <?php elseif (isset($this->data['personal_urls']['login'])): ?> |
| 142 | 155 | <li><a href="<?php echo htmlspecialchars($this->data['personal_urls']['login']['href']); ?>"><?php echo wfMessage( 'login' )->text() ?></a></li> |
| 143 | - <?php else: ?> |
|
| 144 | - <li><?php echo Linker::link(Title::newFromText('Special:UserLogin'), wfMessage( 'login' )->text()); ?></li> |
|
| 156 | + <?php else { |
|
| 157 | + : ?> |
|
| 158 | + <li><?php echo Linker::link(Title::newFromText('Special:UserLogin'), wfMessage( 'login' )->text()); |
|
| 159 | +} |
|
| 160 | +?></li> |
|
| 145 | 161 | <?php endif; ?> |
| 146 | 162 | <?php endif; ?> |
| 147 | 163 | </ul> |
| 148 | 164 | </aside> |
| 149 | 165 | |
| 150 | - <section id="main-section" class="main-section" <?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "style='margin-top:2.8125em'"; ?>> |
|
| 166 | + <section id="main-section" class="main-section" <?php if ($wgPivotFeatures['fixedNavBar'] != false) { |
|
| 167 | + echo "style='margin-top:2.8125em'"; |
|
| 168 | +} |
|
| 169 | +?>> |
|
| 151 | 170 | |
| 152 | 171 | <div id="page-content"> |
| 153 | 172 | |