Update to MediaWiki 1.26.0

5 files changed, 48 insertions, 7 deletions

diff --git a/skins/ArchLinux/ArchLinuxTemplate.php b/skins/ArchLinux/ArchLinuxTemplate.php
index 22ae7a61..52c23aec 100644
--- a/skins/ArchLinux/ArchLinuxTemplate.php
+++ b/skins/ArchLinux/ArchLinuxTemplate.php
@@ -81,12 +81,17 @@ class ArchLinuxTemplate 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>
@@ -328,8 +333,8 @@ class ArchLinuxTemplate extends BaseTemplate {
 
 					<?php
 					}
-					wfRunHooks( 'ArchLinuxTemplateToolboxEnd', array( &$this ) );
-					wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) );
+					Hooks::run( 'ArchLinuxTemplateToolboxEnd', array( &$this ) );
+					Hooks::run( 'SkinTemplateToolboxEnd', array( &$this, true ) );
 					?>
 				</ul>
 				<?php $this->renderAfterPortlet( 'tb' ); ?>
diff --git a/skins/ArchLinux/Gruntfile.js b/skins/ArchLinux/Gruntfile.js
new file mode 100644
index 00000000..9c56558a
--- /dev/null
+++ b/skins/ArchLinux/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/ArchLinux/composer.json b/skins/ArchLinux/composer.json
new file mode 100644
index 00000000..fd380fb7
--- /dev/null
+++ b/skins/ArchLinux/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/ArchLinux/main.css b/skins/ArchLinux/main.css
index 809fe184..0abc7b31 100644
--- a/skins/ArchLinux/main.css
+++ b/skins/ArchLinux/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/ArchLinux/skin.json b/skins/ArchLinux/skin.json
index e0522f59..0729e1cf 100644
--- a/skins/ArchLinux/skin.json
+++ b/skins/ArchLinux/skin.json
@@ -8,8 +8,12 @@
 	"ValidSkinNames": {
 		"archlinux": "ArchLinux"
 	},
+	"SkinOOUIThemes": {
+		"archlinux": "Apex"
+	},
 	"ResourceModules": {
 		"skins.archlinux.styles": {
+			"position": "top",
 			"styles": {
 				"main.css": {
 					"media": "screen"
@@ -33,5 +37,6 @@
 	"AutoloadClasses": {
 		"SkinArchLinux": "SkinArchLinux.php",
 		"ArchLinuxTemplate": "ArchLinuxTemplate.php"
-	}
+	},
+	"manifest_version": 1
 }