Update to MediaWiki 1.26.0

15 files changed, 91 insertions, 18 deletions

diff --git a/skins/MonoBook/Gruntfile.js b/skins/MonoBook/Gruntfile.js
new file mode 100644
index 00000000..9c56558a
--- /dev/null
+++ b/skins/MonoBook/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+	grunt.loadNpmTasks( 'grunt-banana-checker' );
+	grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+	grunt.initConfig( {
+		banana: {
+			all: 'i18n/'
+		},
+		jsonlint: {
+			all: [
+				'**/*.json',
+				'!node_modules/**'
+			]
+		}
+	} );
+
+	grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+	grunt.registerTask( 'default', 'test' );
+};
diff --git a/skins/MonoBook/MonoBookTemplate.php b/skins/MonoBook/MonoBookTemplate.php
index 12f7016f..c1022d9d 100644
--- a/skins/MonoBook/MonoBookTemplate.php
+++ b/skins/MonoBook/MonoBookTemplate.php
@@ -55,12 +55,17 @@ class MonoBookTemplate extends BaseTemplate {
 				}
 				?>
 
-				<?php echo $this->getIndicators(); ?>
+				<?php
+				echo $this->getIndicators();
+				// Loose comparison with '!=' is intentional, to catch null and false too, but not '0'
+				if ( $this->data['title'] != '' ) {
+				?>
 				<h1 id="firstHeading" class="firstHeading" lang="<?php
 				$this->data['pageLanguage'] =
 					$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
 				$this->text( 'pageLanguage' );
 				?>"><?php $this->html( 'title' ) ?></h1>
+				<?php } ?>
 
 				<div id="bodyContent" class="mw-body-content">
 					<div id="siteSub"><?php $this->msg( 'tagline' ) ?></div>
@@ -302,8 +307,8 @@ class MonoBookTemplate extends BaseTemplate {
 
 					<?php
 					}
-					wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) );
-					wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) );
+					Hooks::run( 'MonoBookTemplateToolboxEnd', array( &$this ) );
+					Hooks::run( 'SkinTemplateToolboxEnd', array( &$this, true ) );
 					?>
 				</ul>
 				<?php $this->renderAfterPortlet( 'tb' ); ?>
diff --git a/skins/MonoBook/composer.json b/skins/MonoBook/composer.json
new file mode 100644
index 00000000..fd380fb7
--- /dev/null
+++ b/skins/MonoBook/composer.json
@@ -0,0 +1,10 @@
+{
+    "require-dev": {
+        "jakub-onderka/php-parallel-lint": "0.9"
+    },
+    "scripts": {
+        "test": [
+            "parallel-lint . --exclude node_modules --exclude vendor"
+        ]
+    }
+}
diff --git a/skins/MonoBook/i18n/arq.json b/skins/MonoBook/i18n/arq.json
new file mode 100644
index 00000000..1fdfa114
--- /dev/null
+++ b/skins/MonoBook/i18n/arq.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Bachounda"
+		]
+	},
+	"monobook-desc": "The classic MediaWiki skin since 2004, named after the black-and-white photo of a book in the page background"
+}
diff --git a/skins/MonoBook/i18n/bs.json b/skins/MonoBook/i18n/bs.json
index ddecc4c9..84115506 100644
--- a/skins/MonoBook/i18n/bs.json
+++ b/skins/MonoBook/i18n/bs.json
@@ -2,10 +2,12 @@
 	"@metadata": {
 		"authors": [
 			"CERminator",
-			"Kal-El"
+			"Kal-El",
+			"Srdjan m"
 		]
 	},
 	"skinname-monobook": "MonoKnjiga",
+	"monobook-desc": "Klasična MediaWiki tema od 2004. Dobila ime po crnobijeloj slici knjige u pozadini stranice.",
 	"monobook.css": "/* CSS umetnut ovdje uticat će na korisnike koji koriste Monobook skin */",
 	"monobook.js": "/* Bilo koja JavaScript će biti učitana za sve korisnike koji koriste MonoBook skin */"
 }
diff --git a/skins/MonoBook/i18n/dty.json b/skins/MonoBook/i18n/dty.json
new file mode 100644
index 00000000..b4b2fe11
--- /dev/null
+++ b/skins/MonoBook/i18n/dty.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"राम प्रसाद जोशी"
+		]
+	},
+	"monobook.css": "/* यहाँ राख्याको CSS ले मोनोबुक स्किनको प्रयोगकर्ताहरूलाई प्रभावित गद्या छ  */"
+}
diff --git a/skins/MonoBook/i18n/es.json b/skins/MonoBook/i18n/es.json
index 48d424c7..6b41ae24 100644
--- a/skins/MonoBook/i18n/es.json
+++ b/skins/MonoBook/i18n/es.json
@@ -3,11 +3,12 @@
 		"authors": [
 			"Sanbec",
 			"Vivaelcelta",
-			"Fitoschido"
+			"Fitoschido",
+			"Macofe"
 		]
 	},
 	"skinname-monobook": "MonoBook",
-	"monobook-desc": "El tema clásico de MediaWiki desde 2004, cuyo nombre viene de la foto en blanco y negro de un libro en el fondo",
+	"monobook-desc": "La apariencia clásica de MediaWiki desde 2004, cuyo nombre viene de la foto en blanco y negro de un libro en el fondo",
 	"monobook.css": "/* El CSS colocado en esta página afectará a los usuarios que usen la apariencia \"MonoBook\" */",
 	"monobook.js": "/* El código JavaScript que se ponga aquí será cargado por los usuarios de la apariencia MonoBook */"
 }
diff --git a/skins/MonoBook/i18n/fo.json b/skins/MonoBook/i18n/fo.json
new file mode 100644
index 00000000..fc99562c
--- /dev/null
+++ b/skins/MonoBook/i18n/fo.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"EileenSanda"
+		]
+	},
+	"monobook-desc": "Tann klassiska MediaWiki útsjóndin síðan 2004, uppkallað eftir svørt-hvítu myndini av einari bók í bakgrundini á síðuni"
+}
diff --git a/skins/MonoBook/i18n/ne.json b/skins/MonoBook/i18n/ne.json
index 04516dd8..26574e5d 100644
--- a/skins/MonoBook/i18n/ne.json
+++ b/skins/MonoBook/i18n/ne.json
@@ -1,9 +1,10 @@
 {
 	"@metadata": {
 		"authors": [
-			"सरोज कुमार ढकाल"
+			"सरोज कुमार ढकाल",
+			"राम प्रसाद जोशी"
 		]
 	},
 	"skinname-monobook": "मोनोबुक",
-	"monobook.css": "/* यहाँ राखिएको CSS ले मोनोबुक स्किनको प्रयोगकर्ताहरुलाई प्रभावित गर्ने छ  */"
+	"monobook.css": "/* यहाँ राखिएको CSS ले मोनोबुक स्किनको प्रयोगकर्ताहरूलाई प्रभावित गर्ने छ  */"
 }
diff --git a/skins/MonoBook/i18n/nl.json b/skins/MonoBook/i18n/nl.json
index b08e117c..d62f5ef2 100644
--- a/skins/MonoBook/i18n/nl.json
+++ b/skins/MonoBook/i18n/nl.json
@@ -7,6 +7,6 @@
 	},
 	"skinname-monobook": "Monobook",
 	"monobook-desc": "De klassieke MediaWiki-vormgeving sinds 2004, genoemd naar de zwart-witfoto van een boek op de achtergrond van de pagina",
-	"monobook.css": "/* CSS die hier wordt geplaatst heeft alleen invloed op de skin Monobook */",
-	"monobook.js": "/* JavaScript die hier wordt geplaatst heeft alleen invloed op gebruikers die de skin Monobook gebruiken */"
+	"monobook.css": "/* CSS die hier wordt geplaatst heeft alleen invloed op het uiterlijk Monobook */",
+	"monobook.js": "/* JavaScript die hier wordt geplaatst heeft alleen invloed op gebruikers die het uiterlijk Monobook gebruiken */"
 }
diff --git a/skins/MonoBook/i18n/pt-br.json b/skins/MonoBook/i18n/pt-br.json
index afd441c8..92f7c2c0 100644
--- a/skins/MonoBook/i18n/pt-br.json
+++ b/skins/MonoBook/i18n/pt-br.json
@@ -1,11 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
-			"Fabsouza1"
+			"Fabsouza1",
+			"Cainamarques"
 		]
 	},
 	"skinname-monobook": "MonoBook",
-	"monobook-desc": "A skin clássica do MediaWiki desde 2004, assim chamada depois de uma foto preto-e-branco de um livro colocada plano de fundo da página",
+	"monobook-desc": "A skin clássica do MediaWiki desde 2004, assim chamada pela imagem preto e branco de um livro que é colocada no plano de fundo da página",
 	"monobook.css": "/* o código CSS colocado aqui terá efeito nos usuários do tema Monobook */",
-	"monobook.js": "/* Qualquer JavaScript aqui colocado afetará os usuários do skin MonoBook */"
+	"monobook.js": "/* Qualquer JavaScript aqui colocado afetará os usuários do tema MonoBook */"
 }
diff --git a/skins/MonoBook/i18n/sah.json b/skins/MonoBook/i18n/sah.json
index 5f3cbfc9..8a8790f3 100644
--- a/skins/MonoBook/i18n/sah.json
+++ b/skins/MonoBook/i18n/sah.json
@@ -4,6 +4,7 @@
 			"HalanTul"
 		]
 	},
+	"monobook-desc": "MediaWiki классиката, 2004 сыллаахха баар буолбут. Сирэй кэтэх ойуутун (фонун) быһыытынан туттуллубут өҥө суох хаартыска аатынан ааттаммыт.",
 	"monobook.css": "/* Манна оҥоһуллубут CSS Monobook диэн скиҥҥа туһаныллыа */",
 	"monobook.js": "/* Эргэрбит; маны туһан:[[MediaWiki:common.js]] */"
 }
diff --git a/skins/MonoBook/i18n/scn.json b/skins/MonoBook/i18n/scn.json
index cba6acf2..58a5cf3d 100644
--- a/skins/MonoBook/i18n/scn.json
+++ b/skins/MonoBook/i18n/scn.json
@@ -3,10 +3,12 @@
 		"authors": [
 			"Santu",
 			"Sarvaturi",
-			"Tonyfroio"
+			"Tonyfroio",
+			"Pippinu"
 		]
 	},
 	"skinname-monobook": "MonoBook",
+	"monobook-desc": "La peddi tradizziunali di MediaWiki a pàrtiri dû 2004, chi pigghia lu nomu di na fotu n jancu e nìuru dûn libbru ca si vidi ntô sfunnu dâ pàggina",
 	"monobook.css": "/* Li stili CSS nziriti ccà s'àpplicanu a l'utenti chi usanu la skin Monobook */",
 	"monobook.js": "/* Lu còdici JavaScript nzirutu ccà veni carricatu di l'utenti c'ùsanu la skin MonoBook */"
 }
diff --git a/skins/MonoBook/main.css b/skins/MonoBook/main.css
index 809fe184..0abc7b31 100644
--- a/skins/MonoBook/main.css
+++ b/skins/MonoBook/main.css
@@ -309,7 +309,10 @@ input.searchButton {
 	border: none;
 	line-height: 1.4em;
 	color: #2f6fab;
-	padding: 0 2em 0 3em;
+	padding: 0;
+	padding-right: 2em;
+	/* Avoid overlap with the logo. */
+	padding-left: 14em;
 	margin: 0;
 	text-align: right;
 	list-style-type: none;
@@ -334,12 +337,10 @@ input.searchButton {
 	text-decoration: none;
 	color: #005896;
 	padding-bottom: .2em;
-	background: none;
 }
 
 #p-personal li a:hover {
 	background-color: white;
-	padding-bottom: .2em;
 	text-decoration: none;
 }
 
diff --git a/skins/MonoBook/skin.json b/skins/MonoBook/skin.json
index 1a4efc8d..5d2ea0c8 100644
--- a/skins/MonoBook/skin.json
+++ b/skins/MonoBook/skin.json
@@ -12,6 +12,9 @@
 	"ValidSkinNames": {
 		"monobook": "MonoBook"
 	},
+	"SkinOOUIThemes": {
+		"monobook": "Apex"
+	},
 	"MessagesDirs": {
 		"MonoBook": [
 			"i18n"
@@ -19,6 +22,7 @@
 	},
 	"ResourceModules": {
 		"skins.monobook.styles": {
+			"position": "top",
 			"styles": {
 				"main.css": {
 					"media": "screen"
@@ -33,5 +37,6 @@
 	"AutoloadClasses": {
 		"SkinMonoBook": "SkinMonoBook.php",
 		"MonoBookTemplate": "MonoBookTemplate.php"
-	}
+	},
+	"manifest_version": 1
 }