Paladox has submitted this change and it was merged.
Change subject: Update metrolook
......................................................................
Update metrolook
Change-Id: I3b3ff638ed9682d18476dfe5b4c1b8260eb56dae
---
M MetrolookTemplate.php
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Paladox: Looks good to me, approved
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index c634ba5..40fa1bb 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -132,7 +132,8 @@
if ( is_callable( array( $this, 'getIndicators' ) ) ) {
echo $this->getIndicators();
}
- if ( isset( $this->data['title'] ) ) {
+ // Loose comparison with '!=' is intentional, to catch
null and false too, but not '0'
+ if ( $this->data['title'] != '' ) {
?>
<h1 id="firstHeading" class="firstHeading" lang="<?php
$this->text( 'pageLanguage' ); ?>"><?php
$this->html( 'title' )
@@ -273,9 +274,9 @@
<img class="hamburger" src="<?php echo
htmlspecialchars( $this->getSkin()->getSkinStylePath( 'images/Transparent.gif'
) ) ?>" height="40px" width="40px" />
</div>
- <?php if ( $this->config->get( 'MetrolookSiteName' ) ):
?><div style="padding-left:10px;"><div id="siteLogoBar" 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></div></div><?php endif; ?>
- <?php if ( $this->config->get( 'MetrolookLine' ) ):
?><?php if ( $this->config->get( 'MetrolookSiteName' ) ): ?><div
id="siteLogoBar" class="lighthover" style="height:40px;float:left;"><?php
endif; ?><img class="line" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>"
style="float:left;" /><?php if ( $this->config->get( 'MetrolookSiteName' ) ):
?></div><?php endif; ?><?php endif; ?>
- <?php if ( $this->config->get( 'MetrolookDownArrow' )
): ?><?php if ( $this->config->get( 'MetrolookSiteName' ) ): ?><div
id="siteLogoBar" class="lighthover" style="height:40px;float:left;"><?php
endif; ?><img class="downarrow" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>"
style="height:60px;width:27px;cursor:pointer;" /><?php if ( $this->config->get(
'MetrolookSiteName' ) ): ?></div><?php endif; ?><?php endif; ?>
+ <?php if ( $this->config->get( 'MetrolookSiteName' ) ):
?><div style="padding-left:10px;"><div id="siteLogoBar" 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 (
$this->config->get( 'MetrolookSiteName' ) ): ?></div></div><?php endif; ?>
+ <?php if ( $this->config->get( 'MetrolookLine' ) ):
?><?php if ( $this->config->get( 'MetrolookSiteName' ) ): ?><div
id="siteLogoBar" class="lighthover" style="height:40px;float:left;"><?php
endif; ?><img class="line" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>"
style="float:left;" /><?php endif; ?><?php if ( $this->config->get(
'MetrolookSiteName' ) ): ?></div><?php endif; ?>
+ <?php if ( $this->config->get( 'MetrolookDownArrow' )
): ?><?php if ( $this->config->get( 'MetrolookSiteName' ) ): ?><div
id="siteLogoBar" class="lighthover" style="height:40px;float:left;"><?php
endif; ?><img class="downarrow" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>"
style="height:60px;width:27px;cursor:pointer;" /><?php endif; ?><?php if (
$this->config->get( 'MetrolookSiteName' ) ): ?></div><?php endif; ?>
<?php if ( $this->config->get( 'MetrolookDownArrow' )
): ?>
<div id="top-tile-bar" class="fixed-position">
@@ -292,7 +293,7 @@
<?php else: ?>
<?php
if ( $this->config->get( 'MetrolookTile5' ) ): ?><div
style="float:left;padding:5px;"><div class="tile"><a href="<?php echo
$GLOBALS['wgMetrolookURL1'] ?>"><img src="<?php echo
$GLOBALS['wgMetrolookImage1'] ?>" /></a></div></div><?php endif; ?>
<?php
if ( $this->config->get( 'MetrolookTile6' ) ): ?><div
style="float:left;padding:5px;"><div class="tile"><a href="<?php echo
$GLOBALS['wgMetrolookURL2'] ?>"><img src="<?php echo
$GLOBALS['wgMetrolookImage2'] ?>" /></a></div></div><?php endif; ?>
- <?php
if ( $this->config->get( 'MetrolookTile7' ) ): ?><div
style="float:left;padding:5px;" id="jcctile"><div class="tile"><a href="<?php
echo $GLOBALS['wgMetrolookURL3'] ?>"><img src="<?php echo
$GLOBALS['wgMetrolookImage3'] ?>" /></a></div></div><?php endif; ?>
+ <?php
if ( $this->config->get( 'MetrolookTile7' ) ): ?><div
style="float:left;padding:5px;"><div class="tile"><a href="<?php echo
$GLOBALS['wgMetrolookURL3'] ?>"><img src="<?php echo
$GLOBALS['wgMetrolookImage3'] ?>" /></a></div></div><?php endif; ?>
<?php
if ( $this->config->get( 'MetrolookTile8' ) ): ?><div
style="float:left;padding:5px;"><div class="tile"><a href="<?php echo
$GLOBALS['wgMetrolookURL4'] ?>"><img src="<?php echo
$GLOBALS['wgMetrolookImage4'] ?>" /></a></div></div><?php endif; ?>
<?php
if ( $this->config->get( 'MetrolookTile9' ) ): ?><div
style="float:left;padding:5px;"><div class="tile"><a href="<?php echo
$GLOBALS['wgMetrolookURL5'] ?>"><img src="<?php echo
$GLOBALS['wgMetrolookImage5'] ?>" /></a></div></div><?php endif; ?>
<?php
if ( $this->config->get( 'MetrolookTile10' ) ): ?><div
style="float:left;padding:5px;"><div class="tile"><a href="<?php echo
$GLOBALS['wgMetrolookURL6'] ?>"><img src="<?php echo
$GLOBALS['wgMetrolookImage6'] ?>" /></a></div></div><?php endif; ?>
--
To view, visit https://gerrit.wikimedia.org/r/221273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b3ff638ed9682d18476dfe5b4c1b8260eb56dae
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
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
