Paladox has submitted this change and it was merged.
Change subject: Update Metrolook
......................................................................
Update Metrolook
* Includes bug fixes and new features. Please see README.md for new setting.
* Adds support for composer.
Change-Id: I647d48c0b81dca734041159391b7e210af85ec06
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
M composer.json
4 files changed, 37 insertions(+), 33 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/Metrolook.php b/Metrolook.php
index 8d1d8e3..e27e628 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -21,61 +21,61 @@
* @ingroup Skins
*/
-$wgExtensionCredits['skin'][] = array(
+$GLOBALS['wgExtensionCredits']['skin'][] = array(
'path' => __FILE__,
'name' => 'Metrolook',
'description' => 'Metrolook skin for MediaWiki.',
- 'version' => '1.3.6',
+ 'version' => '1.3.7',
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPLv2+',
);
// Register files
-$wgAutoloadClasses['SkinMetrolook'] = __DIR__ . '/SkinMetrolook.php';
-$wgAutoloadClasses['MetrolookTemplate'] = __DIR__ . '/MetrolookTemplate.php';
+$GLOBALS['wgAutoloadClasses']['SkinMetrolook'] = __DIR__ .
'/SkinMetrolook.php';
+$GLOBALS['wgAutoloadClasses']['MetrolookTemplate'] = __DIR__ .
'/MetrolookTemplate.php';
// Register skin
-$wgValidSkinNames['metrolook'] = 'Metrolook';
+$GLOBALS['wgValidSkinNames']['metrolook'] = 'Metrolook';
-/* To enable logo. Note that if enabled it will not show properly.*/
-$Logoshow = false;
+/* Logo is off by default to turn it on plase see README.md. Note that if
enabled it will not show properly.*/
+$GLOBALS['logo'] = false;
/* to enable search bar on the sidebar and disables the search bar on the top
bar */
-$SearchBar = true;
+$GLOBALS['SearchBar'] = true;
-$DownArrow = true;
+$GLOBALS['DownArrow'] = true;
-$link1 = true;
+$GLOBALS['Line'] = true;
-$image1 = true;
+$GLOBALS['link1'] = true;
-$link2 = true;
+$GLOBALS['image1'] = true;
-$image2 = true;
+$GLOBALS['link2'] = true;
-$link3 = true;
+$GLOBALS['image2'] = true;
-$image3 = true;
+$GLOBALS['link3'] = true;
-$link4 = true;
+$GLOBALS['image3'] = true;
-$image4 = true;
+$GLOBALS['link4'] = true;
-$link5 = false;
+$GLOBALS['image4'] = true;
-$image5 = false;
+$GLOBALS['link5'] = false;
-$link6 = false;
+$GLOBALS['image5'] = false;
-$image6 = false;
+$GLOBALS['link6'] = false;
-$UploadButton = true;
+$GLOBALS['image6'] = false;
-$logo = false;
+$GLOBALS['UploadButton'] = false;
// Register modules
-$wgResourceModules['skins.metrolook.styles'] = array(
+$GLOBALS['wgResourceModules']['skins.metrolook.styles'] = array(
'styles' => array(
'Metrolook/screen.less' => array( 'media' => 'screen' ),
'Metrolook/screen-hd.less' => array( 'media' => 'screen and
(min-width: 982px)' ),
@@ -85,7 +85,7 @@
'remoteBasePath' => &$GLOBALS['wgStylePath'],
'localBasePath' => &$GLOBALS['wgStyleDirectory'],
);
-$wgResourceModules['skins.metrolook.js'] = array(
+$GLOBALS['wgResourceModules']['skins.metrolook.js'] = array(
'scripts' => array(
'Metrolook/collapsibleTabs.js',
'Metrolook/vector.js',
@@ -97,7 +97,7 @@
'remoteBasePath' => &$GLOBALS['wgStylePath'],
'localBasePath' => &$GLOBALS['wgStyleDirectory'],
);
-$wgResourceModules['skins.metrolook.collapsibleNav'] = array(
+$GLOBALS['wgResourceModules']['skins.metrolook.collapsibleNav'] = array(
'scripts' => array(
'Metrolook/collapsibleNav.js',
),
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 787c6fc..929dda4 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -38,9 +38,10 @@
*/
public function execute() {
global $wgVectorUseIconWatch;
- global $Logoshow;
+ global $logo;
global $SearchBar;
global $DownArrow;
+ global $Line;
global $image1;
global $link1;
global $picture1;
@@ -66,7 +67,6 @@
global $picture6;
global $url6;
global $UploadButton;
- global $logo;
// Build additional attributes for navigation urls
$nav = $this->data['content_navigation'];
@@ -324,7 +324,7 @@
?>
</ul>
</div>
-<?php if ( $logo ): ?><div style="padding-left:10px;"><div class="lighthover"
style="height:40px;float:left;"><div class="onhoverbg"
style="height:40px;float:left;"><h4 class="title-name"><a href="<?php echo
$this->data['nav_urls']['mainpage']['href']; ?>"><img alt="<?php echo
$this->text('sitename'); ?>" src="<?php echo $this->text('logopath') ?>"
style="max-width: 65px;height:auto; max-height:36px; display: inline-block;
vertical-align:middle; padding-right:5px;
padding-left:5px;"></div></h4></a><?php else: ?><div
style="padding-left:10px;"><div class="lighthover"
style="height:40px;float:left;"><div class="onhoverbg"
style="height:40px;float:left;"><h4 class="title-name"><a href="<?php echo
$this->data['nav_urls']['mainpage']['href']; ?>"><div class="title-name"
style="font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display: inline-block; vertical-align:middle;"><?php echo
$GLOBALS['wgSitename'] ?></div></a></h4></div><?php endif; ?><img
class="custom2" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>"
style="float:left;" /><?php if ( $DownArrow ): ?><img class="custom3"
src="<?php echo htmlspecialchars( $this->getSkin()->getSkinStylePath(
'images/Transparent.gif' ) ) ?>" style="height:60px;width:27px;cursor:pointer;"
onclick="toggleDiv('bartile');" /><?php else: ?><?php endif; ?></div></div>
+<?php if ( $logo ): ?><div style="padding-left:10px;"><div class="lighthover"
style="height:40px;float:left;"><div class="onhoverbg"
style="height:40px;float:left;"><h4 class="title-name"><a href="<?php echo
$this->data['nav_urls']['mainpage']['href']; ?>"><img alt="<?php echo
$this->text('sitename'); ?>" src="<?php echo $this->text('logopath') ?>"
style="max-width: 65px;height:auto; max-height:36px; display: inline-block;
vertical-align:middle; padding-right:5px;
padding-left:5px;"></div></h4></a><?php else: ?><div
style="padding-left:10px;"><div class="lighthover"
style="height:40px;float:left;"><div class="onhoverbg"
style="height:40px;float:left;"><h4 class="title-name"><a href="<?php echo
$this->data['nav_urls']['mainpage']['href']; ?>"><div class="title-name"
style="font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display: inline-block; vertical-align:middle;"><?php echo
$GLOBALS['wgSitename'] ?></div></a></h4></div><?php endif; ?><?php if ( $Line
): ?><img class="custom2" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>"
style="float:left;" /><?php else: ?><?php endif; ?><?php if ( $DownArrow ):
?><img class="custom3" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>"
style="height:60px;width:27px;cursor:pointer;" onclick="toggleDiv('bartile');"
/><?php else: ?><?php endif; ?></div></div>
<?php if ( $DownArrow ): ?>
<div id="top-tile-bar" class="fixed-position">
diff --git a/README.md b/README.md
index a3529b0..79d570e 100644
--- a/README.md
+++ b/README.md
@@ -42,11 +42,11 @@
To enable logo
-$Logoshow = true;
+$logo = true;
Default is
-$Logoshow = false;
+$logo = false;
To enable sidebar search bar
@@ -66,7 +66,11 @@
Default is
-$DownArrow = true;
+$Line = true;
+
+To turn it off
+
+$Line = false;
to change link
diff --git a/composer.json b/composer.json
index abfde15..94d9b3e 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
"license" : "GPL-2.0+",
"authors" : [
{
- "name" : "immewnity"
+ "name" : "immewnity"
},
{
"name" : "paladox2015"
--
To view, visit https://gerrit.wikimedia.org/r/176309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I647d48c0b81dca734041159391b7e210af85ec06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_23
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
