Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Small changes #4799

Merged
merged 27 commits into from
Jun 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c94c2c9
Update checkout_new_step.md
May 2, 2019
f1459ad
Add __('<your_string>') method in Alert Widget
magehardik Jun 14, 2019
05467af
Merge branch 'master' into patch-4
dobooth Jun 17, 2019
21049b7
Merge pull request #4759 from hardikm-cirkleinc/patch-4
dobooth Jun 17, 2019
113ae86
Fix description of theme.xml contents
Jun 17, 2019
9481f57
Merge branch 'master' into theme-xml-fix
dobooth Jun 17, 2019
3f8426f
Merge master
dobooth Jun 17, 2019
9d8366e
Merge pull request #4768 from DrewML/theme-xml-fix
dobooth Jun 17, 2019
924ed95
Fixed up formatting errors.
dobooth Jun 17, 2019
92a6e15
Merge branch 'master' into db_patch_fix
dobooth Jun 17, 2019
7040abf
Merge master
dobooth Jun 17, 2019
185c0da
Merge pull request #4772 from magento/db_patch_fix
dobooth Jun 17, 2019
882908a
Merge branch 'master' into patch-2
dobooth Jun 17, 2019
83db90a
Merge pull request #4399 from jakobmeissner/patch-2
dobooth Jun 17, 2019
4e67cdd
Merge master
dobooth Jun 18, 2019
117c0f8
Update docs about composer-packaged themes to include naming convention
Jun 18, 2019
7a680d9
Fix root to be visible on Magento DevDocs website
twocs Jun 19, 2019
72e4ad7
Add bash code block around the command
twocs Jun 19, 2019
df1f67a
Merge master
dobooth Jun 19, 2019
f46fb2c
Merge pull request #4779 from twocs/master
dobooth Jun 19, 2019
75ac87e
Apply suggestions from code review
DrewML Jun 19, 2019
f3da082
Add content related to loader widget
ParthBrahmbhatt Jun 20, 2019
30e0bc9
Add __('<your_string>') method in Examples
magehardik Jun 21, 2019
7f90173
Merge branch 'master' into small_changes
jeff-matthews Jun 21, 2019
a3b1d72
Merge pull request #4777 from DrewML/theme-composer-name
jeff-matthews Jun 21, 2019
3b185d8
Merge pull request #4790 from ParthBrahmbhatt/patch20
jeff-matthews Jun 21, 2019
ee293f9
Merge pull request #4797 from hardikm-cirkleinc/patch-5
jeff-matthews Jun 21, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion guides/v2.1/extension-dev-guide/package/package_module.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<vendor-name>/<component-name>`. All letters must be in lowercase. Use dashes in the `<component-name>` to separate words.
`name` | A fully-qualified component name, in the format `<vendor-name>/<component-name>`. All letters must be in lowercase. Use dashes in the `<component-name>` to separate words. Themes must use the format `<vendor-name>/theme-<area>-<theme-name>`.
`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.

Expand Down
4 changes: 2 additions & 2 deletions guides/v2.1/frontend-dev-guide/themes/theme-structure.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ The directories and files structure described below is the most extended one. It
</td>
<td colspan="1">optional</td>
<td colspan="1">
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 <code>"&lt;vendor-name&gt;/theme-&lt;area&gt;-&lt;theme-name&gt;"</code>.
</td>
</tr>
<tr>
Expand All @@ -248,7 +248,7 @@ The directories and files structure described below is the most extended one. It
</td>
<td colspan="1">required</td>
<td colspan="1">
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.
</td>
</tr>
</tbody>
Expand Down
2 changes: 2 additions & 0 deletions guides/v2.1/howdoi/checkout/checkout_new_step.md
Original file line number Diff line number Diff line change
Expand Up @@ -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);
},

/**
Expand Down
8 changes: 4 additions & 4 deletions guides/v2.1/javascript-dev-guide/widgets/widget_alert.md
Original file line number Diff line number Diff line change
Expand Up @@ -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(){}
}
Expand All @@ -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(){}
}
Expand Down
6 changes: 3 additions & 3 deletions guides/v2.1/javascript-dev-guide/widgets/widget_confirm.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(){},
Expand Down
14 changes: 13 additions & 1 deletion guides/v2.1/javascript-dev-guide/widgets/widget_loader.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ $("#element").loader("show");

Hide the loader.

Invoke the show method:
Invoke the hide method:

```javascript
$("#element").loader("hide");
Expand All @@ -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
4 changes: 3 additions & 1 deletion guides/v2.2/config-guide/cli/config-cli-subcommands-mode.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <magento_root>/generated/metadata/* <magento_root>/generated/code/*

```

2. Set the mode:

```bash
Expand Down
4 changes: 2 additions & 2 deletions guides/v2.2/frontend-dev-guide/themes/theme-structure.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ The directories and files structure described below is the most extended one. It
</td>
<td colspan="1">optional</td>
<td colspan="1">
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 <code>"&lt;vendor-name&gt;/theme-&lt;area&gt;-&lt;theme-name&gt;"</code>.
</td>
</tr>
<tr>
Expand All @@ -248,7 +248,7 @@ The directories and files structure described below is the most extended one. It
</td>
<td colspan="1">required</td>
<td colspan="1">
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.
</td>
</tr>
</tbody>
Expand Down
8 changes: 5 additions & 3 deletions guides/v2.3/comp-mgr/patching.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -55,7 +57,7 @@ Please refer to the [Magento Help Center][] for details on how to use Composer t
<!-- Link Definitions -->
[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
4 changes: 2 additions & 2 deletions guides/v2.3/frontend-dev-guide/themes/theme-structure.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ The directories and files structure described below is the most extended one. It
</td>
<td colspan="1">optional</td>
<td colspan="1">
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 <code>"&lt;vendor-name&gt;/theme-&lt;area&gt;-&lt;theme-name&gt;"</code>.
</td>
</tr>
<tr>
Expand All @@ -248,7 +248,7 @@ The directories and files structure described below is the most extended one. It
</td>
<td colspan="1">required</td>
<td colspan="1">
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.
</td>
</tr>
</tbody>
Expand Down