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 .= '<div class="tile-wrapper"><div
class="tile">' .
- '<a href="' . htmlspecialchars(
$siteURL, ENT_QUOTES ) . '"><img src="' .
+ '<a href="' . htmlspecialchars(
$siteURL, ENT_QUOTES ) . '"><object class="image-align" data="' .
+ htmlspecialchars( $imageURLSVG,
ENT_QUOTES ) . '">
+ <img src="' .
htmlspecialchars( $imageURL, ENT_QUOTES
) .
- '" alt="' . htmlspecialchars( $altText,
ENT_QUOTES ) . '" /></a>' .
+ '" alt="' . htmlspecialchars( $altText,
ENT_QUOTES ) . '" /></object></a>' .
'</div></div>';
}
}
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/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/226713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fb65425d89f622e2791d66e4590e5e2a9d7378d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![http://images.pidgi.net/pwntiletop.png"](http://images.pidgi.net/pwntiletop.png"){kind=link}
![http://images.pidgi.net/burstcadetiletop.png"](http://images.pidgi.net/burstcadetiletop.png"){kind=link}