Drop support for < MW 1.25 (#294)

* Delete Foreground.i18n.php

* Remove I18n shim for < MW 1.23

* Update foreground.php

* Switch to skin loading

* Update CHANGELOG.md

* Update changes

* Update skin.json

* Bump version in a sever manner

* Update README.md

* Update README (new configuration option, https, extension registration only, popular skins only, linkupdates, etc.)

CHANGELOG.md

@@ -1,5 +1,7 @@
-## Version 2.0.1
+## Version 2.1
 
+* [code] [b/c break] Switch to MW 1.25+ extension registration mechanism
+* [code] [b/c break] Removed I18n shim for < MW 1.23
 * [code] Move Echo above Page Actions button
 * [feature] Add page indicator support
 * [feature] Add 'enableTabs' for tabs on page support

Foreground.i18n.php

@@ -1,35 +0,0 @@
-<?php
-/**
- * This is a backwards-compatibility shim, generated by:
- * 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( 'wfJsonI18nSkinForeground' ) ) {
-	function wfJsonI18nSkinForeground( $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'][] = 'wfJsonI18nSkinForeground';
-}

README.md

@@ -1,6 +1,6 @@
 # MediaWiki Foreground Skin
 
-[MediaWiki](http://www.mediawiki.org) skin that focuses on putting your content in the *foreground*. Supports responsive layouts and has classes predefined for [Semantic MediaWiki](http://semantic-mediawiki.org/wiki/Semantic_MediaWiki). Built on the [Zurb Foundation](http://foundation.zurb.com) CSS framework.
+[MediaWiki](https://www.mediawiki.org) skin that focuses on putting your content in the *foreground*. Supports responsive layouts and has classes predefined for [Semantic MediaWiki](https://www.semantic-mediawiki.org/wiki/Semantic_MediaWiki). Built on the [Zurb Foundation](http://foundation.zurb.com) CSS framework.
 
 [![Build Status](https://travis-ci.org/thingles/foreground.svg?branch=develop)](https://travis-ci.org/thingles/foreground) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/thingles/foreground/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/thingles/foreground/?branch=develop)
 
@@ -21,11 +21,9 @@ After that, you can issue `git pull` to update the code at anytime.
 
 ## Setup
 
-Once the skin is in place add one the following lines to your `LocalSettings.php` file depending on the version of MediaWiki you are using.
+Once the skin is in place add one the following lines to your `LocalSettings.php` file.
 
-    require_once "$IP/skins/foreground/foreground.php"; //MW versions < 1.25.x
-	
-	wfLoadSkin( 'foreground' ); //MW versions 1.25 and higher
+	wfLoadSkin( 'foreground' );
 
 This will activate Foreground in your installation. At this point you can select it as a user skin in your user preferences.
 
@@ -41,11 +39,12 @@ Use following features in `LocalSettings.php` to change the behavior.
 - `NavWrapperType => 'divonly'`: only a div with id `navwrapper` will be created. `'0'` - no div will be created (old behavior), other values will be used as class. 
 - `showHelpUnderTools => true` a Link to "Help" will be created under "Tools".
 - `showRecentChangesUnderTools => true` a Link to "recent changes" will be created under "Tools".
+- `'enableTabs' => true` for tabs on page support.
 - `wikiName => 'Alternate WikiName'` sets top navbar name to a different output of the wiki's name. Useful if your `$wgSitename` is long but need to keep it for other purposes.
 - `navbarIcon => true` to display an icon in the top navbar. See below for more information.
 - `IeEdgeCode => 1` will produce a meta tag with "X-UA-Compatible" content="IE=edge", `2` will sent a header, `0` nothing will be done
 - `showFooterIcons => 0` suppresses the output of footer icons. Set to `true` or `1` to display them.
-- `addThisFollowPUBID => 'your-id'` add an id to display Follow Us horizontal bar of icons from various social media sites available on [addThis](http://addthis.com).
+- `addThisFollowPUBID => 'your-id'` add an id to display Follow Us horizontal bar of icons from various social media sites available on [addThis](https://addthis.com).
 
 These are the default values:
 
@@ -54,6 +53,7 @@ These are the default values:
       'NavWrapperType' => 'divonly',
       'showHelpUnderTools' => true,
       'showRecentChangesUnderTools' => true,
+      'enableTabs' => false,
       'wikiName' => &$GLOBALS['wgSitename'],
       'navbarIcon' => false,
       'IeEdgeCode' => 1,
@@ -85,7 +85,7 @@ With a setting like:
 
     'navbarIcon' => true
 
-A top navbar icon will be set using the current image set by `$wgLogo` in `LocalSettings.php`. See http://www.mediawiki.org/wiki/Manual:$wgLogo for more information about `$wgLogo`.
+A top navbar icon will be set using the current image set by `$wgLogo` in `LocalSettings.php`. See https://www.mediawiki.org/wiki/Manual:$wgLogo for more information about `$wgLogo`.
 
 The icon will be resized to fit into a maximum width of 64px x 36px wide or a 16:9 ratio.
 
@@ -99,19 +99,19 @@ With a setting like:
 
     'addThisFollowPUBID' => 'yourAddThis-PubID'
 
-Important, this feature uses the free or paid version of the http://addthis.com horizontal Follow Buttons only. Choose which social media FollowUs buttons(Twitter, Facebook, YouTube, etc.) and at the bottom of the screen locate the script. Within the script you will see something similar `...#pubid=ra-5378f4902d02197">`. Everything after the `=` sign and up to the `">` is your Publisher ID. To turn on social follow icons, insert your publisher id:
+Important, this feature uses the free or paid version of the https://addthis.com horizontal Follow Buttons only. Choose which social media FollowUs buttons(Twitter, Facebook, YouTube, etc.) and at the bottom of the screen locate the script. Within the script you will see something similar `...#pubid=ra-5378f4902d02197">`. Everything after the `=` sign and up to the `">` is your Publisher ID. To turn on social follow icons, insert your publisher id:
 
     'addThisFollowPUBID' => 'ra-5378f4902d02197'
 
 
 ### Notes on other skins
 
-As you build a wiki out with Foreground you will likely use the responsive grid from Foundation. This is key to making a responsive wiki, and is one of the largest _migration_ requirements when you want to move a wiki that ppreviously used Vector (and likely a lot of tables for layout) to Foreground. Once you do this, the ability of a user to select whatever skin will be removed. If you take full advantage of Foreground in your templates the lack of the Foundation grid will make viewing the wiki using [Vector](http://wikiapiary.com/wiki/Skin:Vector) or [MonoBook](http://wikiapiary.com/wiki/Skin:MonoBook) very difficult.
+As you build a wiki out with Foreground you will likely use the responsive grid from Foundation. This is key to making a responsive wiki, and is one of the largest _migration_ requirements when you want to move a wiki that ppreviously used Vector (and likely a lot of tables for layout) to Foreground. Once you do this, the ability of a user to select whatever skin will be removed. If you take full advantage of Foreground in your templates the lack of the Foundation grid will make viewing the wiki using [Vector](https://wikiapiary.com/wiki/Skin:Vector) or [MonoBook](https://wikiapiary.com/wiki/Skin:MonoBook) very difficult.
 
 Because of this, it is suggested that you set the `$wgSkipSkins` variable to make sure that everyone sees the site as you intended it. This removes other skins from being user selectable options.
 
     # Foreground is specific, so lets disable other skins
-    $wgSkipSkins = array( 'chick', 'cologneblue', 'modern', 'myskin', 'nostalgia', 'simple', 'standard', 'filament', 'monobook', 'vector' );
+    $wgSkipSkins = array( 'cologneblue', 'modern', 'monobook', 'vector' );
 
 You may also want to allow users to set a User CSS if they want to tweak things inside of Foreground. This is entirely optional.
 
@@ -120,4 +120,4 @@ You may also want to allow users to set a User CSS if they want to tweak things
 
 ## Using Foreground
 
-There is a [mailing list to discuss Foreground](http://lists.thingelstad.com/cgi-bin/mailman/listinfo/foreground-l). Please join to connect with others and explore questions about using Foreground on your wiki. You can see a list of wikis with [Foreground installed at WikiApiary](http://wikiapiary.com/wiki/Skin:Foreground).
+There is a [mailing list to discuss Foreground](https://lists.wikimedia.org/mailman/listinfo/foreground). Please join to connect with others and explore questions about using Foreground on your wiki. You can see a list of wikis with [Foreground installed at WikiApiary](https://wikiapiary.com/wiki/Skin:Foreground).

foreground.php

@@ -12,84 +12,12 @@
 if ( function_exists( 'wfLoadSkin' ) ) {
 	wfLoadSkin( 'foreground' );
 	// Keep i18n globals so mergeMessageFileList.php doesn't break
-	$wgMessagesDirs['SkinForeground'] = __DIR__ . '/i18n';
-	/* wfWarn(
-		'Deprecated PHP entry point used for foreground skin. Please use wfLoadSkin instead, ' .
+	$wgMessagesDirs['foreground'] = __DIR__ . '/i18n';
+	wfWarn(
+		'Deprecated PHP entry point used for the Foregrond skin. Please use wfLoadSkin instead, ' .
 		'see https://www.mediawiki.org/wiki/Extension_registration for more details.'
-	); */
+	);
 	return;
+} else {
+	die( 'This version of the Foreground skin requires MediaWiki 1.25+' );
 }
-
-$wgExtensionCredits['skin'][] = array(
-	'path' => __FILE__,
-	'name' => 'Foreground',
-	'url' => 'https://github.com/thingles/foreground',
-	'author' => array(
-		'Garrick Van Buren',
-		'Jamie Thingelstad',
-		'Tom Hutchison',
-		'...'
-	),
-	'version' => '2.0.1-alpha',
-	'descriptionmsg' => 'foreground-desc',
-	'license-name' => 'BSD-2-Clause'
-);
-
-$wgValidSkinNames['foreground'] = 'Foreground';
-
-$wgAutoloadClasses['SkinForeground'] = __DIR__ . '/Foreground.skin.php';
-$wgAutoloadClasses['foregroundTemplate'] = __DIR__ . '/Foreground.skin.php';
-
-$wgMessagesDirs['SkinForeground'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['SkinForeground'] = __DIR__ . '/Foreground.i18n.php';
-
-$wgResourceModules['skins.foreground.styles'] = array(
-	'position'       => 'top',
-	'styles'         => array(
-		'foreground/assets/stylesheets/normalize.css',
-		'foreground/assets/stylesheets/font-awesome.css',
-		'foreground/assets/stylesheets/foundation.css',
-		'foreground/assets/stylesheets/foreground.css',
-		'foreground/assets/stylesheets/foreground-print.css'
-	),
-	'remoteBasePath' => &$GLOBALS['wgStylePath'],
-	'localBasePath'  => &$GLOBALS['wgStyleDirectory']
-);
-
-$wgResourceModules['skins.foreground.modernizr'] = array(
-	'position'       => 'top',
-	'scripts'        => array(
-		'foreground/assets/scripts/vendor/modernizr.js'
-	),
-	'remoteBasePath' => &$GLOBALS['wgStylePath'],
-	'localBasePath'  => &$GLOBALS['wgStyleDirectory']
-);
-
-$wgResourceModules['skins.foreground.js'] = array(
-	'position'       => 'bottom',
-	'scripts'        => array(
-		'foreground/assets/scripts/vendor/fastclick.js',
-		'foreground/assets/scripts/vendor/placeholder.js',
-		'foreground/assets/scripts/foundation/foundation.js',
-		'foreground/assets/scripts/foundation/foundation.topbar.js',
-		'foreground/assets/scripts/foundation/foundation.dropdown.js',
-		'foreground/assets/scripts/foundation/foundation.joyride.js',
-		'foreground/assets/scripts/foundation/foundation.accordion.js',
-		'foreground/assets/scripts/foundation/foundation.alert.js',
-		'foreground/assets/scripts/foundation/foundation.clearing.js',
-		'foreground/assets/scripts/foundation/foundation.equalizer.js',
-		'foreground/assets/scripts/foundation/foundation.interchange.js',
-		'foreground/assets/scripts/foundation/foundation.offcanvas.js',
-		'foreground/assets/scripts/foundation/foundation.orbit.js',
-		'foreground/assets/scripts/foundation/foundation.reveal.js',
-		'foreground/assets/scripts/foundation/foundation.tab.js',
-		'foreground/assets/scripts/foundation/foundation.tooltip.js',
-		'foreground/assets/scripts/foreground.js',
-	),
-	'dependencies'   => array(
-		'jquery.cookie',
-		'skins.foreground.modernizr',
-	),
-	'remoteBasePath' => &$GLOBALS['wgStylePath'],
-	'localBasePath'  => &$GLOBALS['wgStyleDirectory']
-);

skin.json

@@ -1,6 +1,6 @@
 {
 	"name": "Foreground",
-	"version": "2.0.1-alpha",
+	"version": "2.1.0-alpha",
 	"author": [
 		"Garrick Van Buren",
 		"Jamie Thingelstad",