[MediaWiki-commits] [Gerrit] mediawiki...WoOgLeShades[master]: Reset to example

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371437 )

Change subject: Reset to example
..


Reset to example

bug: T165448
Change-Id: I010f79aaffe82db2700ef6af30f2f895f102676c
---
D CODE_OF_CONDUCT.md
M Gruntfile.js
M WoOgLeShades.skin.php
M WoOgLeShadesTemplate.php
A composer.json
M i18n/en.json
M package.json
M resources/main.js
A resources/print.css
M resources/screen-common.less
M resources/screen-desktop.less
M resources/screen-mobile.less
M resources/variables.less
M skin.json
14 files changed, 661 insertions(+), 231 deletions(-)

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



diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d8e5d08..000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-The development of this software is covered by a [Code of 
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/Gruntfile.js b/Gruntfile.js
index 4337316..3f6ec57 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,9 +1,16 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
-   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
 
grunt.initConfig( {
+   jshint: {
+   all: [
+   '**/*.js',
+   '!node_modules/**'
+   ]
+   },
banana: {
all: 'i18n/'
},
@@ -16,6 +23,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/WoOgLeShades.skin.php b/WoOgLeShades.skin.php
index 16fef8e..7f47a16 100644
--- a/WoOgLeShades.skin.php
+++ b/WoOgLeShades.skin.php
@@ -13,15 +13,24 @@
 *
 * @param $out OutputPage
 */
-   function setupSkinUserCss( OutputPage $out ) {
-   parent::setupSkinUserCss( $out );
+   public function initPage( OutputPage $out ) {
 
$out->addMeta( 'viewport', 'width=device-width, 
initial-scale=1.0' );
 
$out->addModuleStyles( array(
+   'mediawiki.skinning.interface',
'mediawiki.skinning.content.externallinks',
'skins.woogleshades'
) );
-   $out->addModules( array( 'skins.woogleshades.js' ) );
+   $out->addModules( array(
+   'skins.woogleshades.js'
+   ) );
+   }
+
+   /**
+* @param $out OutputPage
+*/
+   function setupSkinUserCss( OutputPage $out ) {
+   parent::setupSkinUserCss( $out );
}
 }
diff --git a/WoOgLeShadesTemplate.php b/WoOgLeShadesTemplate.php
index 17ff95a..6dbe79f 100644
--- a/WoOgLeShadesTemplate.php
+++ b/WoOgLeShadesTemplate.php
@@ -9,240 +9,491 @@
 * Outputs the entire contents of the page
 */
public function execute() {
-   $this->html( 'headelement' );
-   ?>
-   
-   outputLogo();
-   ?>
-   
-   data['sitenotice'] ) {
-   ?>
-   html( 
'sitenotice' ) ?>
-   data['newtalk'] ) {
-   ?>
-   html( 'newtalk' ) ?>
-   
+   $html = '';
+   $html .= $this->get( 'headelement' );
 
-   
-   html( 'title' ) ?>
-   
-   getMsg( 
'tagline' )->parse() ?>
-   
-   
-   data['subtitle'] ) {
-   ?>
-   html( 
'subtitle' ) ?>
-   data['undelete'] ) {
-   ?>
-   html( 
'undelete' ) ?>
-   
-   
+   $html .= Html::rawElement( 'div', [ 'id' => 'mw-wrapper' ],
+   Html::rawElement( 'div', [ 'class' => 'mw-body', 'role' 
=> 'main' ],
+   $this->getSiteNotice() .
+   $this->getNewTalk() .
+

[MediaWiki-commits] [Gerrit] mediawiki...WoOgLeShades[master]: Reset to example

[Isarra (Code Review)]

Isarra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371437 )

Change subject: Reset to example
..

Reset to example

bug: T165448
Change-Id: I010f79aaffe82db2700ef6af30f2f895f102676c
---
M Gruntfile.js
M WoOgLeShades.skin.php
M WoOgLeShadesTemplate.php
A composer.json
M i18n/en.json
M package.json
M resources/main.js
A resources/print.css
M resources/screen-common.less
M resources/screen-desktop.less
M resources/screen-mobile.less
M resources/variables.less
M skin.json
13 files changed, 664 insertions(+), 234 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/WoOgLeShades 
refs/changes/37/371437/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 9c56558..35ddbef 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,9 +1,16 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
-   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
 
grunt.initConfig( {
+   jshint: {
+   all: [
+   '**/*.js',
+   '!node_modules/**'
+   ]
+   },
banana: {
all: 'i18n/'
},
@@ -15,6 +22,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/WoOgLeShades.skin.php b/WoOgLeShades.skin.php
index 16fef8e..7f47a16 100644
--- a/WoOgLeShades.skin.php
+++ b/WoOgLeShades.skin.php
@@ -13,15 +13,24 @@
 *
 * @param $out OutputPage
 */
-   function setupSkinUserCss( OutputPage $out ) {
-   parent::setupSkinUserCss( $out );
+   public function initPage( OutputPage $out ) {
 
$out->addMeta( 'viewport', 'width=device-width, 
initial-scale=1.0' );
 
$out->addModuleStyles( array(
+   'mediawiki.skinning.interface',
'mediawiki.skinning.content.externallinks',
'skins.woogleshades'
) );
-   $out->addModules( array( 'skins.woogleshades.js' ) );
+   $out->addModules( array(
+   'skins.woogleshades.js'
+   ) );
+   }
+
+   /**
+* @param $out OutputPage
+*/
+   function setupSkinUserCss( OutputPage $out ) {
+   parent::setupSkinUserCss( $out );
}
 }
diff --git a/WoOgLeShadesTemplate.php b/WoOgLeShadesTemplate.php
index 17ff95a..6dbe79f 100644
--- a/WoOgLeShadesTemplate.php
+++ b/WoOgLeShadesTemplate.php
@@ -9,240 +9,491 @@
 * Outputs the entire contents of the page
 */
public function execute() {
-   $this->html( 'headelement' );
-   ?>
-   
-   outputLogo();
-   ?>
-   
-   data['sitenotice'] ) {
-   ?>
-   html( 
'sitenotice' ) ?>
-   data['newtalk'] ) {
-   ?>
-   html( 'newtalk' ) ?>
-   
+   $html = '';
+   $html .= $this->get( 'headelement' );
 
-   
-   html( 'title' ) ?>
-   
-   getMsg( 
'tagline' )->parse() ?>
-   
-   
-   data['subtitle'] ) {
-   ?>
-   html( 
'subtitle' ) ?>
-   data['undelete'] ) {
-   ?>
-   html( 
'undelete' ) ?>
-   
-   
+   $html .= Html::rawElement( 'div', [ 'id' => 'mw-wrapper' ],
+   Html::rawElement( 'div', [ 'class' => 'mw-body', 'role' 
=> 'main' ],
+   $this->getSiteNotice() .
+   $this->getNewTalk() .
+   $this->getIndicators() .
+   Html::rawElement( 'h1',
+   [
+   'class' => 'firstHeading',
+   'lang'