Paladox has submitted this change and it was merged.
Change subject: Update Metrolook add support for MediaWiki 1.22
......................................................................
Update Metrolook add support for MediaWiki 1.22
* Fix images issue for good and also give overflow.js a path update in
MetrolookTemplate.php.
* And other fixes and changes.
Change-Id: Ic865793aeeafaf54b7484d06aad9b436cdacb0f7
---
M .gitreview
M Metrolook.php
M MetrolookTemplate.php
3 files changed, 6 insertions(+), 10 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/.gitreview b/.gitreview
index 898e858..07e9c66 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,4 @@
port=29418
project=mediawiki/skins/Metrolook.git
defaultbranch=REL1_22
-defaultrebase=0
+defaultrebase=0
\ No newline at end of file
diff --git a/Metrolook.php b/Metrolook.php
index c76e79d..cfb8a9a 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' => __FILE__,
'name' => 'Metrolook',
'description' => 'Metrolook skin for MediaWiki.',
- 'version' => '0.3.1',
+ 'version' => '0.3.3',
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPLv2+',
@@ -73,8 +73,6 @@
$UploadButton = true;
$logo = false;
-
-$transparent = __DIR__ . '/images/Transparent.gif';
// Register modules
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 3ecb5c5..42c9c0f 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -229,9 +229,7 @@
});
</script>
-<script src="skins/Metrolook/overthrow.js"></script>
-<script src="/skins/Metrolook/overthrow.js"></script>
-<script src="../skins/Metrolook/overthrow.js"></script>
+<script src="<?php echo htmlspecialchars( $this->getSkin()->getSkinStylePath(
'overthrow.js' ) ) ?>"></script>
<div id="mw-page-base" class="noprint"></div>
<div id="mw-head-base" class="noprint"></div>
<div id="content" class="mw-body" class="overthrow" role="main">
@@ -314,7 +312,7 @@
else {
echo htmlspecialchars( $this->getSkin()->getUser()->getName() );
}
- ?><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>
+ ?><span style="word-spacing:4px;"> </span><img class="custom4"
style="position:relative;top:0.4em;" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>"
/></span></a>
<div class="menu"
style="position:absolute;top:40px;right:0px;margin:0;width:200px;">
<?php $this->renderNavigation( 'PERSONAL' ); ?>
</div>
@@ -326,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 $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 ( $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 ( $DownArrow ): ?>
<div id="top-tile-bar" class="fixed-position">
@@ -342,7 +340,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="<?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' ) ); ?>
+ <?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 htmlspecialchars(
$this->getSkin()->getSkinStylePath( '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 ): ?>
--
To view, visit https://gerrit.wikimedia.org/r/168402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic865793aeeafaf54b7484d06aad9b436cdacb0f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_22
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
