Paladox has submitted this change and it was merged.
Change subject: Update Metrolook
......................................................................
Update Metrolook
* Fixes images not working localhost and website.
* Please see README.md for information on customizing and options
* Bumps version to 2.4.4
Change-Id: Ic22f87bafdf179bc4dcec725546bddfdf75b56d9
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
3 files changed, 11 insertions(+), 9 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/Metrolook.php b/Metrolook.php
index b9b6795..5dd719a 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' => __FILE__,
'name' => 'Metrolook',
'description' => 'Metrolook skin for MediaWiki.',
- 'version' => '2.4.3',
+ 'version' => '2.4.4',
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPLv2+',
@@ -95,6 +95,8 @@
$GLOBALS['logo'] = false;
+$GLOBALS['transparent'] = __DIR__ . '/images/Transparent.gif';
+
// Register modules
$GLOBALS['wgResourceModules']['skins.metrolook.styles'] = array(
'styles' => array(
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 865f8c5..9bd9c4c 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -66,6 +66,7 @@
global $url6;
global $UploadButton;
global $logo;
+ global $transparent;
// Build additional attributes for navigation urls
$nav = $this->data['content_navigation'];
@@ -230,6 +231,7 @@
});
</script>
<script src="skins/Metrolook/overthrow.js"></script>
+<script src="/skins/Metrolook/overthrow.js"></script>
<script src="../skins/Metrolook/overthrow.js"></script>
<div id="mw-page-base" class="noprint"></div>
<div id="mw-head-base" class="noprint"></div>
@@ -382,7 +384,7 @@
else {
echo htmlspecialchars( $this->getSkin()->getUser()->getName() );
}
- ?><span style="word-spacing:4px;"> </span><img class="custom4"
style="position:relative;top:0.4em;"
src="skins/Metrolook/images/Transparent.gif" onerror='this.onerror = null;
this.src="../skins/Metrolook/images/Transparent.gif"' /></span></a>
+ ?><span style="word-spacing:4px;"> </span><img class="custom4"
style="position:relative;top:0.4em;" src="<?php echo $transparent ?>"
onerror='this.onerror = null;
this.src="/skins/Metrolook/images/Transparent.gif"' /></span></a>
<div class="menu"
style="position:absolute;top:40px;right:0px;margin:0;width:200px;">
<?php $this->renderNavigation( 'PERSONAL' ); ?>
</div>
@@ -394,7 +396,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="skins/Metrolook/images/Transparent.gif"
onerror='this.onerror = null;
this.src="../skins/Metrolook/images/Transparent.gif"' style="float:left;"
/><?php if ( $DownArrow ): ?><img class="custom3"
src="skins/Metrolook/images/Transparent.gif" onerror='this.onerror = null;
this.src="../skins/Metrolook/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; ?><img
class="custom2" src="<?php echo $transparent ?>" onerror='this.onerror = null;
this.src="/skins/Metrolook/images/Transparent.gif"' style="float:left;" /><?php
if ( $DownArrow ): ?><img class="custom3" src="<?php echo $transparent ?>"
onerror='this.onerror = null;
this.src="/skins/Metrolook/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">
@@ -410,7 +412,7 @@
<?php else: ?>
<?php endif; ?>
<div id="left-navigation">
- <?php if ( $UploadButton ): ?><a href="<?php
echo $this->data['nav_urls']['upload']['href']; ?>"><div class="onhoverbg"
style="padding-left:0.8em;padding-right:0.8em;float:left;height:40px;font-size:10pt;"><img
class="custom" src="skins/Metrolook/images/Transparent.gif"
onerror='this.onerror = null;
this.src="../skins/Metrolook/images/Transparent.gif"' /> <span
style="color:#fff;position:relative;top:3px; "><?php $this->msg('uploadbtn')
?></span></div></a><?php else: ?><?php endif; ?><?php $this->renderNavigation(
array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?>
+ <?php if ( $UploadButton ): ?><a href="<?php
echo $this->data['nav_urls']['upload']['href']; ?>"><div class="onhoverbg"
style="padding-left:0.8em;padding-right:0.8em;float:left;height:40px;font-size:10pt;"><img
class="custom" src="<?php echo $transparent ?>" onerror='this.onerror = null;
this.src="/skins/Metrolook/images/Transparent.gif"' /> <span
style="color:#fff;position:relative;top:3px; "><?php $this->msg('uploadbtn')
?></span></div></a><?php else: ?><?php endif; ?><?php $this->renderNavigation(
array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?>
</div>
<div id="right-navigation">
<?php if ( $SearchBar ): ?>
@@ -826,4 +828,3 @@
}
}
}
-
diff --git a/README.md b/README.md
index 99719e3..d8bef96 100644
--- a/README.md
+++ b/README.md
@@ -10,18 +10,17 @@
If you would like compatibility with mediawiki 1.23, 1.22 or 1.21 please visit
-
1.23
-https://github.com/paladox2015/Metrolook/tree/MediaWiki-1.23
+https://github.com/paladox2015/Metrolook/tree/REL1_23
1.22
-https://github.com/paladox2015/Metrolook/tree/MediaWiki-1.22
+https://github.com/paladox2015/Metrolook/tree/REL1-22
1.21
-https://github.com/paladox2015/Metrolook/tree/MediaWiki-1.21
+https://github.com/paladox2015/Metrolook/tree/REL1_21
Please be aware that there are issues in the codes if you see any could you
point it out it would help. and there are things like logos already set sorry i
will put a setting there.
--
To view, visit https://gerrit.wikimedia.org/r/164776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic22f87bafdf179bc4dcec725546bddfdf75b56d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_24
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
