Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165439
Change subject: Remove 'new' level in directory tree.
......................................................................
Remove 'new' level in directory tree.
The front-end rewrite is no longer new, and this qualifier is unneeded.
Change-Id: I9f6eaf00bb90c3bc7c7fd5d3dae475418126055b
---
M .jshintignore
M Flow.php
M Resources.php
M includes/Notifications/Controller.php
R modules/components/flow-board.js
R modules/flow-api.js
R modules/flow-components.js
R modules/flow-handlebars.js
R modules/flow-history.js
R modules/flow.js
R modules/mw-ui.enhance.js
R modules/mw-ui.modal.js
R modules/notification/icon/Talk-ltr.png
R modules/notification/icon/Talk-rtl.png
R modules/styles/board/collapser.less
R modules/styles/board/content-preview.less
R modules/styles/board/form-actions.less
R modules/styles/board/header.less
R modules/styles/board/menu.less
R modules/styles/board/moderated.less
R modules/styles/board/navigation.less
R modules/styles/board/replycount.less
R modules/styles/board/terms-of-use.less
R modules/styles/board/timestamps.less
R modules/styles/board/topic/meta.less
R modules/styles/board/topic/navigation.less
R modules/styles/board/topic/navigator.less
R modules/styles/board/topic/post.less
R modules/styles/board/topic/summary.less
R modules/styles/board/topic/titlebar.less
R modules/styles/board/topic/watchlist.less
R modules/styles/common.less
R modules/styles/errors.less
R modules/styles/flow.less/flow.colors.less
R modules/styles/flow.less/flow.helpers.less
R modules/styles/flow.less/flow.variables.less
R modules/styles/js.less
R modules/styles/mediawiki.ui/forms.less
R modules/styles/mediawiki.ui/modal.less
R modules/styles/mediawiki.ui/text.less
R modules/styles/mediawiki.ui/tooltips.less
R modules/styles/minerva/common.less
R modules/vendor/Storer.js
R modules/vendor/jquery.ba-throttle-debounce.js
R tests/qunit/components/test_flow-board.js
R tests/qunit/test_flow-handlebars.js
R tests/qunit/test_mw-ui.enhance.js
47 files changed, 40 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/39/165439/1
diff --git a/.jshintignore b/.jshintignore
index 9c3c475..6e5c6c0 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,4 +1,4 @@
modules/jquery.scroll.js
-modules/new/vendor/handlebars-v2.0.0-alpha.2.js
-modules/new/vendor/Storer.js
-modules/new/vendor/jquery.ba-throttle-debounce.js
+modules/vendor/handlebars-v2.0.0-alpha.2.js
+modules/vendor/Storer.js
+modules/vendor/jquery.ba-throttle-debounce.js
diff --git a/Flow.php b/Flow.php
index 2b34dbb..c350811 100755
--- a/Flow.php
+++ b/Flow.php
@@ -126,7 +126,7 @@
// Register Flow import paths
$wgResourceLoaderLESSImportPaths = array_merge(
$wgResourceLoaderLESSImportPaths, array(
- $dir . "modules/new/styles/flow.less/",
+ $dir . "modules/styles/flow.less/",
) );
// Configuration
diff --git a/Resources.php b/Resources.php
index 36e0131..22d2e6a 100644
--- a/Resources.php
+++ b/Resources.php
@@ -214,25 +214,25 @@
// @todo: upstream to mediawiki ui
'ext.flow.mediawiki.ui.modal' => $flowResourceTemplate + array(
'styles' => array(
- 'new/styles/mediawiki.ui/modal.less',
+ 'styles/mediawiki.ui/modal.less',
),
) + $mobile,
// @todo: upstream to mediawiki ui
'ext.flow.mediawiki.ui.text' => $flowResourceTemplate + array(
'styles' => array(
- 'new/styles/mediawiki.ui/text.less',
+ 'styles/mediawiki.ui/text.less',
),
) + $mobile,
// @todo: upstream to mediawiki ui
'ext.flow.mediawiki.ui.form' => $flowResourceTemplate + array(
'styles' => array(
- 'new/styles/mediawiki.ui/forms.less',
+ 'styles/mediawiki.ui/forms.less',
),
) + $mobile,
// @todo: upstream to mediawiki ui
'ext.flow.mediawiki.ui.tooltips' => $flowResourceTemplate + array(
'styles' => array(
- 'new/styles/mediawiki.ui/tooltips.less',
+ 'styles/mediawiki.ui/tooltips.less',
),
) + $mobile,
'ext.flow.icons.styles' => $flowResourceTemplate + array(
@@ -243,39 +243,39 @@
) + $mobile,
'ext.flow.styles' => $flowResourceTemplate + array(
'styles' => array(
- 'new/styles/common.less',
- 'new/styles/errors.less',
+ 'styles/common.less',
+ 'styles/errors.less',
),
) + $mobile,
'ext.flow.board.styles' => $flowResourceTemplate + array(
'styles' => array(
- 'new/styles/board/collapser.less',
- 'new/styles/board/header.less',
- 'new/styles/board/menu.less',
- 'new/styles/board/navigation.less',
- 'new/styles/board/moderated.less',
- 'new/styles/board/timestamps.less',
- 'new/styles/board/replycount.less',
- 'new/styles/js.less',
- 'new/styles/board/content-preview.less',
- 'new/styles/board/form-actions.less',
- 'new/styles/board/terms-of-use.less',
+ 'styles/board/collapser.less',
+ 'styles/board/header.less',
+ 'styles/board/menu.less',
+ 'styles/board/navigation.less',
+ 'styles/board/moderated.less',
+ 'styles/board/timestamps.less',
+ 'styles/board/replycount.less',
+ 'styles/js.less',
+ 'styles/board/content-preview.less',
+ 'styles/board/form-actions.less',
+ 'styles/board/terms-of-use.less',
),
) + $mobile,
'ext.flow.board.topic.styles' => $flowResourceTemplate + array(
'styles' => array(
- 'new/styles/board/topic/navigation.less',
- 'new/styles/board/topic/navigator.less',
- 'new/styles/board/topic/titlebar.less',
- 'new/styles/board/topic/meta.less',
- 'new/styles/board/topic/post.less',
- 'new/styles/board/topic/summary.less',
- 'new/styles/board/topic/watchlist.less',
+ 'styles/board/topic/navigation.less',
+ 'styles/board/topic/navigator.less',
+ 'styles/board/topic/titlebar.less',
+ 'styles/board/topic/meta.less',
+ 'styles/board/topic/post.less',
+ 'styles/board/topic/summary.less',
+ 'styles/board/topic/watchlist.less',
),
) + $mobile,
'ext.flow.new.handlebars' => $flowResourceTemplate + array(
'scripts' => array(
- 'new/flow-handlebars.js',
+ 'flow-handlebars.js',
),
'messages' => array(
'flow-time-ago-second',
@@ -307,18 +307,18 @@
) + $mobile,
'ext.flow.new.history' => $flowResourceTemplate + array(
'scripts' => array(
- 'new/flow-history.js',
+ 'flow-history.js',
),
) + $mobile,
'ext.flow.new' => $flowResourceTemplate + array(
'scripts' => array(
- 'new/mw-ui.enhance.js',
- 'new/mw-ui.modal.js',
- 'new/flow-api.js',
- 'new/flow-components.js',
+ 'mw-ui.enhance.js',
+ 'mw-ui.modal.js',
+ 'flow-api.js',
+ 'flow-components.js',
// flow-component must come before actual components
- 'new/components/flow-board.js',
- 'new/flow.js',
+ 'components/flow-board.js',
+ 'flow.js',
),
'dependencies' => array(
'ext.flow.templating', // ResourceLoader templating
@@ -345,12 +345,12 @@
) + $mobile,
'ext.flow.vendor.storer' => $flowResourceTemplate + array(
'scripts' => array(
- 'new/vendor/Storer.js',
+ 'vendor/Storer.js',
),
) + $mobile,
'ext.flow.vendor.jquery.ba-throttle-debounce' => $flowResourceTemplate
+ array(
'scripts' => array(
- 'new/vendor/jquery.ba-throttle-debounce.js',
+ 'vendor/jquery.ba-throttle-debounce.js',
),
) + $mobile,
'ext.flow.editor' => $flowResourceTemplate + array(
diff --git a/includes/Notifications/Controller.php
b/includes/Notifications/Controller.php
index 5335c95..58488bf 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -45,8 +45,8 @@
$wgEchoNotificationIcons['flow-discussion'] = array(
'path' => array(
- 'ltr' =>
'Flow/modules/new/notification/icon/Talk-ltr.png',
- 'rtl' =>
'Flow/modules/new/notification/icon/Talk-rtl.png'
+ 'ltr' =>
'Flow/modules/notification/icon/Talk-ltr.png',
+ 'rtl' =>
'Flow/modules/notification/icon/Talk-rtl.png'
)
);
diff --git a/modules/new/components/flow-board.js
b/modules/components/flow-board.js
similarity index 100%
rename from modules/new/components/flow-board.js
rename to modules/components/flow-board.js
diff --git a/modules/new/flow-api.js b/modules/flow-api.js
similarity index 100%
rename from modules/new/flow-api.js
rename to modules/flow-api.js
diff --git a/modules/new/flow-components.js b/modules/flow-components.js
similarity index 100%
rename from modules/new/flow-components.js
rename to modules/flow-components.js
diff --git a/modules/new/flow-handlebars.js b/modules/flow-handlebars.js
similarity index 100%
rename from modules/new/flow-handlebars.js
rename to modules/flow-handlebars.js
diff --git a/modules/new/flow-history.js b/modules/flow-history.js
similarity index 100%
rename from modules/new/flow-history.js
rename to modules/flow-history.js
diff --git a/modules/new/flow.js b/modules/flow.js
similarity index 100%
rename from modules/new/flow.js
rename to modules/flow.js
diff --git a/modules/new/mw-ui.enhance.js b/modules/mw-ui.enhance.js
similarity index 100%
rename from modules/new/mw-ui.enhance.js
rename to modules/mw-ui.enhance.js
diff --git a/modules/new/mw-ui.modal.js b/modules/mw-ui.modal.js
similarity index 100%
rename from modules/new/mw-ui.modal.js
rename to modules/mw-ui.modal.js
diff --git a/modules/new/notification/icon/Talk-ltr.png
b/modules/notification/icon/Talk-ltr.png
similarity index 100%
rename from modules/new/notification/icon/Talk-ltr.png
rename to modules/notification/icon/Talk-ltr.png
Binary files differ
diff --git a/modules/new/notification/icon/Talk-rtl.png
b/modules/notification/icon/Talk-rtl.png
similarity index 100%
rename from modules/new/notification/icon/Talk-rtl.png
rename to modules/notification/icon/Talk-rtl.png
Binary files differ
diff --git a/modules/new/styles/board/collapser.less
b/modules/styles/board/collapser.less
similarity index 100%
rename from modules/new/styles/board/collapser.less
rename to modules/styles/board/collapser.less
diff --git a/modules/new/styles/board/content-preview.less
b/modules/styles/board/content-preview.less
similarity index 100%
rename from modules/new/styles/board/content-preview.less
rename to modules/styles/board/content-preview.less
diff --git a/modules/new/styles/board/form-actions.less
b/modules/styles/board/form-actions.less
similarity index 100%
rename from modules/new/styles/board/form-actions.less
rename to modules/styles/board/form-actions.less
diff --git a/modules/new/styles/board/header.less
b/modules/styles/board/header.less
similarity index 100%
rename from modules/new/styles/board/header.less
rename to modules/styles/board/header.less
diff --git a/modules/new/styles/board/menu.less b/modules/styles/board/menu.less
similarity index 100%
rename from modules/new/styles/board/menu.less
rename to modules/styles/board/menu.less
diff --git a/modules/new/styles/board/moderated.less
b/modules/styles/board/moderated.less
similarity index 100%
rename from modules/new/styles/board/moderated.less
rename to modules/styles/board/moderated.less
diff --git a/modules/new/styles/board/navigation.less
b/modules/styles/board/navigation.less
similarity index 100%
rename from modules/new/styles/board/navigation.less
rename to modules/styles/board/navigation.less
diff --git a/modules/new/styles/board/replycount.less
b/modules/styles/board/replycount.less
similarity index 100%
rename from modules/new/styles/board/replycount.less
rename to modules/styles/board/replycount.less
diff --git a/modules/new/styles/board/terms-of-use.less
b/modules/styles/board/terms-of-use.less
similarity index 100%
rename from modules/new/styles/board/terms-of-use.less
rename to modules/styles/board/terms-of-use.less
diff --git a/modules/new/styles/board/timestamps.less
b/modules/styles/board/timestamps.less
similarity index 100%
rename from modules/new/styles/board/timestamps.less
rename to modules/styles/board/timestamps.less
diff --git a/modules/new/styles/board/topic/meta.less
b/modules/styles/board/topic/meta.less
similarity index 100%
rename from modules/new/styles/board/topic/meta.less
rename to modules/styles/board/topic/meta.less
diff --git a/modules/new/styles/board/topic/navigation.less
b/modules/styles/board/topic/navigation.less
similarity index 100%
rename from modules/new/styles/board/topic/navigation.less
rename to modules/styles/board/topic/navigation.less
diff --git a/modules/new/styles/board/topic/navigator.less
b/modules/styles/board/topic/navigator.less
similarity index 100%
rename from modules/new/styles/board/topic/navigator.less
rename to modules/styles/board/topic/navigator.less
diff --git a/modules/new/styles/board/topic/post.less
b/modules/styles/board/topic/post.less
similarity index 100%
rename from modules/new/styles/board/topic/post.less
rename to modules/styles/board/topic/post.less
diff --git a/modules/new/styles/board/topic/summary.less
b/modules/styles/board/topic/summary.less
similarity index 100%
rename from modules/new/styles/board/topic/summary.less
rename to modules/styles/board/topic/summary.less
diff --git a/modules/new/styles/board/topic/titlebar.less
b/modules/styles/board/topic/titlebar.less
similarity index 100%
rename from modules/new/styles/board/topic/titlebar.less
rename to modules/styles/board/topic/titlebar.less
diff --git a/modules/new/styles/board/topic/watchlist.less
b/modules/styles/board/topic/watchlist.less
similarity index 100%
rename from modules/new/styles/board/topic/watchlist.less
rename to modules/styles/board/topic/watchlist.less
diff --git a/modules/new/styles/common.less b/modules/styles/common.less
similarity index 100%
rename from modules/new/styles/common.less
rename to modules/styles/common.less
diff --git a/modules/new/styles/errors.less b/modules/styles/errors.less
similarity index 100%
rename from modules/new/styles/errors.less
rename to modules/styles/errors.less
diff --git a/modules/new/styles/flow.less/flow.colors.less
b/modules/styles/flow.less/flow.colors.less
similarity index 100%
rename from modules/new/styles/flow.less/flow.colors.less
rename to modules/styles/flow.less/flow.colors.less
diff --git a/modules/new/styles/flow.less/flow.helpers.less
b/modules/styles/flow.less/flow.helpers.less
similarity index 100%
rename from modules/new/styles/flow.less/flow.helpers.less
rename to modules/styles/flow.less/flow.helpers.less
diff --git a/modules/new/styles/flow.less/flow.variables.less
b/modules/styles/flow.less/flow.variables.less
similarity index 100%
rename from modules/new/styles/flow.less/flow.variables.less
rename to modules/styles/flow.less/flow.variables.less
diff --git a/modules/new/styles/js.less b/modules/styles/js.less
similarity index 100%
rename from modules/new/styles/js.less
rename to modules/styles/js.less
diff --git a/modules/new/styles/mediawiki.ui/forms.less
b/modules/styles/mediawiki.ui/forms.less
similarity index 100%
rename from modules/new/styles/mediawiki.ui/forms.less
rename to modules/styles/mediawiki.ui/forms.less
diff --git a/modules/new/styles/mediawiki.ui/modal.less
b/modules/styles/mediawiki.ui/modal.less
similarity index 100%
rename from modules/new/styles/mediawiki.ui/modal.less
rename to modules/styles/mediawiki.ui/modal.less
diff --git a/modules/new/styles/mediawiki.ui/text.less
b/modules/styles/mediawiki.ui/text.less
similarity index 100%
rename from modules/new/styles/mediawiki.ui/text.less
rename to modules/styles/mediawiki.ui/text.less
diff --git a/modules/new/styles/mediawiki.ui/tooltips.less
b/modules/styles/mediawiki.ui/tooltips.less
similarity index 100%
rename from modules/new/styles/mediawiki.ui/tooltips.less
rename to modules/styles/mediawiki.ui/tooltips.less
diff --git a/modules/new/styles/minerva/common.less
b/modules/styles/minerva/common.less
similarity index 100%
rename from modules/new/styles/minerva/common.less
rename to modules/styles/minerva/common.less
diff --git a/modules/new/vendor/Storer.js b/modules/vendor/Storer.js
similarity index 100%
rename from modules/new/vendor/Storer.js
rename to modules/vendor/Storer.js
diff --git a/modules/new/vendor/jquery.ba-throttle-debounce.js
b/modules/vendor/jquery.ba-throttle-debounce.js
similarity index 100%
rename from modules/new/vendor/jquery.ba-throttle-debounce.js
rename to modules/vendor/jquery.ba-throttle-debounce.js
diff --git a/tests/qunit/new/components/test_flow-board.js
b/tests/qunit/components/test_flow-board.js
similarity index 100%
rename from tests/qunit/new/components/test_flow-board.js
rename to tests/qunit/components/test_flow-board.js
diff --git a/tests/qunit/new/test_flow-handlebars.js
b/tests/qunit/test_flow-handlebars.js
similarity index 100%
rename from tests/qunit/new/test_flow-handlebars.js
rename to tests/qunit/test_flow-handlebars.js
diff --git a/tests/qunit/new/test_mw-ui.enhance.js
b/tests/qunit/test_mw-ui.enhance.js
similarity index 100%
rename from tests/qunit/new/test_mw-ui.enhance.js
rename to tests/qunit/test_mw-ui.enhance.js
--
To view, visit https://gerrit.wikimedia.org/r/165439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f6eaf00bb90c3bc7c7fd5d3dae475418126055b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
