jenkins-bot has submitted this change and it was merged. Change subject: Add new config wgMetrolookSiteNameLogo ......................................................................
Add new config wgMetrolookSiteNameLogo
This new config will add the support of having the logo in the top bar
instead of having to have the sitetext on the top bar and the logo
underneth.
Change-Id: Ic9dc3cadf25d1c26170b65e8676894b9cbeee567
---
M MetrolookTemplate.php
M skin.json
2 files changed, 36 insertions(+), 19 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 37c6f89..4501c37 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -347,10 +347,22 @@
<a href="<?php
echo $this->data['nav_urls']['mainpage']['href']; ?>">
<span
class="title-name">
<?php
-
if ( $this->config->get( 'MetrolookSiteNameText' ) ) {
-
echo $GLOBALS['wgSitename'];
+
if ( $this->config->get( 'MetrolookSiteNameLogo' ) ) {
+
?>
+
<div style="height:40px;float:left;margin-top:-0.7em;">
+
<a href="<?php
+
echo htmlspecialchars(
$this->data['nav_urls']['mainpage']['href'] )
+
?>">
+
<img src="<?php echo $this->text( 'logopath' ) ?>" />
+
</a>
+
</div>
+
<?php
} else {
-
echo $GLOBALS['wgMetrolookSiteText'];
+
if ( $this->config->get( 'MetrolookSiteNameText' ) ) {
+
echo $GLOBALS['wgSitename'];
+
} else {
+
echo $GLOBALS['wgMetrolookSiteText'];
+
}
}
?>
</span>
@@ -501,14 +513,16 @@
?>
<div id="mw-panel">
<?php
- if ( $this->config->get(
'MetrolookLogo' ) ) {
- ?>
- <div id="p-logo"
role="banner"><a class="mw-wiki-logo" href="<?php
- echo htmlspecialchars(
$this->data['nav_urls']['mainpage']['href'] )
- ?>" <?php
- echo
Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
- ?>></a></div>
- <?php
+ if ( !$this->config->get(
'MetrolookSiteNameLogo' ) ) {
+ if ( $this->config->get(
'MetrolookLogo' ) ) {
+ ?>
+ <div id="p-logo"
role="banner"><a class="mw-wiki-logo" href="<?php
+ echo
htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] )
+ ?>" <?php
+ echo
Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
+ ?>></a></div>
+ <?php
+ }
}
?>
<?php $this->renderPortals(
$this->data['sidebar'] ); ?>
@@ -518,14 +532,16 @@
?>
<div id="mw-panel-custom">
<?php
- if ( $this->config->get(
'MetrolookLogo' ) ) {
- ?>
- <div id="p-logo-custom"
role="banner"><a class="mw-wiki-logo" href="<?php
- echo htmlspecialchars(
$this->data['nav_urls']['mainpage']['href'] )
- ?>" <?php
- echo
Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo-custom' ) )
- ?>></a></div>
- <?php
+ if ( !$this->config->get(
'MetrolookSiteNameLogo' ) ) {
+ if ( $this->config->get(
'MetrolookLogo' ) ) {
+ ?>
+ <div id="p-logo-custom"
role="banner"><a class="mw-wiki-logo" href="<?php
+ echo
htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] )
+ ?>" <?php
+ echo
Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo-custom' ) )
+ ?>></a></div>
+ <?php
+ }
}
?>
<?php $this->renderNavigation( array(
'SEARCH' ) ); ?>
diff --git a/skin.json b/skin.json
index b860af9..77e5435 100644
--- a/skin.json
+++ b/skin.json
@@ -157,6 +157,7 @@
"MetrolookUseSimpleSearch": true,
"MetrolookUseIconWatch": true,
"MetrolookLogo": true,
+ "MetrolookSiteNameLogo": false,
"MetrolookSiteName": true,
"MetrolookSiteNameText": true,
"MetrolookSiteText": "",
--
To view, visit https://gerrit.wikimedia.org/r/270360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9dc3cadf25d1c26170b65e8676894b9cbeee567
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
