[MediaWiki-commits] [Gerrit] Update to 0.2.4 - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/243518 Change subject: Update to 0.2.4 .. Update to 0.2.4 This will probaly be the last update for MediaWiki 1.21 for metrolook. This includes just one new features like new tiles format please changelog on details on it. Renamed settings please also see changelog. Change-Id: I8d20e10e9600a7d11a028e3e726eed22bf00a49d --- M CHANGELOG.md M Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M README.md M js/metrolook.js M js/metrolook.search.js M mobile.css M package.json M screen.css M tablet.css 11 files changed, 225 insertions(+), 401 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/18/243518/1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c305b3..085b7a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,44 @@ Changelog = +0.2.4 +=== + +### New features + +To set tiles now please do the following + +go to MediaWiki:metrolook-tiles + + +Then add + +for example + +Doint forget to add * in front of the code. It wont work without doing * in fornt of code. + +* URL to the site|alternative text|image URL + +* http://example.com|Example name|http://example.com/example.png + +You can now set different tiles for different languges. + +(for french) + +For example MediaWiki:metrolook-tiles/fr + +Renamed settings + +VectorUseSimpleSearch -> MetrolookUseSimpleSearch + +VectorUseIconWatch -> MetrolookUseIconWatch + + +Remove settings + +$wgMetrolookTile1-10 + + 0.2.3 === diff --git a/Metrolook.i18n.php b/Metrolook.i18n.php index dbc536d..ac96828 100644 --- a/Metrolook.i18n.php +++ b/Metrolook.i18n.php @@ -89,22 +89,19 @@ 'metrolook-guest' => 'Meyman', ); -/** - * @author Caliburn - */ -$messages['en-gb'] = array( - 'metrolook-desc' => 'Metrolook skin for MediaWiki', - 'metrolook-guest' => 'Guest', -); - /** English * @author paladox */ $messages['en'] = array( 'skinname-metrolook' => 'Metrolook', + 'metrolook-desc' => 'Metrolook is a [https://en.wikipedia.org/wiki/Metro_(design_language) Metro-inspired] fork of the Vector skin', '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 +* http://www.pidgi.net/press/|PidgiWiki Press|http://images.pidgi.net/pidgipresstiletop.png +* http://www.petalburgwoods.com/|Petalburg Woods|http://images.pidgi.net/pwntiletop.png +* http://burstcade.pidgi.net/|Burstcade|http://images.pidgi.net/burstcadetiletop.png', + 'metrolook-tiles-second' => '', ); /** diff --git a/Metrolook.php b/Metrolook.php index f1e0880..d297842 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -26,7 +26,7 @@ 'name' => 'Metrolook', 'namemsg' => 'skinname-metrolook', 'descriptionmsg' => 'metrolook-desc', - 'version' => '0.2.3', + 'version' => '0.2.4', 'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' => array( 'immewnity', 'Paladox', 'Craig Davison', 'lagleki' ), 'license-name' => 'GPLv2+', @@ -72,14 +72,14 @@ * - true = use an icon search button * - false = use Go & Search buttons */ -$wgVectorUseSimpleSearch = true; +$wgMetrolookUseSimpleSearch = true; /** * Watch and unwatch as an icon rather than a link. * - true = use an icon watch/unwatch button * - false = use watch/unwatch text link */ -$wgVectorUseIconWatch = true; +$wgMetrolookUseIconWatch = true; $wgMetrolookLogo = true; @@ -101,16 +101,7 @@ $wgMetrolookMobile = true; -/* To use tile 5 to 10 please diable this */ $wgMetrolookBartile = true; - -$wgMetrolookTile1 = true; - -$wgMetrolookTile2 = true; - -$wgMetrolookTile3 = true; - -$wgMetrolookTile4 = true; // Register modules $wgResourceModules['skins.metrolook'] = array( diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 3628c67..f72e5c0 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -33,6 +33,52 @@ /** @var string $mPersonalToolsEcho Saves Echo notifications */ private $mPersonalToolsEcho = ''; + private function getTiles( $messageName = 'metrolook-tiles' ) { + /** +* The message's format is: +* * URL to the site|alternative text|image 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 +* *
[MediaWiki-commits] [Gerrit] Update to 0.2.4 - change (mediawiki...Metrolook)
jenkins-bot has submitted this change and it was merged. Change subject: Update to 0.2.4 .. Update to 0.2.4 This will probaly be the last update for MediaWiki 1.21 for metrolook. This includes just one new features like new tiles format please changelog on details on it. Renamed settings please also see changelog. Change-Id: I8d20e10e9600a7d11a028e3e726eed22bf00a49d --- A .jshintignore M CHANGELOG.md M Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M README.md M js/metrolook.js M js/metrolook.search.js M mobile.css M package.json M screen.css M tablet.css 12 files changed, 226 insertions(+), 401 deletions(-) Approvals: Paladox: Looks good to me, approved jenkins-bot: Verified diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 000..aea60a1 --- /dev/null +++ b/.jshintignore @@ -0,0 +1 @@ +js/overthrow.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c305b3..085b7a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,44 @@ Changelog = +0.2.4 +=== + +### New features + +To set tiles now please do the following + +go to MediaWiki:metrolook-tiles + + +Then add + +for example + +Doint forget to add * in front of the code. It wont work without doing * in fornt of code. + +* URL to the site|alternative text|image URL + +* http://example.com|Example name|http://example.com/example.png + +You can now set different tiles for different languges. + +(for french) + +For example MediaWiki:metrolook-tiles/fr + +Renamed settings + +VectorUseSimpleSearch -> MetrolookUseSimpleSearch + +VectorUseIconWatch -> MetrolookUseIconWatch + + +Remove settings + +$wgMetrolookTile1-10 + + 0.2.3 === diff --git a/Metrolook.i18n.php b/Metrolook.i18n.php index dbc536d..ac96828 100644 --- a/Metrolook.i18n.php +++ b/Metrolook.i18n.php @@ -89,22 +89,19 @@ 'metrolook-guest' => 'Meyman', ); -/** - * @author Caliburn - */ -$messages['en-gb'] = array( - 'metrolook-desc' => 'Metrolook skin for MediaWiki', - 'metrolook-guest' => 'Guest', -); - /** English * @author paladox */ $messages['en'] = array( 'skinname-metrolook' => 'Metrolook', + 'metrolook-desc' => 'Metrolook is a [https://en.wikipedia.org/wiki/Metro_(design_language) Metro-inspired] fork of the Vector skin', '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 +* http://www.pidgi.net/press/|PidgiWiki Press|http://images.pidgi.net/pidgipresstiletop.png +* http://www.petalburgwoods.com/|Petalburg Woods|http://images.pidgi.net/pwntiletop.png +* http://burstcade.pidgi.net/|Burstcade|http://images.pidgi.net/burstcadetiletop.png', + 'metrolook-tiles-second' => '', ); /** diff --git a/Metrolook.php b/Metrolook.php index f1e0880..d297842 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -26,7 +26,7 @@ 'name' => 'Metrolook', 'namemsg' => 'skinname-metrolook', 'descriptionmsg' => 'metrolook-desc', - 'version' => '0.2.3', + 'version' => '0.2.4', 'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' => array( 'immewnity', 'Paladox', 'Craig Davison', 'lagleki' ), 'license-name' => 'GPLv2+', @@ -72,14 +72,14 @@ * - true = use an icon search button * - false = use Go & Search buttons */ -$wgVectorUseSimpleSearch = true; +$wgMetrolookUseSimpleSearch = true; /** * Watch and unwatch as an icon rather than a link. * - true = use an icon watch/unwatch button * - false = use watch/unwatch text link */ -$wgVectorUseIconWatch = true; +$wgMetrolookUseIconWatch = true; $wgMetrolookLogo = true; @@ -101,16 +101,7 @@ $wgMetrolookMobile = true; -/* To use tile 5 to 10 please diable this */ $wgMetrolookBartile = true; - -$wgMetrolookTile1 = true; - -$wgMetrolookTile2 = true; - -$wgMetrolookTile3 = true; - -$wgMetrolookTile4 = true; // Register modules $wgResourceModules['skins.metrolook'] = array( diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 3628c67..f72e5c0 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -33,6 +33,52 @@ /** @var string $mPersonalToolsEcho Saves Echo notifications */ private $mPersonalToolsEcho = ''; + private function getTiles( $messageName = 'metrolook-tiles' ) { + /** +* The message's format is: +* * URL to the site|alternative text|image 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 +