From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 17 Dec 2015 09:15:42 +0100 Subject: Update to MediaWiki 1.26.0 --- skins/Vector/Gruntfile.js | 32 ++++++ skins/Vector/SkinVector.php | 7 +- skins/Vector/Vector.php | 2 +- skins/Vector/VectorTemplate.php | 124 +++++++-------------- skins/Vector/collapsibleTabs.js | 5 +- skins/Vector/components/common.less | 13 ++- skins/Vector/components/tabs.less | 2 + skins/Vector/components/watchstar.less | 4 +- skins/Vector/composer.json | 46 ++++---- skins/Vector/i18n/ady-cyrl.json | 15 ++- skins/Vector/i18n/aeb-latn.json | 14 +++ skins/Vector/i18n/aeb.json | 5 +- skins/Vector/i18n/an.json | 6 +- skins/Vector/i18n/ang.json | 5 +- skins/Vector/i18n/arn.json | 3 +- skins/Vector/i18n/arq.json | 3 +- skins/Vector/i18n/arz.json | 3 +- skins/Vector/i18n/ba.json | 6 +- skins/Vector/i18n/bho.json | 8 +- skins/Vector/i18n/bs.json | 9 +- skins/Vector/i18n/ce.json | 6 +- skins/Vector/i18n/din.json | 11 ++ skins/Vector/i18n/dty.json | 16 +++ skins/Vector/i18n/ee.json | 6 +- skins/Vector/i18n/eml.json | 9 ++ skins/Vector/i18n/fo.json | 1 + skins/Vector/i18n/frp.json | 3 +- skins/Vector/i18n/fy.json | 2 +- skins/Vector/i18n/glk.json | 13 +++ skins/Vector/i18n/gom-deva.json | 7 +- skins/Vector/i18n/gom-latn.json | 2 +- skins/Vector/i18n/gsw.json | 3 +- skins/Vector/i18n/gu.json | 2 +- skins/Vector/i18n/hil.json | 12 +- skins/Vector/i18n/hrx.json | 6 +- skins/Vector/i18n/ht.json | 6 +- skins/Vector/i18n/ilo.json | 2 +- skins/Vector/i18n/jut.json | 11 ++ skins/Vector/i18n/jv.json | 3 +- skins/Vector/i18n/kea.json | 9 ++ skins/Vector/i18n/khw.json | 3 +- skins/Vector/i18n/kk-cyrl.json | 2 +- skins/Vector/i18n/km.json | 3 +- skins/Vector/i18n/ko.json | 7 +- skins/Vector/i18n/ksh.json | 8 +- skins/Vector/i18n/ku-latn.json | 9 +- skins/Vector/i18n/kw.json | 3 +- skins/Vector/i18n/ky.json | 6 +- skins/Vector/i18n/lrc.json | 4 +- skins/Vector/i18n/lt.json | 4 +- skins/Vector/i18n/luz.json | 9 +- skins/Vector/i18n/mdf.json | 6 +- skins/Vector/i18n/mg.json | 3 +- skins/Vector/i18n/mk.json | 2 +- skins/Vector/i18n/mn.json | 6 +- skins/Vector/i18n/mzn.json | 3 +- skins/Vector/i18n/nan.json | 5 +- skins/Vector/i18n/nap.json | 2 +- skins/Vector/i18n/ne.json | 5 +- skins/Vector/i18n/nl.json | 4 +- skins/Vector/i18n/olo.json | 19 ++++ skins/Vector/i18n/or.json | 3 +- skins/Vector/i18n/pnb.json | 3 +- skins/Vector/i18n/prs.json | 11 ++ skins/Vector/i18n/ro.json | 3 +- skins/Vector/i18n/sa.json | 5 +- skins/Vector/i18n/sc.json | 4 +- skins/Vector/i18n/scn.json | 11 +- skins/Vector/i18n/sd.json | 11 +- skins/Vector/i18n/sgs.json | 4 +- skins/Vector/i18n/shy-latn.json | 8 ++ skins/Vector/i18n/si.json | 9 +- skins/Vector/i18n/sk.json | 5 +- skins/Vector/i18n/ta.json | 6 +- skins/Vector/i18n/tl.json | 3 +- skins/Vector/i18n/tr.json | 6 +- skins/Vector/i18n/ur.json | 5 +- skins/Vector/i18n/vec.json | 3 +- skins/Vector/i18n/vro.json | 3 +- skins/Vector/i18n/wo.json | 3 +- skins/Vector/i18n/wuu.json | 6 +- skins/Vector/i18n/xmf.json | 6 +- skins/Vector/i18n/yo.json | 3 +- skins/Vector/i18n/za.json | 6 +- skins/Vector/i18n/zh-hans.json | 2 +- skins/Vector/i18n/zh-hant.json | 5 +- skins/Vector/phpcs.xml | 7 ++ skins/Vector/responsive.less | 78 +++++++++++++ skins/Vector/skin.json | 19 +++- .../skinStyles/jquery.ui/jquery.ui.button.css | 13 --- .../Vector/skinStyles/mediawiki.notification.less | 14 ++- skins/Vector/skinStyles/ooui.less | 4 + 92 files changed, 568 insertions(+), 256 deletions(-) create mode 100644 skins/Vector/Gruntfile.js create mode 100644 skins/Vector/i18n/aeb-latn.json create mode 100644 skins/Vector/i18n/din.json create mode 100644 skins/Vector/i18n/dty.json create mode 100644 skins/Vector/i18n/eml.json create mode 100644 skins/Vector/i18n/glk.json create mode 100644 skins/Vector/i18n/jut.json create mode 100644 skins/Vector/i18n/kea.json create mode 100644 skins/Vector/i18n/olo.json create mode 100644 skins/Vector/i18n/prs.json create mode 100644 skins/Vector/i18n/shy-latn.json create mode 100644 skins/Vector/phpcs.xml create mode 100644 skins/Vector/responsive.less create mode 100644 skins/Vector/skinStyles/ooui.less (limited to 'skins/Vector') diff --git a/skins/Vector/Gruntfile.js b/skins/Vector/Gruntfile.js new file mode 100644 index 00000000..cf681717 --- /dev/null +++ b/skins/Vector/Gruntfile.js @@ -0,0 +1,32 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-contrib-jshint' ); + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + grunt.loadNpmTasks( 'grunt-jscs' ); + var conf = grunt.file.readJSON( 'skin.json' ); + + grunt.initConfig( { + jshint: { + options: { + jshintrc: true + }, + all: [ + '*.js' + ] + }, + jscs: { + src: '<%= jshint.all %>' + }, + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/skins/Vector/SkinVector.php b/skins/Vector/SkinVector.php index f5e3634c..5d14628a 100644 --- a/skins/Vector/SkinVector.php +++ b/skins/Vector/SkinVector.php @@ -46,6 +46,11 @@ class SkinVector extends SkinTemplate { public function initPage( OutputPage $out ) { parent::initPage( $out ); + if ( $this->vectorConfig->get( 'VectorResponsive' ) ) { + $out->addMeta( 'viewport', 'width=device-width, initial-scale=1' ); + $out->addModuleStyles( 'skins.vector.styles.responsive' ); + } + // Append CSS which includes IE only behavior fixes for hover support - // this is better than including this in a CSS file since it doesn't // wait for the CSS file to load before fetching the HTC file. @@ -67,7 +72,7 @@ class SkinVector extends SkinTemplate { parent::setupSkinUserCss( $out ); $styles = array( 'mediawiki.skinning.interface', 'skins.vector.styles' ); - wfRunHooks( 'SkinVectorStyleModules', array( $this, &$styles ) ); + Hooks::run( 'SkinVectorStyleModules', array( $this, &$styles ) ); $out->addModuleStyles( $styles ); } diff --git a/skins/Vector/Vector.php b/skins/Vector/Vector.php index 872b5bf7..1a06ea9c 100644 --- a/skins/Vector/Vector.php +++ b/skins/Vector/Vector.php @@ -11,4 +11,4 @@ if ( function_exists( 'wfLoadSkin' ) ) { return true; } else { die( 'This version of the Vector skin requires MediaWiki 1.25+' ); -} \ No newline at end of file +} diff --git a/skins/Vector/VectorTemplate.php b/skins/Vector/VectorTemplate.php index fa3de5e0..ec2c87aa 100644 --- a/skins/Vector/VectorTemplate.php +++ b/skins/Vector/VectorTemplate.php @@ -87,6 +87,10 @@ class VectorTemplate extends BaseTemplate { $this->data['personal_urls'] = array_reverse( $this->data['personal_urls'] ); } + + $this->data['pageLanguage'] = + $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode(); + // Output HTML Page $this->html( 'headelement' ); ?> @@ -106,12 +110,14 @@ class VectorTemplate extends BaseTemplate { if ( is_callable( array( $this, 'getIndicators' ) ) ) { echo $this->getIndicators(); } + // Loose comparison with '!=' is intentional, to catch null and false too, but not '0' + if ( $this->data['title'] != '' ) { ?> -

html( 'title' ) ?>

+

html( 'title' ) + ?>

+ html( 'prebodyhtml' ) ?>
-
html( 'userlangattributes' ) - ?>>html( 'subtitle' ) ?>
+
html( 'userlangattributes' ) ?>>html( 'subtitle' ) + ?>
data['undelete'] ) { ?> @@ -142,13 +148,12 @@ class VectorTemplate extends BaseTemplate { msg( 'jumpto' ) ?> msg( 'jumptonavigation' ) - ?>msg( 'comma-separator' ) - ?> + ?>msg( 'comma-separator' ) ?> msg( 'jumptosearch' ) ?>
- html( 'bodycontent' ) ?> html( 'bodycontent' ); + if ( $this->data['printfooter'] ) { ?>
@@ -156,23 +161,13 @@ class VectorTemplate extends BaseTemplate {
- data['catlinks'] ) { - ?> - html( 'catlinks' ); - ?> - - data['dataAfterContent'] ) { - ?> - html( 'dataAfterContent' ); - ?> -
@@ -204,19 +199,11 @@ class VectorTemplate extends BaseTemplate { getFooterLinks() as $category => $links ) { ?> -