jenkins-bot has submitted this change and it was merged.
Change subject: Rearrange templates folder so that is is consistent with
javascripts and less
......................................................................
Rearrange templates folder so that is is consistent with javascripts and less
Bug: 71523
Change-Id: I84e6d481211269090a9d3ad65a1d16dc74bc0104
---
M includes/Resources.php
M javascripts/modules/PageList.js
M javascripts/modules/issues/CleanupOverlay.js
M javascripts/modules/mediaViewer/ImageOverlay.js
M javascripts/modules/references/references.js
M javascripts/modules/uploads/LeadPhoto.js
M javascripts/modules/uploads/LeadPhotoUploaderButton.js
M javascripts/modules/uploads/PhotoApi.js
M javascripts/modules/uploads/PhotoUploadOverlay.js
M javascripts/modules/uploads/PhotoUploadProgress.js
M javascripts/modules/uploads/PhotoUploaderButton.js
M javascripts/modules/uploads/UploadTutorial.js
M javascripts/specials/mobileoptions.js
M javascripts/specials/uploads.js
R templates/modules/articleList.hogan
R templates/modules/issues/cleanup.hogan
R templates/modules/mediaViewer/ImageOverlay.hogan
R templates/modules/nearby/pagePreview.hogan
R templates/modules/references/ReferencesDrawer.hogan
R templates/modules/uploads/LeadPhoto.hogan
R templates/modules/uploads/LeadPhotoUploaderButton.hogan
R templates/modules/uploads/PhotoUploadOverlay.hogan
R templates/modules/uploads/PhotoUploadProgress.hogan
R templates/modules/uploads/PhotoUploaderButton.hogan
R templates/modules/uploads/UploadTutorial.hogan
R templates/modules/uploads/commons-upload.hogan
R templates/specials/checkbox.hogan
R templates/specials/photo.hogan
R templates/specials/userGallery.hogan
29 files changed, 29 insertions(+), 29 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 0fae181..fecf83d 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -339,10 +339,10 @@
'less/modules/uploads/PhotoUploadOverlay.less',
),
'templates' => array(
- 'uploads/LeadPhoto.hogan',
- 'uploads/UploadTutorial.hogan',
- 'uploads/PhotoUploadOverlay.hogan',
- 'uploads/PhotoUploadProgress.hogan',
+ 'modules/uploads/LeadPhoto.hogan',
+ 'modules/uploads/UploadTutorial.hogan',
+ 'modules/uploads/PhotoUploadOverlay.hogan',
+ 'modules/uploads/PhotoUploadProgress.hogan',
),
'messages' => array(
'mobile-frontend-photo-upload-success-article',
@@ -519,7 +519,7 @@
'javascripts/modules/mediaViewer/ImageOverlay.js',
),
'templates' => array(
- 'modules/ImageOverlay.hogan',
+ 'modules/mediaViewer/ImageOverlay.hogan',
),
'messages' => array(
// mediaViewer.js
@@ -599,15 +599,15 @@
'jquery.cookie',
),
'templates' => array(
- 'wikitext/commons-upload.hogan',
+ 'modules/uploads/commons-upload.hogan',
// SearchOverlay.js and Nearby.js
- 'articleList.hogan',
+ 'modules/articleList.hogan',
// PhotoUploaderButton.js
// For new page action menu
- 'uploads/LeadPhotoUploaderButton.hogan',
+ 'modules/uploads/LeadPhotoUploaderButton.hogan',
// @todo FIXME: this should be in special.uploads (need
to split
// code in PhotoUploaderButton.js into separate files
too)
- 'uploads/PhotoUploaderButton.hogan',
+ 'modules/uploads/PhotoUploaderButton.hogan',
'ctaDrawer.hogan',
),
@@ -665,7 +665,7 @@
),
'templates' => array(
// references.js
- 'ReferencesDrawer.hogan',
+ 'modules/references/ReferencesDrawer.hogan',
),
'scripts' => array(
'javascripts/modules/references/references.js',
@@ -799,7 +799,7 @@
'mobile.overlays',
),
'templates' => array(
- 'overlays/cleanup.hogan',
+ 'modules/issues/cleanup.hogan',
),
'styles' => array(
'less/modules/issues.less',
@@ -819,7 +819,7 @@
'mobile.nearby' => $wgMFMobileResourceBoilerplate + array(
'templates' => array(
- 'overlays/pagePreview.hogan',
+ 'modules/nearby/pagePreview.hogan',
),
'dependencies' => array(
'mobile.stable.common',
@@ -985,7 +985,7 @@
'javascripts/specials/mobileoptions.js',
),
'templates' => array(
- 'specials/mobileoptions/checkbox.hogan',
+ 'specials/checkbox.hogan',
),
'messages' => array(
'mobile-frontend-expand-sections-description',
@@ -1053,8 +1053,8 @@
'mobile.stable'
),
'templates' => array(
- 'specials/uploads/photo.hogan',
- 'specials/uploads/userGallery.hogan',
+ 'specials/photo.hogan',
+ 'specials/userGallery.hogan',
),
'messages' => array(
'mobile-frontend-donate-image-nouploads',
diff --git a/javascripts/modules/PageList.js b/javascripts/modules/PageList.js
index 3c999b3..13fca6e 100644
--- a/javascripts/modules/PageList.js
+++ b/javascripts/modules/PageList.js
@@ -21,7 +21,7 @@
this.api = new WatchstarApi( options );
View.prototype.initialize.apply( this, arguments );
},
- template: M.template.get( 'articleList.hogan' ),
+ template: M.template.get( 'modules/articleList.hogan' ),
postRender: function( options ) {
View.prototype.postRender.apply( this, arguments );
var pages = [], $li = this.$( 'li' ),
diff --git a/javascripts/modules/issues/CleanupOverlay.js
b/javascripts/modules/issues/CleanupOverlay.js
index dff2727..f73b49a 100644
--- a/javascripts/modules/issues/CleanupOverlay.js
+++ b/javascripts/modules/issues/CleanupOverlay.js
@@ -2,7 +2,7 @@
var Overlay = M.require( 'Overlay' ),
CleanupOverlay = Overlay.extend( {
templatePartials: {
- content: M.template.get( 'overlays/cleanup.hogan' )
+ content: M.template.get( 'modules/issues/cleanup.hogan'
)
},
initialize: function( options ) {
options.heading = '<strong>' + options.headingText +
'</strong>';
diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js
b/javascripts/modules/mediaViewer/ImageOverlay.js
index 59f2d25..b25f0aa 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -14,7 +14,7 @@
// allow pinch zooming
hasFixedHeader: false,
className: 'overlay media-viewer',
- template: M.template.get( 'modules/ImageOverlay.hogan' ),
+ template: M.template.get(
'modules/mediaViewer/ImageOverlay.hogan' ),
closeOnBack: true,
defaults: {
diff --git a/javascripts/modules/references/references.js
b/javascripts/modules/references/references.js
index 33cac11..e9d6c58 100644
--- a/javascripts/modules/references/references.js
+++ b/javascripts/modules/references/references.js
@@ -3,7 +3,7 @@
ReferencesDrawer = Drawer.extend( {
className: 'drawer position-fixed text references',
- template: M.template.get( 'ReferencesDrawer.hogan' )
+ template: M.template.get(
'modules/references/ReferencesDrawer.hogan' )
} );
function getReference( id ) {
diff --git a/javascripts/modules/uploads/LeadPhoto.js
b/javascripts/modules/uploads/LeadPhoto.js
index 035d546..b28959e 100644
--- a/javascripts/modules/uploads/LeadPhoto.js
+++ b/javascripts/modules/uploads/LeadPhoto.js
@@ -3,7 +3,7 @@
var View = M.require( 'View' ), LeadPhoto;
LeadPhoto = View.extend( {
- template: M.template.get( 'uploads/LeadPhoto.hogan' ),
+ template: M.template.get( 'modules/uploads/LeadPhoto.hogan' ),
animate: function() {
this.$el.hide().slideDown();
diff --git a/javascripts/modules/uploads/LeadPhotoUploaderButton.js
b/javascripts/modules/uploads/LeadPhotoUploaderButton.js
index 7e4a498..2ba3c8f 100644
--- a/javascripts/modules/uploads/LeadPhotoUploaderButton.js
+++ b/javascripts/modules/uploads/LeadPhotoUploaderButton.js
@@ -4,7 +4,7 @@
LeadPhotoUploaderButton;
LeadPhotoUploaderButton = PhotoUploaderButton.extend( {
- template: M.template.get(
'uploads/LeadPhotoUploaderButton.hogan' ),
+ template: M.template.get(
'modules/uploads/LeadPhotoUploaderButton.hogan' ),
className: 'enabled',
defaults: {
diff --git a/javascripts/modules/uploads/PhotoApi.js
b/javascripts/modules/uploads/PhotoApi.js
index 2932333..7469420 100644
--- a/javascripts/modules/uploads/PhotoApi.js
+++ b/javascripts/modules/uploads/PhotoApi.js
@@ -157,7 +157,7 @@
comment: mw.msg(
options.editSummaryMessage ),
file: options.file,
token: token,
- text: M.template.get(
'wikitext/commons-upload.hogan' ).
+ text: M.template.get(
'modules/uploads/commons-upload.hogan' ).
render( {
suffix: mw.config.get(
'wgMFPhotoUploadAppendToDesc' ),
text:
options.description,
diff --git a/javascripts/modules/uploads/PhotoUploadOverlay.js
b/javascripts/modules/uploads/PhotoUploadOverlay.js
index 078f08d..b286185 100644
--- a/javascripts/modules/uploads/PhotoUploadOverlay.js
+++ b/javascripts/modules/uploads/PhotoUploadOverlay.js
@@ -30,7 +30,7 @@
className: 'overlay photo-overlay',
templatePartials: {
- content: M.template.get(
'uploads/PhotoUploadOverlay.hogan' )
+ content: M.template.get(
'modules/uploads/PhotoUploadOverlay.hogan' )
},
initialize: function( options ) {
diff --git a/javascripts/modules/uploads/PhotoUploadProgress.js
b/javascripts/modules/uploads/PhotoUploadProgress.js
index 0969799..400d203 100644
--- a/javascripts/modules/uploads/PhotoUploadProgress.js
+++ b/javascripts/modules/uploads/PhotoUploadProgress.js
@@ -9,7 +9,7 @@
uploadingMsg: mw.msg( 'mobile-frontend-image-uploading'
),
saveMsg: mw.msg( 'mobile-frontend-editor-save' )
},
- template: M.template.get( 'uploads/PhotoUploadProgress.hogan' ),
+ template: M.template.get(
'modules/uploads/PhotoUploadProgress.hogan' ),
fullScreen: false,
initialize: function() {
diff --git a/javascripts/modules/uploads/PhotoUploaderButton.js
b/javascripts/modules/uploads/PhotoUploaderButton.js
index e8f3651..01b9a71 100644
--- a/javascripts/modules/uploads/PhotoUploaderButton.js
+++ b/javascripts/modules/uploads/PhotoUploaderButton.js
@@ -44,7 +44,7 @@
* @param {string} options.funnel Funnel for EventLogging.
*/
PhotoUploaderButton = View.extend( {
- template: M.template.get( 'uploads/PhotoUploaderButton.hogan' ),
+ template: M.template.get(
'modules/uploads/PhotoUploaderButton.hogan' ),
className: 'mw-ui-progressive mw-ui-button button icon-photo
icon icon-text',
postRender: function() {
diff --git a/javascripts/modules/uploads/UploadTutorial.js
b/javascripts/modules/uploads/UploadTutorial.js
index ab0b60b..371b637 100644
--- a/javascripts/modules/uploads/UploadTutorial.js
+++ b/javascripts/modules/uploads/UploadTutorial.js
@@ -7,7 +7,7 @@
UploadTutorial;
UploadTutorial = Overlay.extend( {
- template: M.template.get( 'uploads/UploadTutorial.hogan' ),
+ template: M.template.get(
'modules/uploads/UploadTutorial.hogan' ),
className: 'overlay carousel tutorial',
defaults: {
diff --git a/javascripts/specials/mobileoptions.js
b/javascripts/specials/mobileoptions.js
index bdca8b3..ca8782b 100644
--- a/javascripts/specials/mobileoptions.js
+++ b/javascripts/specials/mobileoptions.js
@@ -2,7 +2,7 @@
var View = M.require( 'View' ), Checkbox;
Checkbox = View.extend( {
- template: M.template.get(
'specials/mobileoptions/checkbox.hogan' ),
+ template: M.template.get( 'specials/checkbox.hogan' ),
save: function() {
M.settings.saveUserSetting( this.options.name,
this.cb.prop( 'checked' ) ? 'true' : 'false', true );
},
diff --git a/javascripts/specials/uploads.js b/javascripts/specials/uploads.js
index 21b5299..1901b0c 100644
--- a/javascripts/specials/uploads.js
+++ b/javascripts/specials/uploads.js
@@ -63,12 +63,12 @@
} );
PhotoItem = View.extend( {
- template: M.template.get( 'specials/uploads/photo.hogan' ),
+ template: M.template.get( 'specials/photo.hogan' ),
tagName: 'li'
} );
PhotoList = View.extend( {
- template: M.template.get( 'specials/uploads/userGallery.hogan'
),
+ template: M.template.get( 'specials/userGallery.hogan' ),
initialize: function() {
// how close a spinner needs to be to the viewport to
trigger loading (px)
this.threshold = 1000;
diff --git a/templates/articleList.hogan b/templates/modules/articleList.hogan
similarity index 100%
rename from templates/articleList.hogan
rename to templates/modules/articleList.hogan
diff --git a/templates/overlays/cleanup.hogan
b/templates/modules/issues/cleanup.hogan
similarity index 100%
rename from templates/overlays/cleanup.hogan
rename to templates/modules/issues/cleanup.hogan
diff --git a/templates/modules/ImageOverlay.hogan
b/templates/modules/mediaViewer/ImageOverlay.hogan
similarity index 100%
rename from templates/modules/ImageOverlay.hogan
rename to templates/modules/mediaViewer/ImageOverlay.hogan
diff --git a/templates/overlays/pagePreview.hogan
b/templates/modules/nearby/pagePreview.hogan
similarity index 100%
rename from templates/overlays/pagePreview.hogan
rename to templates/modules/nearby/pagePreview.hogan
diff --git a/templates/ReferencesDrawer.hogan
b/templates/modules/references/ReferencesDrawer.hogan
similarity index 100%
rename from templates/ReferencesDrawer.hogan
rename to templates/modules/references/ReferencesDrawer.hogan
diff --git a/templates/uploads/LeadPhoto.hogan
b/templates/modules/uploads/LeadPhoto.hogan
similarity index 100%
rename from templates/uploads/LeadPhoto.hogan
rename to templates/modules/uploads/LeadPhoto.hogan
diff --git a/templates/uploads/LeadPhotoUploaderButton.hogan
b/templates/modules/uploads/LeadPhotoUploaderButton.hogan
similarity index 100%
rename from templates/uploads/LeadPhotoUploaderButton.hogan
rename to templates/modules/uploads/LeadPhotoUploaderButton.hogan
diff --git a/templates/uploads/PhotoUploadOverlay.hogan
b/templates/modules/uploads/PhotoUploadOverlay.hogan
similarity index 100%
rename from templates/uploads/PhotoUploadOverlay.hogan
rename to templates/modules/uploads/PhotoUploadOverlay.hogan
diff --git a/templates/uploads/PhotoUploadProgress.hogan
b/templates/modules/uploads/PhotoUploadProgress.hogan
similarity index 100%
rename from templates/uploads/PhotoUploadProgress.hogan
rename to templates/modules/uploads/PhotoUploadProgress.hogan
diff --git a/templates/uploads/PhotoUploaderButton.hogan
b/templates/modules/uploads/PhotoUploaderButton.hogan
similarity index 100%
rename from templates/uploads/PhotoUploaderButton.hogan
rename to templates/modules/uploads/PhotoUploaderButton.hogan
diff --git a/templates/uploads/UploadTutorial.hogan
b/templates/modules/uploads/UploadTutorial.hogan
similarity index 100%
rename from templates/uploads/UploadTutorial.hogan
rename to templates/modules/uploads/UploadTutorial.hogan
diff --git a/templates/wikitext/commons-upload.hogan
b/templates/modules/uploads/commons-upload.hogan
similarity index 100%
rename from templates/wikitext/commons-upload.hogan
rename to templates/modules/uploads/commons-upload.hogan
diff --git a/templates/specials/mobileoptions/checkbox.hogan
b/templates/specials/checkbox.hogan
similarity index 100%
rename from templates/specials/mobileoptions/checkbox.hogan
rename to templates/specials/checkbox.hogan
diff --git a/templates/specials/uploads/photo.hogan
b/templates/specials/photo.hogan
similarity index 100%
rename from templates/specials/uploads/photo.hogan
rename to templates/specials/photo.hogan
diff --git a/templates/specials/uploads/userGallery.hogan
b/templates/specials/userGallery.hogan
similarity index 100%
rename from templates/specials/uploads/userGallery.hogan
rename to templates/specials/userGallery.hogan
--
To view, visit https://gerrit.wikimedia.org/r/165669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84e6d481211269090a9d3ad65a1d16dc74bc0104
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
