jenkins-bot has submitted this change and it was merged.
Change subject: Sanitized directory structure
......................................................................
Sanitized directory structure
This has been really bugging me. :)
Renamed/merged directories:
* js/ → resources/
* css/ → resources/
* img/form-icon/ → resources/images/
Updated paths where applicable.
Change-Id: I4bc552252b1ac8966d6d96f84e868dd8bc4609f4
---
M BetaFeatures.php
R resources/betafeatures.css
R resources/betafeatures.js
R resources/ext.betaFeatures.popup.js
R resources/images/checked.png
R resources/images/checked.svg
R resources/images/feature-discussion.png
R resources/images/feature-discussion.svg
R resources/images/feature-information.png
R resources/images/feature-information.svg
R resources/mediawiki.ui.checkbox.js
11 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/BetaFeatures.php b/BetaFeatures.php
index 005f6e6..d98de93 100644
--- a/BetaFeatures.php
+++ b/BetaFeatures.php
@@ -47,17 +47,17 @@
$wgJobClasses['updateBetaFeaturesUserCounts'] =
'UpdateBetaFeatureUserCountsJob';
$moduleInfo = array(
- 'localBasePath' => __DIR__,
- 'remoteExtPath' => 'BetaFeatures',
+ 'localBasePath' => __DIR__ . '/resources',
+ 'remoteExtPath' => 'BetaFeatures/resources',
);
$wgResourceModules['ext.betaFeatures'] = array(
'scripts' => array(
- 'js/betafeatures.js',
- 'js/mediawiki.ui.checkbox.js',
+ 'betafeatures.js',
+ 'mediawiki.ui.checkbox.js',
),
'styles' => array(
- 'css/betafeatures.css',
+ 'betafeatures.css',
),
'dependencies' => array(
'jquery.client',
@@ -67,7 +67,7 @@
$wgResourceModules['ext.betaFeatures.popup'] = array(
'scripts' => array(
- 'js/ext.betaFeatures.popup.js',
+ 'ext.betaFeatures.popup.js',
),
'dependencies' => array(
diff --git a/css/betafeatures.css b/resources/betafeatures.css
similarity index 91%
rename from css/betafeatures.css
rename to resources/betafeatures.css
index 39e555d..3bc1910 100644
--- a/css/betafeatures.css
+++ b/resources/betafeatures.css
@@ -52,11 +52,11 @@
/* SVG support using a transparent gradient to guarantee cross-browser
* compatibility (browsers able to understand gradient syntax support
also SVG).
*
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
- background-image: url(../img/form-icon/checked.png);
+ background-image: url(images/checked.png);
/* @embed */
- background-image: -webkit-linear-gradient(transparent, transparent),
url(../img/form-icon/checked.svg);
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(images/checked.svg);
/* @embed */
- background-image: linear-gradient(transparent, transparent),
url(../img/form-icon/checked.svg);
+ background-image: linear-gradient(transparent, transparent),
url(images/checked.svg);
background-repeat: no-repeat;
}
@@ -147,22 +147,22 @@
/* SVG support using a transparent gradient to guarantee cross-browser
* compatibility (browsers able to understand gradient syntax support
also SVG).
*
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
- background-image: url(../img/form-icon/feature-discussion.png);
+ background-image: url(images/feature-discussion.png);
/* @embed */
- background-image: -webkit-linear-gradient(transparent, transparent),
url(../img/form-icon/feature-discussion.svg);
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(images/feature-discussion.svg);
/* @embed */
- background-image: linear-gradient(transparent, transparent),
url(../img/form-icon/feature-discussion.svg);
+ background-image: linear-gradient(transparent, transparent),
url(images/feature-discussion.svg);
}
.mw-ui-feature-info-link {
/* SVG support using a transparent gradient to guarantee cross-browser
* compatibility (browsers able to understand gradient syntax support
also SVG).
*
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
- background-image: url(../img/form-icon/feature-information.png);
+ background-image: url(images/feature-information.png);
/* @embed */
- background-image: -webkit-linear-gradient(transparent, transparent),
url(../img/form-icon/feature-information.svg);
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(images/feature-information.svg);
/* @embed */
- background-image: linear-gradient(transparent, transparent),
url(../img/form-icon/feature-information.svg);
+ background-image: linear-gradient(transparent, transparent),
url(images/feature-information.svg);
padding-left: 46px;
}
diff --git a/js/betafeatures.js b/resources/betafeatures.js
similarity index 100%
rename from js/betafeatures.js
rename to resources/betafeatures.js
diff --git a/js/ext.betaFeatures.popup.js b/resources/ext.betaFeatures.popup.js
similarity index 100%
rename from js/ext.betaFeatures.popup.js
rename to resources/ext.betaFeatures.popup.js
diff --git a/img/form-icon/checked.png b/resources/images/checked.png
similarity index 100%
rename from img/form-icon/checked.png
rename to resources/images/checked.png
Binary files differ
diff --git a/img/form-icon/checked.svg b/resources/images/checked.svg
similarity index 100%
rename from img/form-icon/checked.svg
rename to resources/images/checked.svg
diff --git a/img/form-icon/feature-discussion.png
b/resources/images/feature-discussion.png
similarity index 100%
rename from img/form-icon/feature-discussion.png
rename to resources/images/feature-discussion.png
Binary files differ
diff --git a/img/form-icon/feature-discussion.svg
b/resources/images/feature-discussion.svg
similarity index 100%
rename from img/form-icon/feature-discussion.svg
rename to resources/images/feature-discussion.svg
diff --git a/img/form-icon/feature-information.png
b/resources/images/feature-information.png
similarity index 100%
rename from img/form-icon/feature-information.png
rename to resources/images/feature-information.png
Binary files differ
diff --git a/img/form-icon/feature-information.svg
b/resources/images/feature-information.svg
similarity index 100%
rename from img/form-icon/feature-information.svg
rename to resources/images/feature-information.svg
diff --git a/js/mediawiki.ui.checkbox.js b/resources/mediawiki.ui.checkbox.js
similarity index 100%
rename from js/mediawiki.ui.checkbox.js
rename to resources/mediawiki.ui.checkbox.js
--
To view, visit https://gerrit.wikimedia.org/r/119553
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4bc552252b1ac8966d6d96f84e868dd8bc4609f4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
