Kaldari has uploaded a new change for review. https://gerrit.wikimedia.org/r/98745
Change subject: WIP: New KeepGoing workflow ...................................................................... WIP: New KeepGoing workflow https://wikimedia.mingle.thoughtworks.com/projects/mobile/cards/1448 Change-Id: Idd82e88302f3ecda0da261c48b2a19c555feaa8b --- M MobileFrontend.i18n.php M includes/Resources.php M javascripts/modules/editorNew/EditorOverlay.js R javascripts/modules/keepgoing/KeepGoingOverlay.js M javascripts/modules/keepgoing/keepgoing.js M javascripts/modules/random/random.js D templates/keepgoing/KeepGoingDrawer.html A templates/keepgoing/KeepGoingOverlay.html 8 files changed, 52 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/45/98745/1 diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php index 2b3096b..5e0f692 100644 --- a/MobileFrontend.i18n.php +++ b/MobileFrontend.i18n.php @@ -23,6 +23,7 @@ 'mobilefrontend-keepgoing-cancel' => 'No, thanks', 'mobilefrontend-keepgoing-suggest' => 'Yes, please', 'mobilefrontend-keepgoing-suggest-again' => 'Try another', + 'mobilefrontend-keepgoing-saved-title' => 'Edit saved!', /** special pages */ 'nearby' => 'Pages near you', @@ -104,8 +105,11 @@ 'mobile-frontend-password-confirm-placeholder' => 'Confirm password', 'mobile-frontend-account-create-email-placeholder' => 'Email address (optional)', 'mobile-frontend-account-create-captcha-placeholder' => 'Enter confirmation code', - // Search + // Overlays 'mobile-frontend-overlay-escape' => 'Go back', + 'mobile-frontend-overlay-close' => 'Close', + 'mobile-frontend-overlay-continue' => 'Continue', + // Search 'mobile-frontend-placeholder' => 'Search {{SITENAME}}', 'mobile-frontend-placeholder-beta' => 'Search {{SITENAME}} (Beta)', 'mobile-frontend-placeholder-alpha' => 'Search {{SITENAME}} (Experimental)', @@ -409,6 +413,7 @@ 'mobilefrontend-keepgoing-suggest-again' => 'Label for a button that allows user to try another page as a response to {{msg-mw|Mobilefrontend-keepgoing-explain}}. {{Identical|Try another}}', + 'mobilefrontend-keepgoing-saved-title' => 'Title of the overlay displayed after the user successfully saves an edit. Should be short.', 'nearby' => '{{doc-special|Nearby}}', 'mobile-frontend-desc' => '{{desc|name=Mobile Frontend|url=https://www.mediawiki.org/wiki/Extension:MobileFrontend}}', 'mobile.css' => '{{optional}} @@ -596,6 +601,10 @@ 'mobile-frontend-account-create-captcha-placeholder' => 'Placeholder for captcha input field', 'mobile-frontend-overlay-escape' => 'Text for the button to the left of search / an overlay that when clicked exits the overlay to the previous screen {{Identical|Go back}}', + 'mobile-frontend-overlay-close' => 'Text for the button in an overlay that, when clicked, dismisses the overlay. +{{Identical|Close}}', + 'mobile-frontend-overlay-continue' => 'Text for the button in an overlay that, when clicked, continues to the next screen or step. +{{Identical|Continue}}', 'mobile-frontend-placeholder' => 'Phrase used to prompt user to use search interface for mobile full screen search', 'mobile-frontend-placeholder-beta' => 'Phrase used to prompt user to use search interface for mobile full screen search with identifier that you are in beta mode', 'mobile-frontend-placeholder-alpha' => 'Phrase used to prompt user to use search interface for mobile full screen search with identifier that you are in experimental mode', diff --git a/includes/Resources.php b/includes/Resources.php index 3c08653..f130517 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -458,21 +458,22 @@ 'dependencies' => array( 'mobile.beta', 'mobile.templates', + 'mobile.overlays.beta', ), 'templates' => array( - 'keepgoing/KeepGoingDrawer', + 'keepgoing/KeepGoingOverlay', ), 'messages' => array( 'mobilefrontend-keepgoing-suggest', 'mobilefrontend-keepgoing-suggest-again', - 'mobilefrontend-keepgoing-cancel', 'mobilefrontend-keepgoing-ask', 'mobilefrontend-keepgoing-ask-first', 'mobilefrontend-keepgoing-explain', + 'mobilefrontend-keepgoing-saved-title', ), 'scripts' => array( 'javascripts/loggingSchemas/mobileWebCta.js', - 'javascripts/modules/keepgoing/KeepGoingDrawer.js', + 'javascripts/modules/keepgoing/KeepGoingOverlay.js', ), ), @@ -661,6 +662,10 @@ 'templates' => array( 'OverlayNew', ), + 'messages' => array( + 'mobile-frontend-overlay-close', + 'mobile-frontend-overlay-continue', + ), ), // Important: This module is loaded on both mobile and desktop skin diff --git a/javascripts/modules/editorNew/EditorOverlay.js b/javascripts/modules/editorNew/EditorOverlay.js index 9b91fea..c738b9a 100644 --- a/javascripts/modules/editorNew/EditorOverlay.js +++ b/javascripts/modules/editorNew/EditorOverlay.js @@ -9,7 +9,7 @@ inKeepGoingCampaign = M.query.campaign === 'mobile-keepgoing', Section = M.require( 'Section' ), EditorApi = M.require( 'modules/editor/EditorApi' ), - KeepGoingDrawer, + KeepGoingOverlay, AbuseFilterOverlay = M.require( 'modules/editorNew/AbuseFilterOverlay' ), EditorOverlay; @@ -121,7 +121,7 @@ // pre-fetch keep going with expectation user will go on to save if ( inBetaOrAlpha && ( ( this.isFirstEdit && !inCampaign ) || inKeepGoingCampaign ) ) { mw.loader.using( 'mobile.keepgoing', function() { - KeepGoingDrawer = M.require( 'modules/keepgoing/KeepGoingDrawer' ); + KeepGoingOverlay = M.require( 'modules/keepgoing/KeepGoingOverlay' ); } ); } @@ -271,8 +271,8 @@ // the mobile interface. $.cookie( 'mobileEditor', 'true', { expires: 30 } ); // double check it was successfully pre-fetched during preview phase - if ( KeepGoingDrawer ) { - new KeepGoingDrawer( { isFirstEdit: self.isFirstEdit } ); + if ( KeepGoingOverlay ) { + new KeepGoingOverlay( { isFirstEdit: self.isFirstEdit } ); } else { // just show a toast popup.show( mw.msg( msg ), className ); diff --git a/javascripts/modules/keepgoing/KeepGoingDrawer.js b/javascripts/modules/keepgoing/KeepGoingOverlay.js similarity index 70% rename from javascripts/modules/keepgoing/KeepGoingDrawer.js rename to javascripts/modules/keepgoing/KeepGoingOverlay.js index d3cfb7f..44c322e 100644 --- a/javascripts/modules/keepgoing/KeepGoingDrawer.js +++ b/javascripts/modules/keepgoing/KeepGoingOverlay.js @@ -1,25 +1,30 @@ /** - * This creates the drawer at the bottom of the screen that appears when an anonymous - * user tries to perform an action that requires being logged in. It presents the user - * with options to log in or sign up for a new account. + * This creates the overlay at the bottom of the screen that appears after a user + * successfully completes their first edit. It encourages the user to edit another page. */ ( function( M ) { M.assertMode( [ 'beta', 'alpha' ] ); - var Drawer = M.require( 'Drawer' ), + var Overlay = M.require( 'OverlayNew' ), mobileWebCta = M.require( 'loggingSchemas/mobileWebCta' ), - KeepGoingDrawer, + KeepGoingOverlay, api = M.require( 'api' ); - KeepGoingDrawer = Drawer.extend( { - locked: true, + KeepGoingOverlay = Overlay.extend( { defaults: { step: parseInt( M.query.campaign_step, 10 ) || 0, + closeMsg: mw.msg( 'mobile-frontend-overlay-close' ), + continueMsg: mw.msg( 'mobile-frontend-overlay-continue' ), + //titleMsg: mw.msg( 'mobile-frontend-overlay-saved-title' ), + titleMsg: 'Hello', cancel: mw.msg( 'mobilefrontend-keepgoing-cancel' ), nextLabel: mw.msg( 'mobilefrontend-keepgoing-suggest-again' ), campaign: 'mobile-keepgoing' }, - template: M.template.get( 'keepgoing/KeepGoingDrawer' ), + className: 'overlay overlay-bottom keepgoing-overlay', + closeOnContentTap: true, + fullscreen: false, + template: M.template.get( 'keepgoing/KeepGoingOverlay' ), log: function( status ) { mobileWebCta.log( status, this.options.campaign, this.options.step ); }, @@ -58,7 +63,7 @@ } } ); - M.define( 'modules/keepgoing/KeepGoingDrawer', KeepGoingDrawer ); + M.define( 'modules/keepgoing/KeepGoingOverlay', KeepGoingOverlay ); }( mw.mobileFrontend ) ); diff --git a/javascripts/modules/keepgoing/keepgoing.js b/javascripts/modules/keepgoing/keepgoing.js index 271bb97..aad7aae 100644 --- a/javascripts/modules/keepgoing/keepgoing.js +++ b/javascripts/modules/keepgoing/keepgoing.js @@ -1,9 +1,9 @@ ( function( M ) { if ( M.query.campaign === 'mobile-keepgoing' ) { mw.loader.using( 'mobile.keepgoing', function() { - var KeepGoingDrawer = M.require( 'modules/keepgoing/KeepGoingDrawer' ); + var KeepGoingOverlay = M.require( 'modules/keepgoing/KeepGoingOverlay' ); // deal with case when campaign_step is undefined - new KeepGoingDrawer( { tryAgain: true } ); + new KeepGoingOverlay( { tryAgain: true } ); } ); } }( mw.mobileFrontend ) ); diff --git a/javascripts/modules/random/random.js b/javascripts/modules/random/random.js index a1f09d1..080a121 100644 --- a/javascripts/modules/random/random.js +++ b/javascripts/modules/random/random.js @@ -3,8 +3,8 @@ if ( M.query.campaign === 'random' ) { mw.loader.using( 'mobile.keepgoing', function() { - var KeepGoingDrawer = M.require( 'modules/keepgoing/KeepGoingDrawer' ); - new KeepGoingDrawer( { + var KeepGoingOverlay = M.require( 'modules/keepgoing/KeepGoingOverlay' ); + new KeepGoingOverlay( { campaign: 'random', msg: mw.msg( 'mobilefrontend-random-explain' ), cancel: mw.msg( 'mobilefrontend-random-cancel' ) diff --git a/templates/keepgoing/KeepGoingDrawer.html b/templates/keepgoing/KeepGoingDrawer.html deleted file mode 100644 index 96e8cc7..0000000 --- a/templates/keepgoing/KeepGoingDrawer.html +++ /dev/null @@ -1,5 +0,0 @@ -<p>{{msg}}</p> -<div class="buttonBar"> - <button class="inline close">{{cancel}}</button> - <a class="continue button" href="{{nextUrl}}">{{{nextLabel}}}</a> -</div> diff --git a/templates/keepgoing/KeepGoingOverlay.html b/templates/keepgoing/KeepGoingOverlay.html new file mode 100644 index 0000000..3381f19 --- /dev/null +++ b/templates/keepgoing/KeepGoingOverlay.html @@ -0,0 +1,12 @@ +<div class="overlay-header with-margins initial-header"> + <ul class="v-border bottom-border"> + <li><button class="cancel icon">{{closeMsg}}</button></li> + </ul> + <div class="bottom-border"> + <h2>{{{titleMsg}}}</h2> + </div> + <ul> + <li><button class="continue icon">{{continueMsg}}</button></li> + </ul> +</div> +<div class="content">{{msg}}</div> -- To view, visit https://gerrit.wikimedia.org/r/98745 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd82e88302f3ecda0da261c48b2a19c555feaa8b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Kaldari <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
