[MediaWiki-commits] [Gerrit] Add more resolutions to check for presets in vp8/vp9 - change (mediawiki...TimedMediaHandler)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231775 Change subject: Add more resolutions to check for presets in vp8/vp9 .. Add more resolutions to check for presets in vp8/vp9 Add 180p, 480p and 2160p resolution to check for preset in vp8 and vp9. Change-Id: I946f097d52b48c643a4fbf5453148f879e6d9d14 --- M WebVideoTranscode/WebVideoTranscodeJob.php 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/75/231775/1 diff --git a/WebVideoTranscode/WebVideoTranscodeJob.php b/WebVideoTranscode/WebVideoTranscodeJob.php index d132b06..d9cc696 100755 --- a/WebVideoTranscode/WebVideoTranscodeJob.php +++ b/WebVideoTranscode/WebVideoTranscodeJob.php @@ -482,12 +482,18 @@ // check for presets: if( isset($options['preset']) ){ - if ($options['preset'] == "360p") { + if ($options['preset'] == "160p") { + $cmd.= " -vpre libvpx-160p"; + } elseif ($options['preset'] == "360p") { $cmd.= " -vpre libvpx-360p"; + } elseif ($options['preset'] == "480p") { + $cmd.= " -vpre libvpx-480p"; } elseif ( $options['preset'] == "720p" ) { $cmd.= " -vpre libvpx-720p"; } elseif ( $options['preset'] == "1080p" ) { $cmd.= " -vpre libvpx-1080p"; + } elseif ( $options['preset'] == "2160p" ) { + $cmd.= " -vpre libvpx-2160p"; } } -- To view, visit https://gerrit.wikimedia.org/r/231775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I946f097d52b48c643a4fbf5453148f879e6d9d14 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update link in credits - change (mediawiki...Blueprint)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231776 Change subject: Update link in credits .. Update link in credits This updates the link in the credits to redirect to the skin page on mediawiki. Change-Id: Ieb7318b2db734a0984be45e60d7cb189c555052c --- M skin.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint refs/changes/76/231776/1 diff --git a/skin.json b/skin.json index b82e9b9..4c2d741 100644 --- a/skin.json +++ b/skin.json @@ -4,7 +4,7 @@ "Andrew Garrett", "Prateek Saxena" ], - "url": "https://gerrit.wikimedia.org/r/p/mediawiki/skins/Blueprint";, + "url": "https://www.mediawiki.org/wiki/Skin:Blueprint";, "type": "skin", "license-name": "MIT", "callback": "BlueprintHooks::registerExtension", -- To view, visit https://gerrit.wikimedia.org/r/231776 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb7318b2db734a0984be45e60d7cb189c555052c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Blueprint Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change videoQuality to videoBitrate - change (mediawiki...TimedMediaHandler)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231788 Change subject: Change videoQuality to videoBitrate .. Change videoQuality to videoBitrate Bug: T109184 Change-Id: Id47ca7bc78f32d5192918a6d942dfe4d1f3d3b5f --- M WebVideoTranscode/WebVideoTranscode.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/88/231788/1 diff --git a/WebVideoTranscode/WebVideoTranscode.php b/WebVideoTranscode/WebVideoTranscode.php index 8717b5d..e14c78a 100644 --- a/WebVideoTranscode/WebVideoTranscode.php +++ b/WebVideoTranscode/WebVideoTranscode.php @@ -196,7 +196,7 @@ WebVideoTranscode::ENC_WEBM_720P => array( 'maxSize'=> '1280x720', - 'videoQuality' => 7, + 'videoBitrate' => '2048', 'audioQuality' => 3, 'noUpscaling'=> 'true', 'videoCodec' => 'vp8', @@ -205,7 +205,7 @@ WebVideoTranscode::ENC_WEBM_1080P => array( 'maxSize'=> '1920x1080', - 'videoQuality' => 7, + 'videoBitrate' => '4096', 'audioQuality' => 3, 'noUpscaling'=> 'true', 'videoCodec' => 'vp8', @@ -214,7 +214,7 @@ WebVideoTranscode::ENC_WEBM_2160P => array( 'maxSize'=> '4096x2160', - 'videoQuality' => 7, + 'videoBitrate' => '16384', 'audioQuality' => 3, 'noUpscaling'=> 'true', 'videoCodec' => 'vp8', -- To view, visit https://gerrit.wikimedia.org/r/231788 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id47ca7bc78f32d5192918a6d942dfe4d1f3d3b5f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DO NOT MERGE: Test commit - change (mediawiki...EditUser)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/233119 Change subject: DO NOT MERGE: Test commit .. DO NOT MERGE: Test commit Change-Id: I3609b9813f2f56373716e87e80cb11916a4c9c4a --- A i18n/ast.json 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EditUser refs/changes/19/233119/1 diff --git a/i18n/ast.json b/i18n/ast.json new file mode 100644 index 000..c254831 --- /dev/null +++ b/i18n/ast.json @@ -0,0 +1,16 @@ +{ + "@metadata": { + "authors": [ + "Xuacu" + ] + }, + "edituser": "Editar usuariu", + "extensionname-edituser": "EditUser", + "edituser-desc": "Permite que los usuarios col privilexu editen les preferencies d'otru usuariu", + "edituser-username": "Nome d'usuariu:", + "edituser-dosearch": "Guetar", + "edituser-nouser": "L'usuariu \"$1\" nun esiste.", + "edituser-exempt": "L'usuariu \"$1\" nun pué editase.", + "right-edituser": "Editar les preferencies d'otros usuarios", + "right-edituser-exempt": "Otros nun pueden cambiar les preferencies d'esti usuariu" +} -- To view, visit https://gerrit.wikimedia.org/r/233119 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3609b9813f2f56373716e87e80cb11916a4c9c4a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EditUser Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: L10n-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "DO NOT MERGE: Test commit" - change (mediawiki...EditUser)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/233120 Change subject: Revert "DO NOT MERGE: Test commit" .. Revert "DO NOT MERGE: Test commit" This reverts commit e89d4ad4eae9c4880951ce99723c64d157b641b7. Change-Id: I2422e5441714c9c924be626f9cfd8e49e145fc36 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EditUser refs/changes/20/233120/1 -- To view, visit https://gerrit.wikimedia.org/r/233120 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2422e5441714c9c924be626f9cfd8e49e145fc36 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EditUser Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add php code sniffer - change (mediawiki...EditUser)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/233121 Change subject: Add php code sniffer .. Add php code sniffer Change-Id: I7a1f9f1aa29fec7efa563dcb1e0e710fb4c803d8 --- M composer.json 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EditUser refs/changes/21/233121/1 diff --git a/composer.json b/composer.json index 3d55a97..534f8fb 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,12 @@ { "require-dev": { - "jakub-onderka/php-parallel-lint": "0.9.*" + "jakub-onderka/php-parallel-lint": "0.9.*", + "mediawiki/mediawiki-codesniffer": "0.3.0" }, "scripts": { "test": [ - "parallel-lint . --exclude vendor" + "parallel-lint . --exclude vendor", + "phpcs -p" ] } } -- To view, visit https://gerrit.wikimedia.org/r/233121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a1f9f1aa29fec7efa563dcb1e0e710fb4c803d8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EditUser Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update qqq.json messages - change (mediawiki...TimedMediaHandler)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/233193 Change subject: Update qqq.json messages .. Update qqq.json messages Make timedmedia-derivative optional Change-Id: Id400b4bb56a841867a83416141475077c99a80f1 --- M i18n/qqq.json 1 file changed, 26 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/93/233193/1 diff --git a/i18n/qqq.json b/i18n/qqq.json index 22cda6b..4fe17fe 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -79,50 +79,50 @@ "timedmedia-source-file": "The source file. Parameters:\n* $1 - file type; any one of the following messages:\n** {{msg-mw|Timedmedia-ogg}}\n** {{msg-mw|Timedmedia-webm}}\n** {{msg-mw|Timedmedia-mp4}}\n** {{msg-mw|Timedmedia-flac}}\n** {{msg-mw|Timedmedia-wav}}\nSee also:\n* {{msg-mw|Timedmedia-source-audio-file-desc}}\n* {{msg-mw|Timedmedia-source-file-desc}}\n{{Identical|Source}}", "timedmedia-source-file-desc": "Source file description. This is a file title in the primary source attributes of a timed media file. I can look like \"''Original Ogg file, 640 × 480 (10 Mbps)''\".\n\nParameters:\n* $1 - file type; any one of the following messages:\n** {{msg-mw|Timedmedia-ogg}}\n** {{msg-mw|Timedmedia-webm}}\n** {{msg-mw|Timedmedia-mp4}}\n** {{msg-mw|Timedmedia-flac}}\n** {{msg-mw|Timedmedia-wav}}\n* $2 - resolution width\n* $3 - resolution height\n* $4 - human readable bitrate\nSee also:\n* {{msg-mw|Timedmedia-source-audio-file-desc}} - for audio file", "timedmedia-source-audio-file-desc": "Source file description. Parameters:\n* $1 - file type; any one of the following messages:\n** {{msg-mw|Timedmedia-ogg}}\n** {{msg-mw|Timedmedia-webm}}\n** {{msg-mw|Timedmedia-mp4}}\n** {{msg-mw|Timedmedia-flac}}\n** {{msg-mw|Timedmedia-wav}}\n* $2 - human readable bitrate\nSee also:\n* {{msg-mw|Timedmedia-source-file-desc}} - for video file", - "timedmedia-derivative-160p.ogv": "{{optional}} A type of media format encoding", + "timedmedia-derivative-160p.ogv": "{{optional}} A type of media format encoding", "timedmedia-derivative-desc-160p.ogv": "{{optional}} A type of media format encoding", - "timedmedia-derivative-240p.ogv": "{{optional}} A type of media format encoding", + "timedmedia-derivative-240p.ogv": "{{optional}} A type of media format encoding", "timedmedia-derivative-desc-240p.ogv": "{{optional}} A type of media format encoding", - "timedmedia-derivative-360p.ogv": "{{optional}} A type of media format encoding", + "timedmedia-derivative-360p.ogv": "{{optional}} A type of media format encoding", "timedmedia-derivative-desc-360p.ogv": "{{optional}} A type of media format encoding", - "timedmedia-derivative-480p.ogv": "{{optional}} A type of media format encoding", + "timedmedia-derivative-480p.ogv": "{{optional}} A type of media format encoding", "timedmedia-derivative-desc-480p.ogv": "{{optional}} A type of media format encoding", - "timedmedia-derivative-720p.ogv": "{{optional}} A type of media format encoding", + "timedmedia-derivative-720p.ogv": "{{optional}} A type of media format encoding", "timedmedia-derivative-desc-720p.ogv": "{{optional}} A type of media format encoding", - "timedmedia-derivative-1080p.ogv": "{{optional}} A type of media format encoding", + "timedmedia-derivative-1080p.ogv": "{{optional}} A type of media format encoding", "timedmedia-derivative-desc-1080p.ogv": "{{optional}} A type of media format encoding", - "timedmedia-derivative-160p.webm": "{{optional}} A type of media format encoding", + "timedmedia-derivative-160p.webm": "{{optional}} A type of media format encoding", "timedmedia-derivative-desc-160p.webm": "{{optional}} A type of media format encoding", - "timedmedia-derivative-360p.webm": "{{optional}} A type of media format encoding", + "timedmedia-derivative-360p.webm": "{{optional}} A type of media format encoding", "timedmedia-derivative-desc-360p.webm": "{{optional}} A type of media format encoding", - "timedmedia-derivative-480p.webm": "{{optional}} A type of media format encoding", + "timedmedia-derivative-480p.webm": "{{optional}} A type of media format encoding", "timedmedia-derivative-desc-480p.webm": "{{optional}} A type of media format encoding", - "timedmedia-derivative-720p.webm": "{{optional}} A type of media format encoding", + "timedmedia-derivative-720p.webm": "{{optional}} A type of media format encoding", "timedmedia-derivative-desc-720p.webm": "{{optional}} A type of media format encoding", - "timedmedia-derivative-1080p.webm": "{{optional}} A type of media format encoding", + "timedmedia-derivative-1080p.webm": "{{optional}} A type of media f
[MediaWiki-commits] [Gerrit] Update bootstrap to 3.3.5 - change (mediawiki...Blueprint)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226517 Change subject: Update bootstrap to 3.3.5 .. Update bootstrap to 3.3.5 Change-Id: Ice6477f174776c874918bb9b9d757051e5f9d749 --- M lib/bootstrap/bootstrap.min.css 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint refs/changes/17/226517/1 diff --git a/lib/bootstrap/bootstrap.min.css b/lib/bootstrap/bootstrap.min.css index c607108..1621e28 100755 --- a/lib/bootstrap/bootstrap.min.css +++ b/lib/bootstrap/bootstrap.min.css @@ -1,10 +1,14 @@ /*! - * Bootstrap v3.3.4 (http://getbootstrap.com) + * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! - * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=c5361ade6c44d7b0e78f) - * Config saved to config.json and https://gist.github.com/c5361ade6c44d7b0e78f - *//*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:hover,a:focus{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role="button"]{cursor:pointer}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-x
[MediaWiki-commits] [Gerrit] Update Blueprint tests - change (mediawiki...Blueprint)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226535 Change subject: Update Blueprint tests .. Update Blueprint tests Change-Id: I30f0c4dc656384fb0b1041e5434ea96c003043a5 --- A .jscsrc A .jshintignore A .jshintrc A Gruntfile.js M composer.json A package.json 6 files changed, 76 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint refs/changes/35/226535/1 diff --git a/.jscsrc b/.jscsrc new file mode 100644 index 000..9d22e3f --- /dev/null +++ b/.jscsrc @@ -0,0 +1,3 @@ +{ + "preset": "wikimedia" +} diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 000..3c3629e --- /dev/null +++ b/.jshintignore @@ -0,0 +1 @@ +node_modules diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 000..348affb --- /dev/null +++ b/.jshintrc @@ -0,0 +1,19 @@ +{ + // Enforcing + "bitwise": true, + "eqeqeq": true, + "freeze": true, + "latedef": true, + "noarg": true, + "nonew": true, + "undef": true, + "unused": false, + "strict": false, + + // Relaxing + "es5": false, + + // Environment + "browser": true, + "jquery": true, +} diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..cf68171 --- /dev/null +++ b/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/composer.json b/composer.json index 6e5ef43..1724e12 100644 --- a/composer.json +++ b/composer.json @@ -2,5 +2,13 @@ "require": { "werdnum/simple-lightncandy": "~0.1-dev", "werdnum/mediawiki-lightncandy-skin": "~0.1-dev" +}, +"require-dev": { +"jakub-onderka/php-parallel-lint": "0.9.*" +}, +"scripts": { +"test": [ +"parallel-lint . --exclude vendor" +] } } diff --git a/package.json b/package.json new file mode 100644 index 000..93beca9 --- /dev/null +++ b/package.json @@ -0,0 +1,13 @@ +{ + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "0.4.5", +"grunt-cli": "0.1.13", +"grunt-contrib-jshint": "0.11.2", +"grunt-banana-checker": "0.2.2", +"grunt-jscs": "1.8.0", +"grunt-jsonlint": "1.0.4" + } +} -- To view, visit https://gerrit.wikimedia.org/r/226535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30f0c4dc656384fb0b1041e5434ea96c003043a5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Blueprint Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Blueprint tests - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226542 Change subject: Update Blueprint tests .. Update Blueprint tests Change-Id: I4925da63b0aae22b3e809522466623d7958bfa24 --- M jjb/mediawiki-extensions.yaml M jjb/misc.yaml M zuul/layout.yaml 3 files changed, 22 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/42/226542/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 41df597..b9ce732 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -368,6 +368,22 @@ publishers: - global-teardown +- job: +name: 'mwext-MobileFrontend-doxygen-publish' +node: contintLabsSlave && UbuntuTrusty +defaults: use-remote-zuul-shallow-clone +concurrent: false +triggers: + - zuul +builders: + - global-setup + - doxygen + - doc-publish: +docsrc: 'docs/php' +docdest: 'MobileFrontend/$DOC_SUBPATH/php' +publishers: + - global-teardown + - job-template: name: 'mwext-VisualEditor-sync-gerrit' # bug 49846 node: gallium # needs 'jenkins' user which has the 'jenkins-bot' SSH credentials diff --git a/jjb/misc.yaml b/jjb/misc.yaml index 7bd514d..ee10248 100644 --- a/jjb/misc.yaml +++ b/jjb/misc.yaml @@ -161,22 +161,6 @@ - global-teardown - job: -name: 'mwext-MobileFrontend-doxygen-publish' -node: contintLabsSlave && UbuntuTrusty -defaults: use-remote-zuul-shallow-clone -concurrent: false -triggers: - - zuul -builders: - - global-setup - - doxygen - - doc-publish: -docsrc: 'docs/php' -docdest: 'MobileFrontend/$DOC_SUBPATH/php' -publishers: - - global-teardown - -- job: name: 'visualeditor-coverage' node: contintLabsSlave && UbuntuTrusty defaults: use-remote-zuul-shallow-clone diff --git a/zuul/layout.yaml b/zuul/layout.yaml index ca6bf32..a61cd42 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2337,7 +2337,12 @@ - name: mediawiki/skins/Blueprint template: - - name: mw-checks + - name: composer-test + - name: extension-unittests-generic + - name: npm +check: + - jsonlint + - jshint - name: mediawiki/skins/BlueSky template: -- To view, visit https://gerrit.wikimedia.org/r/226542 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4925da63b0aae22b3e809522466623d7958bfa24 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: JanZerebecki ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] empty php entry point - change (mediawiki...BlueSky)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226600 Change subject: empty php entry point .. empty php entry point Change-Id: Ide1bfaeccd17433a1b7a3f4ead9b313a59bbaf77 --- M BlueSky.php M resources/css/home.css M resources/css/main.less M resources/css/theme/colors/blue.less M skin.json 5 files changed, 18 insertions(+), 177 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSky refs/changes/00/226600/1 diff --git a/BlueSky.php b/BlueSky.php index de8c6ff..098aa17 100644 --- a/BlueSky.php +++ b/BlueSky.php @@ -13,181 +13,20 @@ * * To install place the BlueSky folder (the folder containing this file!) into * skins/ and add this line to your wiki's LocalSettings.php: - * require_once("$IP/skins/BlueSky/BlueSky.php"); + * wfLoadSkin( 'BlueSky' ); */ -// Skin credits that will show up on Special:Version -$wgExtensionCredits['skin'][] = array( - 'path' => __FILE__, - 'name' => 'BlueSky', - 'version' => '1.1', - 'author' => array( 'wikiHow', 'Jack Phoenix' ), - // @todo To be moved into the i18n file eventually once i18n is stable enough. - // No need to cause translators unnecessary extra work before I finalize - // the description. (Suggestions for a better desc? Let me know!) - 'description' => 'Skin based on the current version (late 2013-) of wikiHow\'s skin', - 'url' => 'https://www.mediawiki.org/wiki/Skin:BlueSky', -); +// Soup has been moved to the skin.json. All comments have been removed because json is dumb. -// The first instance must be strtolower()ed so that useskin=bluesky works and -// so that it does *not* force an initial capital (i.e. we do NOT want -// useskin=Bluesky) and the second instance is used to determine the name of -// *this* file. -$wgValidSkinNames['bluesky'] = 'BlueSky'; - -// Autoload the skin class, set up i18n, set up CSS & JS (via ResourceLoader) -$wgAutoloadClasses['SkinBlueSky'] = __DIR__ . '/BlueSky.skin.php'; -$wgAutoloadClasses['BlueSkyTemplate'] = __DIR__ . '/BlueSky.skin.php'; -$wgAutoloadClasses['SkinBlueSkyHooks'] = __DIR__ . '/BlueSky.hooks.php'; - -$wgMessagesDirs['SkinBlueSky'] = __DIR__ . '/i18n'; - -// Main CSS ResourceLoader module -$wgResourceModules['skins.bluesky'] = array( - 'styles' => array( - // MonoBook also loads these - 'resources/src/mediawiki.skinning/interface.css' => array( 'media' => 'screen' ), - // Styles custom to this skin - 'skins/BlueSky/resources/css/nonarticle.css' => array( 'media' => 'screen' ), - 'skins/BlueSky/resources/css/searchresults.css' => array( 'media' => 'screen' ), - 'skins/BlueSky/resources/css/special.css' => array( 'media' => 'screen' ), - 'skins/BlueSky/resources/css/printable.css' => array( 'media' => 'print' ), - #'skins/BlueSky/resources/css/iphone.css' => array( 'media' => 'only screen and (max-device-width: 480px)' ), - ), - 'position' => 'top' -); - -// zzz prefix is a hack to ensure that this module is loaded after the main -// skins.bluesky module -$wgResourceModules['zzzskins.bluesky.mainpage'] = array( - 'styles' => array( - 'skins/BlueSky/resources/css/home.css' => array( 'media' => 'screen' ), - ), - 'position' => 'top' -); - -// LESS versions of things that used to be PHP-side core hacks -$wgResourceModules['skins.bluesky.hacks.general'] = array( - 'styles' => 'skins/BlueSky/resources/css/hacks/general.less', - 'position' => 'top' -); - -// Action-specific LESS hacks -$wgResourceModules['skins.bluesky.hacks.action.delete'] = array( - 'styles' => 'skins/BlueSky/resources/css/hacks/mediawiki.action.delete.less', - 'position' => 'top' -); - -$wgResourceModules['skins.bluesky.hacks.action.edit'] = array( - 'styles' => 'skins/BlueSky/resources/css/hacks/mediawiki.action.edit.less', - 'position' => 'top' -); - -$wgResourceModules['skins.bluesky.hacks.action.history'] = array( - 'styles' => 'skins/BlueSky/resources/css/hacks/mediawiki.action.history.less', - 'position' => 'top' -); - -$wgResourceModules['skins.bluesky.hacks.action.protect'] = array( - 'styles' => 'skins/BlueSky/resources/css/hacks/mediawiki.action.protect.less', - 'position' => 'top' -); - -// Namespace-specific LESS hacks -$wgResourceModules['skins.bluesky.hacks.filepage'] = array( - 'styles' => 'skins/BlueSky/resources/css/hacks/mediawiki.filepage.less', - 'position' => 'top' -); - -// (Special) page-specific LESS hacks -$wgResourceModules['skins.bluesky.hacks.special.log'] = array( - 'styles' => 'skins/BlueSky/resources/css/hacks/mediawiki.special.log.less', - 'position' => 'top' -); - -$wgResourceModules['skins.bluesky.hacks.special.movepage'] = array( - 'styles' => 'skins/BlueSky/re
[MediaWiki-commits] [Gerrit] Update BlueSky tests - change (mediawiki...BlueSky)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226634 Change subject: Update BlueSky tests .. Update BlueSky tests Change-Id: I59e7d4c3f978e9b251950cedf8ec524569af33b4 --- A .jscsrc A .jshintignore A .jshintrc A Gruntfile.js A composer.json A package.json M resources/css/home.css M resources/css/main.less M resources/css/theme/colors/blue.less 9 files changed, 78 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSky refs/changes/34/226634/1 diff --git a/.jscsrc b/.jscsrc new file mode 100644 index 000..9d22e3f --- /dev/null +++ b/.jscsrc @@ -0,0 +1,3 @@ +{ + "preset": "wikimedia" +} diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 000..3c3629e --- /dev/null +++ b/.jshintignore @@ -0,0 +1 @@ +node_modules diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 000..348affb --- /dev/null +++ b/.jshintrc @@ -0,0 +1,19 @@ +{ + // Enforcing + "bitwise": true, + "eqeqeq": true, + "freeze": true, + "latedef": true, + "noarg": true, + "nonew": true, + "undef": true, + "unused": false, + "strict": false, + + // Relaxing + "es5": false, + + // Environment + "browser": true, + "jquery": true, +} diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..cf68171 --- /dev/null +++ b/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/composer.json b/composer.json new file mode 100644 index 000..3d55a97 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..93beca9 --- /dev/null +++ b/package.json @@ -0,0 +1,13 @@ +{ + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "0.4.5", +"grunt-cli": "0.1.13", +"grunt-contrib-jshint": "0.11.2", +"grunt-banana-checker": "0.2.2", +"grunt-jscs": "1.8.0", +"grunt-jsonlint": "1.0.4" + } +} diff --git a/resources/css/home.css b/resources/css/home.css old mode 100755 new mode 100644 diff --git a/resources/css/main.less b/resources/css/main.less old mode 100755 new mode 100644 diff --git a/resources/css/theme/colors/blue.less b/resources/css/theme/colors/blue.less old mode 100755 new mode 100644 -- To view, visit https://gerrit.wikimedia.org/r/226634 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59e7d4c3f978e9b251950cedf8ec524569af33b4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSky Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update BlueSky tests - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226635 Change subject: Update BlueSky tests .. Update BlueSky tests Change-Id: I54312d6f67fe8cf7cc8a9a447d26d35f93bc2d7c --- M zuul/layout.yaml 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/35/226635/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index ca6bf32..e7e7995 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2341,7 +2341,12 @@ - name: mediawiki/skins/BlueSky template: - - name: mw-checks + - name: composer-test + - name: extension-unittests-generic + - name: npm +check: + - jsonlint + - jshint - name: mediawiki/skins/BlueSpiceSkin template: @@ -2586,6 +2591,7 @@ test: - bundle17-cucumber - bundle17-rspec + - bundle17-rubocop - mediawiki-vagrant-puppet-validate - erblint-HEAD - mediawiki-vagrant-puppetlint-lenient @@ -2593,6 +2599,7 @@ gate-and-submit: - bundle17-cucumber - bundle17-rspec + - bundle17-rubocop - erblint-HEAD - mediawiki-vagrant-puppetlint-lenient - mediawiki-vagrant-puppetlint-strict @@ -2600,8 +2607,6 @@ postmerge: - mediawiki-vagrant-puppet-doc-publish - mediawiki-vagrant-bundle17-yard-publish -experimental: - - bundle17-rubocop - name: operations/debs/adminbot template: -- To view, visit https://gerrit.wikimedia.org/r/226635 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54312d6f67fe8cf7cc8a9a447d26d35f93bc2d7c Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add jenkings test for BoilerPlate - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226680 Change subject: Add jenkings test for BoilerPlate .. Add jenkings test for BoilerPlate Change-Id: I48ab39e330ebc71266b72cae8449cc2f6da495fe --- M jjb/macro-browsertests.yaml M zuul/layout.yaml 2 files changed, 31 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/80/226680/1 diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml index 7de1948..5cacf6e 100644 --- a/jjb/macro-browsertests.yaml +++ b/jjb/macro-browsertests.yaml @@ -9,18 +9,18 @@ fi export CUCUMBER_TAGS={cucumber_tags} export HEADLESS={headless} - export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php - export MEDIAWIKI_URL=http://{mediawiki_url}/wiki/ + export PLATFORM='{platform}' # Replace PLATFORM underscores (Jenkins) to spaces (SauceLabs) export PLATFORM=${{PLATFORM//_/ }} + export SCREENSHOT_FAILURES=true export SCREENSHOT_FAILURES_PATH="$WORKSPACE/log" # Log results to Raita export RAITA_URL=http://integration-raita.eqiad.wmflabs:9200/raita - # Set MEDIAWIKI_ENVIRONMENT for mediawiki-selenium >= 1.0.0 + # Set MEDIAWIKI_ENVIRONMENT for mw-selenium 1.x case '{mediawiki_url}' in *.beta.wmflabs.org) export MEDIAWIKI_ENVIRONMENT=beta @@ -31,15 +31,34 @@ esac set +x + if [ -z $MEDIAWIKI_CREDENTIALS ]; then echo "\$MEDIAWIKI_CREDENTIALS is empty. Check job configuration." exit 1 fi - export MEDIAWIKI_USER=`echo $MEDIAWIKI_CREDENTIALS | cut -f1 -d:` - export MEDIAWIKI_PASSWORD=`echo $MEDIAWIKI_CREDENTIALS | cut -f2- -d:` - export MEDIAWIKI_PASSWORD_VARIABLE='MEDIAWIKI_PASSWORD' + + MEDIAWIKI_USER=`echo $MEDIAWIKI_CREDENTIALS | cut -f1 -d:` + MEDIAWIKI_PASSWORD=`echo $MEDIAWIKI_CREDENTIALS | cut -f2- -d:` + set -x + MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php + MEDIAWIKI_URL=http://{mediawiki_url}/wiki/ + + # Let test suites running mw-selenium 1.x use their own + # configuration for URLs and users, but export our settings for + # versions 0.x + if [ ! -f "{folder}/browser/environments.yml" ]; then + export MEDIAWIKI_API_URL + export MEDIAWIKI_URL + export MEDIAWIKI_USER + fi + + # Export the MW user password regardless, as passwords are not kept + # in test suite configurations + export MEDIAWIKI_PASSWORD + + # VERSION is used for SauceLabs export VERSION={version} diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a3be20e..ba3dfa5 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3071,6 +3071,12 @@ - name: jsonlint - name: extension-unittests-generic + - name: mediawiki/extensions/BoilerPlate +template: + - name: jshint + - name: jsonlint + - name: extension-unittests + - name: mediawiki/extensions/BookManager template: - name: jshint -- To view, visit https://gerrit.wikimedia.org/r/226680 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48ab39e330ebc71266b72cae8449cc2f6da495fe Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add php entry points - change (mediawiki...examples)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226684 Change subject: Add php entry points .. Add php entry points Jenkings test fails for mwext-examples-testextension-zend because it carnt find entry point for examples Change-Id: I0f5cd6bc8ef1d4a72f2e7ede05a8815fb9715827 --- A BoilerPlate.php A ContentAction.php A DataPages.php A examples.php 4 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/examples refs/changes/84/226684/1 diff --git a/BoilerPlate.php b/BoilerPlate.php new file mode 100644 index 000..8b48c6d --- /dev/null +++ b/BoilerPlate.php @@ -0,0 +1,2 @@ +https://gerrit.wikimedia.org/r/226684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f5cd6bc8ef1d4a72f2e7ede05a8815fb9715827 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update BoilerPlate tests - change (mediawiki...BoilerPlate)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226687 Change subject: Update BoilerPlate tests .. Update BoilerPlate tests Change-Id: Ie12612e52e9e8dd41e6efb3127013671ca0052fc --- M .gitreview A .jscsrc A .jshintignore A .jshintrc A Gruntfile.js A composer.json A package.json 7 files changed, 82 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BoilerPlate refs/changes/87/226687/1 diff --git a/.gitreview b/.gitreview index 388ac73..a3452c1 100644 --- a/.gitreview +++ b/.gitreview @@ -1,5 +1,6 @@ [gerrit] host=gerrit.wikimedia.org port=29418 -project=mediawiki/extensions/examples.git +project=mediawiki/extensions/BoilerPlate.git defaultbranch=master +defaultrebase=0 diff --git a/.jscsrc b/.jscsrc new file mode 100644 index 000..9d22e3f --- /dev/null +++ b/.jscsrc @@ -0,0 +1,3 @@ +{ + "preset": "wikimedia" +} diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 000..3c3629e --- /dev/null +++ b/.jshintignore @@ -0,0 +1 @@ +node_modules diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 000..82721ad --- /dev/null +++ b/.jshintrc @@ -0,0 +1,19 @@ +{ + // Enforcing + "bitwise": true, + "eqeqeq": true, + "freeze": true, + "latedef": true, + "noarg": true, + "nonew": true, + "undef": true, + "unused": false, + "strict": false, + + // Relaxing + "es5": false, + + // Environment + "browser": true, + "jquery": true +} diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..4538071 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,34 @@ +/*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' ); + + grunt.initConfig( { + jshint: { + options: { + jshintrc: true + }, + all: [ + '*.js' + ] + }, + jscs: { + src: '<%= jshint.all %>' + }, + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '*.json', + '**/*.json', + '!node_modules/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..3d55a97 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..93beca9 --- /dev/null +++ b/package.json @@ -0,0 +1,13 @@ +{ + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "0.4.5", +"grunt-cli": "0.1.13", +"grunt-contrib-jshint": "0.11.2", +"grunt-banana-checker": "0.2.2", +"grunt-jscs": "1.8.0", +"grunt-jsonlint": "1.0.4" + } +} -- To view, visit https://gerrit.wikimedia.org/r/226687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie12612e52e9e8dd41e6efb3127013671ca0052fc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BoilerPlate Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor update to metrolook.search.js - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226693 Change subject: Minor update to metrolook.search.js .. Minor update to metrolook.search.js Change-Id: Id8872d64f5a6674bf00f0a271e82f8a322189adc --- M SkinMetrolook.php M js/metrolook.search.js 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/93/226693/1 diff --git a/SkinMetrolook.php b/SkinMetrolook.php index fbe518f..c85af08 100644 --- a/SkinMetrolook.php +++ b/SkinMetrolook.php @@ -47,7 +47,7 @@ parent::initPage( $out ); if ( $GLOBALS['wgMetrolookMobile'] ) { - $out->addMeta( 'viewport', 'width=device-width;, initial-scale=1;' ); + $out->addMeta( 'viewport', 'width=device-width, initial-scale=1' ); } // Append CSS which includes IE only behavior fixes for hover support - diff --git a/js/metrolook.search.js b/js/metrolook.search.js index 5f26d6d..7e31d34 100644 --- a/js/metrolook.search.js +++ b/js/metrolook.search.js @@ -1,6 +1,9 @@ +/* global $ */ + function isTouchDevice() { return !!('ontouchstart' in window); } + /* This is here to fix js issue with iPad (all models) */ $(function () { if( isTouchDevice() ) { -- To view, visit https://gerrit.wikimedia.org/r/226693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8872d64f5a6674bf00f0a271e82f8a322189adc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: Update tiles - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226700 Change subject: i18n: Update tiles .. i18n: Update tiles Match default tiles from pidgi wiki. Change-Id: I8cb717c79311a13b8bccc686cf3d1d06bf3bcf04 --- M js/metrolook.search.js 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/00/226700/1 diff --git a/js/metrolook.search.js b/js/metrolook.search.js index 5f26d6d..7e31d34 100644 --- a/js/metrolook.search.js +++ b/js/metrolook.search.js @@ -1,6 +1,9 @@ +/* global $ */ + function isTouchDevice() { return !!('ontouchstart' in window); } + /* This is here to fix js issue with iPad (all models) */ $(function () { if( isTouchDevice() ) { -- To view, visit https://gerrit.wikimedia.org/r/226700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8cb717c79311a13b8bccc686cf3d1d06bf3bcf04 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for svg with png format - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226713 Change subject: Add support for svg with png format .. Add support for svg with png format This update changes it so that if you have a png but you doint want to do an svg you have to do png twice. But if you you just need to do the first image for png then second for svg. Change-Id: I9fb65425d89f622e2791d66e4590e5e2a9d7378d --- M MetrolookTemplate.php M components/common.less M i18n/en.json M js/metrolook.search.js 4 files changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/13/226713/1 diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 87b375b..23ea767 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -36,13 +36,13 @@ private function getTiles( $messageName = 'metrolook-tiles' ) { /** * The message's format is: -* * URL to the site|alternative text|image URL +* * URL to the site|alternative text|image URL|image SVG URL * * For example: -* * http://www.pidgi.net/wiki/|PidgiWiki|http://images.pidgi.net/pidgiwikitiletop.png -* * http://www.pidgi.net/press/|PidgiWiki Press|http://images.pidgi.net/pidgipresstiletop.png -* * http://www.pidgi.net/jcc/|The JCC|http://images.pidgi.net/jcctiletop.png -* * http://www.petalburgwoods.com/|Petalburg Woods|http://images.pidgi.net/pwntiletop.png +* * http://www.pidgi.net/wiki/|PidgiWiki|http://images.pidgi.net/pidgiwikitiletop.png|http://images.pidgi.net/pidgiwikitiletop.png +* * http://www.pidgi.net/press/|PidgiWiki Press|http://images.pidgi.net/pidgipresstiletop.png|http://images.pidgi.net/pidgipresstiletop.png +* * http://www.pidgi.net/jcc/|The JCC|http://images.pidgi.net/jcctiletop.png|http://images.pidgi.net/jcctiletop.png +* * http://www.petalburgwoods.com/|Petalburg Woods|http://images.pidgi.net/pwntiletop.png|http://images.pidgi.net/pwntiletop.png */ $tileMessage = $this->getSkin()->msg( $messageName ); $tiles = ''; @@ -56,7 +56,7 @@ if ( strpos( $line, '*' ) !== 0 ) { continue; } else { - $line = explode( '|', trim( $line, '* ' ), 3 ); + $line = explode( '|', trim( $line, '* ' ), 4 ); $siteURL = $line[0]; $altText = $line[1]; @@ -67,11 +67,14 @@ $altText = $linkMsgObj->parse(); } + $imageURLSVG = $line[3]; $imageURL = $line[2]; $tiles .= '' . - ' + ' . + '" alt="' . htmlspecialchars( $altText, ENT_QUOTES ) . '" />' . ''; } } diff --git a/components/common.less b/components/common.less index 9908798..f3b173d 100644 --- a/components/common.less +++ b/components/common.less @@ -257,6 +257,10 @@ } } +object.image-align { + vertical-align: middle; +} + #hamburgerIcon { position: fixed; top: 40px; diff --git a/i18n/en.json b/i18n/en.json index 8de4e47..5f52d6e 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -8,6 +8,6 @@ "skinmetrolook-collapsiblenav-preference": "Enable collapsing of items in the sidebar in Metrolook skin", "metrolook-desc": "Metrolook skin for MediaWiki", "metrolook-guest": "Guest", - "metrolook-tiles": "* http://www.pidgi.net/wiki/|PidgiWiki|http://images.pidgi.net/pidgiwikitiletop.png\n* http://www.pidgi.net/press/|PidgiWiki Press|http://images.pidgi.net/pidgipresstiletop.png\n* http://www.pidgi.net/jcc/|The JCC|http://images.pidgi.net/jcctiletop.png\n* http://www.petalburgwoods.com/|Petalburg Woods|http://images.pidgi.net/pwntiletop.png";, + "metrolook-tiles": "* http://www.pidgi.net/wiki/|PidgiWiki|http://images.pidgi.net/pidgiwikitiletop.png|http://images.pidgi.net/pidgiwikitiletop.png\n* http://www.pidgi.net/press/|PidgiWiki Press|http://images.pidgi.net/pidgipresstiletop.png|http://images.pidgi.net/pidgipresstiletop.png\n* http://www.petalburgwoods.com/|Petalburg Woods|http://images.pidgi.net/pwntiletop.png|http://images.pidgi.net/pwntiletop.png\n* http://burstcade.pidgi.net/|Burstcade|http://images.pidgi.net/burstcadetiletop.png|http://images.pidgi.net/burstcadetiletop.png";, "metrolook-tiles-second": "" } diff --git a/js/metrolook.search.js b/js/metrolo
[MediaWiki-commits] [Gerrit] Update mobile - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226716 Change subject: Update mobile .. Update mobile Fixes mobile so it when it is off its off. Change-Id: I2611c0b33e0888f737aa5b95d52d9f4fb20d5c34 --- M SkinMetrolook.php M i18n/en.json M screen.less A screen.mobile.less M skin.json 5 files changed, 29 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/16/226716/1 diff --git a/SkinMetrolook.php b/SkinMetrolook.php index c85af08..202a13b 100644 --- a/SkinMetrolook.php +++ b/SkinMetrolook.php @@ -46,7 +46,7 @@ parent::initPage( $out ); - if ( $GLOBALS['wgMetrolookMobile'] ) { + if ( $this->metrolookConfig->get( 'MetrolookMobile' ) ) { $out->addMeta( 'viewport', 'width=device-width, initial-scale=1' ); } @@ -70,7 +70,11 @@ public function setupSkinUserCss( OutputPage $out ) { parent::setupSkinUserCss( $out ); - $styles = array( 'mediawiki.skinning.interface', 'skins.metrolook.styles' ); + if ( $this->metrolookConfig->get( 'MetrolookMobile' ) ) { + $styles = array( 'mediawiki.skinning.interface', 'skins.metrolook.styles.responsive' ); + } else { + $styles = array( 'mediawiki.skinning.interface', 'skins.metrolook.styles' ); + } Hooks::run( 'SkinMetrolookStyleModules', array( $this, &$styles ) ); $out->addModuleStyles( $styles ); } diff --git a/i18n/en.json b/i18n/en.json index 8de4e47..31bb273 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -8,6 +8,6 @@ "skinmetrolook-collapsiblenav-preference": "Enable collapsing of items in the sidebar in Metrolook skin", "metrolook-desc": "Metrolook skin for MediaWiki", "metrolook-guest": "Guest", - "metrolook-tiles": "* http://www.pidgi.net/wiki/|PidgiWiki|http://images.pidgi.net/pidgiwikitiletop.png\n* http://www.pidgi.net/press/|PidgiWiki Press|http://images.pidgi.net/pidgipresstiletop.png\n* http://www.pidgi.net/jcc/|The JCC|http://images.pidgi.net/jcctiletop.png\n* http://www.petalburgwoods.com/|Petalburg Woods|http://images.pidgi.net/pwntiletop.png";, + "metrolook-tiles": "* http://www.pidgi.net/wiki/|PidgiWiki|http://images.pidgi.net/pidgiwikitiletop.png\n* http://www.pidgi.net/press/|PidgiWiki Press|http://images.pidgi.net/pidgipresstiletop.png\n* http://www.petalburgwoods.com/|Petalburg Woods|http://images.pidgi.net/pwntiletop.png\n* http://burstcade.pidgi.net/|Burstcade|http://images.pidgi.net/burstcadetiletop.png";, "metrolook-tiles-second": "" } diff --git a/screen.less b/screen.less index cf81df5..1267db6 100644 --- a/screen.less +++ b/screen.less @@ -6,6 +6,4 @@ @import "components/navigation.less"; @import "components/footer.less"; @import "components/externalLinks.less"; -@import "components/tablet.less"; -@import "components/mobile.less"; @import "theme.less"; diff --git a/screen.mobile.less b/screen.mobile.less new file mode 100644 index 000..cf81df5 --- /dev/null +++ b/screen.mobile.less @@ -0,0 +1,11 @@ +/* Metrolook screen styles */ + +@import "variables.less"; + +@import "components/common.less"; +@import "components/navigation.less"; +@import "components/footer.less"; +@import "components/externalLinks.less"; +@import "components/tablet.less"; +@import "components/mobile.less"; +@import "theme.less"; diff --git a/skin.json b/skin.json index 21e7af5..50757cb 100644 --- a/skin.json +++ b/skin.json @@ -55,6 +55,17 @@ } } }, + "skins.metrolook.styles.responsive": { + "position": "top", + "styles": { + "screen.mobile.less": { + "media": "screen" + }, + "screen-hd.less": { + "media": "screen and (min-width: 982px)" + } + } + }, "skins.metrolook.js": { "scripts": [ "js/collapsibleTabs.js", -- To view, visit https://gerrit.wikimedia.org/r/226716 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2611c0b33e0888f737aa5b95d52d9f4fb20d5c34 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: Update i18n - change (mediawiki...WikidataPageBanner)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226912 Change subject: i18n: Update i18n .. i18n: Update i18n * Remove all i18n files except from en.json and qqq.json. The other json files were copyied from boilerplate extension but nether changed. Only add i18n files if you are going to change them. Fix discription. Add description and name of extension to json file (en.json, qqq.json) Change-Id: I2f5cafa46403d8195922f44551f2b483be6c8b81 --- M WikidataPageBanner.php D i18n/ast.json D i18n/bcl.json D i18n/be-tarask.json D i18n/br.json D i18n/ca.json D i18n/da.json D i18n/de.json D i18n/dsb.json D i18n/en-gb.json M i18n/en.json D i18n/eo.json D i18n/es.json D i18n/fa.json D i18n/fi.json D i18n/fo.json D i18n/fr.json D i18n/frp.json D i18n/gl.json D i18n/he.json D i18n/hsb.json D i18n/hu.json D i18n/ia.json D i18n/id.json D i18n/it.json D i18n/ja.json D i18n/ko.json D i18n/ksh.json D i18n/lb.json D i18n/map-bms.json D i18n/mk.json D i18n/mr.json D i18n/ms.json D i18n/mt.json D i18n/nb.json D i18n/nl.json D i18n/oc.json D i18n/pl.json D i18n/pms.json D i18n/pt-br.json D i18n/pt.json M i18n/qqq.json D i18n/roa-tara.json D i18n/ru.json D i18n/si.json D i18n/sv.json D i18n/ta.json D i18n/te.json D i18n/tl.json D i18n/uk.json D i18n/yi.json D i18n/zh-hans.json D i18n/zh-hant.json 53 files changed, 14 insertions(+), 470 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner refs/changes/12/226912/1 diff --git a/WikidataPageBanner.php b/WikidataPageBanner.php index b3566c0..08dfa52 100644 --- a/WikidataPageBanner.php +++ b/WikidataPageBanner.php @@ -6,20 +6,20 @@ * @author Sumit Asthana, 2015 * @license GNU General Public Licence 2.0 or later */ + if ( !defined( 'MEDIAWIKI' ) ) { die( 'This file is a MediaWiki extension, it is not a valid entry point' ); } $wgExtensionCredits['other'][] = array( - 'path' => __FILE__, - 'name' => 'WikidataPageBanner', - 'namemsg'=> "WikidataPageBanner", - 'description'=> "Render banners on wikivoyage", - 'descriptionmsg' => 'Display pagewide banners on wikivoyage', - 'author' => array( 'Sumit Asthana' ), - 'version'=> '0.0.1', - 'url'=> 'https://www.mediawiki.org/wiki/Extension:WikidataPageBanner', - 'license-name' => 'GPL-2.0+', + 'path' => __FILE__, + 'name' => 'WikidataPageBanner', + 'namemsg' => 'Wikidatapagebanner-extname', + 'descriptionmsg' => 'wikidatapagebanner-desc', + 'author' => array( 'Sumit Asthana' ), + 'version' => '0.0.1', + 'url' => 'https://www.mediawiki.org/wiki/Extension:WikidataPageBanner', + 'license-name' => 'GPL-2.0+', ); /** @@ -53,8 +53,4 @@ $wgHooks['ParserFirstCallInit'][] = 'WikidataPageBanner::onParserFirstCallInit'; $wgHooks['UnitTestsList'][] = 'WikidataPageBanner::onUnitTestsList'; -// include WikidataPageBanner class file -require_once __DIR__ . "/includes/WikidataPageBanner.hooks.php"; require_once __DIR__ . "/resources/Resources.php"; - - diff --git a/i18n/ast.json b/i18n/ast.json deleted file mode 100644 index e76d8d8..000 --- a/i18n/ast.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Xuacu" - ] - }, - "boilerplate-desc": "Esta ye una estensión d'exemplu", - "boilerplate-i18n-welcome": "Bienveníu al ficheru de llocalización de la estensión BoilerPlate." -} diff --git a/i18n/bcl.json b/i18n/bcl.json deleted file mode 100644 index d40e06d..000 --- a/i18n/bcl.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Geopoet" - ] - }, - "boilerplate-desc": "Ini sarong ehemplo nin ekstensyon", - "boilerplate-i18n-welcome": "Marhayon na pag-abot sa sagunson nin lokalisasyon kan ekstensyon nin GagaangPlato." -} diff --git a/i18n/be-tarask.json b/i18n/be-tarask.json deleted file mode 100644 index 1b2134d..000 --- a/i18n/be-tarask.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Wizardist" - ] - }, - "boilerplate-desc": "Гэта прыклад пашырэньня", - "boilerplate-i18n-welcome": "Вітаем у лякалізацыйным файле пашырэньня BoilerPlate." -} diff --git a/i18n/br.json b/i18n/br.json deleted file mode 100644 index 4984a57..000 --- a/i18n/br.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Fohanno" - ] - }, - "boilerplate-desc": "Setu amañ ur skouer astenn" -} diff --git a/i18n/ca.json b/i18n/ca.json deleted file mode 100644 index 1aee39c..000 --- a/i18n/ca.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { -
[MediaWiki-commits] [Gerrit] Update WikidataPageBanner tests - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226913 Change subject: Update WikidataPageBanner tests .. Update WikidataPageBanner tests Includes jsonlint checker needed for the i18n files. Includes composer test for the composer file it has that includes php code sniffing. Change-Id: I8a44bfdae42572a8ca403959a2a64328c332035f --- M jjb/macro.yaml M jjb/mediawiki-extensions.yaml M jjb/ruby-jobs.yaml M zuul/layout.yaml 4 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/13/226913/1 diff --git a/jjb/macro.yaml b/jjb/macro.yaml index dd3cd01..f0816ed 100644 --- a/jjb/macro.yaml +++ b/jjb/macro.yaml @@ -377,12 +377,15 @@ # # - tests-dir: Parent of the `features` directory. Usually `tests/browser`. # +# ALWAYS pair with 'localhost-cleanup' +# ALWAYS pair with 'mw-selenium-cleanup' +# - builder: name: mw-selenium-with-dir builders: - prepare-localhost - bundle-with-options: -initialization: '/srv/deployment/integration/slave-scripts/bin/mw-set-env-mw-selenium.sh' +initialization: '/srv/deployment/integration/slave-scripts/bin/mw-selenium-teardown.sh' command: | cucumber --color --tags @integration --tags ~@skip --format pretty \ --format junit --out $WORKSPACE/log/junit @@ -393,12 +396,30 @@ # the MW extension directory. Note that EXT_NAME is set by # zuul/ext_dependencies.py # +# ALWAYS pair with 'localhost-cleanup' +# ALWAYS pair with 'mw-selenium-cleanup' +# - builder: name: mw-selenium builders: - mw-selenium-with-dir: tests-dir: 'src/extensions/$EXT_NAME/tests/browser' +# Cleans up anything left under /tmp/jenkins-$EXECUTOR_NUMBER +# +# Note that once the bug with Xvfb and TMPDIR is resolved, this can be +# removed. See the bin/mw-set-env-mw-selenium.sh slave script for details. +# +- publisher: +name: mw-selenium-cleanup +publishers: + - postbuildscript: + builders: + - shell: '/srv/deployment/integration/slave-scripts/bin/mw-selenium-teardown.sh' + # Postbuild options are confusing, setting both to false ensures the script always runs. + onsuccess: False + onfailure: False + # - src: (without trailing slash) # - project: (usually repo name or a custom title like "VisualEditor") - will be escaped # - version: (usually branch name) - will be escaped diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index b9ce732..7ea3290 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -200,6 +200,7 @@ projects: mediawiki/skins/Vector - mw-selenium publishers: + - mw-selenium-cleanup - localhost-cleanup - mw-teardown-mysql - archive-log-dir diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml index aad06d3..a692290 100644 --- a/jjb/ruby-jobs.yaml +++ b/jjb/ruby-jobs.yaml @@ -157,6 +157,7 @@ - mw-selenium-with-dir: tests-dir: '.' publishers: + - mw-selenium-cleanup - localhost-cleanup - mw-teardown-mysql - archive-log-dir diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 0484c69..18f66e5 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6059,9 +6059,13 @@ - name: mediawiki/extensions/WikidataPageBanner template: + - name: composer-test - name: extension-qunit-generic - name: extension-unittests-generic - name: npm +check: + - jsonlint + - jshint - name: mediawiki/extensions/WikibaseQuality template: -- To view, visit https://gerrit.wikimedia.org/r/226913 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a44bfdae42572a8ca403959a2a64328c332035f Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikidataPageBanner tests - change (mediawiki...WikidataPageBanner)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226914 Change subject: Update WikidataPageBanner tests .. Update WikidataPageBanner tests Change-Id: Ic5dc68507876e62e823c1ca2950bc3b5b40257da --- A .jshintrc M Gruntfile.js M composer.json M package.json A phpcs.xml 5 files changed, 56 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner refs/changes/14/226914/1 diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 000..82721ad --- /dev/null +++ b/.jshintrc @@ -0,0 +1,19 @@ +{ + // Enforcing + "bitwise": true, + "eqeqeq": true, + "freeze": true, + "latedef": true, + "noarg": true, + "nonew": true, + "undef": true, + "unused": false, + "strict": false, + + // Relaxing + "es5": false, + + // Environment + "browser": true, + "jquery": true +} diff --git a/Gruntfile.js b/Gruntfile.js index dba7fa6..07a141e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,22 +1,28 @@ module.exports = function ( grunt ) { - grunt.loadNpmTasks( 'grunt-banana-checker' ); - grunt.loadNpmTasks( 'grunt-contrib-jshint' ); + grunt.loadNpmTasks( 'grunt-contrib-jshint' ); + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + jshint: { + options: { + jshintrc: true + }, + all: [ + '*.js' + ] + }, + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**' + ] + } + } ); - grunt.initConfig( { -jshint: { - options: { -jshintrc: true - }, - all: [ -'Gruntfile.js', -'resources', - ], -}, -banana: { - all: 'i18n/' -}, - } ); - - grunt.registerTask( 'test', [ 'jshint', 'banana' ] ); - grunt.registerTask( 'default', 'test' ); + grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); }; diff --git a/composer.json b/composer.json index 7dd4cd9..6bc638e 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "scripts": { "test": [ "parallel-lint . --exclude vendor", - "phpcs --standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki --extensions=php,php5,inc --ignore=vendor -p ." + "phpcs -p" ] } } diff --git a/package.json b/package.json index c14a4cb..3924b79 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,9 @@ "devDependencies": { "grunt": "0.4.5", "grunt-cli": "0.1.13", -"grunt-banana-checker": "0.2.1", -"grunt-contrib-jshint": "0.11.2" +"grunt-contrib-jshint": "0.11.2", +"grunt-banana-checker": "0.2.2", +"grunt-jscs": "1.8.0", +"grunt-jsonlint": "1.0.4" } } diff --git a/phpcs.xml b/phpcs.xml new file mode 100644 index 000..cb19440 --- /dev/null +++ b/phpcs.xml @@ -0,0 +1,7 @@ + + + + . + + vendor + -- To view, visit https://gerrit.wikimedia.org/r/226914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5dc68507876e62e823c1ca2950bc3b5b40257da Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataPageBanner Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not load WikidataPageBanner.hooks.php - change (mediawiki...WikidataPageBanner)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226933 Change subject: Do not load WikidataPageBanner.hooks.php .. Do not load WikidataPageBanner.hooks.php It is already loaded by autloadclass no need to require it too. Change-Id: I21741e64e73e14824cc2977cdfcd514a426886e4 --- M WikidataPageBanner.php 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner refs/changes/33/226933/1 diff --git a/WikidataPageBanner.php b/WikidataPageBanner.php index b3566c0..ca3bf16 100644 --- a/WikidataPageBanner.php +++ b/WikidataPageBanner.php @@ -54,7 +54,4 @@ $wgHooks['UnitTestsList'][] = 'WikidataPageBanner::onUnitTestsList'; // include WikidataPageBanner class file -require_once __DIR__ . "/includes/WikidataPageBanner.hooks.php"; require_once __DIR__ . "/resources/Resources.php"; - - -- To view, visit https://gerrit.wikimedia.org/r/226933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21741e64e73e14824cc2977cdfcd514a426886e4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataPageBanner Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: Update i18n - change (mediawiki...WikidataPageBanner)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226935 Change subject: i18n: Update i18n .. i18n: Update i18n Replaced copied i18n text with WikiDataPageBanner Adds description and extension name to extension i18n files. Change-Id: I23a4433ba3883286c89683362230161674738ff7 --- M WikidataPageBanner.php M i18n/en.json M i18n/qqq.json 3 files changed, 15 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner refs/changes/35/226935/1 diff --git a/WikidataPageBanner.php b/WikidataPageBanner.php index b3566c0..e98e9f3 100644 --- a/WikidataPageBanner.php +++ b/WikidataPageBanner.php @@ -6,20 +6,20 @@ * @author Sumit Asthana, 2015 * @license GNU General Public Licence 2.0 or later */ + if ( !defined( 'MEDIAWIKI' ) ) { die( 'This file is a MediaWiki extension, it is not a valid entry point' ); } $wgExtensionCredits['other'][] = array( - 'path' => __FILE__, - 'name' => 'WikidataPageBanner', - 'namemsg'=> "WikidataPageBanner", - 'description'=> "Render banners on wikivoyage", - 'descriptionmsg' => 'Display pagewide banners on wikivoyage', - 'author' => array( 'Sumit Asthana' ), - 'version'=> '0.0.1', - 'url'=> 'https://www.mediawiki.org/wiki/Extension:WikidataPageBanner', - 'license-name' => 'GPL-2.0+', + 'path' => __FILE__, + 'name' => 'WikidataPageBanner', + 'namemsg' => 'Wikidatapagebanner-extname', + 'descriptionmsg' => 'wikidatapagebanner-desc', + 'author' => array( 'Sumit Asthana' ), + 'version' => '0.0.1', + 'url' => 'https://www.mediawiki.org/wiki/Extension:WikidataPageBanner', + 'license-name' => 'GPL-2.0+', ); /** diff --git a/i18n/en.json b/i18n/en.json index a9c79b7..2bc4c14 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2,6 +2,6 @@ "@metadata": { "authors": [] }, - "boilerplate-desc": "This is an example extension", - "boilerplate-i18n-welcome": "Welcome to the localization file of the BoilerPlate extension." + "wikidatapagebanner-extname": "WikidataPageBanner", + "wikidatapagebanner-desc": "Render banners on specified pages of wiki at the beginning of articles" } \ No newline at end of file diff --git a/i18n/qqq.json b/i18n/qqq.json index fdeb937..c645c31 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -1,10 +1,7 @@ { "@metadata": { - "authors": [ - "Shirayuki", - "Umherirrender" - ] + "authors": [] }, - "boilerplate-desc": "{{desc|name=Boilerplate|url=https://www.mediawiki.org/wiki/Extension:Boilerplate}}";, - "boilerplate-i18n-welcome": "Used to greet the user when reading the .i18n.php file." -} + "wikidatapagebanner-extname": "Used for the name of extension.", + "wikidatapagebanner-desc": "{{desc|name=WikidataPageBanner|url=https://www.mediawiki.org/wiki/Extension:WikidataPageBanner}}";, +} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/226935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23a4433ba3883286c89683362230161674738ff7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataPageBanner Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: Remove copied i18n files - change (mediawiki...WikidataPageBanner)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226936 Change subject: i18n: Remove copied i18n files .. i18n: Remove copied i18n files Removes copied i18n files that were copied from boilerplate but never changed. Once this extension is added to translatewiki the files will be recreated with actual text in that lanaguage for the extension. Change-Id: I088de85cc2185f40390c661fc674d3bf05c2f5af --- D i18n/ast.json D i18n/bcl.json D i18n/be-tarask.json D i18n/br.json D i18n/ca.json D i18n/da.json D i18n/de.json D i18n/dsb.json D i18n/en-gb.json D i18n/eo.json D i18n/es.json D i18n/fa.json D i18n/fi.json D i18n/fo.json D i18n/fr.json D i18n/frp.json D i18n/gl.json D i18n/he.json D i18n/hsb.json D i18n/hu.json D i18n/ia.json D i18n/id.json D i18n/it.json D i18n/ja.json D i18n/ko.json D i18n/ksh.json D i18n/lb.json D i18n/map-bms.json D i18n/mk.json D i18n/mr.json D i18n/ms.json D i18n/mt.json D i18n/nb.json D i18n/nl.json D i18n/oc.json D i18n/pl.json D i18n/pms.json D i18n/pt-br.json D i18n/pt.json D i18n/roa-tara.json D i18n/ru.json D i18n/si.json D i18n/sv.json D i18n/ta.json D i18n/te.json D i18n/tl.json D i18n/uk.json D i18n/yi.json D i18n/zh-hans.json D i18n/zh-hant.json 50 files changed, 0 insertions(+), 449 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner refs/changes/36/226936/1 diff --git a/i18n/ast.json b/i18n/ast.json deleted file mode 100644 index e76d8d8..000 --- a/i18n/ast.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Xuacu" - ] - }, - "boilerplate-desc": "Esta ye una estensión d'exemplu", - "boilerplate-i18n-welcome": "Bienveníu al ficheru de llocalización de la estensión BoilerPlate." -} diff --git a/i18n/bcl.json b/i18n/bcl.json deleted file mode 100644 index d40e06d..000 --- a/i18n/bcl.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Geopoet" - ] - }, - "boilerplate-desc": "Ini sarong ehemplo nin ekstensyon", - "boilerplate-i18n-welcome": "Marhayon na pag-abot sa sagunson nin lokalisasyon kan ekstensyon nin GagaangPlato." -} diff --git a/i18n/be-tarask.json b/i18n/be-tarask.json deleted file mode 100644 index 1b2134d..000 --- a/i18n/be-tarask.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Wizardist" - ] - }, - "boilerplate-desc": "Гэта прыклад пашырэньня", - "boilerplate-i18n-welcome": "Вітаем у лякалізацыйным файле пашырэньня BoilerPlate." -} diff --git a/i18n/br.json b/i18n/br.json deleted file mode 100644 index 4984a57..000 --- a/i18n/br.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Fohanno" - ] - }, - "boilerplate-desc": "Setu amañ ur skouer astenn" -} diff --git a/i18n/ca.json b/i18n/ca.json deleted file mode 100644 index 1aee39c..000 --- a/i18n/ca.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Arnaugir" - ] - }, - "boilerplate-desc": "Aquesta és una extensió d'exemple" -} diff --git a/i18n/da.json b/i18n/da.json deleted file mode 100644 index db916dd..000 --- a/i18n/da.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Hylle" - ] - }, - "boilerplate-desc": "Dette er et eksempel på en udvidelse", - "boilerplate-i18n-welcome": "Velkommen til lokaliseringsdelen af BoilerPlate udvidelsen." -} diff --git a/i18n/de.json b/i18n/de.json deleted file mode 100644 index 33285fb..000 --- a/i18n/de.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Kghbln" - ] - }, - "boilerplate-desc": "Veranschaulicht beispielhaft eine einfache MediaWiki-Erweiterung", - "boilerplate-i18n-welcome": "Willkommen bei der Lokalisierungs- und Internationalisierungsdatei der Programmerweiterung BoilerPlate." -} diff --git a/i18n/dsb.json b/i18n/dsb.json deleted file mode 100644 index 1eabed0..000 --- a/i18n/dsb.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Michawiki" - ] - }, - "boilerplate-desc": "To jo pśikładowe rozšyrjenje", - "boilerplate-i18n-welcome": "Witaj k localizaciskej dataji rozšyrjenja BoilerPlate." -} diff --git a/i18n/en-gb.json b/i18n/en-gb.json deleted file mode 100644 index 8ccb844..000 --- a/i18n/en-gb.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Lloffiwr", -
[MediaWiki-commits] [Gerrit] i18n: Update qqq.json messages - change (mediawiki...apex)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226988 Change subject: i18n: Update qqq.json messages .. i18n: Update qqq.json messages Updates messages in qqq.json so this extension can be added to translatewiki Change-Id: I11da23769ccff4edd04945b8841044db4a6b7381 --- M i18n/qqq.json M skin.json 2 files changed, 13 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex refs/changes/88/226988/1 diff --git a/i18n/qqq.json b/i18n/qqq.json index 79cec8d..e509757 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -6,16 +6,15 @@ "apex-desc": "{{desc|what=skin|name=Apex|url=https://www.mediawiki.org/wiki/Skin:Apex}}";, "apex.css": "{{optional}}", "apex.js": "{{optional}}", - "apex-action-addsection": "?", - "apex-action-delete": "?", - "apex-action-move": "?", - "apex-action-protect": "?", - "apex-action-undelete": "?", - "apex-action-unprotect": "?", - "apex-simplesearch-preference": "?", - "apex-view-create": "?", - "apex-view-edit": "?", - "apex-view-history": "?", - "apex-view-view": "?", - "apex-view-viewsource": "?" -} + "apex-action-addsection": "Used in the Apex skin. See for example {{canonicalurl:Talk:Main_Page|useskin=apex}}\n{{Identical|Add topic}}", + "apex-action-delete": "Used in the Apex skin, as the name of a tab at the top of the page. See for example {{canonicalurl:Main_Page|useskin=apex}}\n\n{{Identical|Delete}}", + "apex-action-move": "Used in the Apex skin, on the tabs at the top of the page. See for example {{canonicalurl:Talk:Main_Page|useskin=apex}}\n\n{{Identical|Move}}", + "apex-action-protect": "Tab at top of page, in apex skin\n\n{{Identical|Protect}}", + "apex-action-undelete": "Tab at top of page, in apex skin.\n{{Identical|Undelete}}", + "apex-action-unprotect": "Tab at top of page, in apex skin.\n{{Identical|Change protection}}", + "apex-view-create": "Tab label in the Apex skin. See for example {{canonicalurl:Foo|useskin=apex}}\n{{Identical|Create}}", + "apex-view-edit": "Tab label in the Apex skin. See for example {{canonicalurl:Main_Page|useskin=apex}}\n{{Identical|Edit}}", + "apex-view-history": "Tab label in the Apex skin. See for example {{canonicalurl:Main_Page|useskin=apex}}\n{{Identical|View history}}", + "apex-view-view": "Tab label in the Apex skin (verb). See for example {{canonicalurl:Main_Page|useskin=apex}}.\n{{Identical|Read}}", + "apex-view-viewsource": "Tab label in the Apex skin.\n{{Identical|View source}}" +} \ No newline at end of file diff --git a/skin.json b/skin.json index 4b55efb..4bc6316 100644 --- a/skin.json +++ b/skin.json @@ -12,7 +12,7 @@ "apex": "Apex" }, "SkinOOUIThemes": { - "apex": "apex" + "apex": "Apex" }, "MessagesDirs": { "apex": [ -- To view, visit https://gerrit.wikimedia.org/r/226988 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I11da23769ccff4edd04945b8841044db4a6b7381 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/apex Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add translations for apex skin - change (translatewiki)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226990 Change subject: Add translations for apex skin .. Add translations for apex skin Change-Id: I066bb0b78c40f7ecd4594aa3bf7047b96732a14c --- M groups/MediaWiki/mediawiki-extensions.txt M groups/MediaWiki/mediawiki-skins.txt 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/90/226990/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index a12807b..246f60a 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -666,7 +666,7 @@ Content Translation descmsg = cx-desc aliasfile = ContentTranslation/ContentTranslation.alias.php -ignored = cx-tools-view-guidelines-link +ignored = cx-tools-view-guidelines-link, cx-descriptionpagelink #Contest / Unused per https://bugzilla.wikimedia.org/show_bug.cgi?id=41526#c0 diff --git a/groups/MediaWiki/mediawiki-skins.txt b/groups/MediaWiki/mediawiki-skins.txt index b1990d1..35595ce 100644 --- a/groups/MediaWiki/mediawiki-skins.txt +++ b/groups/MediaWiki/mediawiki-skins.txt @@ -1,5 +1,4 @@ -# qqq incomplete -#apex +apex # qqq missing #Blue Sky -- To view, visit https://gerrit.wikimedia.org/r/226990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I066bb0b78c40f7ecd4594aa3bf7047b96732a14c Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Apex skin tests - change (mediawiki...apex)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226993 Change subject: Update Apex skin tests .. Update Apex skin tests Allow npm to run jshint and jscs. Allow composer to run php tests. I will do a follow up with php code sniffer. Change-Id: I881b467686235436c737e8070d458b13025fa3da --- A .jscsrc A .jshintignore A .jshintrc M Gruntfile.js A composer.json M package.json M skin.json 7 files changed, 52 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex refs/changes/93/226993/1 diff --git a/.jscsrc b/.jscsrc new file mode 100644 index 000..9d22e3f --- /dev/null +++ b/.jscsrc @@ -0,0 +1,3 @@ +{ + "preset": "wikimedia" +} diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 000..3c3629e --- /dev/null +++ b/.jshintignore @@ -0,0 +1 @@ +node_modules diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 000..82721ad --- /dev/null +++ b/.jshintrc @@ -0,0 +1,19 @@ +{ + // Enforcing + "bitwise": true, + "eqeqeq": true, + "freeze": true, + "latedef": true, + "noarg": true, + "nonew": true, + "undef": true, + "unused": false, + "strict": false, + + // Relaxing + "es5": false, + + // Environment + "browser": true, + "jquery": true +} diff --git a/Gruntfile.js b/Gruntfile.js index 9c56558..cf68171 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,12 +1,24 @@ /*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.loadNpmTasks( 'grunt-jscs' ); + var conf = grunt.file.readJSON( 'skin.json' ); grunt.initConfig( { - banana: { - all: 'i18n/' + jshint: { + options: { + jshintrc: true + }, + all: [ + '*.js' + ] }, + jscs: { + src: '<%= jshint.all %>' + }, + banana: conf.MessagesDirs, jsonlint: { all: [ '**/*.json', @@ -15,6 +27,6 @@ } } ); - grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/composer.json b/composer.json new file mode 100644 index 000..5d71a21 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} \ No newline at end of file diff --git a/package.json b/package.json index 76e8a82..3914bc3 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,9 @@ "devDependencies": { "grunt": "0.4.5", "grunt-cli": "0.1.13", +"grunt-contrib-jshint": "0.11.2", "grunt-banana-checker": "0.2.2", +"grunt-jscs": "1.8.0", "grunt-jsonlint": "1.0.4" } } diff --git a/skin.json b/skin.json index 4b55efb..4bc6316 100644 --- a/skin.json +++ b/skin.json @@ -12,7 +12,7 @@ "apex": "Apex" }, "SkinOOUIThemes": { - "apex": "apex" + "apex": "Apex" }, "MessagesDirs": { "apex": [ -- To view, visit https://gerrit.wikimedia.org/r/226993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I881b467686235436c737e8070d458b13025fa3da Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/apex Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Apex tests - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226994 Change subject: Update Apex tests .. Update Apex tests Support composer-test so that php code sniffer can run. Use extension-unittests-generic Change-Id: I210a57eaa41c5a43a3743e5d24434c74c63479c1 --- M jjb/macro.yaml M jjb/mediawiki-extensions.yaml M jjb/ruby-jobs.yaml M zuul/layout.yaml 4 files changed, 27 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/94/226994/1 diff --git a/jjb/macro.yaml b/jjb/macro.yaml index dd3cd01..f0816ed 100644 --- a/jjb/macro.yaml +++ b/jjb/macro.yaml @@ -377,12 +377,15 @@ # # - tests-dir: Parent of the `features` directory. Usually `tests/browser`. # +# ALWAYS pair with 'localhost-cleanup' +# ALWAYS pair with 'mw-selenium-cleanup' +# - builder: name: mw-selenium-with-dir builders: - prepare-localhost - bundle-with-options: -initialization: '/srv/deployment/integration/slave-scripts/bin/mw-set-env-mw-selenium.sh' +initialization: '/srv/deployment/integration/slave-scripts/bin/mw-selenium-teardown.sh' command: | cucumber --color --tags @integration --tags ~@skip --format pretty \ --format junit --out $WORKSPACE/log/junit @@ -393,12 +396,30 @@ # the MW extension directory. Note that EXT_NAME is set by # zuul/ext_dependencies.py # +# ALWAYS pair with 'localhost-cleanup' +# ALWAYS pair with 'mw-selenium-cleanup' +# - builder: name: mw-selenium builders: - mw-selenium-with-dir: tests-dir: 'src/extensions/$EXT_NAME/tests/browser' +# Cleans up anything left under /tmp/jenkins-$EXECUTOR_NUMBER +# +# Note that once the bug with Xvfb and TMPDIR is resolved, this can be +# removed. See the bin/mw-set-env-mw-selenium.sh slave script for details. +# +- publisher: +name: mw-selenium-cleanup +publishers: + - postbuildscript: + builders: + - shell: '/srv/deployment/integration/slave-scripts/bin/mw-selenium-teardown.sh' + # Postbuild options are confusing, setting both to false ensures the script always runs. + onsuccess: False + onfailure: False + # - src: (without trailing slash) # - project: (usually repo name or a custom title like "VisualEditor") - will be escaped # - version: (usually branch name) - will be escaped diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index b9ce732..7ea3290 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -200,6 +200,7 @@ projects: mediawiki/skins/Vector - mw-selenium publishers: + - mw-selenium-cleanup - localhost-cleanup - mw-teardown-mysql - archive-log-dir diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml index aad06d3..a692290 100644 --- a/jjb/ruby-jobs.yaml +++ b/jjb/ruby-jobs.yaml @@ -157,6 +157,7 @@ - mw-selenium-with-dir: tests-dir: '.' publishers: + - mw-selenium-cleanup - localhost-cleanup - mw-teardown-mysql - archive-log-dir diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 0484c69..d80cc6c 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2329,10 +2329,12 @@ - name: mediawiki/skins/apex template: - - name: mw-checks-test + - name: composer-test + - name: extension-unittests-generic - name: npm check: - jsonlint +- jshint - name: mediawiki/skins/Blueprint template: -- To view, visit https://gerrit.wikimedia.org/r/226994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I210a57eaa41c5a43a3743e5d24434c74c63479c1 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add extension-unittests-generic to metrolook - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226995 Change subject: Add extension-unittests-generic to metrolook .. Add extension-unittests-generic to metrolook Change-Id: Iaa33b2002e898d68fe78f236e225c6e4bac61679 --- M jjb/macro.yaml M jjb/mediawiki-extensions.yaml M jjb/ruby-jobs.yaml M zuul/layout.yaml 4 files changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/95/226995/1 diff --git a/jjb/macro.yaml b/jjb/macro.yaml index dd3cd01..f0816ed 100644 --- a/jjb/macro.yaml +++ b/jjb/macro.yaml @@ -377,12 +377,15 @@ # # - tests-dir: Parent of the `features` directory. Usually `tests/browser`. # +# ALWAYS pair with 'localhost-cleanup' +# ALWAYS pair with 'mw-selenium-cleanup' +# - builder: name: mw-selenium-with-dir builders: - prepare-localhost - bundle-with-options: -initialization: '/srv/deployment/integration/slave-scripts/bin/mw-set-env-mw-selenium.sh' +initialization: '/srv/deployment/integration/slave-scripts/bin/mw-selenium-teardown.sh' command: | cucumber --color --tags @integration --tags ~@skip --format pretty \ --format junit --out $WORKSPACE/log/junit @@ -393,12 +396,30 @@ # the MW extension directory. Note that EXT_NAME is set by # zuul/ext_dependencies.py # +# ALWAYS pair with 'localhost-cleanup' +# ALWAYS pair with 'mw-selenium-cleanup' +# - builder: name: mw-selenium builders: - mw-selenium-with-dir: tests-dir: 'src/extensions/$EXT_NAME/tests/browser' +# Cleans up anything left under /tmp/jenkins-$EXECUTOR_NUMBER +# +# Note that once the bug with Xvfb and TMPDIR is resolved, this can be +# removed. See the bin/mw-set-env-mw-selenium.sh slave script for details. +# +- publisher: +name: mw-selenium-cleanup +publishers: + - postbuildscript: + builders: + - shell: '/srv/deployment/integration/slave-scripts/bin/mw-selenium-teardown.sh' + # Postbuild options are confusing, setting both to false ensures the script always runs. + onsuccess: False + onfailure: False + # - src: (without trailing slash) # - project: (usually repo name or a custom title like "VisualEditor") - will be escaped # - version: (usually branch name) - will be escaped diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index b9ce732..7ea3290 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -200,6 +200,7 @@ projects: mediawiki/skins/Vector - mw-selenium publishers: + - mw-selenium-cleanup - localhost-cleanup - mw-teardown-mysql - archive-log-dir diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml index aad06d3..a692290 100644 --- a/jjb/ruby-jobs.yaml +++ b/jjb/ruby-jobs.yaml @@ -157,6 +157,7 @@ - mw-selenium-with-dir: tests-dir: '.' publishers: + - mw-selenium-cleanup - localhost-cleanup - mw-teardown-mysql - archive-log-dir diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 0484c69..e168a20 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2431,6 +2431,7 @@ - name: mediawiki/skins/Metrolook template: - name: composer-test + - name: extension-unittests-generic - name: npm check: - jsonlint -- To view, visit https://gerrit.wikimedia.org/r/226995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa33b2002e898d68fe78f236e225c6e4bac61679 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add release notes for version 3.0 - change (mediawiki...Math)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226998 Change subject: Add release notes for version 3.0 .. Add release notes for version 3.0 Add release note for math 3.0. Change-Id: I7cb0c3c03bc60de3b3503edeaf74d46f935ac581 --- D RELEASE-NOTES-2.0 A RELEASE-NOTES-3.0 M i18n/bs.json 3 files changed, 19 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/98/226998/1 diff --git a/RELEASE-NOTES-2.0 b/RELEASE-NOTES-2.0 deleted file mode 100644 index 43bf86c..000 --- a/RELEASE-NOTES-2.0 +++ /dev/null @@ -1,14 +0,0 @@ -== Math 2.0 == - -THIS IS NOT A RELEASE YET - -Math 2.0 is an alpha-quality branch and is not recommended for use in -production. - -=== Configuration changes in 2.0 === -* $wgLaTeXMLUrl was renamed to $wgMathLaTeXMLUrl -* $wgLaTeXMLTimeout was renamed to $wgMathLaTeXMLTimeout -* $wgMathValidModes is introduced: - It determines the selectable math rendering modes MW_MATH_(PNG|MATHML|...) in user preferences. -* $wgUseLaTeXML becomes unnecessary use $wgMathValidModes[] = MW_MATH_LATEXML; - to enable the LaTeXML rendering mode. diff --git a/RELEASE-NOTES-3.0 b/RELEASE-NOTES-3.0 new file mode 100644 index 000..0b7b041 --- /dev/null +++ b/RELEASE-NOTES-3.0 @@ -0,0 +1,15 @@ +== Math 3.0 == + +Math 3.0 is an stable-quality branch and is recommended for use in +production. + +=== Configuration changes in 3.0 === + + +=== New features in 3.0 === +* (T87941) Add extension.json, empty php entry point. +* (T106631,T88324) Convert the math integer constants to string constants. +* (T106630) Rename constants. +* (T99369) Remove client-side MathJax support. + +=== Bug fixes in 3.0 === \ No newline at end of file diff --git a/i18n/bs.json b/i18n/bs.json index c27748a..d21f58a 100644 --- a/i18n/bs.json +++ b/i18n/bs.json @@ -2,7 +2,8 @@ "@metadata": { "authors": [ "CERminator", - "Semso98" + "Semso98", + "Srdjan m" ] }, "math_bad_output": "Ne može se napisati ili napraviti direktorijum za matematični izvještaj.", @@ -16,8 +17,9 @@ "math_tip": "Matematička formula (LaTeX)", "math_unknown_error": "nepoznata greška", "math_unknown_function": "nepoznata funkcija \"$1\"", + "mw_math_mathjax": "Klijentni MathJax (spor; poboljšava prikaz na nekim preglednicima i pristupačnim alatima)", "mw_math_mathml": "MathML sa SVG ili PNG rezervom (preporučuje se za moderne preglednike i alate pristupačnosti)", "mw_math_png": "PNG slike", "mw_math_source": "TeX izvor (za tekstualne preglednike)", - "prefs-math": "Prikazivanje matematike" + "prefs-math": "Matematika" } -- To view, visit https://gerrit.wikimedia.org/r/226998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7cb0c3c03bc60de3b3503edeaf74d46f935ac581 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up Apex skin - change (mediawiki...apex)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227064 Change subject: Clean up Apex skin .. Clean up Apex skin * Cleans up code in apex skin to match some of vector which this skin is based on. Includes two new configs to enable or disable watch icon and the search bar with an icon instead of button. Adds two missing files. Add search icon in svg format too. Change-Id: If89ce311e26751511fc4285f3f836fed1a57a686 --- M ApexTemplate.php M SkinApex.php A csshover.htc A csshover.min.htc A hooks.txt A i18n/pt.json M i18n/qqq.json R resources/images/icons/search-ltr.png A resources/images/icons/search-ltr.svg A resources/images/icons/search-rtl.png A resources/images/icons/search-rtl.svg M resources/screen-narrow.css M resources/screen.css M skin.json 14 files changed, 591 insertions(+), 148 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex refs/changes/64/227064/1 diff --git a/ApexTemplate.php b/ApexTemplate.php index 23b673c..f8e19fc 100644 --- a/ApexTemplate.php +++ b/ApexTemplate.php @@ -16,12 +16,18 @@ // Build additional attributes for navigation urls $nav = $this->data['content_navigation']; - $mode = $this->getSkin()->getUser()->isWatched( $this->getSkin()->getRelevantTitle() ) ? - 'unwatch' : 'watch'; - if ( isset( $nav['actions'][$mode] ) ) { - $nav['views'][$mode] = $nav['actions'][$mode]; - $nav['views'][$mode]['primary'] = true; - unset( $nav['actions'][$mode] ); + + if ( $this->config->get( 'ApexUseIconWatch' ) ) { + $mode = $this->getSkin()->getUser()->isWatched( $this->getSkin()->getRelevantTitle() ) + ? 'unwatch' + : 'watch'; + + if ( isset( $nav['actions'][$mode] ) ) { + $nav['views'][$mode] = $nav['actions'][$mode]; + $nav['views'][$mode]['class'] = rtrim( 'icon ' . $nav['views'][$mode]['class'], ' ' ); + $nav['views'][$mode]['primary'] = true; + unset( $nav['actions'][$mode] ); + } } // TODO: Move defining the logo path to a resource loader module with media queries to add @@ -69,47 +75,83 @@ $this->data['personal_urls'] = array_reverse( $this->data['personal_urls'] ); } + + $this->data['pageLanguage'] = + $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode(); + // Output HTML Page $this->html( 'headelement' ); -?> + ?> - + - html( 'userlangattributes' ) ?>> - data['sitenotice'] ): ?> - html( 'sitenotice' ) ?> - - html( 'title' ) ?> - - data['isarticle'] ): ?> - msg( 'tagline' ) ?> - - html( 'userlangattributes' ) ?>>html( 'subtitle' ) ?> - data['undelete'] ): ?> - html( 'undelete' ) ?> - - data['newtalk'] ): ?> - html( 'newtalk' ) ?> - - data['showjumplinks'] ): ?> + + data['sitenotice'] ) { + ?> + html( 'sitenotice' ) ?> + + data['title'] != '' ) { + ?> + html( 'title' ) + ?> + + html( 'prebodyhtml' ) ?> + + data['isarticle'] ) { + ?> + msg( 'tagline' ) ?> + + html( 'userlangattributes' ) ?>>html( 'subtitle' ) + ?> + data['undelete'] ) { + ?> + ht
[MediaWiki-commits] [Gerrit] Fix toc - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227170 Change subject: Fix toc .. Fix toc Bug: T105800 Change-Id: I1e7006a8ecbfe7bedfb06d9ea22bc8295b477ebe --- M components/common.less M components/mobile.less M components/navigation.less M components/personalMenu.less M components/tablet.less M i18n/vi.json 6 files changed, 22 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/70/227170/1 diff --git a/components/common.less b/components/common.less index 9908798..b1ab55a 100644 --- a/components/common.less +++ b/components/common.less @@ -111,7 +111,7 @@ color: black; direction: ltr; height: auto; - position: absolute; + position: relative; bottom: 0; right: 0; left: 0; @@ -321,4 +321,4 @@ .spacer { word-spacing: 4px; -} \ No newline at end of file +} diff --git a/components/mobile.less b/components/mobile.less index faf47d5..d1bda8c 100644 --- a/components/mobile.less +++ b/components/mobile.less @@ -9,7 +9,7 @@ } div#mw-head { - position: absolute; + position: fixed; top: 0; min-width: 97%; diff --git a/components/navigation.less b/components/navigation.less index 25b4338..7309884 100644 --- a/components/navigation.less +++ b/components/navigation.less @@ -23,7 +23,10 @@ /* This image is only a fallback (for IE 6-9), so we do not @embed it. */ background-image: url('images/page-fade.png'); .vertical-gradient(#CF8B54, #CF8B54, 50%, 100%); - min-width: auto; + min-width: 100%; + position: fixed; + top: 0px; + z-index: 1; } #mw-head-base { @@ -34,12 +37,14 @@ background-image: url(images/border.png); background-position: bottom left; background-repeat: repeat-x; + position: fixed; } div#mw-head { - position: absolute; + position: fixed; top: 0; min-width: 100%; + z-index: 1; h5 { margin: 0; @@ -102,7 +107,7 @@ /* Panel */ div#mw-panel { font-size: @menu-main-font-size; - position: absolute; + position: fixed; top: 40px; bottom: 0px; height: auto; @@ -177,7 +182,7 @@ /* Panel */ div#mw-panel-custom { font-size: @menu-main-font-size; - position: absolute; + position: fixed; top: 40px; bottom: 0; height: auto; diff --git a/components/personalMenu.less b/components/personalMenu.less index 221f207..73986b2 100644 --- a/components/personalMenu.less +++ b/components/personalMenu.less @@ -112,4 +112,4 @@ top: 40px; right: 0px; width: 200px; -} \ No newline at end of file +} diff --git a/components/tablet.less b/components/tablet.less index 6771876..3609034 100644 --- a/components/tablet.less +++ b/components/tablet.less @@ -34,7 +34,7 @@ div#mw-panel { font-size: @menu-main-font-size; - position: absolute; + position: fixed; top: 40px; bottom: 0; height: auto; @@ -107,7 +107,7 @@ div#mw-panel-custom { font-size: @menu-main-font-size; - position: absolute; + position: fixed; top: 40px; bottom: 0; height: auto; @@ -193,7 +193,7 @@ color: black; direction: ltr; height: auto; - position: absolute; + position: fixed; bottom: 0; right: 0em; left: 0; @@ -287,9 +287,8 @@ } div#mw-head { - position: absolute; + position: fixed; top: 0; - min-width: 99%; h5 { margin: 0; @@ -304,7 +303,6 @@ background-repeat: repeat-x; /* This image is only a fallback (for IE 6-9), so we do not @embed it. */ background-image: url('images/page-fade.png'); - min-width: 62em; } #p-search { @@ -367,7 +365,7 @@ div#mw-panel { font-size: @menu-main-font-size; - position: absolute; + position: fixed; top: 40px; bottom: 0; height: auto; @@ -440,7 +438,7 @@ div#mw-panel-custom { font-size: @menu-main-font-size; - position: absolute; + position: fixed; top: 40px; bottom: 0; height: auto; @@ -526,7 +524,7 @@ color: black; direction: ltr; height: auto; - position: absolute; + position: fixed; bottom: 0; right: 0; left: 0; @@ -620,9 +618,8 @@ } div#mw-head { - position: absolute; + position: fixed; top: 0; - min-width: 92.750%; h5 { margin: 0; diff --git a/i18n/vi.json b/i18n/vi.json index 58e199f..570cc7b 100644 --- a/i18n/vi.json +++ b/i18n/vi.json @@ -4,6 +4,7 @@ "Minh Nguyen" ] }, + "skinmetrolook-collapsiblenav-prefe
[MediaWiki-commits] [Gerrit] Clean up Apex skin - change (mediawiki...apex)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227212 Change subject: Clean up Apex skin .. Clean up Apex skin * Cleans up code in apex skin to match some of vector which this skin is * based on. Includes two new configs to enable or disable watch icon and the search bar with an icon instead of button. Adds two missing files. Add search icon in svg format too. Convert css to less Add some svg images Fixes login and create account was hidden with this patch it is un hidden. Updated the personal menu so when your logged out it shows The name as guest which should fix login in and creating account issue. Change-Id: I9aca5319ee9bee1e069fa7f0ce83c70e1a381c7a --- M ApexTemplate.php M SkinApex.php A csshover.htc A csshover.min.htc A hooks.txt A i18n/de.json M i18n/en.json A i18n/es.json A i18n/ksh.json A i18n/lb.json A i18n/mk.json A i18n/my.json A i18n/pl.json M i18n/qqq.json A i18n/ro.json A i18n/ru.json A i18n/shn.json A i18n/vi.json A i18n/zh-hans.json A images/bullet-icon.png A images/bullet-icon.svg R images/menu-hover.png R images/menu.png R images/nav-hover.png R images/nav.png R images/search-ltr.png A images/search-ltr.svg A images/search-rtl.png A images/search-rtl.svg R images/talk.png R images/toc-hover.png R images/toc.png A images/unwatch-icon-hl.png A images/unwatch-icon-hl.svg A images/unwatch-icon.png A images/unwatch-icon.svg A images/user-icon.png A images/user-icon.svg R images/user.png A images/watch-icon-hl.png A images/watch-icon-hl.svg A images/watch-icon-loading.png A images/watch-icon-loading.svg A images/watch-icon.png A images/watch-icon.svg D resources/images/icons/watch-loading.gif D resources/images/icons/watch.png R resources/screen-narrow.less R resources/screen-wide.less R resources/screen.less M skin.json 51 files changed, 1,128 insertions(+), 290 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex refs/changes/12/227212/1 diff --git a/ApexTemplate.php b/ApexTemplate.php index 23b673c..48faf0e 100644 --- a/ApexTemplate.php +++ b/ApexTemplate.php @@ -14,12 +14,18 @@ public function execute() { global $wgSitename, $wgApexLogo, $wgStylePath; + $skin = $this->getSkin(); + // Build additional attributes for navigation urls $nav = $this->data['content_navigation']; - $mode = $this->getSkin()->getUser()->isWatched( $this->getSkin()->getRelevantTitle() ) ? - 'unwatch' : 'watch'; + + $mode = $this->getSkin()->getUser()->isWatched( $this->getSkin()->getRelevantTitle() ) + ? 'unwatch' + : 'watch'; + if ( isset( $nav['actions'][$mode] ) ) { $nav['views'][$mode] = $nav['actions'][$mode]; + $nav['views'][$mode]['class'] = rtrim( 'icon ' . $nav['views'][$mode]['class'], ' ' ); $nav['views'][$mode]['primary'] = true; unset( $nav['actions'][$mode] ); } @@ -69,55 +75,136 @@ $this->data['personal_urls'] = array_reverse( $this->data['personal_urls'] ); } + + $this->data['pageLanguage'] = + $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode(); + + + // User name (or "Guest") to be displayed at the top right (on LTR + // interfaces) portion of the skin + $user = $skin->getUser(); + if ( !$user->isLoggedIn() ) { + $userNameTop = $skin->msg( 'apex-guest' )->text(); + } else { + $userNameTop = htmlspecialchars( $user->getName(), ENT_QUOTES ); + } + // Output HTML Page $this->html( 'headelement' ); -?> + ?> - + - html( 'userlangattributes' ) ?>> - data['sitenotice'] ): ?> - html( 'sitenotice' ) ?> - - html( 'title' ) ?> - - data['isarticle'] ): ?> - msg( 'tagline' ) ?> - - html( 'userlangattributes' ) ?>>html( 'subtitle' ) ?> - data['undelete'] ): ?> - html( 'undelete' ) ?> - - data['newtalk'] ): ?> - html( 'newtalk' ) ?> - -
[MediaWiki-commits] [Gerrit] Add BlogPage to testextension - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227217 Change subject: Add BlogPage to testextension .. Add BlogPage to testextension The extension was already running it but failing. Please see https://integration.wikimedia.org/ci/job/mwext-testextension-zend/5409/console and https://integration.wikimedia.org/ci/job/mwext-testextension-zend/5408/console Change-Id: I315f11a1e9922b59d2da7c0f110e705b6ec859eb --- M jjb/mediawiki-extensions.yaml M zuul/layout.yaml 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/17/227217/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 7ea3290..1d0789d 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -428,6 +428,7 @@ - BayesianFilter - BlameMaps - BlockAndNuke + - BlogPage - BlueSpiceExtensions - BookManager - Bootstrap diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 0484c69..cdc2fae 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6531,6 +6531,9 @@ experimental: - mathoid-deploy-npm + - name: mediawiki/services/mobileapps +template: + - name: npm - name: mediawiki/services/parsoid check: -- To view, visit https://gerrit.wikimedia.org/r/227217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I315f11a1e9922b59d2da7c0f110e705b6ec859eb Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prefix files with extension name - change (mediawiki...BlogPage)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227220 Change subject: Prefix files with extension name .. Prefix files with extension name * Test fails because BlogPgae is a class not main php file. This fixes test. Change-Id: If49308f52cbaacbb5417842b680669f43f512fb6 --- D Blog.php R BlogPage.alias.php R BlogPage.namespaces.php M BlogPage.php A BlogPageClass.php R BlogPageHooks.php M i18n/en.json M i18n/fi.json 8 files changed, 1,391 insertions(+), 1,389 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlogPage refs/changes/20/227220/1 diff --git a/Blog.php b/Blog.php deleted file mode 100644 index a5f1062..000 --- a/Blog.php +++ /dev/null @@ -1,145 +0,0 @@ - - * @author Jack Phoenix - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later - * @link https://www.mediawiki.org/wiki/Extension:BlogPage Documentation - */ -if ( !defined( 'MEDIAWIKI' ) ) { - die(); -} - -// Extension credits that will show up on Special:Version -$wgExtensionCredits['other'][] = array( - 'name' => 'BlogPage', - 'version' => '2.3', - 'author' => array( 'David Pean', 'Jack Phoenix' ), - 'descriptionmsg' => 'blogpage-desc', - 'url' => 'https://www.mediawiki.org/wiki/Extension:BlogPage', -); - -// Define the namespace constants -define( 'NS_BLOG', 500 ); -define( 'NS_BLOG_TALK', 501 ); - -// ResourceLoader support for MediaWiki 1.17+ -$blogResourceTemplate = array( - 'localBasePath' => __DIR__, - 'remoteExtPath' => 'BlogPage' -); - -// Main module, used on *all* blog pages (see the hooks file) -$wgResourceModules['ext.blogPage'] = $blogResourceTemplate + array( - 'styles' => 'resources/css/BlogPage.css', - 'position' => 'top' -); - -// Used on Special:ArticlesHome & Special:ArticleLists -$wgResourceModules['ext.blogPage.articlesHome'] = $blogResourceTemplate + array( - 'styles' => 'resources/css/ArticlesHome.css', - 'position' => 'top' -); - -// Used on Special:CreateBlogPost -$wgResourceModules['ext.blogPage.create.css'] = $blogResourceTemplate + array( - 'styles' => 'resources/css/CreateBlogPost.css', - 'position' => 'top' -); - -$wgResourceModules['ext.blogPage.create.js'] = $blogResourceTemplate + array( - 'scripts' => 'resources/js/CreateBlogPost.js', - // 'dependencies' => 'mediawiki.action.edit', - 'messages' => array( - 'blog-js-create-error-need-content', 'blog-js-create-error-need-title', - 'blog-js-create-error-page-exists' - ) -); - -// Default setup for displaying sections -$wgBlogPageDisplay = array( - // Output the left-hand column? This column contains the list of authors, - // recent editors (if enabled), recent voters (if enabled), embed widget - // (if enabled) and left-side advertisement (if enabled). - 'leftcolumn' => true, - // Output the right-hand column? This column contains the list of popular - // blog articles (if enabled), in the news section (if enabled), comments - // of the day (if enabled), a random casual game (if enabled) and a list of - // new blog articles. - 'rightcolumn' => true, - // Display the box that contains some information about the author of the - // blog post? - 'author' => true, - // Display some (three, to be exact) other blog articles written by the - // same user? - 'author_articles' => true, - // Display a list of people (complete with their avatars) who recently - // edited this blog post? - 'recent_editors' => true, - // Display a list of people (complete with their avatars) who recently - // voted for this blog post? - 'recent_voters' => true, - // Show an advertisement in the left-hand column? - 'left_ad' => false, - // Show a listing of the most popular blog posts? - 'popular_articles' => true, - // Should we display some random news items from [[MediaWiki:Inthenews]]? - 'in_the_news' => true, - // Show comments of the day (comments with the most votes) in the sidebar - // on a blog post page? - 'comments_of_day' => true, - // Display a random casual game (picture game, poll or quiz)? - // Requires the RandomGameUnit extension. - 'games' => true, - // Show a listing of the newest blog posts in blog pages? - 'new_articles' => true, - // Display the widget that allows you to embed the blog post on another - // site? Off by default since it requires the ContentWidget extension, - // which is currently ArmchairGM-specific. - 'embed_widget' => false -); - -// Set up everything -$wgMessagesDirs['Blog'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['BlogAlias'] = __DIR__ . '/Blog.alias.php'; -// Namespace translations -$wgExtensionMes
[MediaWiki-commits] [Gerrit] Update .gitreview project link - change (mediawiki...BlogPage)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227221 Change subject: Update .gitreview project link .. Update .gitreview project link Updates project link in .gitreview. Matches most repos on wikimedia git that have .git in there project link. Change-Id: I2ef24c9bf6a95611cf31fb6d34e90cf7367fa6af --- M .gitreview M i18n/en.json M i18n/fi.json 3 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlogPage refs/changes/21/227221/1 diff --git a/.gitreview b/.gitreview index 2b30b85..0d37a47 100644 --- a/.gitreview +++ b/.gitreview @@ -1,6 +1,6 @@ [gerrit] host=gerrit.wikimedia.org port=29418 -project=mediawiki/extensions/BlogPage +project=mediawiki/extensions/BlogPage.git defaultbranch=master defaultrebase=0 \ No newline at end of file diff --git a/i18n/en.json b/i18n/en.json index 6232fac..7ac38d5 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -65,6 +65,7 @@ "blog-time-hours": "{{PLURAL:$1|one hour|$1 hours}}", "blog-time-minutes": "{{PLURAL:$1|one minute|$1 minutes}}", "blog-time-seconds": "{{PLURAL:$1|one second|$1 seconds}}", + "action-createblogpost": "create new blog posts", "right-createblogpost": "[[Special:CreateBlogPost|Create new blog posts]]", "blog-user-articles-title": "Blogs", "blog-user-articles-votes": "{{PLURAL:$1|one vote|$1 votes}}", diff --git a/i18n/fi.json b/i18n/fi.json index 0667bb5..95a5386 100644 --- a/i18n/fi.json +++ b/i18n/fi.json @@ -61,6 +61,7 @@ "blog-js-create-error-need-content": "Blogikirjoituksellasi tulee olla myös sisältöä!", "blog-js-create-error-need-title": "Sinun tulee antaa otsikko blogikirjoituksellesi!", "blog-js-create-error-page-exists": "Olemassaolevalla blogikirjoituksella on jo sama otsikko. Annathan erilaisen otsikon blogikirjoituksellesi.", + "action-createblogpost": "luoda uusia blogikirjoituksia", "right-createblogpost": "[[Special:CreateBlogPost|Luoda uusia blogikirjoituksia]]", "blog-user-articles-title": "Blogit", "blog-user-articles-votes": "{{PLURAL:$1|yksi ääni|$1 ääntä}}", -- To view, visit https://gerrit.wikimedia.org/r/227221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ef24c9bf6a95611cf31fb6d34e90cf7367fa6af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlogPage Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix using GLOBALS in database updater - change (mediawiki/core)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227238 Change subject: Fix using GLOBALS in database updater .. Fix using GLOBALS in database updater Some extension use GLOBALS. And those that use composer.json this patch fixes it. Change-Id: I460e0e899e2905387b1a3c2c0d00d182144bcbd4 --- M includes/installer/DatabaseUpdater.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/38/227238/1 diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php index 702f850..d4c4057 100644 --- a/includes/installer/DatabaseUpdater.php +++ b/includes/installer/DatabaseUpdater.php @@ -148,11 +148,12 @@ if ( !$vars ) { return; // no LocalSettings found } - if ( !isset( $vars['wgHooks'] ) || !isset( $vars['wgHooks']['LoadExtensionSchemaUpdates'] ) ) { + if ( !isset( $vars['wgHooks'] ) || !isset( $vars['wgHooks']['LoadExtensionSchemaUpdates'] ) || $GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'] ) { return; } global $wgHooks, $wgAutoloadClasses; $wgHooks['LoadExtensionSchemaUpdates'] = $vars['wgHooks']['LoadExtensionSchemaUpdates']; + $GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'] = $GLOBALS['wgHooks']['LoadExtensionSchemaUpdates']; $wgAutoloadClasses = $wgAutoloadClasses + $vars['wgAutoloadClasses']; } -- To view, visit https://gerrit.wikimedia.org/r/227238 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I460e0e899e2905387b1a3c2c0d00d182144bcbd4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Read extension.json files in the web updater - change (mediawiki/core)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227240 Change subject: Read extension.json files in the web updater .. Read extension.json files in the web updater The web updater reads LocalSettings.php in function scope to figure out what extensions have been loaded. This doesn't work for extensions being loaded through the ExtensionRegistry since they're only added to a queue. This adds the ability for the installer to read and get information from the current extension load queue. LocalSettings.php is still read for extensions that have not been converted yet. Other uses of Installer::getExistingLocalSettings() were audited and determined to be safe with regards to extension usage. Extensions that register hooks using explicit globals ($GLOBALS['wgHooks']['FooBar']) are still broken. Bug: T100414 Change-Id: Icc574a38a7947a1e3aff8622a4889e9dcfd7a4b2 --- M includes/installer/DatabaseUpdater.php M includes/registration/ExtensionRegistry.php 2 files changed, 35 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/40/227240/1 diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php index 702f850..7070790 100644 --- a/includes/installer/DatabaseUpdater.php +++ b/includes/installer/DatabaseUpdater.php @@ -145,15 +145,26 @@ return; // already loaded } $vars = Installer::getExistingLocalSettings(); - if ( !$vars ) { - return; // no LocalSettings found + + $registry = ExtensionRegistry::getInstance(); + $queue = $registry->getQueue(); + // Don't accidentally load extensions in the future + $registry->clearQueue(); + + // This will automatically add "AutoloadClasses" to $wgAutoloadClasses + $data = $registry->readFromQueue( $queue ); + $hooks = array( 'wgHooks' => array( 'LoadExtensionSchemaUpdates' => array() ) ); + if ( isset( $data['globals']['wgHooks']['LoadExtensionSchemaUpdates'] ) ) { + $hooks = $data['globals']['wgHooks']['LoadExtensionSchemaUpdates']; } - if ( !isset( $vars['wgHooks'] ) || !isset( $vars['wgHooks']['LoadExtensionSchemaUpdates'] ) ) { - return; + if ( $vars && isset( $vars['wgHooks']['LoadExtensionSchemaUpdates'] ) ) { + $hooks = array_merge_recursive( $hooks, $vars['wgHooks']['LoadExtensionSchemaUpdates'] ); } global $wgHooks, $wgAutoloadClasses; - $wgHooks['LoadExtensionSchemaUpdates'] = $vars['wgHooks']['LoadExtensionSchemaUpdates']; - $wgAutoloadClasses = $wgAutoloadClasses + $vars['wgAutoloadClasses']; + $wgHooks['LoadExtensionSchemaUpdates'] = $hooks; + if ( $vars && isset( $vars['wgAutoloadClasses'] ) ) { + $wgAutoloadClasses += $vars['wgAutoloadClasses']; + } } /** diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php index 0cdb2c1..4e690aa 100644 --- a/includes/registration/ExtensionRegistry.php +++ b/includes/registration/ExtensionRegistry.php @@ -109,6 +109,24 @@ } /** +* Get the current load queue. Not intended to be used +* outside of the installer. +* +* @return array +*/ + public function getQueue() { + return $this->queued; + } + + /** +* Clear the current load queue. Not intended to be used +* outside of the installer. +*/ + public function clearQueue() { + $this->queued = array(); + } + + /** * Process a queue of extensions and return their extracted data * * @param array $queue keys are filenames, values are ignored -- To view, visit https://gerrit.wikimedia.org/r/227240 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc574a38a7947a1e3aff8622a4889e9dcfd7a4b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox Gerrit-Reviewer: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re enable translations for WikidataPageBanner extension - change (translatewiki)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227253 Change subject: Re enable translations for WikidataPageBanner extension .. Re enable translations for WikidataPageBanner extension I have updated all the json i18n files. Change-Id: I1f72e8b80b6a79d922faed3bac3424fbc3a89412 --- M groups/MediaWiki/mediawiki-extensions.txt M groups/MediaWiki/mediawiki-skins.txt 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/53/227253/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 246f60a..13c60ba 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2494,8 +2494,7 @@ #Wikidata Entity Suggester / No real extension, Java program -# Only with boilerplate messages - 2015-04-27 -# Wikidata Page Banner +Wikidata Page Banner Wikibase Quality aliasfile = WikibaseQuality/WikibaseQuality.alias.php diff --git a/groups/MediaWiki/mediawiki-skins.txt b/groups/MediaWiki/mediawiki-skins.txt index 35595ce..b5f5ee1 100644 --- a/groups/MediaWiki/mediawiki-skins.txt +++ b/groups/MediaWiki/mediawiki-skins.txt @@ -1,4 +1,5 @@ apex +optional = skinname-apex, apex.css, apex.js # qqq missing #Blue Sky -- To view, visit https://gerrit.wikimedia.org/r/227253 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f72e8b80b6a79d922faed3bac3424fbc3a89412 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump grunt-banana-checker to 0.2.2 - change (mediawiki...WikidataPageBanner)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227429 Change subject: Bump grunt-banana-checker to 0.2.2 .. Bump grunt-banana-checker to 0.2.2 Change-Id: Ibba426fc1d16fa5fdeaf3dab8c29369c3d7e2761 --- A i18n/de.json A i18n/es.json M i18n/qqq.json M package.json 4 files changed, 21 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner refs/changes/29/227429/1 diff --git a/i18n/de.json b/i18n/de.json new file mode 100644 index 000..e662c51 --- /dev/null +++ b/i18n/de.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Metalhead64" + ] + }, + "wikidatapagebanner-extname": "WikidataPageBanner", + "wikidatapagebanner-desc": "Rendert Banner auf angegebenen Wikiseiten am Artikelanfang" +} diff --git a/i18n/es.json b/i18n/es.json new file mode 100644 index 000..0d3478a --- /dev/null +++ b/i18n/es.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Macofe" + ] + }, + "wikidatapagebanner-extname": "WikidataPageBanner", + "wikidatapagebanner-desc": "Despliega pancartas en páginas especificadas del wiki, al principio de los artículos" +} diff --git a/i18n/qqq.json b/i18n/qqq.json index b3061d4..8f1f695 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -1,7 +1,5 @@ { - "@metadata": { - "authors": [] - }, + "@metadata": [], "wikidatapagebanner-extname": "Used for the name of extension.", "wikidatapagebanner-desc": "{{desc|name=WikidataPageBanner|url=https://www.mediawiki.org/wiki/Extension:WikidataPageBanner}}"; -} \ No newline at end of file +} diff --git a/package.json b/package.json index c14a4cb..16d4081 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "devDependencies": { "grunt": "0.4.5", "grunt-cli": "0.1.13", -"grunt-banana-checker": "0.2.1", +"grunt-banana-checker": "0.2.2", "grunt-contrib-jshint": "0.11.2" } } -- To view, visit https://gerrit.wikimedia.org/r/227429 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibba426fc1d16fa5fdeaf3dab8c29369c3d7e2761 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataPageBanner Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add jsonlint to grunt - change (mediawiki...WikidataPageBanner)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227430 Change subject: Add jsonlint to grunt .. Add jsonlint to grunt Adds jsonlint to grunt Change-Id: Ibfedfe05eb1b1ff5ce647ea3dc95498753ca0b5d --- A .jshintrc M Gruntfile.js A i18n/de.json A i18n/es.json M i18n/qqq.json M package.json 6 files changed, 67 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner refs/changes/30/227430/1 diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 000..82721ad --- /dev/null +++ b/.jshintrc @@ -0,0 +1,19 @@ +{ + // Enforcing + "bitwise": true, + "eqeqeq": true, + "freeze": true, + "latedef": true, + "noarg": true, + "nonew": true, + "undef": true, + "unused": false, + "strict": false, + + // Relaxing + "es5": false, + + // Environment + "browser": true, + "jquery": true +} diff --git a/Gruntfile.js b/Gruntfile.js index dba7fa6..1e63211 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,22 +1,28 @@ module.exports = function ( grunt ) { - grunt.loadNpmTasks( 'grunt-banana-checker' ); - grunt.loadNpmTasks( 'grunt-contrib-jshint' ); + grunt.loadNpmTasks( 'grunt-contrib-jshint' ); + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); - grunt.initConfig( { -jshint: { - options: { -jshintrc: true - }, - all: [ -'Gruntfile.js', -'resources', - ], -}, -banana: { - all: 'i18n/' -}, - } ); + grunt.initConfig( { + jshint: { + options: { + jshintrc: true + }, + all: [ + '*.js' + ] + }, + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**' + ] + } + } ); - grunt.registerTask( 'test', [ 'jshint', 'banana' ] ); - grunt.registerTask( 'default', 'test' ); + grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); }; diff --git a/i18n/de.json b/i18n/de.json new file mode 100644 index 000..e662c51 --- /dev/null +++ b/i18n/de.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Metalhead64" + ] + }, + "wikidatapagebanner-extname": "WikidataPageBanner", + "wikidatapagebanner-desc": "Rendert Banner auf angegebenen Wikiseiten am Artikelanfang" +} diff --git a/i18n/es.json b/i18n/es.json new file mode 100644 index 000..0d3478a --- /dev/null +++ b/i18n/es.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Macofe" + ] + }, + "wikidatapagebanner-extname": "WikidataPageBanner", + "wikidatapagebanner-desc": "Despliega pancartas en páginas especificadas del wiki, al principio de los artículos" +} diff --git a/i18n/qqq.json b/i18n/qqq.json index b3061d4..8f1f695 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -1,7 +1,5 @@ { - "@metadata": { - "authors": [] - }, + "@metadata": [], "wikidatapagebanner-extname": "Used for the name of extension.", "wikidatapagebanner-desc": "{{desc|name=WikidataPageBanner|url=https://www.mediawiki.org/wiki/Extension:WikidataPageBanner}}"; -} \ No newline at end of file +} diff --git a/package.json b/package.json index c14a4cb..0d58125 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,9 @@ "devDependencies": { "grunt": "0.4.5", "grunt-cli": "0.1.13", -"grunt-banana-checker": "0.2.1", -"grunt-contrib-jshint": "0.11.2" +"grunt-contrib-jshint": "0.11.2", +"grunt-banana-checker": "0.2.2", +"grunt-jsonlint": "1.0.4" } } + -- To view, visit https://gerrit.wikimedia.org/r/227430 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfedfe05eb1b1ff5ce647ea3dc95498753ca0b5d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataPageBanner Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move php code sniffer from composer.json to phpcs.xml file - change (mediawiki...WikidataPageBanner)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227431 Change subject: Move php code sniffer from composer.json to phpcs.xml file .. Move php code sniffer from composer.json to phpcs.xml file Change-Id: Ib1d01ba7112b8c5511405a577c9c950d5f69084d --- M composer.json A i18n/de.json A i18n/es.json M i18n/qqq.json A phpcs.xml 5 files changed, 28 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner refs/changes/31/227431/1 diff --git a/composer.json b/composer.json index 7dd4cd9..6bc638e 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "scripts": { "test": [ "parallel-lint . --exclude vendor", - "phpcs --standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki --extensions=php,php5,inc --ignore=vendor -p ." + "phpcs -p" ] } } diff --git a/i18n/de.json b/i18n/de.json new file mode 100644 index 000..e662c51 --- /dev/null +++ b/i18n/de.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Metalhead64" + ] + }, + "wikidatapagebanner-extname": "WikidataPageBanner", + "wikidatapagebanner-desc": "Rendert Banner auf angegebenen Wikiseiten am Artikelanfang" +} diff --git a/i18n/es.json b/i18n/es.json new file mode 100644 index 000..0d3478a --- /dev/null +++ b/i18n/es.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Macofe" + ] + }, + "wikidatapagebanner-extname": "WikidataPageBanner", + "wikidatapagebanner-desc": "Despliega pancartas en páginas especificadas del wiki, al principio de los artículos" +} diff --git a/i18n/qqq.json b/i18n/qqq.json index b3061d4..8f1f695 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -1,7 +1,5 @@ { - "@metadata": { - "authors": [] - }, + "@metadata": [], "wikidatapagebanner-extname": "Used for the name of extension.", "wikidatapagebanner-desc": "{{desc|name=WikidataPageBanner|url=https://www.mediawiki.org/wiki/Extension:WikidataPageBanner}}"; -} \ No newline at end of file +} diff --git a/phpcs.xml b/phpcs.xml new file mode 100644 index 000..cb19440 --- /dev/null +++ b/phpcs.xml @@ -0,0 +1,7 @@ + + + + . + + vendor + -- To view, visit https://gerrit.wikimedia.org/r/227431 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1d01ba7112b8c5511405a577c9c950d5f69084d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikidataPageBanner Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update HitCounters tests - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227438 Change subject: Update HitCounters tests .. Update HitCounters tests Add jsonlint test. Add npm test. Adds extension-unittests-generic test Adds jshint test. ( there is no js file in this repo but when someone adds a js file this test will run. ) Change-Id: Ia58bf3d500e334d27a54e922099794063ea0568a --- M zuul/layout.yaml 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/38/227438/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index cdc2fae..22dfa63 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5946,7 +5946,7 @@ - name: mediawiki/extensions/UrlShortener template: - - name: extension-jslint + - name: npm - name: extension-unittests-generic - name: mediawiki/extensions/URNames @@ -6247,7 +6247,12 @@ - name: mediawiki/extensions/HitCounters template: - - name: mw-checks + - name: composer-test + - name: extension-unittests-generic + - name: npm +check: + - jsonlint + - jshint - name: mediawiki/extensions/Html2Wiki template: -- To view, visit https://gerrit.wikimedia.org/r/227438 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia58bf3d500e334d27a54e922099794063ea0568a Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update HitCounters extension tests - change (mediawiki...HitCounters)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227439 Change subject: Update HitCounters extension tests .. Update HitCounters extension tests Add jsonlint test Add banana check Add composer.json. ( I will do a follow up with php code sniffer ). Adds package.json Requires https://gerrit.wikimedia.org/r/#/c/227438/ Change-Id: I395203bfdaeb7b286cd5666cbb9e82d993a16aec --- A Gruntfile.js A composer.json A i18n/fr.json M i18n/zh-hant.json A package.json 5 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HitCounters refs/changes/39/227439/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..6e443b1 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + var conf = grunt.file.readJSON( 'extension.json' ); + + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..7e86f90 --- /dev/null +++ b/composer.json @@ -0,0 +1,11 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } + +} diff --git a/i18n/fr.json b/i18n/fr.json new file mode 100644 index 000..a1d4df1 --- /dev/null +++ b/i18n/fr.json @@ -0,0 +1,16 @@ +{ + "@metadata": { + "authors": [ + "Wladek92" + ] + }, + "hitcounters-desc": "Fournit les statistiques de consultation par page", + "hitcounters-nviews": "$1 {{PLURAL:$1|consultation|consultations}}", + "popularpages": "Pages les plus populaires", + "hitcounters-pageinfo-views": "Nombre de consultations", + "hitcounters-statistics-header-views": "Statistiques des consultations", + "hitcounters-statistics-views-total": "Total des consultations", + "hitcounters-statistics-views-total-desc": "L'accès aux pages non existantes et aux pages spéciales ne sont pas inclus", + "hitcounters-statistics-views-peredit": "Nombre de consultations par édition", + "hitcounters-statistics-mostpopular": "Pages les plus consultées" +} diff --git a/i18n/zh-hant.json b/i18n/zh-hant.json index 766938b..b3779eb 100644 --- a/i18n/zh-hant.json +++ b/i18n/zh-hant.json @@ -4,8 +4,13 @@ "Cwlin0416" ] }, + "hitcounters-desc": "提供面個頁面的檢視統計資訊", + "hitcounters-nviews": "$1 次{{PLURAL:$1|檢視|檢視}}", "popularpages": "熱門頁面", "hitcounters-pageinfo-views": "檢視次數", + "hitcounters-statistics-header-views": "檢視統計資訊", "hitcounters-statistics-views-total": "檢視總計", + "hitcounters-statistics-views-total-desc": "檢視次數不包含不存在頁面與特殊頁面", + "hitcounters-statistics-views-peredit": "每次編輯檢視次數", "hitcounters-statistics-mostpopular": "被最多人檢查的頁面" } diff --git a/package.json b/package.json new file mode 100644 index 000..e74f430 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "0.4.5", +"grunt-cli": "0.1.13", +"grunt-banana-checker": "0.2.2", +"grunt-jsonlint": "1.0.4" + } +} -- To view, visit https://gerrit.wikimedia.org/r/227439 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I395203bfdaeb7b286cd5666cbb9e82d993a16aec Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/HitCounters Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump jscs version in package.json to 2.0.0 - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227494 Change subject: Bump jscs version in package.json to 2.0.0 .. Bump jscs version in package.json to 2.0.0 Change-Id: I6a95a950ceee0e7522436deaa0ac0abc1c3a5b91 --- M i18n/vi.json M package.json 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/94/227494/1 diff --git a/i18n/vi.json b/i18n/vi.json index 58e199f..570cc7b 100644 --- a/i18n/vi.json +++ b/i18n/vi.json @@ -4,6 +4,7 @@ "Minh Nguyen" ] }, + "skinmetrolook-collapsiblenav-preference": "Bật trình đơn chuyển hướng gấp lại được ở bên phải trong giao diện Metrolook", "metrolook-desc": "Giao diện Metrolook dành cho MediaWiki", "metrolook-guest": "Khách" } diff --git a/package.json b/package.json index 93beca9..7a6ece4 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "grunt-cli": "0.1.13", "grunt-contrib-jshint": "0.11.2", "grunt-banana-checker": "0.2.2", -"grunt-jscs": "1.8.0", +"grunt-jscs": "2.0.0", "grunt-jsonlint": "1.0.4" } } -- To view, visit https://gerrit.wikimedia.org/r/227494 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a95a950ceee0e7522436deaa0ac0abc1c3a5b91 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update i18n messages - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227498 Change subject: Update i18n messages .. Update i18n messages Fixes a sentance mistake. Add messages for metrolook.css and metrolook.js both optional. Change-Id: I56e782d85f1fbc1cc22af4ad3b7dd562b59fc8f0 --- M Gruntfile.js M i18n/en.json M i18n/qqq.json M package.json 4 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/98/227498/1 diff --git a/Gruntfile.js b/Gruntfile.js index abb41c9..32da573 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,10 +1,10 @@ /*jshint node:true */ module.exports = function ( grunt ) { + var conf = grunt.file.readJSON( 'skin.json' ); 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: { diff --git a/i18n/en.json b/i18n/en.json index 31bb273..7838ec0 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5,8 +5,10 @@ ] }, "skinname-metrolook": "Metrolook", - "skinmetrolook-collapsiblenav-preference": "Enable collapsing of items in the sidebar in Metrolook skin", "metrolook-desc": "Metrolook skin for MediaWiki", + "metrolook.css": "/* CSS placed here will affect users of the Metrolook skin */", + "metrolook.js": "/* Any JavaScript here will be loaded for users using the Metrolook skin */", + "skinmetrolook-collapsiblenav-preference": "Enable collapsing of items in the sidebar in Metrolook skin", "metrolook-guest": "Guest", "metrolook-tiles": "* http://www.pidgi.net/wiki/|PidgiWiki|http://images.pidgi.net/pidgiwikitiletop.png\n* http://www.pidgi.net/press/|PidgiWiki Press|http://images.pidgi.net/pidgipresstiletop.png\n* http://www.petalburgwoods.com/|Petalburg Woods|http://images.pidgi.net/pwntiletop.png\n* http://burstcade.pidgi.net/|Burstcade|http://images.pidgi.net/burstcadetiletop.png";, "metrolook-tiles-second": "" diff --git a/i18n/qqq.json b/i18n/qqq.json index 74886e4..36a492c 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -7,8 +7,10 @@ ] }, "skinname-metrolook": "{{optional}}", - "skinmetrolook-collapsiblenav-preference": "The message refers to the sidebar, whose sections a re collapsible in Metrolook skin (some of them collapsed by default and some no); the preference disables collapsing entirely and is among \"Advanced options\" in the \"Appearence\" section.", "metrolook-desc": "{{desc|name=Metrolook|url=https://www.mediawiki.org/wiki/Skin:Metrolook}}";, + "metrolook.css": "{{optional}}", + "metrolook.js": "{{optional}}", + "skinmetrolook-collapsiblenav-preference": "The message refers to the sidebar, whose sections are collapsible in Metrolook skin (some of them collapsed by default and some no); the preference disables collapsing entirely and is among \"Advanced options\" in the \"Appearence\" section.", "metrolook-guest": "Used for descbribing you as a guest editing the wiki.\n{{Identical|Guest}}", "metrolook-tiles": "Used to configure the first set of tiles, which are displayed when $wgMetrolookBartile is set to true.\nThe message's format is:\n\n* URL to the site|alternative text|image URL\n\nFor example:\n\n* http://www.pidgi.net/wiki/|PidgiWiki|http://images.pidgi.net/pidgiwikitiletop.png\n* http://www.pidgi.net/press/|PidgiWiki Press|http://images.pidgi.net/pidgipresstiletop.png\n* http://www.pidgi.net/jcc/|The JCC|http://images.pidgi.net/jcctiletop.png\n* http://www.petalburgwoods.com/|Petalburg Woods|http://images.pidgi.net/pwntiletop.png";, "metrolook-tiles-second": "Used to configure the second set of tiles, which are displayed when $wgMetrolookBartile is set to false. The format is same as that of [[MediaWiki:Metrolook-tiles]]." diff --git a/package.json b/package.json index 93beca9..7a6ece4 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "grunt-cli": "0.1.13", "grunt-contrib-jshint": "0.11.2", "grunt-banana-checker": "0.2.2", -"grunt-jscs": "1.8.0", +"grunt-jscs": "2.0.0", "grunt-jsonlint": "1.0.4" } } -- To view, visit https://gerrit.wikimedia.org/r/227498 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56e782d85f1fbc1cc22af4ad3b7dd562b59fc8f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add grunt test for less - change (mediawiki...Vector)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227659 Change subject: Add grunt test for less .. Add grunt test for less This adds grunt test for less to test less. Change-Id: I13ac6e3c92799ab6e5a282b3ff58ad0f61632e39 --- M Gruntfile.js M i18n/ksh.json M i18n/mk.json M i18n/zh-hans.json M package.json 5 files changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector refs/changes/59/227659/1 diff --git a/Gruntfile.js b/Gruntfile.js index cf68171..ccb16bc 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,6 +4,7 @@ grunt.loadNpmTasks( 'grunt-jsonlint' ); grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.loadNpmTasks( 'grunt-jscs' ); + grunt.loadNpmTasks('grunt-contrib-less'); var conf = grunt.file.readJSON( 'skin.json' ); grunt.initConfig( { @@ -24,9 +25,16 @@ '**/*.json', '!node_modules/**' ] + }, + less: { + compile: { + options: { + paths: [''] + } + } } } ); - grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'less', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/i18n/ksh.json b/i18n/ksh.json index 55fccaf..c797831 100644 --- a/i18n/ksh.json +++ b/i18n/ksh.json @@ -5,7 +5,7 @@ ] }, "skinname-vector": "Väktor", - "vector-skin-desc": "En modärne Väsjohn vun dä ällere Bedehnbovverfläsch „Monobooch“ met enem neue Ußsinn un Verbäßeronge bem Bedehne.", + "vector-skin-desc": "En modärne Väsjohn vun dä älldere Bedehnbovverfläsch „Monobooch“ met enem neue Ußsinn un Verbäßeronge bem Bedehne.", "vector.css": "/* Dat CSS heh aan dä Schtäll wirrek blohß op de Bedehnbovverfläsch „Väktor“ */", "vector.js": "/* De JavaSkreppte fun heh krejje alle Sigge met dä Bedehnbovverfläsch „Väktor“ jeschek */", "vector-action-addsection": "Ne neue Afschnet onge drahn!", diff --git a/i18n/mk.json b/i18n/mk.json index 1f883ae..3476793 100644 --- a/i18n/mk.json +++ b/i18n/mk.json @@ -6,7 +6,7 @@ ] }, "skinname-vector": "Векторско", - "vector-skin-desc": "Современа верзија на рувото МоноБук со свеж изглед и многу подобрувања на употребливоста", + "vector-skin-desc": "Современа верзија на рувото „МоноБук“ со свеж изглед и многу подобрувања на употребливоста", "vector.css": "/* Тука поставениот CSS се однесува на корисниците на рувото „Векторско“ */", "vector.js": "/* Тука поставениот JavaScript ќе им се вчитува на корисниците што го користат рувото „Векторско“ */", "vector-action-addsection": "Додај тема", diff --git a/i18n/zh-hans.json b/i18n/zh-hans.json index 79b7cca..56e7622 100644 --- a/i18n/zh-hans.json +++ b/i18n/zh-hans.json @@ -9,7 +9,7 @@ ] }, "skinname-vector": "Vector", - "vector-skin-desc": "提供清新的外观和许多可用性改进的现代版MonoBook", + "vector-skin-desc": "提供清新的外观和很多可用性改进的现代版MonoBook", "vector.css": "/* 放置于这里的CSS将影响使用Vector皮肤的用户 */", "vector.js": "/* 这里的任何JavaScript将为使用Vector皮肤的用户加载 */", "vector-action-addsection": "添加话题", diff --git a/package.json b/package.json index 93beca9..f536655 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "grunt-contrib-jshint": "0.11.2", "grunt-banana-checker": "0.2.2", "grunt-jscs": "1.8.0", -"grunt-jsonlint": "1.0.4" +"grunt-jsonlint": "1.0.4", +"grunt-contrib-less": "1.0.1" } } -- To view, visit https://gerrit.wikimedia.org/r/227659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I13ac6e3c92799ab6e5a282b3ff58ad0f61632e39 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Vector Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update jscs to 2.0.0 - change (mediawiki...Vector)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227660 Change subject: Update jscs to 2.0.0 .. Update jscs to 2.0.0 Change-Id: Ibba453510c8e15c3e915d28f7ecf7c296bca7894 --- M Gruntfile.js M i18n/ksh.json M i18n/mk.json M i18n/zh-hans.json M package.json 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector refs/changes/60/227660/1 diff --git a/Gruntfile.js b/Gruntfile.js index cf68171..8f1a931 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,10 +1,10 @@ /*jshint node:true */ module.exports = function ( grunt ) { + var conf = grunt.file.readJSON( 'skin.json' ); 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: { diff --git a/i18n/ksh.json b/i18n/ksh.json index 55fccaf..c797831 100644 --- a/i18n/ksh.json +++ b/i18n/ksh.json @@ -5,7 +5,7 @@ ] }, "skinname-vector": "Väktor", - "vector-skin-desc": "En modärne Väsjohn vun dä ällere Bedehnbovverfläsch „Monobooch“ met enem neue Ußsinn un Verbäßeronge bem Bedehne.", + "vector-skin-desc": "En modärne Väsjohn vun dä älldere Bedehnbovverfläsch „Monobooch“ met enem neue Ußsinn un Verbäßeronge bem Bedehne.", "vector.css": "/* Dat CSS heh aan dä Schtäll wirrek blohß op de Bedehnbovverfläsch „Väktor“ */", "vector.js": "/* De JavaSkreppte fun heh krejje alle Sigge met dä Bedehnbovverfläsch „Väktor“ jeschek */", "vector-action-addsection": "Ne neue Afschnet onge drahn!", diff --git a/i18n/mk.json b/i18n/mk.json index 1f883ae..3476793 100644 --- a/i18n/mk.json +++ b/i18n/mk.json @@ -6,7 +6,7 @@ ] }, "skinname-vector": "Векторско", - "vector-skin-desc": "Современа верзија на рувото МоноБук со свеж изглед и многу подобрувања на употребливоста", + "vector-skin-desc": "Современа верзија на рувото „МоноБук“ со свеж изглед и многу подобрувања на употребливоста", "vector.css": "/* Тука поставениот CSS се однесува на корисниците на рувото „Векторско“ */", "vector.js": "/* Тука поставениот JavaScript ќе им се вчитува на корисниците што го користат рувото „Векторско“ */", "vector-action-addsection": "Додај тема", diff --git a/i18n/zh-hans.json b/i18n/zh-hans.json index 79b7cca..56e7622 100644 --- a/i18n/zh-hans.json +++ b/i18n/zh-hans.json @@ -9,7 +9,7 @@ ] }, "skinname-vector": "Vector", - "vector-skin-desc": "提供清新的外观和许多可用性改进的现代版MonoBook", + "vector-skin-desc": "提供清新的外观和很多可用性改进的现代版MonoBook", "vector.css": "/* 放置于这里的CSS将影响使用Vector皮肤的用户 */", "vector.js": "/* 这里的任何JavaScript将为使用Vector皮肤的用户加载 */", "vector-action-addsection": "添加话题", diff --git a/package.json b/package.json index 93beca9..7a6ece4 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "grunt-cli": "0.1.13", "grunt-contrib-jshint": "0.11.2", "grunt-banana-checker": "0.2.2", -"grunt-jscs": "1.8.0", +"grunt-jscs": "2.0.0", "grunt-jsonlint": "1.0.4" } } -- To view, visit https://gerrit.wikimedia.org/r/227660 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibba453510c8e15c3e915d28f7ecf7c296bca7894 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Vector Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new job fail-archived-repositories - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/228130 Change subject: Add new job fail-archived-repositories .. Add new job fail-archived-repositories * This new job will fail all the time. This test is meant for reos that are either unused or not used anymore. Change-Id: Id994e799f0a43fe34400fba99796e845c629910f --- M jjb/misc.yaml M jjb/wikidata.yaml 2 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/30/228130/1 diff --git a/jjb/misc.yaml b/jjb/misc.yaml index ee10248..fd71dc3 100644 --- a/jjb/misc.yaml +++ b/jjb/misc.yaml @@ -174,3 +174,13 @@ dest: 'visualeditor' publishers: - global-teardown + +- job: +name: 'fail-archived-repositories' +node: contintLabsSlave && UbuntuTrusty +defaults: use-remote-zuul-shallow-clone +concurrent: false +triggers: + - zuul +builders: + - shell: "exit 1" diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml index 8ad0b49..3f3d8a9 100644 --- a/jjb/wikidata.yaml +++ b/jjb/wikidata.yaml @@ -6,8 +6,6 @@ cd "$WORKSPACE/src/" /srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py ../deps.txt composer.local.json timeout 300 composer update --prefer-source -vvv -# FIXME BUG the first run just exits without error without finishing especially in a clean working copy -timeout 300 composer update --prefer-source -vvv - builder: name: wd-wikibase-apply-settings -- To view, visit https://gerrit.wikimedia.org/r/228130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id994e799f0a43fe34400fba99796e845c629910f Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update tests in vector extension - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/228133 Change subject: Update tests in vector extension .. Update tests in vector extension * The vector extension was discontinued a few years ago. Use new fail-archived-repositories test. This test will fail. Change-Id: Ie5f2789daf0d3e6f232f5a101bd15ac8c2ebae46 --- M jjb/mediawiki-extensions.yaml M jjb/wikidata.yaml M zuul/layout.yaml 3 files changed, 1 insertion(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/33/228133/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index bcfe56b..0914142 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -594,7 +594,6 @@ - Validator: dependencies: 'DataValues' - ValueView - - Vector - VectorBeta: dependencies: 'EventLogging' - VisualChat @@ -1041,7 +1040,6 @@ - mwext-TwnMainPage - mwext-UniversalLanguageSelector - mwext-UploadWizard - - mwext-Vector - mwext-WebFonts - mwext-WikiGrok diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml index 8ad0b49..3f3d8a9 100644 --- a/jjb/wikidata.yaml +++ b/jjb/wikidata.yaml @@ -6,8 +6,6 @@ cd "$WORKSPACE/src/" /srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py ../deps.txt composer.local.json timeout 300 composer update --prefer-source -vvv -# FIXME BUG the first run just exits without error without finishing especially in a clean working copy -timeout 300 composer update --prefer-source -vvv - builder: name: wd-wikibase-apply-settings diff --git a/zuul/layout.yaml b/zuul/layout.yaml index c6f0cb8..cb644e9 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -657,8 +657,6 @@ voting: false - name: mwext-UploadWizard-phpcs-HEAD voting: false - - name: mwext-Vector-phpcs-HEAD -voting: false - name: mwext-WebFonts-phpcs-HEAD voting: false - name: mwext-WhitelistPages-phpcs-HEAD @@ -7297,18 +7295,7 @@ - name: mediawiki/extensions/Vector check-only: - - jshint - - jsonlint - - mwext-Vector-phpcs-HEAD - - phplint - - php-composer-validate -gate-and-submit: - - mediawiki-gate - - jshint - - jsonlint - - mwext-Vector-phpcs-HEAD - - phplint - - php-composer-validate + - fail-archived-repositories - name: mediawiki/extensions/VectorBeta template: -- To view, visit https://gerrit.wikimedia.org/r/228133 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5f2789daf0d3e6f232f5a101bd15ac8c2ebae46 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update BreadCrumbs tests - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/228136 Change subject: Update BreadCrumbs tests .. Update BreadCrumbs tests There are i18n json files in BreadCrumbs Change-Id: I2d54f37408a2fa63fb8e36007c742083b7fe0e5b --- M jjb/wikidata.yaml M zuul/layout.yaml 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/36/228136/1 diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml index 8ad0b49..3f3d8a9 100644 --- a/jjb/wikidata.yaml +++ b/jjb/wikidata.yaml @@ -6,8 +6,6 @@ cd "$WORKSPACE/src/" /srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py ../deps.txt composer.local.json timeout 300 composer update --prefer-source -vvv -# FIXME BUG the first run just exits without error without finishing especially in a clean working copy -timeout 300 composer update --prefer-source -vvv - builder: name: wd-wikibase-apply-settings diff --git a/zuul/layout.yaml b/zuul/layout.yaml index c6f0cb8..374554c 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -4533,6 +4533,9 @@ - name: mediawiki/extensions/BreadCrumbs template: - name: extension-unittests-generic + check: + - jshint + - jsonlint - name: mediawiki/extensions/BreadCrumbs2 template: -- To view, visit https://gerrit.wikimedia.org/r/228136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d54f37408a2fa63fb8e36007c742083b7fe0e5b Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add license name to main php file - change (mediawiki...TimedMediaHandler)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/230069 Change subject: Add license name to main php file .. Add license name to main php file Change-Id: Id553e5b3b417b77687903e459383cd2025e95afa --- M TimedMediaHandler.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/69/230069/1 diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php index 707ea1c..5095156 100644 --- a/TimedMediaHandler.php +++ b/TimedMediaHandler.php @@ -299,4 +299,5 @@ 'url'=> 'https://www.mediawiki.org/wiki/Extension:TimedMediaHandler', 'descriptionmsg' => 'timedmedia-desc', 'version'=> '0.4.0', + 'license-name' => 'GPL-2.0+', ); -- To view, visit https://gerrit.wikimedia.org/r/230069 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id553e5b3b417b77687903e459383cd2025e95afa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update i18n to BoilerPlate extension - change (translatewiki)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/230114 Change subject: Update i18n to BoilerPlate extension .. Update i18n to BoilerPlate extension Repo is now at https://git.wikimedia.org/summary/mediawiki%2Fextensions%2FBoilerPlate Change-Id: I061a63001fb3011588db6930df6b88aacd9f4635 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/14/230114/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index b4434ed..3728b29 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -466,7 +466,6 @@ file = BlueSpiceExtensions/WikiAdmin/i18n/%CODE%.json Boiler Plate -file = examples/BoilerPlate/i18n/%CODE%.json Book Manager descmsg = bm-printversion-desc -- To view, visit https://gerrit.wikimedia.org/r/230114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I061a63001fb3011588db6930df6b88aacd9f4635 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove extension example from mwext-example-testextension - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/230125 Change subject: Remove extension example from mwext-example-testextension .. Remove extension example from mwext-example-testextension It was causing test to fail because this test looks for expected entry point example but example is in the example/example folder there is no file for example in example/ This should run mwext-testextension instead. Change-Id: I08f1ba1822c661b8e9131b3888fe7fb260681e45 --- M jjb/mediawiki-extensions.yaml M zuul/layout.yaml 2 files changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/25/230125/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 87e5bd3..339a5c1 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -454,7 +454,6 @@ - EditPageTracking - EtherEditor - EventLogging - - examples - ExtTab - FanBoxes - Flow: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8aaf705..1730577 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1407,8 +1407,6 @@ voting: false - name: ^mwext-DjangoAnalytics-testextension.* voting: false - - name: ^mwext-examples-testextension.* -voting: false - name: ^mwext-ExtTab-testextension.* voting: false - name: ^mwext-FanBoxes-testextension.* # 69970 @@ -4769,7 +4767,7 @@ - name: mediawiki/extensions/examples template: - name: extension-jslint - - name: extension-unittests + - name: extension-unittests-generic - name: mediawiki/extensions/ExternalArticles template: -- To view, visit https://gerrit.wikimedia.org/r/230125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08f1ba1822c661b8e9131b3888fe7fb260681e45 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...FeaturedFeeds)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/230291 Change subject: Remove i18n shim .. Remove i18n shim Change-Id: I6edcb49c30d8195f51e2c8dd49732671bb136ba6 --- D FeaturedFeeds.i18n.php 1 file changed, 0 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FeaturedFeeds refs/changes/91/230291/1 diff --git a/FeaturedFeeds.i18n.php b/FeaturedFeeds.i18n.php deleted file mode 100644 index 06a8f6a..000 --- a/FeaturedFeeds.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim61fab068a6df6bb7' ) ) { - function wfJsonI18nShim61fab068a6df6bb7( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim61fab068a6df6bb7'; -} -- To view, visit https://gerrit.wikimedia.org/r/230291 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6edcb49c30d8195f51e2c8dd49732671bb136ba6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FeaturedFeeds Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improvements to Blueprint skin - change (mediawiki...Blueprint)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/230410 Change subject: Improvements to Blueprint skin .. Improvements to Blueprint skin This patch includes bugfixes. This fixes the usermenu showing on load and wont hide after clicking to hide it wont. Change-Id: I2eca8857111561663856a18bf39925cdfa147da0 --- A lib/bootstrap/bootstrap.css A lib/bootstrap/bootstrap.js D lib/bootstrap/bootstrap.min.css D lib/bootstrap/bootstrap.min.js M resources/master.less M resources/menu.js M skin.json M src/SkinBlueprint.php 8 files changed, 2,836 insertions(+), 34 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint refs/changes/10/230410/1 diff --git a/lib/bootstrap/bootstrap.css b/lib/bootstrap/bootstrap.css new file mode 100644 index 000..6aabc9e --- /dev/null +++ b/lib/bootstrap/bootstrap.css @@ -0,0 +1,2615 @@ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +/*! + * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=9d6b9bf52bc030ff7612) + * Config saved to config.json and https://gist.github.com/9d6b9bf52bc030ff7612 + */ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ +html { + font-family: sans-serif; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; +} +body { + margin: 0; +} +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} +audio, +canvas, +progress, +video { + display: inline-block; + vertical-align: baseline; +} +audio:not([controls]) { + display: none; + height: 0; +} +[hidden], +template { + display: none; +} +a { + background-color: transparent; +} +a:active, +a:hover { + outline: 0; +} +abbr[title] { + border-bottom: 1px dotted; +} +b, +strong { + font-weight: bold; +} +dfn { + font-style: italic; +} +h1 { + font-size: 2em; + margin: 0.67em 0; +} +mark { + background: #ff0; + color: #000; +} +small { + font-size: 80%; +} +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} +sup { + top: -0.5em; +} +sub { + bottom: -0.25em; +} +img { + border: 0; +} +svg:not(:root) { + overflow: hidden; +} +figure { + margin: 1em 40px; +} +hr { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} +pre { + overflow: auto; +} +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} +button, +input, +optgroup, +select, +textarea { + color: inherit; + font: inherit; + margin: 0; +} +button { + overflow: visible; +} +button, +select { + text-transform: none; +} +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; +} +button[disabled], +html input[disabled] { + cursor: default; +} +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} +input { + line-height: normal; +} +input[type="checkbox"], +input[type="radio"] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 0; +} +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} +input[type="search"] { + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} +legend { + border: 0; + padding: 0; +} +textarea { + overflow: auto; +} +optgroup { + font-weight: bold; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +td, +th { + padding: 0; +} +* { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +*:before, +*:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +html { + font-size: 10px; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} +body { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + line-height: 1.42857143; + color: #33; + background-color: #ff; +} +input, +button, +select, +textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; +} +a { + color: #337ab7; + text-decoration: none; +} +a:hover, +a:focus { + color: #23527c; + text-decoration
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...ProofreadPage)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/230737 Change subject: Remove i18n shim .. Remove i18n shim Change-Id: Ia3b29a4ae9969b6810579c7ca0713e998ef53bc0 --- D ProofreadPage.i18n.php M ProofreadPage.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/37/230737/1 diff --git a/ProofreadPage.i18n.php b/ProofreadPage.i18n.php deleted file mode 100644 index 4ea1a78..000 --- a/ProofreadPage.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim3b7d16892b71f328' ) ) { - function wfJsonI18nShim3b7d16892b71f328( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim3b7d16892b71f328'; -} diff --git a/ProofreadPage.php b/ProofreadPage.php index f6bcb44..e22ff49 100644 --- a/ProofreadPage.php +++ b/ProofreadPage.php @@ -40,7 +40,6 @@ $dir = __DIR__ . '/'; $wgMessagesDirs['ProofreadPage'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['ProofreadPage'] = $dir . 'ProofreadPage.i18n.php'; $wgExtensionMessagesFiles['ProofreadPageAlias'] = $dir . 'ProofreadPage.alias.php'; $wgAutoloadClasses['ProofreadPage'] = $dir . 'ProofreadPage.body.php'; -- To view, visit https://gerrit.wikimedia.org/r/230737 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3b29a4ae9969b6810579c7ca0713e998ef53bc0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix namspace problem - change (mediawiki...ProofreadPage)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/230759 Change subject: Fix namspace problem .. Fix namspace problem This might fix the namspace problem where you have to use include instead of using $wgExtensionMessagesFiles to load the file. Change-Id: Ie562d4c10159f0f55daf5993dc6cafccbef4fde3 --- M ProofreadPage.namespaces.php M ProofreadPage.php 2 files changed, 50 insertions(+), 52 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/59/230759/1 diff --git a/ProofreadPage.namespaces.php b/ProofreadPage.namespaces.php index 703488a..fea8661 100644 --- a/ProofreadPage.namespaces.php +++ b/ProofreadPage.namespaces.php @@ -5,12 +5,12 @@ * @file * @ingroup Extensions */ +// @codingStandardsIgnoreFile -global $proofreadPageNamespacesNames; //needed in order to be used inside of ProofreadPageInit -$proofreadPageNamespacesNames = array(); +$namespaceNames = array(); /** English (English) */ -$proofreadPageNamespacesNames['en'] = array( +$namespaceNames['en'] = array( 'page' => 'Page', 'page_talk' => 'Page_talk', 'index' => 'Index', @@ -18,7 +18,7 @@ ); /** Arabic (العربية) */ -$proofreadPageNamespacesNames['ar'] = array( +$namespaceNames['ar'] = array( 'page' => 'صفحة', 'page_talk' => 'نقاش_الصفحة', 'index' => 'فهرس', @@ -26,7 +26,7 @@ ); /** Assamese (অসমীয়া) */ -$proofreadPageNamespacesNames['as'] = array( +$namespaceNames['as'] = array( 'page' => 'পৃষ্ঠা', 'page_talk' => 'পৃষ্ঠা_আলোচনা', 'index' => 'সূচী', @@ -34,7 +34,7 @@ ); /** Belarusian (беларуская) */ -$proofreadPageNamespacesNames['be'] = array( +$namespaceNames['be'] = array( 'page' => 'Старонка', 'page_talk' => 'Размовы_пра_старонку', 'index' => 'Індэкс', @@ -42,7 +42,7 @@ ); /** Bengali (বাংলা) */ -$proofreadPageNamespacesNames['bn'] = array( +$namespaceNames['bn'] = array( 'page' => 'পাতা', 'page_talk' => 'পাতা_আলাপ', 'index' => 'নির্ঘণ্ট', @@ -50,7 +50,7 @@ ); /** Breton (brezhoneg) */ -$proofreadPageNamespacesNames['br'] = array( +$namespaceNames['br'] = array( 'page' => 'Pajenn', 'page_talk' => 'Kaozeadenn_pajenn', 'index' => 'Meneger', @@ -58,7 +58,7 @@ ); /** Catalan (català) */ -$proofreadPageNamespacesNames['ca'] = array( +$namespaceNames['ca'] = array( 'page' => 'Pàgina', 'page_talk' => 'Pàgina_Discussió', 'index' => 'Llibre', @@ -66,7 +66,7 @@ ); /** Czech (česky) */ -$proofreadPageNamespacesNames['cs'] = array( +$namespaceNames['cs'] = array( 'page' => 'Stránka', 'page_talk' => 'Diskuse_ke_stránce', 'index' => 'Index', @@ -74,7 +74,7 @@ ); /** Welsh (Cymraeg) */ -$proofreadPageNamespacesNames['cy'] = array( +$namespaceNames['cy'] = array( 'page' => 'Tudalen', 'page_talk' => 'Sgwrs_Tudalen', 'index' => 'Indecs', @@ -82,7 +82,7 @@ ); /** Danish (dansk) */ -$proofreadPageNamespacesNames['da'] = array( +$namespaceNames['da'] = array( 'page' => 'Side', 'page_talk' => 'Sidediskussion', 'index' => 'Indeks', @@ -90,7 +90,7 @@ ); /** German (Deutsch) */ -$proofreadPageNamespacesNames['de'] = array( +$namespaceNames['de'] = array( 'page' => 'Seite', 'page_talk' => 'Seite_Diskussion', 'index' => 'Index', @@ -98,7 +98,7 @@ ); /** Greek (Ελληνικά) */ -$proofreadPageNamespacesNames['el'] = array( +$namespaceNames['el'] = array( 'page' => 'Σελίδα', 'page_talk' => 'Συζήτηση_σελίδας', 'index' => 'Βιβλίο', @@ -106,7 +106,7 @@ ); /** Esperanto (Esperanto) */ -$proofreadPageNamespacesNames['eo'] = array( +$namespaceNames['eo'] = array( 'page' => 'Paĝo', 'page_talk' => 'Paĝo-Diskuto', 'index' => 'Indekso', @@ -114,7 +114,7 @@ ); /** Spanish (español) */ -$proofreadPageNamespacesNames['es'] = array( +$namespaceNames['es'] = array( 'page' => 'Página', 'page_talk' => 'Página_Discusión', 'index' => 'Índice', @@ -122,7 +122,7 @@ ); /** Estonian (eesti) */ -$proofreadPageNamespacesNames['et'] = array( +$namespaceNames['et'] = array( 'page' => 'Lehekülg', 'page_talk' => 'Lehekülje_arutelu', 'index' => 'Register', @@ -130,7 +130,7 @@ ); /** Persian (فارسی) */ -$proofreadPageNamespacesNames['fa'] = array( +$namespaceNames['fa'] = array( 'page' => 'برگه', 'page_talk' => 'گفتگوی برگه', 'index' => 'فهرست', @@ -138,7 +138,7 @@ ); /** Finnish (suomi) */ -$proofreadPageNamespacesNames['fi'] = array( +$namespaceNames['fi'] = array( 'page' => 'Sivu', 'page_talk' => 'Keskustelu_sivusta', 'index' => 'Hakemisto', @@ -146,7 +146,7 @@ ); /** French (Français) */ -$proofreadPageNamespacesNames['fr'] = array( +$namespaceNames['fr'] = array(
[MediaWiki-commits] [Gerrit] e name extension back to intersection - change (mediawiki...intersection)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231048 Change subject: e name extension back to intersection .. e name extension back to intersection Reasons: 1. There is an extension already named DynamicPageList. This makes it confusing for users if there are two extension named like each other. 2. This repo hasent been renamed so might as well keep the name sync with repo. 3. All the i18n messages refer to it as intersection even qqq.json desc refers to this as intersections. There are links for intersection and not updated for DynamicPageList. Change-Id: I75f6c9af611b7bc42f8c53ad52517e8d9695ef80 --- M DynamicPageList.php R Intersection.hooks.php R Intersection.tests.txt M intersection.php 4 files changed, 80 insertions(+), 76 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/intersection refs/changes/48/231048/1 diff --git a/DynamicPageList.php b/DynamicPageList.php index d88569e..e7d69a6 100644 --- a/DynamicPageList.php +++ b/DynamicPageList.php @@ -1,72 +1 @@ -http://en.wikinews.org/wiki/User:Amgine - http://en.wikinews.org/wiki/User:IlyaHaykinson - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - http://www.gnu.org/copyleft/gpl.html - - Current feature request list -1. Unset cached of calling page -2. RSS feed output? (GNSM extension?) - - To install, add following to LocalSettings.php - include("$IP/extensions/intersection/DynamicPageList.php"); - -*/ - -if ( !defined( 'MEDIAWIKI' ) ) { - die( 'This is not a valid entry point to MediaWiki.' ); -} - -// Extension credits that will show up on Special:Version -$wgExtensionCredits['parserhook'][] = array( - 'path' => __FILE__, - 'name' => 'DynamicPageList', - 'version'=> '1.7.0', - 'descriptionmsg' => 'intersection-desc', - 'url'=> 'https://www.mediawiki.org/wiki/Extension:Intersection', - 'author' => array( '[http://en.wikinews.org/wiki/User:Amgine Amgine]', '[http://en.wikinews.org/wiki/User:IlyaHaykinson IlyaHaykinson]' ), -); - -// Internationalization file -$wgMessagesDirs['DynamicPageList'] = __DIR__ . '/i18n'; - -$wgAutoloadClasses['DynamicPageListHooks'] = __DIR__ . '/DynamicPageList.hooks.php'; - -// Parser tests -// Warning, these only work when run with parserTests.php. There will be -// failures if run via phpunit! (you may want to comment the below line -// out if you're regularly running phpunit tests) -$wgParserTestFiles[] = __DIR__ . '/DynamicPageList.tests.txt'; - -# Configuration variables. Warning: These use DLP instead of DPL -# for historical reasons (pretend Dynamic list of pages) -$wgDLPmaxCategories = 6;// Maximum number of categories to look for -$wgDLPMaxResultCount = 200; // Maximum number of results to allow -$wgDLPAllowUnlimitedResults = false;// Allow unlimited results -$wgDLPAllowUnlimitedCategories = false; // Allow unlimited categories -// How long to cache pages using DPL's in seconds. Default to 1 day. Set to -// false to not decrease cache time (most efficient), Set to 0 to disable -// cache altogether (inefficient, but results will never be outdated) -$wgDLPMaxCacheTime = 60*60*24; // How long to cache pages - -$wgHooks['ParserFirstCallInit'][] = 'DynamicPageListHooks::onParserFirstCallInit'; +intersection.php \ No newline at end of file diff --git a/DynamicPageList.hooks.php b/Intersection.hooks.php similarity index 97% rename from DynamicPageList.hooks.php rename to Intersection.hooks.php index f2aada0..b40f0bc 100644 --- a/DynamicPageList.hooks.php +++ b/Intersection.hooks.php @@ -1,21 +1,23 @@ tag. +* Set up the tag. * @param Parser &$parser * @return boolean true */ public static function onParserFirstCallInit( &$parser ) { - $parser->setHook( 'DynamicPageList', 'DynamicPageListHooks::renderDynamicPageList' ); + $parser->setHook( 'DynamicPageList', 'IntersectionHooks::renderIntersection' ); + $parser->setHook( 'Intersection', 'IntersectionHooks::renderIntersection' ); return true; } /** * The callback function for converting the input text to HTML
[MediaWiki-commits] [Gerrit] Remove $wgPageProps - change (mediawiki...LiquidThreads)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231058 Change subject: Remove $wgPageProps .. Remove $wgPageProps This was removed in MediaWiki 1.17. Please see https://www.mediawiki.org/wiki/Manual:$wgPageProps Change-Id: I389af5737285a60c0bd8465947ea7e9d44b67b28 --- M LiquidThreads.php 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads refs/changes/58/231058/1 diff --git a/LiquidThreads.php b/LiquidThreads.php index 6575683..ba428c0 100644 --- a/LiquidThreads.php +++ b/LiquidThreads.php @@ -279,8 +279,6 @@ $wgAvailableRights[] = 'lqt-merge'; $wgAvailableRights[] = 'lqt-react'; -$wgPageProps['use-liquid-threads'] = 'Whether or not the page enabled or disabled LiquidThreads through a parser function'; - /* Allows activation of LiquidThreads on individual pages */ $wgLqtPages = array(); -- To view, visit https://gerrit.wikimedia.org/r/231058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I389af5737285a60c0bd8465947ea7e9d44b67b28 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LiquidThreads Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support custom prefix - change (mediawiki/core)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231244 Change subject: Support custom prefix .. Support custom prefix Add $wgDisableWg setting so that it is set extension or skin. Change-Id: Id2d9b83a1e4a2a4ffd900b84a18be211b647577b --- M includes/registration/ExtensionProcessor.php 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/44/231244/1 diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php index 68e5a17..1b44e54 100644 --- a/includes/registration/ExtensionProcessor.php +++ b/includes/registration/ExtensionProcessor.php @@ -165,7 +165,11 @@ $this->extractCredits( $path, $info ); foreach ( $info as $key => $val ) { - if ( in_array( $key, self::$globalSettings ) ) { + global $wgDisableWg; + if ( in_array( $key, self::$globalSettings && $wgDisableWg ) ) { + $this->storeToArray( "$key", $val, $this->globals ); + // Ignore anything that starts with a @ + } else ( in_array( $key, self::$globalSettings ) ) { $this->storeToArray( "wg$key", $val, $this->globals ); // Ignore anything that starts with a @ } elseif ( $key[0] !== '@' && !in_array( $key, self::$notAttributes ) @@ -305,9 +309,12 @@ * @param array $info */ protected function extractConfig( array $info ) { + global $wgDisableWg; if ( isset( $info['config'] ) ) { foreach ( $info['config'] as $key => $val ) { - if ( $key[0] !== '@' ) { + if ( $key[0] !== '@' && $wgDisableWg) { + $this->globals["$key"] = $val; + } else ( $key[0] !== '@' ) { $this->globals["wg$key"] = $val; } } -- To view, visit https://gerrit.wikimedia.org/r/231244 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2d9b83a1e4a2a4ffd900b84a18be211b647577b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...TorBlock)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231259 Change subject: Remove i18n shim .. Remove i18n shim Change-Id: I121eef72a030e0d93dc1fd83744ae60c64f6def0 --- D TorBlock.i18n.php M TorBlock.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TorBlock refs/changes/59/231259/1 diff --git a/TorBlock.i18n.php b/TorBlock.i18n.php deleted file mode 100644 index 990d4cd..000 --- a/TorBlock.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShime8dc6e7a6d9e775f' ) ) { - function wfJsonI18nShime8dc6e7a6d9e775f( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShime8dc6e7a6d9e775f'; -} diff --git a/TorBlock.php b/TorBlock.php index baf46b1..cbf4368 100644 --- a/TorBlock.php +++ b/TorBlock.php @@ -40,7 +40,6 @@ ); $wgMessagesDirs['TorBlock'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['TorBlock'] = __DIR__ . "/TorBlock.i18n.php"; $wgAutoloadClasses['TorBlockHooks'] = __DIR__ . '/includes/TorBlockHooks.php'; $wgAutoloadClasses['TorExitNodes'] = __DIR__ . '/includes/TorExitNodes.php'; -- To view, visit https://gerrit.wikimedia.org/r/231259 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I121eef72a030e0d93dc1fd83744ae60c64f6def0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TorBlock Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add more mobile support to mobile js - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231297 Change subject: Add more mobile support to mobile js .. Add more mobile support to mobile js Change-Id: I898a185b8c7cf3b859fdc62b062a05d248f6e3b8 --- M js/metrolook.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/97/231297/1 diff --git a/js/metrolook.js b/js/metrolook.js index 0b0db01..2309db3 100644 --- a/js/metrolook.js +++ b/js/metrolook.js @@ -17,7 +17,7 @@ } function isMobileUserAgent() { - return !!( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|CriOS|Opera Mini|Mobile|mobile/i.test( navigator.userAgent ) ); + return !!( /mobi|alcatel|Android|android|kindle|webOS|webos|iPhone|iPad|iPod|Tablet|PlayBook|Wii|Silk|BlackBerry|playstation|phone|nintendo|htc[-_]|IEMobile|CriOS|Opera Mini|opera.m|palm|panasonic|philips|samsung|Mobile|mobile/i.test( navigator.userAgent ) ); } $( function() { -- To view, visit https://gerrit.wikimedia.org/r/231297 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I898a185b8c7cf3b859fdc62b062a05d248f6e3b8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add more mobile browser listed in metrolook.search.js - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231305 Change subject: Add more mobile browser listed in metrolook.search.js .. Add more mobile browser listed in metrolook.search.js Change-Id: I95b68a733110f2519b280824623c8d43b390e4fc --- M js/metrolook.search.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/05/231305/1 diff --git a/js/metrolook.search.js b/js/metrolook.search.js index 7e31d34..cd9af9e 100644 --- a/js/metrolook.search.js +++ b/js/metrolook.search.js @@ -7,7 +7,7 @@ /* This is here to fix js issue with iPad (all models) */ $(function () { if( isTouchDevice() ) { - if( /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) { + if( /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|CriOS|Opera Mini|Mobile|mobile/i.test(navigator.userAgent) ) { $( '#p-search' ).hide(); $( 'img.searchbar' ).click(function(e) { $( '#p-search' ).fadeToggle(150); -- To view, visit https://gerrit.wikimedia.org/r/231305 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95b68a733110f2519b280824623c8d43b390e4fc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Match changes done to vector - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231312 Change subject: Match changes done to vector .. Match changes done to vector Change-Id: I11a5ca610d76bf6c0ad03ca47a10d3f0559f58a1 --- M skinStyles/mediawiki.notification.less 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/12/231312/1 diff --git a/skinStyles/mediawiki.notification.less b/skinStyles/mediawiki.notification.less index 55cfe76..df7ae5e 100644 --- a/skinStyles/mediawiki.notification.less +++ b/skinStyles/mediawiki.notification.less @@ -2,9 +2,9 @@ /* mediawiki.notification */ -// This wrapper class is needed to ensure these rules have larger CSS +// This wrapper element is needed to ensure these rules have larger CSS // selector specificity than default styles -.mediawiki { +body { .mw-notification-area { font-size: 0.8em; } @@ -21,4 +21,14 @@ border-radius: 0.75em; box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.125); } + + .mw-notification-type-warn { + border-color: #f5be00; /* yellow */ + box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.125), 0 0 0.75em rgba(245, 190, 0, 0.25) inset; + } + + .mw-notification-type-error { + border-color: red; + box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.125), 0 0 0.75em rgba(255, 0, 0, 0.25) inset; + } } -- To view, visit https://gerrit.wikimedia.org/r/231312 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I11a5ca610d76bf6c0ad03ca47a10d3f0559f58a1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for h265 format - change (mediawiki...TimedMediaHandler)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231575 Change subject: Add support for h265 format .. Add support for h265 format This add support for h265 format that uses less data to play the video. This support 8k too. (Added in seperate patch). Change-Id: I1730cd1e7a85d2285fe1ef1a1799ed5137963834 --- M MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php M MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js M MwEmbedModules/EmbedPlayer/resources/mw.MediaElement.js M TimedMediaHandler.php M WebVideoTranscode/WebVideoTranscode.php M i18n/en.json M i18n/qqq.json 7 files changed, 113 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/75/231575/1 diff --git a/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php b/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php index 324a41e..c5ad0c6 100644 --- a/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php +++ b/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php @@ -10,7 +10,7 @@ // The preferred media codec preference // Note user selected format order - 'EmbedPlayer.CodecPreference' => array( 'vp9', 'webm', 'h264', 'ogg' ), + 'EmbedPlayer.CodecPreference' => array( 'vp9', 'webm', 'h265', 'h264', 'ogg' ), // If video tag support should be disabled all-together, used to test // fallback decoding methods and direct file links diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js index 1369f10..c9b35b2 100644 --- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js +++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js @@ -48,6 +48,10 @@ 'video/h264', 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"' ], 'Native' ); +var h265NativePlayer = new mw.MediaPlayer( 'h265Native', [ + 'video/h265', + 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"' +], 'Native' ); var appleVdnPlayer = new mw.MediaPlayer( 'appleVdn', [ 'application/vnd.apple.mpegurl', 'application/vnd.apple.mpegurl; codecs="avc1.42E01E"' @@ -264,10 +268,25 @@ } } + + // Test for h265: + if ( dummyvid.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"' ) ) { + this.mediaPlayers.addPlayer( h265NativePlayer ); + // Check for iOS for vdn player support ( apple adaptive ) or vdn canPlayType != '' ( ie maybe/probably ) + if( mw.isIOS() || dummyvid.canPlayType('application/vnd.apple.mpegurl; codecs="avc1.42E01E"' ) ){ + // Android 3x lies about HLS support ( only add if not Android 3.x ) + if( navigator.userAgent.indexOf( 'Android 3.') == -1 ){ + this.mediaPlayers.addPlayer( appleVdnPlayer ); + } + } + + } + // For now if Android assume we support h264Native (FIXME // test on real devices ) if ( mw.isAndroid2() ){ this.mediaPlayers.addPlayer( h264NativePlayer ); + this.mediaPlayers.addPlayer( h265NativePlayer ); } // Test for ogg diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.MediaElement.js b/MwEmbedModules/EmbedPlayer/resources/mw.MediaElement.js index 9af4899..acc289b 100644 --- a/MwEmbedModules/EmbedPlayer/resources/mw.MediaElement.js +++ b/MwEmbedModules/EmbedPlayer/resources/mw.MediaElement.js @@ -283,6 +283,9 @@ case 'h264Native': var shortName = 'h264'; break; + case 'h265Native': + var shortName = 'h265'; + break; case 'appleVdn': var shortName = 'appleVdn'; break; diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php index 5
[MediaWiki-commits] [Gerrit] Fix jshint errors - change (mediawiki...TimedMediaHandler)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/231578 Change subject: Fix jshint errors .. Fix jshint errors jshint is showing errors and now marking patches with a big red x. Change-Id: Iac63dce513e92cd7139d1d67690d47f6ed86a2bc --- M .jshintrc M resources/mw.PopUpThumbVideo.js 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/78/231578/1 diff --git a/.jshintrc b/.jshintrc index a45bc7c..ef363f8 100644 --- a/.jshintrc +++ b/.jshintrc @@ -38,6 +38,7 @@ "jQuery", "OGVVersion", "OGVSupport", - "OGVPlayer" + "OGVPlayer", + "OGVLoader" ] } diff --git a/resources/mw.PopUpThumbVideo.js b/resources/mw.PopUpThumbVideo.js index 71fde89..c0aa30d 100644 --- a/resources/mw.PopUpThumbVideo.js +++ b/resources/mw.PopUpThumbVideo.js @@ -27,7 +27,7 @@ $( this ).find( 'video, audio' ).embedPlayer(); } }) - .css( 'overflow', 'hidden' ) + .css( 'overflow', 'hidden' ); } ); // don't follow file link return false; -- To view, visit https://gerrit.wikimedia.org/r/231578 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac63dce513e92cd7139d1d67690d47f6ed86a2bc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Now supports MediaWiki 1.21 on metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203481 Change subject: Now supports MediaWiki 1.21 on metrolook .. Now supports MediaWiki 1.21 on metrolook Change-Id: I45f0cf7e5831e20b8c196b7cbad26fcf6dc64adb --- M .gitignore A CHANGELOG.md A COPYING A Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M README.md M SkinMetrolook.php A collapsibleNav.css A csshover.htc A csshover.min.htc A images/Transparent.gif A images/arrow-collapsed-ltr.png A images/arrow-collapsed-ltr.svg A images/arrow-collapsed-rtl.png A images/arrow-collapsed-rtl.svg A images/arrow-down-focus-icon.svg A images/arrow-down-icon.svg A images/arrow-expanded.png A images/arrow-expanded.svg M images/audio-icon.png A images/bullet-circle-icon.png A images/closed-ltr.png A images/closed-ltr.svg A images/closed-rtl.png A images/closed-rtl.svg M images/document-icon.png A images/downarrow.png A images/downarrow.svg M images/edit-icon.png A images/edit-icon.svg D images/external-link-icon.png A images/external-link-ltr-icon.svg A images/external-link-rtl-icon.svg A images/fade.png M images/file-icon.png A images/hamburger.png A images/hamburger.svg A images/line.png A images/line.svg M images/link-icon.png M images/lock-icon.png M images/magnify-clip.png M images/mail-icon.png M images/news-icon.png A images/open.png A images/open.svg M images/preferences-break.png D images/preferences-edge.png M images/preferences-fade.png M images/talk-icon.png A images/uploadlogo.png A images/uploadlogo.svg A images/user-icon-20.png A images/user-icon-20.svg A images/user-icon-40.png A images/user-icon-40.svg D images/user-icon.png M images/video-icon.png A images/watch-icon-loading.gif A js/collapsibleNav.js R js/collapsibleTabs.js A js/mediawiki.searchSuggest.custom.js A js/metrolook.js A js/overthrow.js A js/vector.js A mobile.css M screen-hd.css M screen.css A theme.css D vector.js 71 files changed, 5,980 insertions(+), 1,808 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/81/203481/1 -- To view, visit https://gerrit.wikimedia.org/r/203481 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45f0cf7e5831e20b8c196b7cbad26fcf6dc64adb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_21 Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Now supports MediaWiki 1.21 on metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged. Change subject: Now supports MediaWiki 1.21 on metrolook .. Now supports MediaWiki 1.21 on metrolook Change-Id: I45f0cf7e5831e20b8c196b7cbad26fcf6dc64adb --- M .gitignore A CHANGELOG.md A COPYING A Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M README.md M SkinMetrolook.php A collapsibleNav.css A csshover.htc A csshover.min.htc A images/Transparent.gif A images/arrow-collapsed-ltr.png A images/arrow-collapsed-ltr.svg A images/arrow-collapsed-rtl.png A images/arrow-collapsed-rtl.svg A images/arrow-down-focus-icon.svg A images/arrow-down-icon.svg A images/arrow-expanded.png A images/arrow-expanded.svg M images/audio-icon.png A images/bullet-circle-icon.png A images/closed-ltr.png A images/closed-ltr.svg A images/closed-rtl.png A images/closed-rtl.svg M images/document-icon.png A images/downarrow.png A images/downarrow.svg M images/edit-icon.png A images/edit-icon.svg D images/external-link-icon.png A images/external-link-ltr-icon.svg A images/external-link-rtl-icon.svg A images/fade.png M images/file-icon.png A images/hamburger.png A images/hamburger.svg A images/line.png A images/line.svg M images/link-icon.png M images/lock-icon.png M images/magnify-clip.png M images/mail-icon.png M images/news-icon.png A images/open.png A images/open.svg M images/preferences-break.png D images/preferences-edge.png M images/preferences-fade.png M images/talk-icon.png A images/uploadlogo.png A images/uploadlogo.svg A images/user-icon-20.png A images/user-icon-20.svg A images/user-icon-40.png A images/user-icon-40.svg D images/user-icon.png M images/video-icon.png A images/watch-icon-loading.gif A js/collapsibleNav.js R js/collapsibleTabs.js A js/mediawiki.searchSuggest.custom.js A js/metrolook.js A js/overthrow.js A js/vector.js A mobile.css M screen-hd.css M screen.css A theme.css D vector.js 71 files changed, 5,980 insertions(+), 1,808 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/203481 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45f0cf7e5831e20b8c196b7cbad26fcf6dc64adb Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_21 Gerrit-Owner: Paladox Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improvements to Metrolook skin and bump version - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203483 Change subject: Improvements to Metrolook skin and bump version .. Improvements to Metrolook skin and bump version * Includes skin.json. * Bump version to 3.0 rc 1. Change-Id: I261882d0d165146e740ad0e720bfb53233dfb046 --- M .gitreview M CHANGELOG.md M Metrolook.php M MetrolookTemplate.php M README.md M components/mobile.less M components/personalMenu.less M components/tabs.less M composer.json D i18n/oc.json D i18n/ps.json M i18n/qqq.json M js/mediawiki.searchSuggest.custom.js A skin.json M theme.less 15 files changed, 179 insertions(+), 173 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/83/203483/1 diff --git a/.gitreview b/.gitreview index db98503..ae14985 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/skins/Metrolook.git -defaultbranch=master +defaultbranch=REL1_25 defaultrebase=0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d77fb..3a332d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ = +### 3.0 rc 1 + +Improvement to mobile and desktop desgn. + +Includes skin.json. Requires MediaWiki 1.25+. Please read README.md on how to use new extension registration + ### 3.0 beta 16 Big release with new desgn for mobile and minor improvements to desktop desgn. diff --git a/Metrolook.php b/Metrolook.php index 16c7368..073885e 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -26,7 +26,7 @@ 'name' => 'Metrolook', 'namemsg' => 'skinname-metrolook', 'descriptionmsg' => 'metrolook-desc', - 'version' => '3.0 beta 16', + 'version' => '3.0 rc 1', 'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' => array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' => 'GPL-2.0+', diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 0982aab..e790d84 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -318,11 +318,12 @@ msg('uploadbtn') ?>renderNavigation( array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?> - + + diff --git a/README.md b/README.md index 846bf39..1f1f6ed 100644 --- a/README.md +++ b/README.md @@ -6,25 +6,29 @@ The author of the skin is http://www.pidgi.net/wiki/Main_Page -Compatible with MediaWiki 1.25+ +Compatible with MediaWiki 1.25+. -If you would like compatibility with mediawiki 1.24, 1.23, 1.22 or 1.21 please visit +If you would like compatibility with mediawiki 1.26, 1.24, 1.23, 1.22 or 1.21 please visit + +1.26 + +https://github.com/paladox/Metrolook/tree/master 1.24 -https://github.com/paladox2015/Metrolook/tree/REL1_24 +https://github.com/paladox/Metrolook/tree/REL1_24 1.23 -https://github.com/paladox2015/Metrolook/tree/REL1_23 +https://github.com/paladox/Metrolook/tree/REL1_23 1.22 -https://github.com/paladox2015/Metrolook/tree/REL1-22 +https://github.com/paladox/Metrolook/tree/REL1_22 1.21 -https://github.com/paladox2015/Metrolook/tree/REL1_21 +https://github.com/paladox/Metrolook/tree/REL1_21 Please be aware that there are issues in the codes if you see any could you point it out it would help. and there are things like logos already set sorry i will put a setting there. @@ -38,6 +42,12 @@ ```php require_once "$IP/skins/Metrolook/Metrolook.php"; +``` + +MediaWiki 1.25+ (optional) + +```php +wfLoadSkin( 'Metrolook' ); ``` ## Settings @@ -58,13 +68,6 @@ |`$wgMetrolookTileN`Where `N` is between 5 to 10. | | `$wgMetrolookTile5 = true;`| `$wgMetrolookTile5 = false;` | |`$wgMetrolookURLN`, `$wgMetrolookImageN`Where `N` is between 1 to 6. | | `$wgMetrolookURL1 = link of website;``$wgMetrolookImage1 = image link;`| | -## Mobile desgn - -To test out the new mobile desgn please visit https://github.com/paladox/Metrolook/tree/test - -It is in preview meaning there will be bugs and problems. Please report any bugs or suggestion for the desgn. - - $wgBartile is now used to disable the default tiles or enable them so you can have the default tiles or set your self one. $link and $picture were removed in favour of using $wgMetrolookBartile and $wgMetrolookURL1 and $wgMetrolookImage1 @@ -75,6 +78,14 @@ Note: Tile 5 to 10 is for when you disable bartile. Note: Image setting should be set like this for example $wgMetrolookImage1 = file/to/image or can be set like http://example.com/image.png; + + +## Mobile desgn + +Mobile desgn now included in the latest release for MediaWiki 1.24+. Mobile desgn for Me
[MediaWiki-commits] [Gerrit] Improvements to Metrolook skin and bump version - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged. Change subject: Improvements to Metrolook skin and bump version .. Improvements to Metrolook skin and bump version * Includes skin.json. * Bump version to 3.0 rc 1. Change-Id: I261882d0d165146e740ad0e720bfb53233dfb046 --- M .gitreview M CHANGELOG.md M Metrolook.php M MetrolookTemplate.php M README.md M components/mobile.less M components/personalMenu.less M components/tabs.less M composer.json M js/mediawiki.searchSuggest.custom.js A skin.json M theme.less 12 files changed, 177 insertions(+), 153 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved diff --git a/.gitreview b/.gitreview index db98503..ae14985 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/skins/Metrolook.git -defaultbranch=master +defaultbranch=REL1_25 defaultrebase=0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d77fb..3a332d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ = +### 3.0 rc 1 + +Improvement to mobile and desktop desgn. + +Includes skin.json. Requires MediaWiki 1.25+. Please read README.md on how to use new extension registration + ### 3.0 beta 16 Big release with new desgn for mobile and minor improvements to desktop desgn. diff --git a/Metrolook.php b/Metrolook.php index 16c7368..073885e 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -26,7 +26,7 @@ 'name' => 'Metrolook', 'namemsg' => 'skinname-metrolook', 'descriptionmsg' => 'metrolook-desc', - 'version' => '3.0 beta 16', + 'version' => '3.0 rc 1', 'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' => array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' => 'GPL-2.0+', diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 0982aab..e790d84 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -318,11 +318,12 @@ msg('uploadbtn') ?>renderNavigation( array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?> - + + diff --git a/README.md b/README.md index 846bf39..1f1f6ed 100644 --- a/README.md +++ b/README.md @@ -6,25 +6,29 @@ The author of the skin is http://www.pidgi.net/wiki/Main_Page -Compatible with MediaWiki 1.25+ +Compatible with MediaWiki 1.25+. -If you would like compatibility with mediawiki 1.24, 1.23, 1.22 or 1.21 please visit +If you would like compatibility with mediawiki 1.26, 1.24, 1.23, 1.22 or 1.21 please visit + +1.26 + +https://github.com/paladox/Metrolook/tree/master 1.24 -https://github.com/paladox2015/Metrolook/tree/REL1_24 +https://github.com/paladox/Metrolook/tree/REL1_24 1.23 -https://github.com/paladox2015/Metrolook/tree/REL1_23 +https://github.com/paladox/Metrolook/tree/REL1_23 1.22 -https://github.com/paladox2015/Metrolook/tree/REL1-22 +https://github.com/paladox/Metrolook/tree/REL1_22 1.21 -https://github.com/paladox2015/Metrolook/tree/REL1_21 +https://github.com/paladox/Metrolook/tree/REL1_21 Please be aware that there are issues in the codes if you see any could you point it out it would help. and there are things like logos already set sorry i will put a setting there. @@ -38,6 +42,12 @@ ```php require_once "$IP/skins/Metrolook/Metrolook.php"; +``` + +MediaWiki 1.25+ (optional) + +```php +wfLoadSkin( 'Metrolook' ); ``` ## Settings @@ -58,13 +68,6 @@ |`$wgMetrolookTileN`Where `N` is between 5 to 10. | | `$wgMetrolookTile5 = true;`| `$wgMetrolookTile5 = false;` | |`$wgMetrolookURLN`, `$wgMetrolookImageN`Where `N` is between 1 to 6. | | `$wgMetrolookURL1 = link of website;``$wgMetrolookImage1 = image link;`| | -## Mobile desgn - -To test out the new mobile desgn please visit https://github.com/paladox/Metrolook/tree/test - -It is in preview meaning there will be bugs and problems. Please report any bugs or suggestion for the desgn. - - $wgBartile is now used to disable the default tiles or enable them so you can have the default tiles or set your self one. $link and $picture were removed in favour of using $wgMetrolookBartile and $wgMetrolookURL1 and $wgMetrolookImage1 @@ -75,6 +78,14 @@ Note: Tile 5 to 10 is for when you disable bartile. Note: Image setting should be set like this for example $wgMetrolookImage1 = file/to/image or can be set like http://example.com/image.png; + + +## Mobile desgn + +Mobile desgn now included in the latest release for MediaWiki 1.24+. Mobile desgn for MediaWiki 1.23 and 1.22 coming soon. Also to get mobile desgn please download Metrolook release 2.5 or 3.0 beta 16 o
[MediaWiki-commits] [Gerrit] Updater author. - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203484 Change subject: Updater author. .. Updater author. Change-Id: Iedc278db99c7fc593f488310e8a01793466020a4 --- M .gitreview M CHANGELOG.md M Metrolook.php M MetrolookTemplate.php M README.md M components/mobile.less M components/personalMenu.less M components/tabs.less M composer.json M js/mediawiki.searchSuggest.custom.js A skin.json M theme.less 12 files changed, 177 insertions(+), 153 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/84/203484/1 diff --git a/.gitreview b/.gitreview index db98503..ae14985 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/skins/Metrolook.git -defaultbranch=master +defaultbranch=REL1_25 defaultrebase=0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d77fb..3a332d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ = +### 3.0 rc 1 + +Improvement to mobile and desktop desgn. + +Includes skin.json. Requires MediaWiki 1.25+. Please read README.md on how to use new extension registration + ### 3.0 beta 16 Big release with new desgn for mobile and minor improvements to desktop desgn. diff --git a/Metrolook.php b/Metrolook.php index 16c7368..073885e 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -26,7 +26,7 @@ 'name' => 'Metrolook', 'namemsg' => 'skinname-metrolook', 'descriptionmsg' => 'metrolook-desc', - 'version' => '3.0 beta 16', + 'version' => '3.0 rc 1', 'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' => array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' => 'GPL-2.0+', diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 0982aab..e790d84 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -318,11 +318,12 @@ msg('uploadbtn') ?>renderNavigation( array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?> - + + diff --git a/README.md b/README.md index 846bf39..1f1f6ed 100644 --- a/README.md +++ b/README.md @@ -6,25 +6,29 @@ The author of the skin is http://www.pidgi.net/wiki/Main_Page -Compatible with MediaWiki 1.25+ +Compatible with MediaWiki 1.25+. -If you would like compatibility with mediawiki 1.24, 1.23, 1.22 or 1.21 please visit +If you would like compatibility with mediawiki 1.26, 1.24, 1.23, 1.22 or 1.21 please visit + +1.26 + +https://github.com/paladox/Metrolook/tree/master 1.24 -https://github.com/paladox2015/Metrolook/tree/REL1_24 +https://github.com/paladox/Metrolook/tree/REL1_24 1.23 -https://github.com/paladox2015/Metrolook/tree/REL1_23 +https://github.com/paladox/Metrolook/tree/REL1_23 1.22 -https://github.com/paladox2015/Metrolook/tree/REL1-22 +https://github.com/paladox/Metrolook/tree/REL1_22 1.21 -https://github.com/paladox2015/Metrolook/tree/REL1_21 +https://github.com/paladox/Metrolook/tree/REL1_21 Please be aware that there are issues in the codes if you see any could you point it out it would help. and there are things like logos already set sorry i will put a setting there. @@ -38,6 +42,12 @@ ```php require_once "$IP/skins/Metrolook/Metrolook.php"; +``` + +MediaWiki 1.25+ (optional) + +```php +wfLoadSkin( 'Metrolook' ); ``` ## Settings @@ -58,13 +68,6 @@ |`$wgMetrolookTileN`Where `N` is between 5 to 10. | | `$wgMetrolookTile5 = true;`| `$wgMetrolookTile5 = false;` | |`$wgMetrolookURLN`, `$wgMetrolookImageN`Where `N` is between 1 to 6. | | `$wgMetrolookURL1 = link of website;``$wgMetrolookImage1 = image link;`| | -## Mobile desgn - -To test out the new mobile desgn please visit https://github.com/paladox/Metrolook/tree/test - -It is in preview meaning there will be bugs and problems. Please report any bugs or suggestion for the desgn. - - $wgBartile is now used to disable the default tiles or enable them so you can have the default tiles or set your self one. $link and $picture were removed in favour of using $wgMetrolookBartile and $wgMetrolookURL1 and $wgMetrolookImage1 @@ -75,6 +78,14 @@ Note: Tile 5 to 10 is for when you disable bartile. Note: Image setting should be set like this for example $wgMetrolookImage1 = file/to/image or can be set like http://example.com/image.png; + + +## Mobile desgn + +Mobile desgn now included in the latest release for MediaWiki 1.24+. Mobile desgn for MediaWiki 1.23 and 1.22 coming soon. Also to get mobile desgn please download Metrolook release 2.5 or 3.0 beta 16 or higher please. + +And please report feedback
[MediaWiki-commits] [Gerrit] Update author - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203485 Change subject: Update author .. Update author Change-Id: Ib25ac5d05043404f4bf9acec34c9651411b73bcd --- M .gitreview M CHANGELOG.md M Metrolook.php M MetrolookTemplate.php M README.md M components/mobile.less M components/personalMenu.less M components/tabs.less M composer.json M js/mediawiki.searchSuggest.custom.js A skin.json M theme.less 12 files changed, 177 insertions(+), 153 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/85/203485/1 diff --git a/.gitreview b/.gitreview index db98503..ae14985 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/skins/Metrolook.git -defaultbranch=master +defaultbranch=REL1_25 defaultrebase=0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d77fb..3a332d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ = +### 3.0 rc 1 + +Improvement to mobile and desktop desgn. + +Includes skin.json. Requires MediaWiki 1.25+. Please read README.md on how to use new extension registration + ### 3.0 beta 16 Big release with new desgn for mobile and minor improvements to desktop desgn. diff --git a/Metrolook.php b/Metrolook.php index 16c7368..073885e 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -26,7 +26,7 @@ 'name' => 'Metrolook', 'namemsg' => 'skinname-metrolook', 'descriptionmsg' => 'metrolook-desc', - 'version' => '3.0 beta 16', + 'version' => '3.0 rc 1', 'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' => array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' => 'GPL-2.0+', diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 0982aab..e790d84 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -318,11 +318,12 @@ msg('uploadbtn') ?>renderNavigation( array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?> - + + diff --git a/README.md b/README.md index 846bf39..1f1f6ed 100644 --- a/README.md +++ b/README.md @@ -6,25 +6,29 @@ The author of the skin is http://www.pidgi.net/wiki/Main_Page -Compatible with MediaWiki 1.25+ +Compatible with MediaWiki 1.25+. -If you would like compatibility with mediawiki 1.24, 1.23, 1.22 or 1.21 please visit +If you would like compatibility with mediawiki 1.26, 1.24, 1.23, 1.22 or 1.21 please visit + +1.26 + +https://github.com/paladox/Metrolook/tree/master 1.24 -https://github.com/paladox2015/Metrolook/tree/REL1_24 +https://github.com/paladox/Metrolook/tree/REL1_24 1.23 -https://github.com/paladox2015/Metrolook/tree/REL1_23 +https://github.com/paladox/Metrolook/tree/REL1_23 1.22 -https://github.com/paladox2015/Metrolook/tree/REL1-22 +https://github.com/paladox/Metrolook/tree/REL1_22 1.21 -https://github.com/paladox2015/Metrolook/tree/REL1_21 +https://github.com/paladox/Metrolook/tree/REL1_21 Please be aware that there are issues in the codes if you see any could you point it out it would help. and there are things like logos already set sorry i will put a setting there. @@ -38,6 +42,12 @@ ```php require_once "$IP/skins/Metrolook/Metrolook.php"; +``` + +MediaWiki 1.25+ (optional) + +```php +wfLoadSkin( 'Metrolook' ); ``` ## Settings @@ -58,13 +68,6 @@ |`$wgMetrolookTileN`Where `N` is between 5 to 10. | | `$wgMetrolookTile5 = true;`| `$wgMetrolookTile5 = false;` | |`$wgMetrolookURLN`, `$wgMetrolookImageN`Where `N` is between 1 to 6. | | `$wgMetrolookURL1 = link of website;``$wgMetrolookImage1 = image link;`| | -## Mobile desgn - -To test out the new mobile desgn please visit https://github.com/paladox/Metrolook/tree/test - -It is in preview meaning there will be bugs and problems. Please report any bugs or suggestion for the desgn. - - $wgBartile is now used to disable the default tiles or enable them so you can have the default tiles or set your self one. $link and $picture were removed in favour of using $wgMetrolookBartile and $wgMetrolookURL1 and $wgMetrolookImage1 @@ -75,6 +78,14 @@ Note: Tile 5 to 10 is for when you disable bartile. Note: Image setting should be set like this for example $wgMetrolookImage1 = file/to/image or can be set like http://example.com/image.png; + + +## Mobile desgn + +Mobile desgn now included in the latest release for MediaWiki 1.24+. Mobile desgn for MediaWiki 1.23 and 1.22 coming soon. Also to get mobile desgn please download Metrolook release 2.5 or 3.0 beta 16 or higher please. + +And please report feedback in t
[MediaWiki-commits] [Gerrit] Update author - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203487 Change subject: Update author .. Update author Change-Id: I12e986aff28013fe02f44301f438434da1203bc3 --- M .gitreview M CHANGELOG.md M Metrolook.php M MetrolookTemplate.php M README.md M components/mobile.less M components/personalMenu.less M components/tabs.less M composer.json M js/mediawiki.searchSuggest.custom.js A skin.json M theme.less 12 files changed, 177 insertions(+), 153 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/87/203487/1 diff --git a/.gitreview b/.gitreview index db98503..ae14985 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/skins/Metrolook.git -defaultbranch=master +defaultbranch=REL1_25 defaultrebase=0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d77fb..3a332d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ = +### 3.0 rc 1 + +Improvement to mobile and desktop desgn. + +Includes skin.json. Requires MediaWiki 1.25+. Please read README.md on how to use new extension registration + ### 3.0 beta 16 Big release with new desgn for mobile and minor improvements to desktop desgn. diff --git a/Metrolook.php b/Metrolook.php index 16c7368..073885e 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -26,7 +26,7 @@ 'name' => 'Metrolook', 'namemsg' => 'skinname-metrolook', 'descriptionmsg' => 'metrolook-desc', - 'version' => '3.0 beta 16', + 'version' => '3.0 rc 1', 'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' => array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' => 'GPL-2.0+', diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 0982aab..e790d84 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -318,11 +318,12 @@ msg('uploadbtn') ?>renderNavigation( array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?> - + + diff --git a/README.md b/README.md index 846bf39..1f1f6ed 100644 --- a/README.md +++ b/README.md @@ -6,25 +6,29 @@ The author of the skin is http://www.pidgi.net/wiki/Main_Page -Compatible with MediaWiki 1.25+ +Compatible with MediaWiki 1.25+. -If you would like compatibility with mediawiki 1.24, 1.23, 1.22 or 1.21 please visit +If you would like compatibility with mediawiki 1.26, 1.24, 1.23, 1.22 or 1.21 please visit + +1.26 + +https://github.com/paladox/Metrolook/tree/master 1.24 -https://github.com/paladox2015/Metrolook/tree/REL1_24 +https://github.com/paladox/Metrolook/tree/REL1_24 1.23 -https://github.com/paladox2015/Metrolook/tree/REL1_23 +https://github.com/paladox/Metrolook/tree/REL1_23 1.22 -https://github.com/paladox2015/Metrolook/tree/REL1-22 +https://github.com/paladox/Metrolook/tree/REL1_22 1.21 -https://github.com/paladox2015/Metrolook/tree/REL1_21 +https://github.com/paladox/Metrolook/tree/REL1_21 Please be aware that there are issues in the codes if you see any could you point it out it would help. and there are things like logos already set sorry i will put a setting there. @@ -38,6 +42,12 @@ ```php require_once "$IP/skins/Metrolook/Metrolook.php"; +``` + +MediaWiki 1.25+ (optional) + +```php +wfLoadSkin( 'Metrolook' ); ``` ## Settings @@ -58,13 +68,6 @@ |`$wgMetrolookTileN`Where `N` is between 5 to 10. | | `$wgMetrolookTile5 = true;`| `$wgMetrolookTile5 = false;` | |`$wgMetrolookURLN`, `$wgMetrolookImageN`Where `N` is between 1 to 6. | | `$wgMetrolookURL1 = link of website;``$wgMetrolookImage1 = image link;`| | -## Mobile desgn - -To test out the new mobile desgn please visit https://github.com/paladox/Metrolook/tree/test - -It is in preview meaning there will be bugs and problems. Please report any bugs or suggestion for the desgn. - - $wgBartile is now used to disable the default tiles or enable them so you can have the default tiles or set your self one. $link and $picture were removed in favour of using $wgMetrolookBartile and $wgMetrolookURL1 and $wgMetrolookImage1 @@ -75,6 +78,14 @@ Note: Tile 5 to 10 is for when you disable bartile. Note: Image setting should be set like this for example $wgMetrolookImage1 = file/to/image or can be set like http://example.com/image.png; + + +## Mobile desgn + +Mobile desgn now included in the latest release for MediaWiki 1.24+. Mobile desgn for MediaWiki 1.23 and 1.22 coming soon. Also to get mobile desgn please download Metrolook release 2.5 or 3.0 beta 16 or higher please. + +And please report feedback in t
[MediaWiki-commits] [Gerrit] Update author - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203488 Change subject: Update author .. Update author Change-Id: I12e986aff28013fe02f44301f438434da1203bc3 --- M skin.json 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/88/203488/1 diff --git a/skin.json b/skin.json index 626ece4..876269d 100644 --- a/skin.json +++ b/skin.json @@ -3,11 +3,7 @@ "version": "3.0 rc 1", "author": [ "immewnity", -<<< HEAD (e64213 Update author) "Paladox", -=== - "paladox2015", ->>> BRANCH (2c7b8a Improvements to Metrolook skin and bump version) "Craig Davison", "lagleki" ], @@ -34,6 +30,7 @@ "SkinMetrolook": "SkinMetrolook.php", "MetrolookTemplate": "MetrolookTemplate.php" }, + "ResourceModules": { "skins.metrolook.styles": { "styles": { -- To view, visit https://gerrit.wikimedia.org/r/203488 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12e986aff28013fe02f44301f438434da1203bc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update author - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203489 Change subject: Update author .. Update author Change-Id: I5e666032efdb011b5c3b4882fd068dcd355e16b8 --- M skin.json 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/89/203489/1 diff --git a/skin.json b/skin.json index 626ece4..876269d 100644 --- a/skin.json +++ b/skin.json @@ -3,11 +3,7 @@ "version": "3.0 rc 1", "author": [ "immewnity", -<<< HEAD (e64213 Update author) "Paladox", -=== - "paladox2015", ->>> BRANCH (2c7b8a Improvements to Metrolook skin and bump version) "Craig Davison", "lagleki" ], @@ -34,6 +30,7 @@ "SkinMetrolook": "SkinMetrolook.php", "MetrolookTemplate": "MetrolookTemplate.php" }, + "ResourceModules": { "skins.metrolook.styles": { "styles": { -- To view, visit https://gerrit.wikimedia.org/r/203489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e666032efdb011b5c3b4882fd068dcd355e16b8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update author - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged. Change subject: Update author .. Update author Change-Id: I5e666032efdb011b5c3b4882fd068dcd355e16b8 --- M skin.json 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/skin.json b/skin.json index eb6c292..50fcd75 100644 --- a/skin.json +++ b/skin.json @@ -30,6 +30,7 @@ "SkinMetrolook": "SkinMetrolook.php", "MetrolookTemplate": "MetrolookTemplate.php" }, + "ResourceModules": { "skins.metrolook.styles": { "styles": { -- To view, visit https://gerrit.wikimedia.org/r/203489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e666032efdb011b5c3b4882fd068dcd355e16b8 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203491 Change subject: Fix .. Fix Change-Id: I050ab4097f2268a1aa1cf28d284896b8ae627d37 --- M skin.json 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/91/203491/1 diff --git a/skin.json b/skin.json index 50fcd75..eb6c292 100644 --- a/skin.json +++ b/skin.json @@ -30,7 +30,6 @@ "SkinMetrolook": "SkinMetrolook.php", "MetrolookTemplate": "MetrolookTemplate.php" }, - "ResourceModules": { "skins.metrolook.styles": { "styles": { -- To view, visit https://gerrit.wikimedia.org/r/203491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I050ab4097f2268a1aa1cf28d284896b8ae627d37 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged. Change subject: Fix .. Fix Change-Id: I050ab4097f2268a1aa1cf28d284896b8ae627d37 --- M skin.json 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Paladox: Verified; Looks good to me, approved diff --git a/skin.json b/skin.json index 50fcd75..eb6c292 100644 --- a/skin.json +++ b/skin.json @@ -30,7 +30,6 @@ "SkinMetrolook": "SkinMetrolook.php", "MetrolookTemplate": "MetrolookTemplate.php" }, - "ResourceModules": { "skins.metrolook.styles": { "styles": { -- To view, visit https://gerrit.wikimedia.org/r/203491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I050ab4097f2268a1aa1cf28d284896b8ae627d37 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improvement to Metrolook and bump version - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203492 Change subject: Improvement to Metrolook and bump version .. Improvement to Metrolook and bump version * Supports MediaWiki 1.26. * Includes skin.json. Read README.md on how to use new extension registration. Change-Id: I0183976033cbd9c24d8d29cffc0aa637dae2da6a --- M CHANGELOG.md M Metrolook.php M MetrolookTemplate.php M README.md M components/mobile.less M components/personalMenu.less M components/tabs.less M composer.json D i18n/oc.json D i18n/ps.json M i18n/qqq.json M js/mediawiki.searchSuggest.custom.js A skin.json M theme.less 14 files changed, 236 insertions(+), 254 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/92/203492/1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d77fb..0166678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,85 +2,10 @@ = -### 3.0 beta 16 +### 4.0 alpha 1 -Big release with new desgn for mobile and minor improvements to desktop desgn. +First release of Metrolook to support MediaWiki 1.26. +Includes improvements to mobile desgn and desktop desgn. -Bump required mediawiki version to mediawiki 1.25 wmf 18 - -Mainly new features and desgn are - -* Mobile desgn - -* Full logo support. - -* Cleaned up MetrolookTemplate.php file. - -* Cleaned up setting names. - -* Settings that were renamed - -$logo renamed to $wgMetrolookLogo$SearchBar renamed to $wgMetrolookSearchBar$DownArrow renamed to $wgMetrolookDownArrow$Line renamed to $wgMetrolookLine$UploadButton renamed to $wgMetrolookUploadButton$wgURL1 and $wgImage1 where renamed to $wgMetrolookURL1 and $wgMetrolookImage1 and there settings were changed. for url you put in the url to website for image you put in the path to image or url to image. - -* Settings that were removed. - - $link and $picture - -* New settings that were added - -$wgMetrolookBartile - -$wgMetrolookTile1$wgMetrolookTile2$wgMetrolookTile3$wgMetrolookTile4$wgMetrolookTile5$wgMetrolookTile6$wgMetrolookTile7$wgMetrolookTile8$wgMetrolookTile9$wgMetrolookTile10 - -$wgMetrolookSiteName - -$wgMetrolookMobile - - - -Note: Please see settings section in README.md for more information on how to enable and disable it. - -* Remove styles and js from the main MetrolookTemplate.php and seperated it into own files. - -* More new things and changes comming soon to this release. /* This will be removed once this is ready to be published */ - - -Improvements to ipad desgn. - -* Bug fixes. - -* Fixes for desktop desgn. - - - -### 3.0 beta 15 - -* Adding copying file for license. - -* Adding namemsg for skin name. - -* Localisation updates. - -* Update license to GPL-2.0+ in Metrolook.php. - - -### 3.0 beta 14 - -* Added scroll for sidebar. Will automatically show if content goes out of screen. Note this will only work for people who do not have the search bar in the sidebar enabled. Reason because width is a problem and maybe in future releases it will be added to search bar in sidebar. - -* Updated collapsiblenav css code. - -* Updated i18n and added some more languges. - -* Added bullet-circle-icon.png and svg. - -* Added bullet-icon.svg. - -* Updated Metrolook.php, SkinMetrolook and MetrolookTemplate.php. - -* Updated SkinStyles/jquery.ui. - -* Added changelog. - -* Convert space to tabs. +Includes skin.json. New extension/skin registration in mediawiki starting from mediawiki 1.25. Please read the README.md on how to do it. when using extension.json please remove require_once from localsettings.php for metrolook. diff --git a/Metrolook.php b/Metrolook.php index 16c7368..a7d6d97 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -26,7 +26,7 @@ 'name' => 'Metrolook', 'namemsg' => 'skinname-metrolook', 'descriptionmsg' => 'metrolook-desc', - 'version' => '3.0 beta 16', + 'version' => '4.0 alpha 1', 'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' => array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' => 'GPL-2.0+', diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 0982aab..e790d84 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -318,11 +318,12 @@ msg('uploadbtn') ?>renderNavigation( array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?> - + + diff --git a/README.md b/README.md index 846bf39..6bfbfb3 100644 --- a/README.md +++ b/README.md @@ -6,25 +6,29 @@ The author of the skin is http://www.pidgi.net/wiki/Main_Page -Compatible with MediaWiki 1.25+ +Compatible with MediaWiki 1.26
[MediaWiki-commits] [Gerrit] Improvement to Metrolook and bump version - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203493 Change subject: Improvement to Metrolook and bump version .. Improvement to Metrolook and bump version * Supports MediaWiki 1.26. * Includes skin.json. Read README.md on how to use new extension registration. Change-Id: I6940420d6c76548e65f3874f9a0641db0186fa26 --- M CHANGELOG.md M Metrolook.php M MetrolookTemplate.php M README.md M components/mobile.less M components/personalMenu.less M components/tabs.less M composer.json D i18n/oc.json D i18n/ps.json M i18n/qqq.json M js/mediawiki.searchSuggest.custom.js A skin.json M theme.less 14 files changed, 236 insertions(+), 254 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/93/203493/1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d77fb..0166678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,85 +2,10 @@ = -### 3.0 beta 16 +### 4.0 alpha 1 -Big release with new desgn for mobile and minor improvements to desktop desgn. +First release of Metrolook to support MediaWiki 1.26. +Includes improvements to mobile desgn and desktop desgn. -Bump required mediawiki version to mediawiki 1.25 wmf 18 - -Mainly new features and desgn are - -* Mobile desgn - -* Full logo support. - -* Cleaned up MetrolookTemplate.php file. - -* Cleaned up setting names. - -* Settings that were renamed - -$logo renamed to $wgMetrolookLogo$SearchBar renamed to $wgMetrolookSearchBar$DownArrow renamed to $wgMetrolookDownArrow$Line renamed to $wgMetrolookLine$UploadButton renamed to $wgMetrolookUploadButton$wgURL1 and $wgImage1 where renamed to $wgMetrolookURL1 and $wgMetrolookImage1 and there settings were changed. for url you put in the url to website for image you put in the path to image or url to image. - -* Settings that were removed. - - $link and $picture - -* New settings that were added - -$wgMetrolookBartile - -$wgMetrolookTile1$wgMetrolookTile2$wgMetrolookTile3$wgMetrolookTile4$wgMetrolookTile5$wgMetrolookTile6$wgMetrolookTile7$wgMetrolookTile8$wgMetrolookTile9$wgMetrolookTile10 - -$wgMetrolookSiteName - -$wgMetrolookMobile - - - -Note: Please see settings section in README.md for more information on how to enable and disable it. - -* Remove styles and js from the main MetrolookTemplate.php and seperated it into own files. - -* More new things and changes comming soon to this release. /* This will be removed once this is ready to be published */ - - -Improvements to ipad desgn. - -* Bug fixes. - -* Fixes for desktop desgn. - - - -### 3.0 beta 15 - -* Adding copying file for license. - -* Adding namemsg for skin name. - -* Localisation updates. - -* Update license to GPL-2.0+ in Metrolook.php. - - -### 3.0 beta 14 - -* Added scroll for sidebar. Will automatically show if content goes out of screen. Note this will only work for people who do not have the search bar in the sidebar enabled. Reason because width is a problem and maybe in future releases it will be added to search bar in sidebar. - -* Updated collapsiblenav css code. - -* Updated i18n and added some more languges. - -* Added bullet-circle-icon.png and svg. - -* Added bullet-icon.svg. - -* Updated Metrolook.php, SkinMetrolook and MetrolookTemplate.php. - -* Updated SkinStyles/jquery.ui. - -* Added changelog. - -* Convert space to tabs. +Includes skin.json. New extension/skin registration in mediawiki starting from mediawiki 1.25. Please read the README.md on how to do it. when using extension.json please remove require_once from localsettings.php for metrolook. diff --git a/Metrolook.php b/Metrolook.php index 16c7368..a7d6d97 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -26,7 +26,7 @@ 'name' => 'Metrolook', 'namemsg' => 'skinname-metrolook', 'descriptionmsg' => 'metrolook-desc', - 'version' => '3.0 beta 16', + 'version' => '4.0 alpha 1', 'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' => array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' => 'GPL-2.0+', diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 0982aab..e790d84 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -318,11 +318,12 @@ msg('uploadbtn') ?>renderNavigation( array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?> - + + diff --git a/README.md b/README.md index 846bf39..6bfbfb3 100644 --- a/README.md +++ b/README.md @@ -6,25 +6,29 @@ The author of the skin is http://www.pidgi.net/wiki/Main_Page -Compatible with MediaWiki 1.25+ +Compatible with MediaWiki 1.26
[MediaWiki-commits] [Gerrit] Improvement to Metrolook and bump version - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged. Change subject: Improvement to Metrolook and bump version .. Improvement to Metrolook and bump version * Supports MediaWiki 1.26. * Includes skin.json. Read README.md on how to use new extension registration. Change-Id: I6940420d6c76548e65f3874f9a0641db0186fa26 --- M CHANGELOG.md M Metrolook.php M MetrolookTemplate.php M README.md M components/mobile.less M components/personalMenu.less M components/tabs.less M composer.json M js/mediawiki.searchSuggest.custom.js A skin.json M theme.less 11 files changed, 234 insertions(+), 234 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d77fb..0166678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,85 +2,10 @@ = -### 3.0 beta 16 +### 4.0 alpha 1 -Big release with new desgn for mobile and minor improvements to desktop desgn. +First release of Metrolook to support MediaWiki 1.26. +Includes improvements to mobile desgn and desktop desgn. -Bump required mediawiki version to mediawiki 1.25 wmf 18 - -Mainly new features and desgn are - -* Mobile desgn - -* Full logo support. - -* Cleaned up MetrolookTemplate.php file. - -* Cleaned up setting names. - -* Settings that were renamed - -$logo renamed to $wgMetrolookLogo$SearchBar renamed to $wgMetrolookSearchBar$DownArrow renamed to $wgMetrolookDownArrow$Line renamed to $wgMetrolookLine$UploadButton renamed to $wgMetrolookUploadButton$wgURL1 and $wgImage1 where renamed to $wgMetrolookURL1 and $wgMetrolookImage1 and there settings were changed. for url you put in the url to website for image you put in the path to image or url to image. - -* Settings that were removed. - - $link and $picture - -* New settings that were added - -$wgMetrolookBartile - -$wgMetrolookTile1$wgMetrolookTile2$wgMetrolookTile3$wgMetrolookTile4$wgMetrolookTile5$wgMetrolookTile6$wgMetrolookTile7$wgMetrolookTile8$wgMetrolookTile9$wgMetrolookTile10 - -$wgMetrolookSiteName - -$wgMetrolookMobile - - - -Note: Please see settings section in README.md for more information on how to enable and disable it. - -* Remove styles and js from the main MetrolookTemplate.php and seperated it into own files. - -* More new things and changes comming soon to this release. /* This will be removed once this is ready to be published */ - - -Improvements to ipad desgn. - -* Bug fixes. - -* Fixes for desktop desgn. - - - -### 3.0 beta 15 - -* Adding copying file for license. - -* Adding namemsg for skin name. - -* Localisation updates. - -* Update license to GPL-2.0+ in Metrolook.php. - - -### 3.0 beta 14 - -* Added scroll for sidebar. Will automatically show if content goes out of screen. Note this will only work for people who do not have the search bar in the sidebar enabled. Reason because width is a problem and maybe in future releases it will be added to search bar in sidebar. - -* Updated collapsiblenav css code. - -* Updated i18n and added some more languges. - -* Added bullet-circle-icon.png and svg. - -* Added bullet-icon.svg. - -* Updated Metrolook.php, SkinMetrolook and MetrolookTemplate.php. - -* Updated SkinStyles/jquery.ui. - -* Added changelog. - -* Convert space to tabs. +Includes skin.json. New extension/skin registration in mediawiki starting from mediawiki 1.25. Please read the README.md on how to do it. when using extension.json please remove require_once from localsettings.php for metrolook. diff --git a/Metrolook.php b/Metrolook.php index 16c7368..a7d6d97 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -26,7 +26,7 @@ 'name' => 'Metrolook', 'namemsg' => 'skinname-metrolook', 'descriptionmsg' => 'metrolook-desc', - 'version' => '3.0 beta 16', + 'version' => '4.0 alpha 1', 'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' => array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' => 'GPL-2.0+', diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 0982aab..e790d84 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -318,11 +318,12 @@ msg('uploadbtn') ?>renderNavigation( array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?> - + + diff --git a/README.md b/README.md index 846bf39..6bfbfb3 100644 --- a/README.md +++ b/README.md @@ -6,25 +6,29 @@ The author of the skin is http://www.pidgi.net/wiki/Main_Page -Compatible with MediaWiki 1.25+ +Compatible with MediaWiki 1.26+. -If you would like compatibility with mediawiki 1.24, 1.23, 1.22 or 1.21 please visit +If you would like com
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203496 Change subject: Update Metrolook .. Update Metrolook Change-Id: Id3bcf27afb5196930d584e3371bf342a9c04584f --- M CHANGELOG.md M Metrolook.php M MetrolookTemplate.php M README.md M SkinMetrolook.php M components/collapsibleNav.less M components/common.less M components/mobile.less M components/navigation.less M components/personalMenu.less M components/search.less M components/tabs.less M composer.json M hooks.txt M i18n/ast.json A i18n/cv.json A i18n/en-gb.json M i18n/fr.json M i18n/hi.json M i18n/it.json M i18n/ko.json A i18n/oc.json A i18n/ps.json M i18n/qqq.json A i18n/uk.json M images/closed-ltr.svg M images/closed-rtl.svg M images/downarrow.svg M images/open.svg M images/uploadlogo.svg M js/mediawiki.searchSuggest.custom.js M js/metrolook.js M screen-hd.less A skin.json A skinStyles/mediawiki.sectionAnchor.less M variables.less 36 files changed, 896 insertions(+), 453 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/96/203496/1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 954285f..0166678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,102 +1,11 @@ Changelog = -### 3.0 beta 16 -Big release with new desgn for mobile and minor improvements to desktop desgn. +### 4.0 alpha 1 -Please see test branch for updates to beta 16 release once it looks like there arnt many issues and all things have been added to it, it will be released to the master branch. +First release of Metrolook to support MediaWiki 1.26. -Bump required mediawiki version to mediawiki 1.25 wmf 18 +Includes improvements to mobile desgn and desktop desgn. - -Mainly new features and desgn are - - -* Mobile desgn (This is a preview of mobile desgn please report bug in issue section and fix bugs if you know how to thanks. and please also suggest improvements to the desktop and mobile desgn.) - -* Full logo support. - -* Cleaned up MetrolookTemplate.php file. - -* Cleaned up setting names. - -* Settings that were renamed - -$logo renamed to $wgMetrolookLogo$SearchBar renamed to $wgMetrolookSearchBar$DownArrow renamed to $wgMetrolookDownArrow$Line renamed to $wgMetrolookLine$UploadButton renamed to $wgMetrolookUploadButton$wgURL1 and $wgImage1 where renamed to $wgMetrolookURL1 and $wgMetrolookImage1 and there settings were changed. for url you put in the url to website for image you put in the path to image or url to image. - -* Settings that were removed. - - $link and $picture - -* New settings that were added - -$wgMetrolookBartile - -$wgMetrolookTile1$wgMetrolookTile2$wgMetrolookTile3$wgMetrolookTile4$wgMetrolookTile5$wgMetrolookTile6$wgMetrolookTile7$wgMetrolookTile8$wgMetrolookTile9$wgMetrolookTile10 - -$wgMetrolookSiteName - -$wgMetrolookMobile - - - -Fixes - -Fix for ipad. - -Fix for desktop view. - -Fix for mobile view. - - - -Note: Please see settings section in README.md for more information on how to enable and disable it. - -* Remove styles and js from the main MetrolookTemplate.php and seperated it into own files. - -* More new things and changes comming soon to this release. /* This will be removed once this is ready to be published */ - - - -Revision 3 brings these fixes /* This may be removed near to time of release. */ - -* Fixes for ipad desgn. - -* Disabled searchbar js for ipad. - -* Fixes for mobile desgn. - -* Fixes for desktop desgn. - - -### 3.0 beta 15 - -* Adding copying file for license. - -* Adding namemsg for skin name. - -* Localisation updates. - -* Update license to GPL-2.0+ in Metrolook.php. - - -### 3.0 beta 14 - -* Added scroll for sidebar. Will automatically show if content goes out of screen. Note this will only work for people who do not have the search bar in the sidebar enabled. Reason because width is a problem and maybe in future releases it will be added to search bar in sidebar. - -* Updated collapsiblenav css code. - -* Updated i18n and added some more languges. - -* Added bullet-circle-icon.png and svg. - -* Added bullet-icon.svg. - -* Updated Metrolook.php, SkinMetrolook and MetrolookTemplate.php. - -* Updated SkinStyles/jquery.ui. - -* Added changelog. - -* Convert space to tabs. +Includes skin.json. New extension/skin registration in mediawiki starting from mediawiki 1.25. Please read the README.md on how to do it. when using extension.json please remove require_once from localsettings.php for metrolook. diff --git a/Metrolook.php b/Metrolook.php index f0d14d4..a7d6d97 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -26,7 +26,7 @@ 'name' => 'Metrolook', 'namemsg' => 'skinname-metrolook', 'descriptionmsg' => 'metrolook-desc', - 'version' => '3.0 beta 16', + 'version' => '4.0 alpha 1', 'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' => array( 'immewnity', 'paladox2015', 'Craig Davi
[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...SiteMatrix)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203058 Change subject: Add extension.json .. Add extension.json Bug: T87974 Change-Id: Ib4e8dfd579afbecbad936ddff610eb33685e9118 --- M SiteMatrix.alias.php A extension.json 2 files changed, 94 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SiteMatrix refs/changes/58/203058/1 diff --git a/SiteMatrix.alias.php b/SiteMatrix.alias.php index 2f4ba9f..972b07d 100644 --- a/SiteMatrix.alias.php +++ b/SiteMatrix.alias.php @@ -34,6 +34,11 @@ 'SiteMatrix' => array( 'SiteMatrix' ), ); +/** Western Balochi (بلوچی رخشانی) */ +$specialPageAliases['bgn'] = array( + 'SiteMatrix' => array( 'ویب_سایٹ_ئی_ماتریس' ), +); + /** Catalan (català) */ $specialPageAliases['ca'] = array( 'SiteMatrix' => array( 'Projectes_Wikimedia', 'Wikis_Wikimedia' ), diff --git a/extension.json b/extension.json new file mode 100644 index 000..1611928 --- /dev/null +++ b/extension.json @@ -0,0 +1,89 @@ +{ + "name": "SiteMatrix", + "version": "1.3.0", + "author": [ + "Tim Starling", + "Brion Vibber", + "Victor Vasiliev", + "Alexandre Emsenhuber" + ], + "url": "https://www.mediawiki.org/wiki/Extension:SiteMatrix";, + "descriptionmsg": "sitematrix-desc", + "type": "specialpage", + "SpecialPages": { + "SiteMatrix": "SpecialSiteMatrix" + }, + "SpecialPageGroups": { + "SiteMatrix": "wiki" + }, + "APIModules": { + "sitematrix": "ApiSiteMatrix" + }, + "MessagesDirs": { + "SiteMatrix": [ + "i18n" + ] + }, + "ExtensionMessagesFiles": { + "SiteMatrix": "SiteMatrix.i18n.php", + "SiteMatrixAlias": "SiteMatrix.alias.php" + }, + "AutoloadClasses": { + "SiteMatrix": "SiteMatrix_body.php", + "SpecialSiteMatrix": "SpecialSiteMatrix.php", + "ApiSiteMatrix": "SiteMatrixApi.php" + }, + "Hooks": { + "APIQuerySiteInfoGeneralInfo": [ + "SiteMatrix::APIQuerySiteInfoGeneralInfo" + ] + }, + "config": { + "SiteMatrixFile": null, + "SiteMatrixSites": { + "wiki": { + "name": "Wikipedia", + "host": "www.wikipedia.org", + "prefix": "w" + }, + "wiktionary": { + "name": "Wiktionary", + "host": "www.wiktionary.org", + "prefix": "wikt" + }, + "wikibooks": { + "name": "Wikibooks", + "host": "www.wikibooks.org", + "prefix": "b" + }, + "wikinews": { + "name": "Wikinews", + "host": "www.wikinews.org", + "prefix": "n" + }, + "wikiquote": { + "name": "Wikiquote", + "host": "www.wikiquote.org", + "prefix": "q" + }, + "wikisource": { + "name": "Wikisource", + "host": "www.wikisource.org", + "prefix": "s" + }, + "wikiversity": { + "name": "Wikiversity", + "host": "www.wikiversity.org", + "prefix": "v" + }, + "wikivoyage": { + "name": "Wikivoyage", + "host": "www.wikivoyage.org", + "prefix": "voy" + } + }, + "SiteMatrixPrivateSites": null, + "SiteMatrixFishbowlSites": null, + "SiteMatrixClosedSites": null + } +} -- To view, visit https://gerrit.wikimedia.org/r/203058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4e8dfd579afbecbad936ddff610eb33685e9118 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SiteMatrix Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...Gadgets)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203098 Change subject: Add extension.json .. Add extension.json Bug: T87918 Change-Id: Iacd056781823bd73144c5fa09cd884ee8e9cf0d4 --- M Gadgets.alias.php A extension.json 2 files changed, 66 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets refs/changes/98/203098/1 diff --git a/Gadgets.alias.php b/Gadgets.alias.php index ba0e62e..46c7852 100644 --- a/Gadgets.alias.php +++ b/Gadgets.alias.php @@ -44,6 +44,11 @@ 'Gadgets' => array( 'Джаджи' ), ); +/** Western Balochi (بلوچی رخشانی) */ +$specialPageAliases['bgn'] = array( + 'Gadgets' => array( 'وسایل_ئان' ), +); + /** Banjar (Bahasa Banjar) */ $specialPageAliases['bjn'] = array( 'Gadgets' => array( 'Pakakas' ), diff --git a/extension.json b/extension.json new file mode 100644 index 000..2dc517d --- /dev/null +++ b/extension.json @@ -0,0 +1,61 @@ +{ + "name": "Gadgets", + "author": [ + "Daniel Kinzler", + "Max Semenik" + ], + "url": "https://www.mediawiki.org/wiki/Extension:Gadgets";, + "descriptionmsg": "gadgets-desc", + "license-name": "GPL-2.0+", + "type": "other", + "SpecialPages": { + "Gadgets": "SpecialGadgets" + }, + "SpecialPageGroups": { + "Gadgets": "wiki" + }, + "APIListModules": { + "gadgetcategories": "ApiQueryGadgetCategories", + "gadgets": "ApiQueryGadgets" + }, + "MessagesDirs": { + "Gadgets": [ + "i18n" + ] + }, + "ExtensionMessagesFiles": { + "Gadgets": "Gadgets.i18n.php", + "GadgetsAlias": "Gadgets.alias.php" + }, + "AutoloadClasses": { + "ApiQueryGadgetCategories": "api/ApiQueryGadgetCategories.php", + "ApiQueryGadgets": "api/ApiQueryGadgets.php", + "Gadget": "Gadgets_body.php", + "GadgetHooks": "GadgetHooks.php", + "GadgetResourceLoaderModule": "Gadgets_body.php", + "SpecialGadgets": "SpecialGadgets.php" + }, + "Hooks": { + "ArticleSaveComplete": [ + "GadgetHooks::articleSaveComplete" + ], + "BeforePageDisplay": [ + "GadgetHooks::beforePageDisplay" + ], + "UserGetDefaultOptions": [ + "GadgetHooks::userGetDefaultOptions" + ], + "GetPreferences": [ + "GadgetHooks::getPreferences" + ], + "ResourceLoaderRegisterModules": [ + "GadgetHooks::registerModules" + ], + "UnitTestsList": [ + "GadgetHooks::onUnitTestsList" + ] + }, + "config": { + "GadgetsCaching": true + } +} -- To view, visit https://gerrit.wikimedia.org/r/203098 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iacd056781823bd73144c5fa09cd884ee8e9cf0d4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gadgets Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...ExtensionDistributor)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203101 Change subject: Add extension.json .. Add extension.json Bug: T87913 Change-Id: If8718c9f798d890f1a5d8f6bbd6a4f180a7efd4e --- M ExtensionDistributor.php A extension.json M specials/SpecialBaseDistributor.php 3 files changed, 65 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor refs/changes/01/203101/1 diff --git a/ExtensionDistributor.php b/ExtensionDistributor.php index 5a08611..44da6f3 100644 --- a/ExtensionDistributor.php +++ b/ExtensionDistributor.php @@ -53,6 +53,11 @@ 'master', ); +/** + * Snapshot branch/tag to default to + */ +$wgExtDistDefaultSnapshot = 'master'; + / * Registration */ diff --git a/extension.json b/extension.json new file mode 100644 index 000..78930b7 --- /dev/null +++ b/extension.json @@ -0,0 +1,54 @@ +{ + "name": "Extension Distributor", + "author": [ + "Tim Starling", + "Sam Reed", + "Chad Horohoe", + "Kunal Mehta" + ], + "url": "https://www.mediawiki.org/wiki/Extension:ExtensionDistributor";, + "descriptionmsg": "extensiondistributor-desc", + "type": "specialpage", + "SpecialPages": { + "ExtensionDistributor": "SpecialExtensionDistributor", + "SkinDistributor": "SpecialSkinDistributor" + }, + "SpecialPageGroups": { + "ExtensionDistributor": "developer", + "SkinDistributor": "developer" + }, + "APIListModules": { + "extdistrepos": "ApiListExtDistRepos" + }, + "MessagesDirs": { + "ExtensionDistributor": [ + "i18n" + ] + }, + "ExtensionMessagesFiles": { + "ExtensionDistributorAliases": "ExtensionDistributor.alias.php" + }, + "AutoloadClasses": { + "ExtensionDistributorHooks": "ExtensionDistributor.hooks.php", + "SpecialBaseDistributor": "specials/SpecialBaseDistributor.php", + "SpecialExtensionDistributor": "specials/SpecialExtensionDistributor.php", + "SpecialSkinDistributor": "specials/SpecialSkinDistributor.php", + "ExtDistProvider": "providers/ExtDistProvider.php", + "GerritExtDistProvider": "providers/GerritExtDistProvider.php", + "GithubExtDistProvider": "providers/GithubExtDistProvider.php", + "ApiListExtDistRepos": "api/ApiListExtDistRepos.php" + }, + "Hooks": { + "APIQuerySiteInfoGeneralInfo": [ + "ExtensionDistributorHooks::onAPIQuerySiteInfoGeneralInfo" + ] + }, + "config": { + "ExtDistAPIConfig": false, + "ExtDistListFile": false, + "ExtDistSnapshotRefs": [ + "master" + ], + "ExtDistDefaultSnapshot": "master" + } +} diff --git a/specials/SpecialBaseDistributor.php b/specials/SpecialBaseDistributor.php index c7e4efa..2c413b3 100644 --- a/specials/SpecialBaseDistributor.php +++ b/specials/SpecialBaseDistributor.php @@ -128,7 +128,7 @@ * @return mixed */ protected function showVersionSelector( $repoName ) { - global $wgExtDistSnapshotRefs; + global $wgExtDistSnapshotRefs, $wgExtDistDefaultSnapshot; if ( !$wgExtDistSnapshotRefs ) { // extdist-no-versions-extensions, extdist-no-versions-skins @@ -157,7 +157,11 @@ if ( $this->getProvider()->hasBranch( $repoName, $branchName ) ) { $branchMsg = $this->msg( "extdist-branch-$branchName" ); $branchDesc = $branchMsg->isDisabled() ? $branchName : $branchMsg->plain(); - $html .= Xml::option( $branchDesc, $branchName, ($selected == 1) ); + $html .= Xml::option( + $branchDesc, + $branchName, + ( $branchName === $wgExtDistDefaultSnapshot ) + ); $selected++; } } -- To view, visit https://gerrit.wikimedia.org/r/203101 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8718c9f798d890f1a5d8f6bbd6a4f180a7efd4e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ExtensionDistributor Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinf
[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...VectorBeta)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203066 Change subject: Add extension.json .. Add extension.json Bug: T87990 Change-Id: I7cb69e23606809947a289ca64bc52e1fa73f004b --- A extension.json M i18n/gl.json 2 files changed, 123 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VectorBeta refs/changes/66/203066/1 diff --git a/extension.json b/extension.json new file mode 100644 index 000..7f6bffb --- /dev/null +++ b/extension.json @@ -0,0 +1,122 @@ +{ + "name": "VectorBeta", + "author": [ + "Jon Robson", + "Trevor Parscal", + "Juliusz Gonera" + ], + "url": "https://www.mediawiki.org/wiki/Extension:VectorBeta";, + "descriptionmsg": "vectorbeta-desc", + "type": "betafeatures", + "MessagesDirs": { + "VectorBeta": [ + "i18n" + ] + }, + "ExtensionMessagesFiles": { + "VectorBeta": "VectorBeta.i18n.php" + }, + "AutoloadClasses": { + "VectorBetaHooks": "VectorBeta.hooks.php" + }, + "ResourceModules": { + "skins.vector.beta": { + "styles": [ + "resources/typography/styles.less" + ] + }, + "skins.vector.header.beta": { + "styles": [ + "resources/fixedHeader/header.less", + "resources/fixedHeader/page-actions.less", + "resources/fixedHeader/personal-bar.less" + ], + "group": "other" + }, + "skins.vector.headerjs.beta": { + "dependencies": [ + "jquery.throttle-debounce" + ], + "scripts": [ + "resources/fixedHeader/header.js", + "resources/fixedHeader/hamburger.js" + ], + "styles": [ + "resources/fixedHeader/search-suggestions.less" + ] + }, + "skins.vector.compactPersonalBar.trackClick": { + "dependencies": [ + "mediawiki.user", + "ext.eventLogging", + "skins.vector.compactPersonalBar.schema" + ], + "scripts": [ + "resources/compactPersonalBar/trackClick.js" + ], + "position": "top" + }, + "skins.vector.compactPersonalBar.defaultTracking": { + "dependencies": [ + "skins.vector.compactPersonalBar.trackClick" + ], + "scripts": [ + "resources/compactPersonalBar/defaultTracking.js" + ], + "position": "top" + }, + "skins.vector.compactPersonalBar": { + "dependencies": [ + "skins.vector.compactPersonalBar.trackClick", + "jquery.accessKeyLabel" + ], + "styles": [ + "resources/compactPersonalBar/compactPersonalBar.less" + ], + "scripts": [ + "resources/compactPersonalBar/compactPersonalBar.js" + ], + "messages": [ + "notifications", + "vector-beta-compact-personal-bar-privacy", + "privacypage", + "help", + "helppage" + ], + "position": "top" + } + }, + "ResourceFileModulePaths": { + "localBasePath": "", + "remoteExtPath": "VectorBeta" + }, + "Hooks": { + "SkinTemplateOutputPageBeforeExec": [ + "VectorBetaHooks::getSkinTemplateOutputPageBeforeExec" + ], + "GetBetaFeaturePreferences": [ + "VectorBetaHooks::getPreferences" + ], + "BeforePageDisplay": [ + "VectorBetaHooks::onBeforePageDisplay" + ], + "SkinVectorStyleModules": [ + "VectorBetaHooks::skinVectorStyleModules" + ], + "ResourceLoaderRegisterModules": [ +
[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...LocalisationUpdate)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203052 Change subject: Add extension.json .. Add extension.json Bug: T87937 Change-Id: Iebd77c54ccdfa95d917d5e33c0a054715604ef24 --- A extension.json M i18n/qqq.json 2 files changed, 57 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LocalisationUpdate refs/changes/52/203052/1 diff --git a/extension.json b/extension.json new file mode 100644 index 000..f9ec463 --- /dev/null +++ b/extension.json @@ -0,0 +1,54 @@ +{ + "name": "LocalisationUpdate", + "version": "1.3.0", + "author": [ + "Tom Maaswinkel", + "Niklas Laxström", + "Roan Kattouw" + ], + "url": "https://www.mediawiki.org/wiki/Extension:LocalisationUpdate";, + "descriptionmsg": "localisationupdate-desc", + "type": "other", + "MessagesDirs": { + "LocalisationUpdate": [ + "i18n" + ] + }, + "ExtensionMessagesFiles": { + "LocalisationUpdate": "LocalisationUpdate.i18n.php" + }, + "AutoloadClasses": { + "LocalisationUpdate": "LocalisationUpdate.class.php", + "LU_Updater": "Updater.php", + "QuickArrayReader": "QuickArrayReader.php", + "LU_Fetcher": "fetcher/Fetcher.php", + "LU_FetcherFactory": "fetcher/FetcherFactory.php", + "LU_FileSystemFetcher": "fetcher/FileSystemFetcher.php", + "LU_GitHubFetcher": "fetcher/GitHubFetcher.php", + "LU_HttpFetcher": "fetcher/HttpFetcher.php", + "LU_Finder": "finder/Finder.php", + "LU_JSONReader": "reader/JSONReader.php", + "LU_PHPReader": "reader/PHPReader.php", + "LU_Reader": "reader/Reader.php", + "LU_ReaderFactory": "reader/ReaderFactory.php" + }, + "Hooks": { + "LocalisationCacheRecache": [ + "LocalisationUpdate::onRecache" + ], + "LocalisationCacheRecacheFallback": [ + "LocalisationUpdate::onRecacheFallback" + ] + }, + "config": { + "LocalisationUpdateDirectory": false, + "LocalisationUpdateRepository": "github", + "LocalisationUpdateRepositories": { + "github": { + "mediawiki": "https://raw.github.com/wikimedia/mediawiki/master/%PATH%";, + "extension": "https://raw.github.com/wikimedia/mediawiki-extensions-%NAME%/master/%PATH%";, + "skin": "https://raw.github.com/wikimedia/mediawiki-skins-%NAME%/master/%PATH%"; + } + } + } +} diff --git a/i18n/qqq.json b/i18n/qqq.json index c6978bb..c08af07 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -3,8 +3,9 @@ "authors": [ "Fryed-peach", "Purodha", - "Shirayuki" + "Shirayuki", + "Umherirrender" ] }, - "localisationupdate-desc": "{{desc|name=Localisation Update|url=http://www.mediawiki.org/wiki/Extension:LocalisationUpdate}}"; + "localisationupdate-desc": "{{desc|name=Localisation Update|url=https://www.mediawiki.org/wiki/Extension:LocalisationUpdate}}"; } -- To view, visit https://gerrit.wikimedia.org/r/203052 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iebd77c54ccdfa95d917d5e33c0a054715604ef24 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LocalisationUpdate Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add skin.json - change (mediawiki...Vector)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203047 Change subject: Add skin.json .. Add skin.json Bug: T87875 Change-Id: I0e298137e27e2a4c7ced5213ea90aef4cd991376 --- M i18n/yue.json A skin.json 2 files changed, 88 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector refs/changes/47/203047/1 diff --git a/i18n/yue.json b/i18n/yue.json index 3aa2309..c104579 100644 --- a/i18n/yue.json +++ b/i18n/yue.json @@ -2,10 +2,12 @@ "@metadata": { "authors": [ "Ktchankt", - "Waihorace" + "Waihorace", + "Yueman" ] }, "skinname-vector": "Vector", + "vector-skin-desc": "MonoBook嘅摩登版,有新嘅樣,又有好多功能改進", "vector.css": "/* 響呢度放 CSS 碼去改用戶用嘅域達畫面 */", "vector.js": "/* 響每一次個頁面載入時,用域達畫面嘅用戶都會載入呢度任何嘅JavaScript */", "vector-action-addsection": "加主題", diff --git a/skin.json b/skin.json new file mode 100644 index 000..1d1ac1b --- /dev/null +++ b/skin.json @@ -0,0 +1,85 @@ +{ + "name": "Vector", + "author": [ + "Trevor Parscal", + "Roan Kattouw", + "..." + ], + "url": "https://www.mediawiki.org/wiki/Skin:Vector";, + "descriptionmsg": "vector-skin-desc", + "namemsg": "skinname-vector", + "license-name": "GPL-2.0+", + "type": "skin", + "ConfigRegistry": { + "vector": "GlobalVarConfig::newInstance" + }, + "ValidSkinNames": { + "vector": "Vector" + }, + "MessagesDirs": { + "Vector": [ + "i18n" + ] + }, + "AutoloadClasses": { + "SkinVector": "SkinVector.php", + "VectorTemplate": "VectorTemplate.php" + }, + "ResourceModules": { + "skins.vector.styles": { + "styles": { + "screen.less": { + "media": "screen" + }, + "screen-hd.less": { + "media": "screen and (min-width: 982px)" + } + } + }, + "skins.vector.js": { + "scripts": [ + "collapsibleTabs.js", + "vector.js" + ], + "position": "top", + "dependencies": [ + "jquery.throttle-debounce", + "jquery.tabIndex" + ] + } + }, + "ResourceFileModulePaths": { + "localBasePath": "", + "remoteSkinPath": "Vector" + }, + "ResourceModuleSkinStyles": { + "vector": { + "jquery.tipsy": "skinStyles/jquery.tipsy.less", + "jquery.ui.core": [ + "skinStyles/jquery.ui/jquery.ui.core.css", + "skinStyles/jquery.ui/jquery.ui.theme.css" + ], + "jquery.ui.accordion": "skinStyles/jquery.ui/jquery.ui.accordion.css", + "jquery.ui.autocomplete": "skinStyles/jquery.ui/jquery.ui.autocomplete.css", + "jquery.ui.button": "skinStyles/jquery.ui/jquery.ui.button.css", + "jquery.ui.datepicker": "skinStyles/jquery.ui/jquery.ui.datepicker.css", + "jquery.ui.dialog": "skinStyles/jquery.ui/jquery.ui.dialog.css", + "jquery.ui.menu": "skinStyles/jquery.ui/jquery.ui.menu.css", + "jquery.ui.progressbar": "skinStyles/jquery.ui/jquery.ui.progressbar.css", + "jquery.ui.resizable": "skinStyles/jquery.ui/jquery.ui.resizable.css", + "jquery.ui.selectable": "skinStyles/jquery.ui/jquery.ui.selectable.css", + "jquery.ui.slider": "skinStyles/jquery.ui/jquery.ui.slider.css", + "jquery.ui.spinner": "skinStyles/jquery.ui/jquery.ui.spinner.css", + "jquery.ui.tabs": "skinStyles/jquery.ui/jquery.ui.tabs.css", + "jquery.ui.tooltips": "skinStyles/jquery.ui/jquery.ui.tooltips.css", + "mediawiki.notification": "skinStyles/mediawiki.notification.less", + "+mediawiki.sectionAnchor": "skinStyles/mediawiki.sectionAnchor.less", + "mediawiki.special": "skinStyles/mediawiki.special.less", + "mediawiki.special.preferences": "skinStyles/mediawiki.special.preferences.less" + } + }, + "co
[MediaWiki-commits] [Gerrit] Add extension.json and replaced settings with prefix wg - change (mediawiki...WikimediaIncubator)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203092 Change subject: Add extension.json and replaced settings with prefix wg .. Add extension.json and replaced settings with prefix wg * This add the extension.json file. * Setting have been renamed with the prefix now wg. followers mediawiki guidlines. and also they had to be renamed to work with extension.json. Bug: T87998 Change-Id: I8ee42ebe11aa0f25eb1719069c0a13d87da54cb9 --- M CreateAccountTestWiki.php M InfoPage.php M ListUsersTestWiki.php M SpecialRandomByTest.php M SpecialSearchWiki.php M SpecialViewUserLang.php M TestWikiRC.php M WikimediaIncubator.class.php M WikimediaIncubator.php A extension.json M i18n/qqq.json 11 files changed, 338 insertions(+), 120 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaIncubator refs/changes/92/203092/1 diff --git a/CreateAccountTestWiki.php b/CreateAccountTestWiki.php index 80fb213..9b26bdc 100644 --- a/CreateAccountTestWiki.php +++ b/CreateAccountTestWiki.php @@ -18,10 +18,10 @@ * @return bool */ public static function onUserCreateForm( &$template ) { - global $wgRequest, $wmincProjects; + global $wgRequest, $wgwmincProjects; $projectvalue = strtolower( $wgRequest->getVal( 'testwikiproject', '' ) ); $codevalue = strtolower( $wgRequest->getVal( 'testwikicode', '' ) ); - if ( WikimediaIncubator::validateLanguageCode( $codevalue ) && isset( $wmincProjects[$projectvalue] ) ) { + if ( WikimediaIncubator::validateLanguageCode( $codevalue ) && isset( $wgwmincProjects[$projectvalue] ) ) { $template->set( 'header', Html::hidden('testwiki-project', $projectvalue). Html::hidden('testwiki-code', $codevalue) @@ -35,12 +35,12 @@ * @return bool */ public static function onAddNewAccount( $user ) { - global $wgRequest, $wmincProjects, $wmincPref; + global $wgRequest, $wgwmincProjects, $wgwmincPref; $projectvalue = $wgRequest->getVal( 'testwiki-project' ); $codevalue = $wgRequest->getVal( 'testwiki-code' ); - if ( WikimediaIncubator::validateLanguageCode( $codevalue ) && isset( $wmincProjects[$projectvalue] ) ) { - $user->setOption( $wmincPref . '-project', $projectvalue ); - $user->setOption( $wmincPref . '-code', $codevalue ); + if ( WikimediaIncubator::validateLanguageCode( $codevalue ) && isset( $wgwmincProjects[$projectvalue] ) ) { + $user->setOption( $wgwmincPref . '-project', $projectvalue ); + $user->setOption( $wgwmincPref . '-code', $codevalue ); $user->saveSettings(); } return true; diff --git a/InfoPage.php b/InfoPage.php index b6e345d..4e52bc1 100644 --- a/InfoPage.php +++ b/InfoPage.php @@ -1,18 +1,17 @@ mTitle = $title; $this->mPrefix = $prefixdata['prefix']; $this->mLangCode = $prefixdata['lang']; $this->mProjectCode = $prefixdata['project']; - $allProjects = array_merge( $wmincProjects, $wmincSisterProjects ); + $allProjects = array_merge( $wgwmincProjects, $wgwmincSisterProjects ); $this->mProjectName = isset( $allProjects[$this->mProjectCode] ) ? $allProjects[$this->mProjectCode] : ''; $this->mPortal = WikimediaIncubator::getSubdomain( 'www', $this->mProjectCode ); - $this->mIsSister = array_key_exists( $this->mProjectCode, $wmincSisterProjects ); + $this->mIsSister = array_key_exists( $this->mProjectCode, $wgwmincSisterProjects ); $this->mDBStatus = ''; $this->mSubStatus = ''; $this->mThisLangData = array( 'type' => 'valid' ); # For later code check feature @@ -89,8 +88,8 @@ * (Wikipedia, Wiktionary, ...) */ public function listOtherProjects() { - global $wmincProjects, $wmincSisterProjects; - $otherProjects = $wmincProjects + $wmincSisterProjects; + global $wgwmincProjects, $wgwmincSisterProjects; + $otherProjects = $wgwmincProjects + $wgwmincSisterProjects; unset( $otherProjects[$this->mProjectCode] ); $listOtherProjects = array(); foreach ( $otherProjects as $code => $name ) { @@ -106,12 +105,12 @@ * (Meta, Commons, ...) */ public function listMultilingualProjects() { - global $wmincMultilingualProjects, $wmincProjects; - if ( !is_arr
[MediaWiki-commits] [Gerrit] Improvements to Metrolook on MediaWiki 1.21 - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203541 Change subject: Improvements to Metrolook on MediaWiki 1.21 .. Improvements to Metrolook on MediaWiki 1.21 Change-Id: I3346cdd13660035393bdea1edf6516522eecb9c8 --- M .gitignore D .gitreview A CHANGELOG.md A COPYING A Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M README.md M SkinMetrolook.php A collapsibleNav.css D composer.json A csshover.htc A csshover.min.htc A images/Transparent.gif A images/arrow-collapsed-ltr.png A images/arrow-collapsed-ltr.svg A images/arrow-collapsed-rtl.png A images/arrow-collapsed-rtl.svg A images/arrow-down-focus-icon.svg A images/arrow-down-icon.svg A images/arrow-expanded.png A images/arrow-expanded.svg M images/audio-icon.png A images/bullet-circle-icon.png A images/closed-ltr.png A images/closed-ltr.svg A images/closed-rtl.png A images/closed-rtl.svg M images/document-icon.png A images/downarrow.png A images/downarrow.svg M images/edit-icon.png A images/edit-icon.svg D images/external-link-icon.png A images/external-link-ltr-icon.svg A images/external-link-rtl-icon.svg A images/fade.png M images/file-icon.png A images/hamburger.png A images/hamburger.svg A images/line.png A images/line.svg M images/link-icon.png M images/lock-icon.png M images/magnify-clip.png M images/mail-icon.png M images/news-icon.png A images/open.png A images/open.svg M images/preferences-break.png D images/preferences-edge.png M images/preferences-fade.png M images/talk-icon.png A images/uploadlogo.png A images/uploadlogo.svg A images/user-icon-20.png A images/user-icon-20.svg A images/user-icon-40.png A images/user-icon-40.svg D images/user-icon.png M images/video-icon.png A images/watch-icon-loading.gif A js/collapsibleNav.js R js/collapsibleTabs.js A js/mediawiki.searchSuggest.custom.js A js/metrolook.js A js/overthrow.js A js/vector.js A mobile.css M screen-hd.css M screen.css A theme.css D vector.js 73 files changed, 5,998 insertions(+), 1,806 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/41/203541/1 -- To view, visit https://gerrit.wikimedia.org/r/203541 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3346cdd13660035393bdea1edf6516522eecb9c8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_21 Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improvements to Metrolook on MediaWiki 1.21 - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203542 Change subject: Improvements to Metrolook on MediaWiki 1.21 .. Improvements to Metrolook on MediaWiki 1.21 Change-Id: Iac516ce175fb62a8c3ff658b1796fdbe41bb1b2c --- M .gitreview A CHANGELOG.md A COPYING M Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M README.md M SkinMetrolook.php A collapsibleNav.css D components/animations.less D components/collapsibleNav.less D components/common.less D components/externalLinks.less D components/footer.less D components/navigation.less D components/personalMenu.less D components/search.less D components/tabs.less D components/watchstar.less D composer.json D hooks.txt D i18n/ar.json D i18n/av.json D i18n/be-tarask.json D i18n/bn.json D i18n/br.json D i18n/cs.json D i18n/de.json D i18n/diq.json D i18n/en.json D i18n/es.json D i18n/et.json D i18n/fa.json D i18n/fi.json D i18n/fr.json D i18n/fy.json D i18n/gl.json D i18n/he.json D i18n/ia.json D i18n/ka.json D i18n/ko.json D i18n/ksh.json D i18n/lb.json D i18n/mk.json D i18n/nap.json D i18n/nb.json D i18n/nl.json D i18n/pl.json D i18n/pt-br.json D i18n/pt.json D i18n/qqq.json D i18n/roa-tara.json D i18n/ru.json D i18n/su.json D i18n/sv.json D i18n/ta.json D i18n/vi.json D i18n/zh-hans.json D i18n/zh-hant.json A images/audio-icon.png A images/bullet-circle-icon.png M images/closed-ltr.svg M images/closed-rtl.svg A images/document-icon.png M images/downarrow.svg A images/edit-icon.png A images/edit-icon.svg R images/fade.png A images/file-icon.png A images/hamburger.png A images/hamburger.svg A images/lock-icon.png A images/mail-icon.png A images/news-icon.png M images/open.svg R images/preferences-break.png C images/preferences-fade.png A images/talk-icon.png M images/unwatch-icon-hl.svg M images/unwatch-icon.svg M images/uploadlogo.svg A images/user-icon-20.png A images/user-icon-20.svg A images/user-icon-40.png A images/user-icon-40.svg D images/user-icon.png D images/user-icon.svg A images/video-icon.png M images/watch-icon-hl.svg A images/watch-icon-loading.gif M images/watch-icon-loading.svg M images/watch-icon.svg R js/collapsibleNav.js R js/collapsibleTabs.js A js/mediawiki.searchSuggest.custom.js A js/metrolook.js R js/overthrow.js A js/vector.js A mobile.css R screen-hd.css A screen.css D screen.less D skinStyles/jquery.tipsy.less D skinStyles/jquery.ui/images/close.png D skinStyles/jquery.ui/images/titlebar-fade.png D skinStyles/jquery.ui/images/ui-anim_basic_16x16.gif D skinStyles/jquery.ui/images/ui-bg_flat_15_cd0a0a_40x100.png D skinStyles/jquery.ui/images/ui-bg_flat_70_00_40x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-hard_80_d7ebf9_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_e4f1fb_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_ff_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_25_ffef8f_1x100.png D skinStyles/jquery.ui/images/ui-bg_inset-hard_100_f0f0f0_1x100.png D skinStyles/jquery.ui/images/ui-icons_2694e8_256x240.png D skinStyles/jquery.ui/images/ui-icons_2e83ff_256x240.png D skinStyles/jquery.ui/images/ui-icons_3d80b3_256x240.png D skinStyles/jquery.ui/images/ui-icons_66_256x240.png D skinStyles/jquery.ui/images/ui-icons_72a7cf_256x240.png D skinStyles/jquery.ui/images/ui-icons_ff_256x240.png D skinStyles/jquery.ui/jquery.ui.accordion.css D skinStyles/jquery.ui/jquery.ui.autocomplete.css D skinStyles/jquery.ui/jquery.ui.button.css D skinStyles/jquery.ui/jquery.ui.core.css D skinStyles/jquery.ui/jquery.ui.datepicker.css D skinStyles/jquery.ui/jquery.ui.dialog.css D skinStyles/jquery.ui/jquery.ui.progressbar.css D skinStyles/jquery.ui/jquery.ui.resizable.css D skinStyles/jquery.ui/jquery.ui.selectable.css D skinStyles/jquery.ui/jquery.ui.slider.css D skinStyles/jquery.ui/jquery.ui.tabs.css D skinStyles/jquery.ui/jquery.ui.theme.css D skinStyles/mediawiki.notification.less D skinStyles/mediawiki.special.less D skinStyles/mediawiki.special.preferences.less R theme.css D variables.less D vector.js 138 files changed, 4,167 insertions(+), 4,585 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/42/203542/1 -- To view, visit https://gerrit.wikimedia.org/r/203542 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac516ce175fb62a8c3ff658b1796fdbe41bb1b2c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_21 Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update .gitreview - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203543 Change subject: Update .gitreview .. Update .gitreview Change-Id: I062ba4a1f9282b7aa92e0821f5743d0daca79dc7 --- M .gitreview 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/43/203543/1 diff --git a/.gitreview b/.gitreview index db98503..898e858 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/skins/Metrolook.git -defaultbranch=master +defaultbranch=REL1_22 defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/203543 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I062ba4a1f9282b7aa92e0821f5743d0daca79dc7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_21 Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Mobile desgn now on Metrolook on MediaWiki 1.22 - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203547 Change subject: Mobile desgn now on Metrolook on MediaWiki 1.22 .. Mobile desgn now on Metrolook on MediaWiki 1.22 * Fixed a bug where Metrolook not work on MediaWiki 1.22 * Includes Mobile desgn Change-Id: I76442fa37ba7ec75a66a2b6af23341a61dd988dc --- A CHANGELOG.md A COPYING M Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M README.md M SkinMetrolook.php A beta/screen.less A beta/variables.less R collapsibleNav.less D components/animations.less D components/common.less D components/externalLinks.less D components/footer.less D components/navigation.less D components/personalMenu.less D components/search.less D components/tabs.less D components/watchstar.less A externalLinks.less D hooks.txt D i18n/ar.json D i18n/av.json D i18n/be-tarask.json D i18n/bn.json D i18n/br.json D i18n/cs.json D i18n/de.json D i18n/diq.json D i18n/en.json D i18n/es.json D i18n/et.json D i18n/fa.json D i18n/fi.json D i18n/fr.json D i18n/fy.json D i18n/gl.json D i18n/he.json D i18n/ia.json D i18n/ka.json D i18n/ko.json D i18n/ksh.json D i18n/lb.json D i18n/mk.json D i18n/nap.json D i18n/nb.json D i18n/nl.json D i18n/pl.json D i18n/pt-br.json D i18n/pt.json D i18n/qqq.json D i18n/roa-tara.json D i18n/ru.json D i18n/su.json D i18n/sv.json D i18n/ta.json D i18n/vi.json D i18n/zh-hans.json D i18n/zh-hant.json A images/audio-icon.png A images/bullet-circle-icon.png A images/bullet-circle-icon.svg A images/bullet-icon.svg M images/closed-ltr.svg M images/closed-rtl.svg A images/document-icon.png M images/downarrow.svg A images/edit-icon.png A images/edit-icon.svg R images/fade.png A images/file-icon.png A images/hamburger.png A images/hamburger.svg A images/lock-icon.png A images/mail-icon.png A images/news-icon.png M images/open.svg R images/preferences-break.png C images/preferences-fade.png A images/talk-icon.png M images/uploadlogo.svg A images/user-icon-20.png A images/user-icon-20.svg A images/user-icon-40.png A images/user-icon-40.svg A images/video-icon.png A images/watch-icon-loading.gif R js/collapsibleNav.js R js/collapsibleTabs.js A js/mediawiki.searchSuggest.custom.js A js/metrolook.js R js/overthrow.js A js/vector.js A mobile.less M screen-hd.less M screen.less D skinStyles/jquery.tipsy.less D skinStyles/jquery.ui/images/close.png D skinStyles/jquery.ui/images/titlebar-fade.png D skinStyles/jquery.ui/images/ui-anim_basic_16x16.gif D skinStyles/jquery.ui/images/ui-bg_flat_15_cd0a0a_40x100.png D skinStyles/jquery.ui/images/ui-bg_flat_70_00_40x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-hard_80_d7ebf9_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_e4f1fb_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_ff_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_25_ffef8f_1x100.png D skinStyles/jquery.ui/images/ui-bg_inset-hard_100_f0f0f0_1x100.png D skinStyles/jquery.ui/images/ui-icons_2694e8_256x240.png D skinStyles/jquery.ui/images/ui-icons_2e83ff_256x240.png D skinStyles/jquery.ui/images/ui-icons_3d80b3_256x240.png D skinStyles/jquery.ui/images/ui-icons_66_256x240.png D skinStyles/jquery.ui/images/ui-icons_72a7cf_256x240.png D skinStyles/jquery.ui/images/ui-icons_ff_256x240.png D skinStyles/jquery.ui/jquery.ui.accordion.css D skinStyles/jquery.ui/jquery.ui.autocomplete.css D skinStyles/jquery.ui/jquery.ui.button.css D skinStyles/jquery.ui/jquery.ui.core.css D skinStyles/jquery.ui/jquery.ui.datepicker.css D skinStyles/jquery.ui/jquery.ui.dialog.css D skinStyles/jquery.ui/jquery.ui.progressbar.css D skinStyles/jquery.ui/jquery.ui.resizable.css D skinStyles/jquery.ui/jquery.ui.selectable.css D skinStyles/jquery.ui/jquery.ui.slider.css D skinStyles/jquery.ui/jquery.ui.tabs.css D skinStyles/jquery.ui/jquery.ui.theme.css D skinStyles/mediawiki.notification.less D skinStyles/mediawiki.special.less D skinStyles/mediawiki.special.preferences.less A styles-beta.less A styles.less M variables.less D vector.js 133 files changed, 4,344 insertions(+), 3,857 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/47/203547/1 -- To view, visit https://gerrit.wikimedia.org/r/203547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76442fa37ba7ec75a66a2b6af23341a61dd988dc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_22 Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Update .gitreview" - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203548 Change subject: Revert "Update .gitreview" .. Revert "Update .gitreview" This reverts commit aeb136a70dd842c9b9a418bad79bcd1aea6de6e3. Change-Id: I85ac34186197dff36bd21ad1ab829dac0245a988 --- M .gitreview 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/48/203548/1 diff --git a/.gitreview b/.gitreview index 898e858..db98503 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/skins/Metrolook.git -defaultbranch=REL1_22 +defaultbranch=master defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/203548 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85ac34186197dff36bd21ad1ab829dac0245a988 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_22 Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Mobile desgn now on Metrolook on MediaWiki 1.22 - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203550 Change subject: Mobile desgn now on Metrolook on MediaWiki 1.22 .. Mobile desgn now on Metrolook on MediaWiki 1.22 * Fixed a bug where Metrolook not work on MediaWiki 1.22 * Includes Mobile desgn Change-Id: I76442fa37ba7ec75a66a2b6af23341a61dd988dc --- A CHANGELOG.md A COPYING M Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M README.md M SkinMetrolook.php A beta/screen.less A beta/variables.less R collapsibleNav.less D components/animations.less D components/common.less D components/externalLinks.less D components/footer.less D components/navigation.less D components/personalMenu.less D components/search.less D components/tabs.less D components/watchstar.less A externalLinks.less D hooks.txt D i18n/ar.json D i18n/av.json D i18n/be-tarask.json D i18n/bn.json D i18n/br.json D i18n/cs.json D i18n/de.json D i18n/diq.json D i18n/en.json D i18n/es.json D i18n/et.json D i18n/fa.json D i18n/fi.json D i18n/fr.json D i18n/fy.json D i18n/gl.json D i18n/he.json D i18n/ia.json D i18n/ka.json D i18n/ko.json D i18n/ksh.json D i18n/lb.json D i18n/mk.json D i18n/nap.json D i18n/nb.json D i18n/nl.json D i18n/pl.json D i18n/pt-br.json D i18n/pt.json D i18n/qqq.json D i18n/roa-tara.json D i18n/ru.json D i18n/su.json D i18n/sv.json D i18n/ta.json D i18n/vi.json D i18n/zh-hans.json D i18n/zh-hant.json A images/audio-icon.png A images/bullet-circle-icon.png A images/bullet-circle-icon.svg A images/bullet-icon.svg M images/closed-ltr.svg M images/closed-rtl.svg A images/document-icon.png M images/downarrow.svg A images/edit-icon.png A images/edit-icon.svg R images/fade.png A images/file-icon.png A images/hamburger.png A images/hamburger.svg A images/lock-icon.png A images/mail-icon.png A images/news-icon.png M images/open.svg R images/preferences-break.png C images/preferences-fade.png A images/talk-icon.png M images/uploadlogo.svg A images/user-icon-20.png A images/user-icon-20.svg A images/user-icon-40.png A images/user-icon-40.svg A images/video-icon.png A images/watch-icon-loading.gif R js/collapsibleNav.js R js/collapsibleTabs.js A js/mediawiki.searchSuggest.custom.js A js/metrolook.js R js/overthrow.js A js/vector.js A mobile.less M screen-hd.less M screen.less D skinStyles/jquery.tipsy.less D skinStyles/jquery.ui/images/close.png D skinStyles/jquery.ui/images/titlebar-fade.png D skinStyles/jquery.ui/images/ui-anim_basic_16x16.gif D skinStyles/jquery.ui/images/ui-bg_flat_15_cd0a0a_40x100.png D skinStyles/jquery.ui/images/ui-bg_flat_70_00_40x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-hard_80_d7ebf9_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_e4f1fb_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_ff_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_25_ffef8f_1x100.png D skinStyles/jquery.ui/images/ui-bg_inset-hard_100_f0f0f0_1x100.png D skinStyles/jquery.ui/images/ui-icons_2694e8_256x240.png D skinStyles/jquery.ui/images/ui-icons_2e83ff_256x240.png D skinStyles/jquery.ui/images/ui-icons_3d80b3_256x240.png D skinStyles/jquery.ui/images/ui-icons_66_256x240.png D skinStyles/jquery.ui/images/ui-icons_72a7cf_256x240.png D skinStyles/jquery.ui/images/ui-icons_ff_256x240.png D skinStyles/jquery.ui/jquery.ui.accordion.css D skinStyles/jquery.ui/jquery.ui.autocomplete.css D skinStyles/jquery.ui/jquery.ui.button.css D skinStyles/jquery.ui/jquery.ui.core.css D skinStyles/jquery.ui/jquery.ui.datepicker.css D skinStyles/jquery.ui/jquery.ui.dialog.css D skinStyles/jquery.ui/jquery.ui.progressbar.css D skinStyles/jquery.ui/jquery.ui.resizable.css D skinStyles/jquery.ui/jquery.ui.selectable.css D skinStyles/jquery.ui/jquery.ui.slider.css D skinStyles/jquery.ui/jquery.ui.tabs.css D skinStyles/jquery.ui/jquery.ui.theme.css D skinStyles/mediawiki.notification.less D skinStyles/mediawiki.special.less D skinStyles/mediawiki.special.preferences.less A styles-beta.less A styles.less M variables.less D vector.js 133 files changed, 4,344 insertions(+), 3,857 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/50/203550/1 -- To view, visit https://gerrit.wikimedia.org/r/203550 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76442fa37ba7ec75a66a2b6af23341a61dd988dc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Mobile desgn now on Metrolook on MediaWiki 1.22 - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203551 Change subject: Mobile desgn now on Metrolook on MediaWiki 1.22 .. Mobile desgn now on Metrolook on MediaWiki 1.22 * Fixed a bug where Metrolook not work on MediaWiki 1.22 * Includes Mobile desgn Change-Id: I5c5c845d536c0ab865dcbe7ceb6680e8ef51e613 --- A CHANGELOG.md A COPYING M Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M README.md M SkinMetrolook.php A beta/screen.less A beta/variables.less R collapsibleNav.less D components/animations.less D components/common.less D components/externalLinks.less D components/footer.less D components/navigation.less D components/personalMenu.less D components/search.less D components/tabs.less D components/watchstar.less A externalLinks.less D hooks.txt D i18n/ar.json D i18n/av.json D i18n/be-tarask.json D i18n/bn.json D i18n/br.json D i18n/cs.json D i18n/de.json D i18n/diq.json D i18n/en.json D i18n/es.json D i18n/et.json D i18n/fa.json D i18n/fi.json D i18n/fr.json D i18n/fy.json D i18n/gl.json D i18n/he.json D i18n/ia.json D i18n/ka.json D i18n/ko.json D i18n/ksh.json D i18n/lb.json D i18n/mk.json D i18n/nap.json D i18n/nb.json D i18n/nl.json D i18n/pl.json D i18n/pt-br.json D i18n/pt.json D i18n/qqq.json D i18n/roa-tara.json D i18n/ru.json D i18n/su.json D i18n/sv.json D i18n/ta.json D i18n/vi.json D i18n/zh-hans.json D i18n/zh-hant.json A images/audio-icon.png A images/bullet-circle-icon.png A images/bullet-circle-icon.svg A images/bullet-icon.svg M images/closed-ltr.svg M images/closed-rtl.svg A images/document-icon.png M images/downarrow.svg A images/edit-icon.png A images/edit-icon.svg R images/fade.png A images/file-icon.png A images/hamburger.png A images/hamburger.svg A images/lock-icon.png A images/mail-icon.png A images/news-icon.png M images/open.svg R images/preferences-break.png C images/preferences-fade.png A images/talk-icon.png M images/uploadlogo.svg A images/user-icon-20.png A images/user-icon-20.svg A images/user-icon-40.png A images/user-icon-40.svg A images/video-icon.png A images/watch-icon-loading.gif R js/collapsibleNav.js R js/collapsibleTabs.js A js/mediawiki.searchSuggest.custom.js A js/metrolook.js R js/overthrow.js A js/vector.js A mobile.less M screen-hd.less M screen.less D skinStyles/jquery.tipsy.less D skinStyles/jquery.ui/images/close.png D skinStyles/jquery.ui/images/titlebar-fade.png D skinStyles/jquery.ui/images/ui-anim_basic_16x16.gif D skinStyles/jquery.ui/images/ui-bg_flat_15_cd0a0a_40x100.png D skinStyles/jquery.ui/images/ui-bg_flat_70_00_40x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-hard_80_d7ebf9_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_e4f1fb_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_ff_1x100.png D skinStyles/jquery.ui/images/ui-bg_highlight-soft_25_ffef8f_1x100.png D skinStyles/jquery.ui/images/ui-bg_inset-hard_100_f0f0f0_1x100.png D skinStyles/jquery.ui/images/ui-icons_2694e8_256x240.png D skinStyles/jquery.ui/images/ui-icons_2e83ff_256x240.png D skinStyles/jquery.ui/images/ui-icons_3d80b3_256x240.png D skinStyles/jquery.ui/images/ui-icons_66_256x240.png D skinStyles/jquery.ui/images/ui-icons_72a7cf_256x240.png D skinStyles/jquery.ui/images/ui-icons_ff_256x240.png D skinStyles/jquery.ui/jquery.ui.accordion.css D skinStyles/jquery.ui/jquery.ui.autocomplete.css D skinStyles/jquery.ui/jquery.ui.button.css D skinStyles/jquery.ui/jquery.ui.core.css D skinStyles/jquery.ui/jquery.ui.datepicker.css D skinStyles/jquery.ui/jquery.ui.dialog.css D skinStyles/jquery.ui/jquery.ui.progressbar.css D skinStyles/jquery.ui/jquery.ui.resizable.css D skinStyles/jquery.ui/jquery.ui.selectable.css D skinStyles/jquery.ui/jquery.ui.slider.css D skinStyles/jquery.ui/jquery.ui.tabs.css D skinStyles/jquery.ui/jquery.ui.theme.css D skinStyles/mediawiki.notification.less D skinStyles/mediawiki.special.less D skinStyles/mediawiki.special.preferences.less A styles-beta.less A styles.less M variables.less D vector.js 133 files changed, 4,344 insertions(+), 3,857 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/51/203551/1 -- To view, visit https://gerrit.wikimedia.org/r/203551 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c5c845d536c0ab865dcbe7ceb6680e8ef51e613 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_22 Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improvements to Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/203646 Change subject: Improvements to Metrolook .. Improvements to Metrolook Change-Id: I36f2037c45d4b017aa320328fc63fcd4acbad16d --- M README.md M components/mobile.less M components/navigation.less M composer.json M skin.json 5 files changed, 83 insertions(+), 160 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/46/203646/1 diff --git a/README.md b/README.md index 1f1f6ed..4a2bb69 100644 --- a/README.md +++ b/README.md @@ -184,11 +184,6 @@ } -ul { - list-style-type: disc; - .list-style-image-svg('images/bullet-circle-icon.svg', 'images/bullet-circle-icon.png'); -} - @media (max-width: 768px) { #hamburgerIcon:hover { background-color: blue; @@ -207,7 +202,14 @@ } } -/* Top Bar colour and hover colour */ +/* To change bullet icon to a circle */ + +ul { + list-style-type: disc; + .list-style-image-svg('images/bullet-circle-icon.svg', 'images/bullet-circle-icon.png'); +} + +/* Top Bar colour and hover colour end */ ``` ## Known Issues @@ -218,7 +220,7 @@ Note plans may change. -Mobile desgn for MediaWiki 1.22 and 1.23. +Mobile desgn for MediaWiki 1.23. ## Version diff --git a/components/mobile.less b/components/mobile.less index cd063a8..5cbea35 100644 --- a/components/mobile.less +++ b/components/mobile.less @@ -9,17 +9,17 @@ } div#mw-panel { - font-size: @menu-main-font-size; - position: absolute; - top: 40px; - bottom: 0; - height: auto; - overflow-y: auto; - overflow-x: hidden; - -webkit-overflow-scrolling: touch; - padding-top: 1em; - width: 9.5em; - left: 0; + font-size: @menu-main-font-size; + position: absolute; + top: 40px; + bottom: 0; + height: auto; + overflow-y: auto; + overflow-x: hidden; + -webkit-overflow-scrolling: touch; + padding-top: 1em; + width: 9.5em; + left: 0; div.portal { margin: 0 0.6em 0 0.7em; @@ -82,18 +82,18 @@ } div#mw-panel-custom { - font-size: @menu-main-font-size; - position: absolute; - top: 40px; - bottom: 0; - height: auto; - overflow-y: auto; - overflow-x: hidden; - -webkit-overflow-scrolling: touch; - padding-right: 1em; - padding-top: 1em; - width: 11em; - left: 0; + font-size: @menu-main-font-size; + position: absolute; + top: 40px; + bottom: 0; + height: auto; + overflow-y: auto; + overflow-x: hidden; + -webkit-overflow-scrolling: touch; + padding-right: 1em; + padding-top: 1em; + width: 11em; + left: 0; div.portal-custom { margin: 0 0.6em 0 0.7em; @@ -112,7 +112,7 @@ padding-top: 0; padding-left: 17px; padding-bottom: 0; - margin-bottom:0; + margin-bottom: 0; cursor: default; border: none; } @@ -310,17 +310,17 @@ } div#mw-panel { - font-size: @menu-main-font-size; - position: absolute; - top: 40px; - bottom: 0; - height: auto; - overflow-y: auto; - overflow-x: hidden; - -webkit-overflow-scrolling: touch; - padding-top: 1em; - width: 9.5em; - left: 0; + font-size: @menu-main-font-size; + position: absolute; + top: 40px; + bottom: 0; + height: auto; + overflow-y: auto; + overflow-x: hidden; + -webkit-overflow-scrolling: touch; + padding-top: 1em; + width: 10em; + left: 0; div.portal { margin: 0 0.6em 0 0.7em; @@ -383,18 +383,18 @@ } div#mw-panel-custom { - font-size: @menu-main-font-size; - position: absolute; - top: 40px; - bottom: 0; - height: auto; - overflow-y: auto; - overflow-x: hidden; - -webkit-overflow-scrolling: touch; - padding-right: 1em; - padding-top: 1em; - width: 11em; - left: 0; + font-size: @menu-main-font-size; + position: absolute; + top: 40px; + bottom: 0; + height: auto; + overflow-y: auto; + overflow-x: hidden; + -webkit-overflow-scrolling: touch; + padding-right: 1em; + padding-top: 1em; + width: 11em; + left: 0;