[MediaWiki-commits] [Gerrit] Add php code sniffer to metrolook - change (mediawiki...Metrolook)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add php code sniffer to metrolook
..


Add php code sniffer to metrolook

Add some new options please see changelog.

Fixes some collapisblenav problems.

follow-up: https://gerrit.wikimedia.org/r/#/c/221178/

Change-Id: I39f503970f9ee9aeb07fa6777a7948281f02565c
---
M CHANGELOG.md
M MetrolookTemplate.php
M README.md
M SkinMetrolook.php
M SkinMetrolookHooks.php
M components/mobile.less
M components/navigation.less
M components/tablet.less
M composer.json
M screen-hd.less
M skin.json
11 files changed, 529 insertions(+), 193 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57b06a0..1f0ac45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,21 @@
 
 * New metrolook.search.js that holds search js that was in metrolook.js.
 
+New options
+
+$wgMetrolookSiteNameText
+
+and
+
+$wgMetrolookSiteText
+
+To use it please do the following
+
+$wgMetrolookSiteNameText = false;
+
+$wgMetrolookSiteText = 'Enter text here';
+
+
 Bug Fixes
 ===
 
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 9fa9d08..a469c93 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -171,11 +171,17 @@
msg( 'jumptonavigation' )
?>msg( 
'comma-separator' ) ?>
-   config->get( 
'MetrolookSearchBar' ) ): ?>
-   msg( 
'jumptosearch' ) ?>
-   
-   msg( 'jumptosearch' ) ?>
-   
+   config->get( 
'MetrolookSearchBar' ) ) {
+   ?>
+   msg( 'jumptosearch' ) ?>
+   
+   msg( 'jumptosearch' ) ?>
+   

html( 'bodycontent' );
@@ -251,11 +257,23 @@

 

-   
+   

 

-   
+   



@@ -271,50 +289,297 @@

 

-   
+   

 
-   config->get( 'MetrolookSiteName' ) ): 
?>config->get( 'MetrolookSiteName' ) ): ?>
-   config->get( 'MetrolookLine' ) ): 
?>config->get( 'MetrolookSiteName' ) ): ?>config->get( 
'MetrolookSiteName' ) ): ?>
-   config->get( 'MetrolookDownArrow' ) 
): ?>config->get( 'MetrolookSiteName' ) ): ?>config->get( 
'MetrolookSiteName' ) ): ?>
+   config->get( 'MetrolookSiteName' ) ) {
+   ?>
+   
+   
+   
+   
+   
+   
+   
config->get( 'MetrolookSiteNameText' ) ) {
+   
?>
+   

+   

+   

+   

+   
+   
+   
+   
+   
+   
+   
+   config->get( 'MetrolookLine' ) ) {
+   ?>
+ 

[MediaWiki-commits] [Gerrit] Add php code sniffer to metrolook - change (mediawiki...Metrolook)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222179

Change subject: Add php code sniffer to metrolook
..

Add php code sniffer to metrolook

Change-Id: I39f503970f9ee9aeb07fa6777a7948281f02565c
---
M MetrolookTemplate.php
M SkinMetrolook.php
M SkinMetrolookHooks.php
M composer.json
4 files changed, 105 insertions(+), 54 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/79/222179/1

diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 9fa9d08..cba20fa 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -173,9 +173,13 @@
?>msg( 
'comma-separator' ) ?>
config->get( 
'MetrolookSearchBar' ) ): ?>
msg( 
'jumptosearch' ) ?>
-   
+   
msg( 'jumptosearch' ) ?>
-   
+   

html( 'bodycontent' );
@@ -251,11 +255,23 @@

 

-   
+   

 

-   
+   



@@ -274,9 +290,17 @@


 
-   config->get( 'MetrolookSiteName' ) ): 
?>config->get( 'MetrolookSiteName' ) ): ?>
-   config->get( 'MetrolookLine' ) ): 
?>config->get( 'MetrolookSiteName' ) ): ?>config->get( 
'MetrolookSiteName' ) ): ?>
-   config->get( 'MetrolookDownArrow' ) 
): ?>config->get( 'MetrolookSiteName' ) ): ?>config->get( 
'MetrolookSiteName' ) ): ?>
+   config->get( 'MetrolookSiteName' ) ): 
?>config->get( 'MetrolookSiteName' ) ): 
?>
+   config->get( 'MetrolookLine' ) ): 
?>config->get( 'MetrolookSiteName' ) ): ?>config->get( 'MetrolookSiteName' ) ): ?>
+   config->get( 'MetrolookDownArrow' ) 
): ?>config->get( 'MetrolookSiteName' ) ): ?>config->get( 'MetrolookSiteName' ) ): ?>
 
config->get( 'MetrolookDownArrow' ) 
): ?>

@@ -286,34 +310,49 @@


config->get( 'MetrolookBartile' ) ): ?>
-   config->get( 'MetrolookTile1' ) ): ?>http://www.pidgi.net/wiki/";>http://images.pidgi.net/pidgiwikitiletop.png"; />
-   config->get( 'MetrolookTile2' ) ): ?>http://www.pidgi.net/press/";>http://images.pidgi.net/pidgipresstiletop.png"; />
-   config->get( 'MetrolookTile3' ) ): ?>http://www.pidgi.net/jcc/";>http://images.pidgi.net/jcctiletop.png"; />
-   config->get( 'MetrolookTile4' ) ): ?>http://www.petalburgwoods.com/";>http://images.pidgi.net/pwntiletop.png"; />
-   
-   config->get( 'MetrolookTile5' ) ): ?>
-   config->get( 'MetrolookTile6' ) ): ?>
-   config->get( 'MetrolookTile7' ) ): ?>
-   config->get( 'MetrolookTile8' ) ): ?>
-   config->get( 'MetrolookTile9' ) ): ?>
-   config->get( 'MetrolookTile10' ) ): ?>
-   
+   config->get( 'MetrolookTile1' ) ): ?>http://www.pidgi.net/wiki/";>http://images.pidgi.net/pidgiwikitiletop.png"; />
+