jenkins-bot has submitted this change and it was merged.
Change subject: ResourceLoader consistency file moves
......................................................................
ResourceLoader consistency file moves
Keep modules in separate dirs, move images to their module dirs, and fix
up the module declarations so they still work.
Also moved viewer.svg into the root.
Bug: 56421
Change-Id: Ia84ddfd3b91c784c42d9ba243c5cfd46354f139f
---
M MultimediaViewer.php
M MultimediaViewerHooks.php
M importml.sh
R resources/ext.multimediaViewer/ext.multimediaViewer.css
R resources/ext.multimediaViewer/ext.multimediaViewer.js
R resources/ext.multimediaViewer/img/cc.svg
R resources/ext.multimediaViewer/img/mw-close.svg
R resources/ext.multimediaViewer/img/mw-defullscreen.svg
R resources/ext.multimediaViewer/img/mw-fullscreen.svg
R resources/ext.multimediaViewer/img/repo.svg
R resources/ext.multimediaViewer/img/time.svg
R resources/ext.multimediaViewer/img/use.svg
R resources/ext.multimediaViewer/img/user.svg
R resources/multilightbox/hooks.txt
R resources/multilightbox/img/close.svg
R resources/multilightbox/img/defullscreen.svg
R resources/multilightbox/img/fullscreen.svg
R resources/multilightbox/lightboximage.js
R resources/multilightbox/lightboxinterface.js
R resources/multilightbox/multilightbox.css
R resources/multilightbox/multilightbox.js
R viewer.svg
22 files changed, 43 insertions(+), 28 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 43b9f87..2108652 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -21,46 +21,51 @@
* @copyright Copyright © 2013, Mark Holmquist
*/
-$moduleInfo = array(
- 'localBasePath' => __DIR__,
- 'remoteExtPath' => 'MultimediaViewer',
+$moduleInfoML = array(
+ 'localBasePath' => __DIR__ . '/resources/multilightbox',
+ 'remoteExtPath' => 'MultimediaViewer/resources/multilightbox',
+);
+
+$moduleInfoMMV = array(
+ 'localBasePath' => __DIR__ . '/resources/ext.multimediaViewer',
+ 'remoteExtPath' => 'MultimediaViewer/resources/ext.multimediaViewer',
);
$wgExtensionMessagesFiles['MultimediaViewer'] = __DIR__ .
'/MultimediaViewer.i18n.php';
$wgResourceModules['multilightbox.interface'] = array_merge( array(
'scripts' => array(
- 'js/multilightbox/lightboxinterface.js',
+ 'lightboxinterface.js',
),
'styles' => array(
- 'css/multilightbox.css',
+ 'multilightbox.css',
),
-), $moduleInfo );
+), $moduleInfoML );
$wgResourceModules['multilightbox.image'] = array_merge( array(
'scripts' => array(
- 'js/multilightbox/lightboximage.js',
+ 'lightboximage.js',
),
-), $moduleInfo );
+), $moduleInfoML );
$wgResourceModules['multilightbox'] = array_merge( array(
'scripts' => array(
- 'js/multilightbox/multilightbox.js',
+ 'multilightbox.js',
),
'dependencies' => array(
'multilightbox.interface',
),
-), $moduleInfo );
+), $moduleInfoML );
$wgResourceModules['ext.multimediaViewer'] = array_merge( array(
'scripts' => array(
- 'js/ext.multimediaViewer.js',
+ 'ext.multimediaViewer.js',
),
'styles' => array(
- 'css/ext.multimediaViewer.css',
+ 'ext.multimediaViewer.css',
),
'dependencies' => array(
@@ -86,7 +91,7 @@
'multimediaviewer-about-mmv',
'multimediaviewer-discuss-mmv',
),
-), $moduleInfo );
+), $moduleInfoMMV );
$wgExtensionFunctions[] = function () {
global $wgResourceModules;
diff --git a/MultimediaViewerHooks.php b/MultimediaViewerHooks.php
index 3429489..1f170fc 100644
--- a/MultimediaViewerHooks.php
+++ b/MultimediaViewerHooks.php
@@ -87,7 +87,7 @@
'desc-message' => 'multimediaviewer-pref-desc',
'info-link' => self::$infoLink,
'discussion-link' => self::$discussionLink,
- 'screenshot' => $wgExtensionAssetsPath .
'/MultimediaViewer/img/viewer.svg',
+ 'screenshot' => $wgExtensionAssetsPath .
'/MultimediaViewer/viewer.svg',
);
return true;
diff --git a/importml.sh b/importml.sh
index 245d78b..44244fe 100755
--- a/importml.sh
+++ b/importml.sh
@@ -9,15 +9,17 @@
JSDIR=$MLDIR/lib
CSSDIR=$MLDIR/css
IMGDIR=$MLDIR/img
+HOOKSFILE=$MLDIR/hooks.txt
+LOCALMLDIR=resources/multilightbox
if [ $1 = "--reverse" ]; then
- cp js/multilightbox/* $JSDIR
- cp css/multilightbox.css $CSSDIR
+ cp $LOCALMLDIR/*.js $JSDIR
+ cp $LOCALMLDIR/multilightbox.css $CSSDIR
cp img/close.svg img/fullscreen.svg img/defullscreen.svg $IMGDIR
- cp js/multilightbox/hooks.txt $MLDIR
+ cp $LOCALMLDIR/hooks.txt $HOOKSFILE
else
- cp $JSDIR/* js/multilightbox/
- cp $CSSDIR/* css/
+ cp $JSDIR/* resources/multilightbox/
+ cp $CSSDIR/* resources/multilightbox/
cp $IMGDIR/* img/
- cp $MLDIR/hooks.txt js/multilightbox/
+ cp $HOOKSFILE resources/multilightbox/
fi
diff --git a/css/ext.multimediaViewer.css
b/resources/ext.multimediaViewer/ext.multimediaViewer.css
similarity index 89%
rename from css/ext.multimediaViewer.css
rename to resources/ext.multimediaViewer/ext.multimediaViewer.css
index 3c36d3e..d28a799 100644
--- a/css/ext.multimediaViewer.css
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.css
@@ -67,15 +67,18 @@
}
.mlb-close {
- background-image: url( '../img/mw-close.svg' );
+ /* @embed */
+ background-image: url(img/mw-close.svg);
}
.mlb-fullscreen-div .mlb-fullscreen {
- background-image: url( '../img/mw-defullscreen.svg' );
+ /* @embed */
+ background-image: url(img/mw-defullscreen.svg);
}
.mlb-fullscreen {
- background-image: url( '../img/mw-fullscreen.svg' );
+ /* @embed */
+ background-image: url(img/mw-fullscreen.svg);
}
.mw-mlb-license,
@@ -135,19 +138,23 @@
}
.mw-mlb-image-links li.mw-mlb-repo-li:before {
- background-image: url( '../img/repo.svg' );
+ /* @embed */
+ background-image: url(img/repo.svg);
}
.mw-mlb-image-links li.mw-mlb-username-li:before {
- background-image: url( '../img/user.svg' );
+ /* @embed */
+ background-image: url(img/user.svg);
}
.mw-mlb-image-links li.mw-mlb-datetime-li:before {
- background-image: url( '../img/time.svg' );
+ /* @embed */
+ background-image: url(img/time.svg);
}
.mw-mlb-image-links li.mw-mlb-usefile-li:before {
- background-image: url( '../img/use.svg' );
+ /* @embed */
+ background-image: url(img/use.svg);
}
.mw-mlb-image-links li.empty:before {
@@ -185,7 +192,8 @@
.mw-mlb-license.cc-license:before {
background-size: contain;
- background-image: url( '../img/cc.svg' );
+ /* @embed */
+ background-image: url(img/cc.svg);
display: inline-block;
vertical-align: middle;
height: 20px;
diff --git a/js/ext.multimediaViewer.js
b/resources/ext.multimediaViewer/ext.multimediaViewer.js
similarity index 100%
rename from js/ext.multimediaViewer.js
rename to resources/ext.multimediaViewer/ext.multimediaViewer.js
diff --git a/img/cc.svg b/resources/ext.multimediaViewer/img/cc.svg
similarity index 100%
rename from img/cc.svg
rename to resources/ext.multimediaViewer/img/cc.svg
diff --git a/img/mw-close.svg b/resources/ext.multimediaViewer/img/mw-close.svg
similarity index 100%
rename from img/mw-close.svg
rename to resources/ext.multimediaViewer/img/mw-close.svg
diff --git a/img/mw-defullscreen.svg
b/resources/ext.multimediaViewer/img/mw-defullscreen.svg
similarity index 100%
rename from img/mw-defullscreen.svg
rename to resources/ext.multimediaViewer/img/mw-defullscreen.svg
diff --git a/img/mw-fullscreen.svg
b/resources/ext.multimediaViewer/img/mw-fullscreen.svg
similarity index 100%
rename from img/mw-fullscreen.svg
rename to resources/ext.multimediaViewer/img/mw-fullscreen.svg
diff --git a/img/repo.svg b/resources/ext.multimediaViewer/img/repo.svg
similarity index 100%
rename from img/repo.svg
rename to resources/ext.multimediaViewer/img/repo.svg
diff --git a/img/time.svg b/resources/ext.multimediaViewer/img/time.svg
similarity index 100%
rename from img/time.svg
rename to resources/ext.multimediaViewer/img/time.svg
diff --git a/img/use.svg b/resources/ext.multimediaViewer/img/use.svg
similarity index 100%
rename from img/use.svg
rename to resources/ext.multimediaViewer/img/use.svg
diff --git a/img/user.svg b/resources/ext.multimediaViewer/img/user.svg
similarity index 100%
rename from img/user.svg
rename to resources/ext.multimediaViewer/img/user.svg
diff --git a/js/multilightbox/hooks.txt b/resources/multilightbox/hooks.txt
similarity index 100%
rename from js/multilightbox/hooks.txt
rename to resources/multilightbox/hooks.txt
diff --git a/img/close.svg b/resources/multilightbox/img/close.svg
similarity index 100%
rename from img/close.svg
rename to resources/multilightbox/img/close.svg
diff --git a/img/defullscreen.svg b/resources/multilightbox/img/defullscreen.svg
similarity index 100%
rename from img/defullscreen.svg
rename to resources/multilightbox/img/defullscreen.svg
diff --git a/img/fullscreen.svg b/resources/multilightbox/img/fullscreen.svg
similarity index 100%
rename from img/fullscreen.svg
rename to resources/multilightbox/img/fullscreen.svg
diff --git a/js/multilightbox/lightboximage.js
b/resources/multilightbox/lightboximage.js
similarity index 100%
rename from js/multilightbox/lightboximage.js
rename to resources/multilightbox/lightboximage.js
diff --git a/js/multilightbox/lightboxinterface.js
b/resources/multilightbox/lightboxinterface.js
similarity index 100%
rename from js/multilightbox/lightboxinterface.js
rename to resources/multilightbox/lightboxinterface.js
diff --git a/css/multilightbox.css b/resources/multilightbox/multilightbox.css
similarity index 100%
rename from css/multilightbox.css
rename to resources/multilightbox/multilightbox.css
diff --git a/js/multilightbox/multilightbox.js
b/resources/multilightbox/multilightbox.js
similarity index 100%
rename from js/multilightbox/multilightbox.js
rename to resources/multilightbox/multilightbox.js
diff --git a/img/viewer.svg b/viewer.svg
similarity index 100%
rename from img/viewer.svg
rename to viewer.svg
--
To view, visit https://gerrit.wikimedia.org/r/93867
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia84ddfd3b91c784c42d9ba243c5cfd46354f139f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
