Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164778
Change subject: Update Metrolook
......................................................................
Update Metrolook
* Fixes some bugs and fixes images.
* Bumps version to 1.3.1.
* Please see README.md for customising your top bar and for settings.
Change-Id: I5f34765b1283a5bb60a6fc8b40ac188f2b70bcd7
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
3 files changed, 38 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/78/164778/1
diff --git a/Metrolook.php b/Metrolook.php
index 95605e4..277c098 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,11 @@
'path' => __FILE__,
'name' => 'Metrolook',
'description' => 'Metrolook skin for MediaWiki.',
+<<<<<<< HEAD
'version' => '1.3',
+=======
+ 'version' => '1.3.1',
+>>>>>>> Update Metrolook
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPLv2+',
@@ -73,6 +77,12 @@
$UploadButton = true;
$logo = false;
+<<<<<<< HEAD
+=======
+
+$transparent = __DIR__ . '/images/Transparent.gif';
+
+>>>>>>> Update Metrolook
// Register modules
$wgResourceModules['skins.metrolook.styles'] = array(
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index fb242b3..bdb579e 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -67,6 +67,10 @@
global $url6;
global $UploadButton;
global $logo;
+<<<<<<< HEAD
+=======
+ global $transparent;
+>>>>>>> Update Metrolook
// Build additional attributes for navigation urls
$nav = $this->data['content_navigation'];
@@ -229,6 +233,10 @@
</script>
<script src="skins/Metrolook/overthrow.js"></script>
+<<<<<<< HEAD
+=======
+<script src="/skins/Metrolook/overthrow.js"></script>
+>>>>>>> Update Metrolook
<script src="../skins/Metrolook/overthrow.js"></script>
<div id="mw-page-base" class="noprint"></div>
<div id="mw-head-base" class="noprint"></div>
@@ -313,7 +321,11 @@
else {
echo htmlspecialchars( $this->getSkin()->getUser()->getName() );
}
+<<<<<<< HEAD
?><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>
+>>>>>>> Update Metrolook
<div class="menu"
style="position:absolute;top:40px;right:0px;margin:0;width:200px;">
<?php $this->renderNavigation( 'PERSONAL' ); ?>
</div>
@@ -325,7 +337,11 @@
?>
</ul>
</div>
+<<<<<<< HEAD
<?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>
+>>>>>>> Update Metrolook
<?php if ( $DownArrow ): ?>
<div id="top-tile-bar" class="fixed-position">
@@ -341,7 +357,11 @@
<?php else: ?>
<?php endif; ?>
<div id="left-navigation">
+<<<<<<< HEAD
<?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' ) ); ?>
+>>>>>>> Update Metrolook
</div>
<div id="right-navigation">
<?php if ( $SearchBar ): ?>
diff --git a/README.md b/README.md
index 6e2c887..ee5f6fa 100644
--- a/README.md
+++ b/README.md
@@ -8,23 +8,27 @@
Compatible with MediaWiki 1.23
+<<<<<<< HEAD
If you would like compatibility with mediawiki 1.24, 1.23, 1.22 or 1.21 please
visit
1.24
https://github.com/paladox2015/Metrolook/tree/MediaWiki-1.24
+=======
+If you would like compatibility with mediawiki 1.24, 1.22 or 1.21 please visit
+>>>>>>> Update Metrolook
-1.23
+1.24
-https://github.com/paladox2015/Metrolook/tree/MediaWiki-1.23
+https://github.com/paladox2015/Metrolook/tree/REL1_24
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/164778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f34765b1283a5bb60a6fc8b40ac188f2b70bcd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_23
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
