diff --git a/guides/v2.1/extension-dev-guide/package/package_module.md b/guides/v2.1/extension-dev-guide/package/package_module.md index bd1b348bc6e..747bc8b0b4d 100644 --- a/guides/v2.1/extension-dev-guide/package/package_module.md +++ b/guides/v2.1/extension-dev-guide/package/package_module.md @@ -27,7 +27,7 @@ The `composer.json` uses [Composer's generic schema](https://getcomposer.org/doc Element | Description --- | --- -`name` | A fully-qualified component name, in the format `/`. All letters must be in lowercase. Use dashes in the `` to separate words. +`name` | A fully-qualified component name, in the format `/`. All letters must be in lowercase. Use dashes in the `` to separate words. Themes must use the format `/theme--`. `type` | For modules, this value must be set to `magento2-module`. Other possible types are `metapackage`, `magento2-theme`, and `magento2-language`. `autoload` | Specify necessary information to be loaded, such as [registration.php]({{ page.baseurl }}/extension-dev-guide/build/component-registration.html). For more information, see [Autoloading](https://getcomposer.org/doc/01-basic-usage.md#autoloading) from Composer. diff --git a/guides/v2.1/frontend-dev-guide/themes/theme-structure.md b/guides/v2.1/frontend-dev-guide/themes/theme-structure.md index c5f0e70149a..9b6c843c1ff 100644 --- a/guides/v2.1/frontend-dev-guide/themes/theme-structure.md +++ b/guides/v2.1/frontend-dev-guide/themes/theme-structure.md @@ -230,7 +230,7 @@ The directories and files structure described below is the most extended one. It optional - Describes the theme dependencies and some meta-information. Will be here if your theme is a Composer package. + Describes the theme dependencies and some meta-information. Will be here if your theme is a Composer package. The "name" field must be in the format "<vendor-name>/theme-<area>-<theme-name>". @@ -248,7 +248,7 @@ The directories and files structure described below is the most extended one. It required - The file is mandatory as it declares a theme as a system component. It contains the basic meta-information, like the theme name and the parent theme name, if the theme is inherited from an existing theme. The file is used by the Magento system to recognize the theme. + The file is mandatory as it declares a theme as a system component. It contains the basic meta-information, like the theme title and the parent theme name, if the theme is inherited from an existing theme. The file is used by the Magento system to recognize the theme. diff --git a/guides/v2.1/howdoi/checkout/checkout_new_step.md b/guides/v2.1/howdoi/checkout/checkout_new_step.md index c47c7a143c1..b45c6038ba5 100644 --- a/guides/v2.1/howdoi/checkout/checkout_new_step.md +++ b/guides/v2.1/howdoi/checkout/checkout_new_step.md @@ -106,9 +106,11 @@ define( * The navigate() method is responsible for navigation between checkout step * during checkout. You can add custom logic, for example some conditions * for switching to your custom step + * When the user navigates to the custom step via url anchor or back button we_must show step manually here */ navigate: function () { + this.isVisible(true); }, /** diff --git a/guides/v2.1/javascript-dev-guide/widgets/widget_alert.md b/guides/v2.1/javascript-dev-guide/widgets/widget_alert.md index 13fe3437e16..e424d6c267b 100644 --- a/guides/v2.1/javascript-dev-guide/widgets/widget_alert.md +++ b/guides/v2.1/javascript-dev-guide/widgets/widget_alert.md @@ -19,8 +19,8 @@ The alert widget can be initialized with or without binding to a certain element ```javascript $('#init_element').alert({ - title: 'Warning', - content: 'Warning content', + title: $.mage.__('Warning'), + content: $.mage.__('Warning content'), actions: { always: function(){} } @@ -34,8 +34,8 @@ require([ ], function(alert) { // Variable that represents the `alert` function alert({ - title: 'Some title', - content: 'Some content', + title: $.mage.__('Some title'), + content: $.mage.__('Some content'), actions: { always: function(){} } diff --git a/guides/v2.1/javascript-dev-guide/widgets/widget_confirm.md b/guides/v2.1/javascript-dev-guide/widgets/widget_confirm.md index 54a2797840c..39283341a2a 100644 --- a/guides/v2.1/javascript-dev-guide/widgets/widget_confirm.md +++ b/guides/v2.1/javascript-dev-guide/widgets/widget_confirm.md @@ -20,7 +20,7 @@ The confirmation widget can be initialized with or without binding to a certain ```javascript $('#confirm_init').confirm({ - title: 'Confirmation title', + title: $.mage.__('Confirmation title'), actions: { confirm: function(){}, //callback on 'Ok' button click cancel: function(){}, //callback on 'Cancel' button click @@ -36,8 +36,8 @@ require([ ], function(confirmation) { // Variable that represents the `confirm` widget confirmation({ - title: 'Some title', - content: 'Some content', + title: $.mage.__('Some title'), + content: $.mage.__('Some content'), actions: { confirm: function(){}, cancel: function(){}, diff --git a/guides/v2.1/javascript-dev-guide/widgets/widget_loader.md b/guides/v2.1/javascript-dev-guide/widgets/widget_loader.md index edd499c53f7..00d4c55c22d 100644 --- a/guides/v2.1/javascript-dev-guide/widgets/widget_loader.md +++ b/guides/v2.1/javascript-dev-guide/widgets/widget_loader.md @@ -68,7 +68,7 @@ $("#element").loader("show"); Hide the loader. -Invoke the show method: +Invoke the hide method: ```javascript $("#element").loader("hide"); @@ -83,8 +83,20 @@ Loader is subscribed to the following events: ### `processStart` {#l_processStart} Display the loader. Can be triggered on any page element. +Start show loading: + +```javascript +$("body").trigger('processStart'); +``` + ### `processStop` {#l_processStop} Hide the loader. Can be triggered on any page element. +Stop show loading: + +```javascript +$("body").trigger('processStop'); +``` + [lib/web/mage/loader.js]: {{ site.mage2bloburl }}/{{ page.guide_version }}/lib/web/mage/loader.js [JavaScript initialization]: {{page.baseurl}}/javascript-dev-guide/javascript/js_init.html diff --git a/guides/v2.2/config-guide/cli/config-cli-subcommands-mode.md b/guides/v2.2/config-guide/cli/config-cli-subcommands-mode.md index d75fc3fb9d4..36e8b3882cf 100644 --- a/guides/v2.2/config-guide/cli/config-cli-subcommands-mode.md +++ b/guides/v2.2/config-guide/cli/config-cli-subcommands-mode.md @@ -125,8 +125,10 @@ When you change from production to developer mode, you should clear generated cl 1. If you're changing from production mode to developer mode, delete the contents of the `generated/code` and `generated/metadata` directories: + ```bash rm -rf /generated/metadata/* /generated/code/* - + ``` + 2. Set the mode: ```bash diff --git a/guides/v2.2/frontend-dev-guide/themes/theme-structure.md b/guides/v2.2/frontend-dev-guide/themes/theme-structure.md index c5f0e70149a..9b6c843c1ff 100644 --- a/guides/v2.2/frontend-dev-guide/themes/theme-structure.md +++ b/guides/v2.2/frontend-dev-guide/themes/theme-structure.md @@ -230,7 +230,7 @@ The directories and files structure described below is the most extended one. It optional - Describes the theme dependencies and some meta-information. Will be here if your theme is a Composer package. + Describes the theme dependencies and some meta-information. Will be here if your theme is a Composer package. The "name" field must be in the format "<vendor-name>/theme-<area>-<theme-name>". @@ -248,7 +248,7 @@ The directories and files structure described below is the most extended one. It required - The file is mandatory as it declares a theme as a system component. It contains the basic meta-information, like the theme name and the parent theme name, if the theme is inherited from an existing theme. The file is used by the Magento system to recognize the theme. + The file is mandatory as it declares a theme as a system component. It contains the basic meta-information, like the theme title and the parent theme name, if the theme is inherited from an existing theme. The file is used by the Magento system to recognize the theme. diff --git a/guides/v2.3/comp-mgr/patching.md b/guides/v2.3/comp-mgr/patching.md index 03082cc1998..4bf4fed7d08 100644 --- a/guides/v2.3/comp-mgr/patching.md +++ b/guides/v2.3/comp-mgr/patching.md @@ -34,7 +34,9 @@ When the [patch][] program is run, this file is read in and the specified change 1. Login to the server as the [Magento admin user][] and verify the file is in the correct directory. 1. In the command line interface, run the following commands according to the patch extension: - patch < patch_file_name.patch + ```bash + patch < patch_file_name.patch + ``` The command assumes the file to be patched is located relative to the patch file. @@ -55,7 +57,7 @@ Please refer to the [Magento Help Center][] for details on how to use Composer t [Magento Security Center]:https://magento.com/security/patches [-p1 instead of -p0]:http://man7.org/linux/man-pages/man1/patch.1.html -[Back up and roll back the file system]:https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-backup.html +[Back up and roll back the file system]:{{ page.baseurl }}/install-gde/install/cli/install-cli-backup.html [patch]:https://en.wikipedia.org/wiki/Patch_(Unix) [Magento Help Center]:https://support.magento.com/hc/en-us/articles/360005484154-Create-a-patch-for-a-Magento-2-Composer-installation-from-a-GitHub-commit -[Magento Admin user]:https://devdocs.magento.com/guides/v2.3/config-guide/cli/config-cli.html#config-install-cli-first +[Magento Admin user]:{{ page.baseurl }}/config-guide/cli/config-cli.html#config-install-cli-first diff --git a/guides/v2.3/frontend-dev-guide/themes/theme-structure.md b/guides/v2.3/frontend-dev-guide/themes/theme-structure.md index c5f0e70149a..9b6c843c1ff 100644 --- a/guides/v2.3/frontend-dev-guide/themes/theme-structure.md +++ b/guides/v2.3/frontend-dev-guide/themes/theme-structure.md @@ -230,7 +230,7 @@ The directories and files structure described below is the most extended one. It optional - Describes the theme dependencies and some meta-information. Will be here if your theme is a Composer package. + Describes the theme dependencies and some meta-information. Will be here if your theme is a Composer package. The "name" field must be in the format "<vendor-name>/theme-<area>-<theme-name>". @@ -248,7 +248,7 @@ The directories and files structure described below is the most extended one. It required - The file is mandatory as it declares a theme as a system component. It contains the basic meta-information, like the theme name and the parent theme name, if the theme is inherited from an existing theme. The file is used by the Magento system to recognize the theme. + The file is mandatory as it declares a theme as a system component. It contains the basic meta-information, like the theme title and the parent theme name, if the theme is inherited from an existing theme. The file is used by the Magento system to recognize the theme.