Skip to content

Commit

Permalink
Update files to use Spectrum theme edition classes
Browse files Browse the repository at this point in the history
  • Loading branch information
leslietilling committed May 12, 2020
1 parent f321daf commit 3686f71
Show file tree
Hide file tree
Showing 150 changed files with 739 additions and 1,068 deletions.
3 changes: 3 additions & 0 deletions src/_data/main-nav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@
- label: Design & Theme
url: /design/design-theme.html

- label: Content Staging
url: /cms/content-staging.html

- label: Customers
url: /customers.html
children:
Expand Down
34 changes: 18 additions & 16 deletions src/_data/toc/content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ pages:
url: "/cms/widget-orders-returns.html"
- label: Page Builder
url: "/cms/page-builder.html"
edition: ee-only
children:
- label: Learning Page Builder
url: "/cms/page-builder-learn.html"
Expand Down Expand Up @@ -209,19 +210,20 @@ pages:
url: "/design/merge-javascript.html"
- label: Scheduling Design Changes
url: "/design/schedule.html"
- label: Content Staging
url: "/cms/content-staging.html"
children:
- label: Content Staging Workflow
url: "/cms/content-staging-workflow.html"
- label: Scheduling an Update
url: "/cms/content-staging-scheduled-update.html"
- label: Staging Dashboard
url: "/cms/content-staging-dashboard.html"
children:
- label: Editing a Campaign
url: "/cms/content-staging-dashboard-view-edit.html"
- label: Adding an Item
url: "/cms/content-staging-add-item.html"
- label: Previewing a Campaign
url: "/cms/content-staging-preview.html"
- label: Content Staging
url: "/cms/content-staging.html"
edition: ee-only
children:
- label: Content Staging Workflow
url: "/cms/content-staging-workflow.html"
- label: Scheduling an Update
url: "/cms/content-staging-scheduled-update.html"
- label: Staging Dashboard
url: "/cms/content-staging-dashboard.html"
children:
- label: Editing a Campaign
url: "/cms/content-staging-dashboard-view-edit.html"
- label: Adding an Item
url: "/cms/content-staging-add-item.html"
- label: Previewing a Campaign
url: "/cms/content-staging-preview.html"
3 changes: 1 addition & 2 deletions src/_includes/layout/header-styles.html
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
<link rel="stylesheet" href="{{ site.baseurl }}/css/merchdocs.css" />
<link rel="stylesheet" href="{{ site.baseurl }}/css/editions.css" />
<link rel="stylesheet" href="{{ site.baseurl }}/css/merchdocs.css" />
2 changes: 2 additions & 0 deletions src/_includes/layout/page-header.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ <h1 class="page-title">{{ page.title }}</h1>

{% include layout/github-links.html %}

{% include layout/edition-callout.html %}

</section>
4 changes: 2 additions & 2 deletions src/catalog.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ sections:
content: Learn how to create attributes with input controls for product options, and to provide additional information on product pages.
url: /catalog/product-attributes.html

- title: Shared Catalogs
content: <span class="card-edition-b2b">Learn how to set up shared catalogs with curated selections of products using custom pricing that can be limited to specific companies.</span>
- title: <span class="b2b-only">Shared Catalogs</span>
content: Learn how to set up shared catalogs with curated selections of products using custom pricing that can be limited to specific companies.
url: /catalog/catalog-shared.html

---
Expand Down
4 changes: 2 additions & 2 deletions src/catalog/catalog-menu.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: Catalog Menu
The Catalog Menu provides easy access to product creation, category, and inventory management tools, as well as shared catalogs for custom pricing in B2B stores.

![]({% link images/images-b2b/admin-menu-catalog.png %}){: .zoom}
_Catalog Menu_{:.caption-edition-b2b}
_Catalog Menu_{:.b2b-only}

On the _Admin_ sidebar, click **Catalog**.

Expand All @@ -27,7 +27,7 @@ Create the [category]({% link catalog/categories.md %}) structure that is the fo

See [Categories]({% link catalog/categories.md %}).

{: .heading-edition-b2b }
{:.b2b-only}
## Shared Catalogs

[Shared catalogs]({% link catalog/catalog-shared.md %}) give you the ability to make custom pricing available to different companies.
Expand Down
4 changes: 2 additions & 2 deletions src/catalog/catalog-price-scope.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The scope of the [base currency]({% link stores/currency-configuration.md %}) th

Different factors can affect the price of the same product in one location and not another. For example, there might be additional costs to bring the product to market, and other considerations that impact the price of products sold in a specific store. The following illustration shows a multisite installation with the base currency set to the website level. The stores and store views associated with each website reflect the product pricing that is set at the website level.

- {:.edition-b2b}See also [Configuring Catalog Price Scope]({% link catalog/catalog-shared-price-scope.md %}).
- {:.b2b-only}See also [Configuring Catalog Price Scope]({% link catalog/catalog-shared-price-scope.md %}).

![]({% link images/images/scope-product-price.png %}){: .zoom}
_Price Scope_
Expand All @@ -26,6 +26,6 @@ _Price Scope_
The scope setting that you choose appears below price fields in your catalog.

![]({% link images/images-ee/config-catalog-catalog-price-website.png %}){: .zoom}
*Catalog Price Scope*{:.caption-edition-ee}
*Catalog Price Scope*{:.ee-only}

1. When complete, click <span class="btn">Save Config</span>.
21 changes: 8 additions & 13 deletions src/catalog/categories-category-products.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@
title: Products in Category
---

The Products in Category section lists the products that are currently assigned to the category. The search filters at the top of each column are used to add and remove products from the category.

{: .edition-ee }
The Products in Category section also allows you to use [category rules]({% link catalog/category-product-rules.md %}) to dynamically change the product selection when a set of conditions is met. To learn more, see [Visual Merchandiser]({% link marketing/visual-merchandiser.md %}).
The Products in Category section lists the products that are currently assigned to the category. The search filters at the top of each column are used to add and remove products from the category. You can also use [category rules]({% link catalog/category-product-rules.md %}) (<span class="ee-only"></span>) to dynamically change the product selection when a set of conditions is met. To learn more, see [Visual Merchandiser]({% link marketing/visual-merchandiser.md %}).

![]({% link images/images-ee/category-products-in-category.png %}){: .zoom}
_Category Products_{:.caption-edition-ee}
_Category Products_{:.ee-only}

{: .heading-edition-ee }
{:.ee-only}
## Apply a category rule

1. Set **Match products by rule** to `Yes`.
Expand Down Expand Up @@ -52,7 +49,7 @@ _Category Products_{:.caption-edition-ee}
{:.bs-callout-tip}
When setting up a category rule, the products are matched and assigned to the rule when the category is saved. Therefore, if you add a new product to the catalog and want to include it in the rule, you must re-save each category that is set to match products by rule to ensure that the new product is included.

{: .heading-edition-ee }
{:.ee-only}
## Page options

|Option|Description|
Expand All @@ -61,7 +58,7 @@ When setting up a category rule, the products are matched and assigned to the ru
|Automatic Sorting|Automatically applies a sorting order to the list of category products. Options: <br/>None<br/>Move low stock to top<br/>Move low stock to bottom<br/>Special price to top<br/>Special price to bottom<br/>Newest products first<br/>Sort by color<br/>Name: A - Z<br/>Name: Z - A<br/>SKU: Ascending<br/>SKU: Descending<br/>Price: High to Low<br/>Price: Low to High|
|Add Condition|Adds another condition to the rule.|

{: .heading-edition-ee }
{:.ee-only}
## Page conditions

|Option|Description|
Expand All @@ -71,11 +68,9 @@ When setting up a category rule, the products are matched and assigned to the ru
|Value|Specifies the value the attribute must have to meet the condition.|
|Logic|The Logic column is used to define multiple conditions, and appears only when an additional condition is added. Options: OR / AND|

{:.ee-only}
## Page controls

{: .edition-ee }
Controls in Magento Commerce only

| Control | Description |
|----------|--------------|
| ![]({% link images/images/btn-view-as-list.png %}) | View as List |
Expand All @@ -85,8 +80,8 @@ Controls in Magento Commerce only
| ![]({% link images/images/btn-drag.png %}) | The drag and drop control allows you to grab a product and move it to another position in the current page of the grid. To learn more, see [Visual Merchandiser]({% link marketing/visual-merchandiser.md %}). |
| ![]({% link images/images/btn-position.png %}) | Determines the position of the product in the list. |

{: .edition-ce }
Controls in Magento Open Source only
{:.ce-only}
## Page controls

| Control | Description |
|----------|--------------|
Expand Down
8 changes: 4 additions & 4 deletions src/catalog/categories-content-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
title: Content Settings
---

The Content settings determine any additional content appears on the category page. In addition to the list of category products, the page can include an image, description, and CMS block. In Magento Commerce, you can use the [Page Builder]({% link cms/page-builder.md %}) advanced content tools to enter the category description.
The Content settings determine any additional content appears on the category page. In addition to the list of category products, the page can include an image, description, and CMS block. You can use the [Page Builder]({% link cms/page-builder.md %}) (<span class="ee-only"></span>) advanced content tools to enter the category description.

![]({% link images/images-ee/category-content.png %}){: .zoom}
_Category Content_{:.caption-edition-ee}
_Category Content_{:.ee-only}

|Field|[Scope]({% link configuration/scope.md %})|Description|
|--- |--- |--- |
|Category Image|Store View|Specifies an image for the top of the category page. Methods: <br/><br/><span class="btn">Upload</span> - Uploads an image file from your local computer to the gallery, and uses it as the category image. <br/><br/><span class="btn">Select from Gallery</span> - Prompts you to choose an existing image from the gallery. <br/><br/>![]({% link images/images-ee/icon-pb-camera.png %}){: width="30px"} _-_{:.caption-edition-ee} Either drag an image file to the camera tile, or browse to the image and select it from your local file system.|
|Description|Store View|Specifies a description that appears on the category page. <br/><br/><span class="btn">Edit with Page Builder</span> _-_{:.caption-edition-ee} Opens the [Page Builder workspace]({% link cms/page-builder-workspace.md %}), where you can edit the description. <br/><br/><span class="btn">Show / Hide Editor</span> _-_{:.caption-edition-ce} Toggles the display between WYSIWYG editor and HTML modes.|
|Category Image|Store View|Specifies an image for the top of the category page. Methods: <br/><br/><span class="btn">Upload</span> - Uploads an image file from your local computer to the gallery, and uses it as the category image. <br/><br/><span class="btn">Select from Gallery</span> - Prompts you to choose an existing image from the gallery. <br/><br/>![]({% link images/images-ee/icon-pb-camera.png %}){: width="30px"} <span class="ee-only"></span> - Either drag an image file to the camera tile, or browse to the image and select it from your local file system.|
|Description|Store View|Specifies a description that appears on the category page. <br/><br/><span class="btn">Edit with Page Builder</span><span class="ee-only"></span> - Opens the [Page Builder workspace]({% link cms/page-builder-workspace.md %}), where you can edit the description. <br/><br/><span class="btn">Show / Hide Editor</span> <span class="ee-only"></span> - Toggles the display between WYSIWYG editor and HTML modes.|
|Add CMS Block|Store View|Adds an existing [CMS block]({% link cms/blocks.md %}) to the category page.|
7 changes: 3 additions & 4 deletions src/catalog/categories-custom-design.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ _Design_
|--- |--- |
|Use Parent Category Settings|Allows the current category to inherit the design settings from the parent category. If used, all other fields in the Design section become unavailable. Options: Yes / No|
|Theme|Applies a custom theme to the category.|
|Layout|Applies a different layout to the category page. Options: <br/>**No layout updates** - By default, layout updates are not available for category pages. <br/>**Empty** - Use to define your own page layout. (Requires an understanding of XML.) <br/>**1 column** - Applies a one-column layout to the category page. <br/>**2 columns with left bar** - Applies a two-column layout with a left sidebar to the category page. <br/>**2 columns with right bar** - Applies a two-column layout with a right sidebar to the category page. <br/>**3 columns** - Applies a three-column layout to the category page.<br/>**Page -- Full Width** - (Requires [Page Builder]({% link cms/page-builder.md %})) Applies the full-width layout for CMS pages to the category page. <br/>**Category -- Full Width** - (Requires Page Builder) Applies the full-width layout for category pages to the category page. <br/>**Product -- Full Width** - (Requires Page Builder) Applies the full-width layout for product pages to the category page.|
|Layout Update XML|Updates the theme [layout with custom XML]({% link design/layout-updates.md %}) code.|
|Layout|Applies a different layout to the category page. Options: <br/>**No layout updates** - By default, layout updates are not available for category pages. <br/>**Empty** - Use to define your own page layout. (Requires an understanding of XML.) <br/>**1 column** - Applies a one-column layout to the category page. <br/>**2 columns with left bar** - Applies a two-column layout with a left sidebar to the category page. <br/>**2 columns with right bar** - Applies a two-column layout with a right sidebar to the category page. <br/>**3 columns** - Applies a three-column layout to the category page.<br/><span class="ee-only">**Page -- Full Width**</span> - (Requires [Page Builder]({% link cms/page-builder.md %})) Applies the full-width layout for CMS pages to the category page. <br/><span class="ee-only">**Category -- Full Width**</span> - (Requires Page Builder) Applies the full-width layout for category pages to the category page. <br/><span class="ee-only">**Product -- Full Width**</span> - (Requires Page Builder) Applies the full-width layout for product pages to the category page.|
|Custom Layout Update|Lists the available custom layout update files on the server. Choose the custom layout update that you want to apply to the category.|
|Apply Design to Products|When selected, applies the custom settings to all products in the category.|
|Layout|Applies a different layout to the category page. Options: <br/>**No layout updates** - By default, layout updates are not available for category pages. <br/>**Empty** - Use to define your own page layout. (Requires an understanding of XML.) <br/>**1 column** - Applies a one-column layout to the category page. <br/>**2 columns with left bar** - Applies a two-column layout with a left sidebar to the category page. <br/>**2 columns with right bar** - Applies a two-column layout with a right sidebar to the category page. <br/>**3 columns** - Applies a three-column layout to the category page. <br/>_Additional options_{:.caption-edition-ee}:<br/>**Page -- Full Width** - (Requires [Page Builder]({% link cms/page-builder.md %})) Applies the full-width layout for CMS pages to the category page. <br/>**Category -- Full Width** - (Requires Page Builder) Applies the full-width layout for category pages to the category page. <br/>**Product -- Full Width** - (Requires Page Builder) Applies the full-width layout for product pages to the category page.|

{:.edition-ce}
{:.ce-only}
## Scheduled Design Update

The Scheduled Design Update section determines the range of dates when a custom design is applied to category pages.
Expand Down
2 changes: 1 addition & 1 deletion src/catalog/categories.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: Categories
Before you add products to your catalog, you need to establish the basic category structure of your catalog. Every product must be assigned to at least one category. Categories are usually created in advance, before products are added to the catalog. However, you can also add categories “on the fly” while creating a product. The category structure of the catalog is reflected by the main menu — or [top navigation]({% link catalog/navigation-top.md %}) — of the store.

![]({% link images/images-ee/catalog-categories.png %}){: .zoom}
_Category Tree_{:.caption-edition-ee}
_Category Tree_{:.ee-only}

|Control|Description|
|--- |--- |
Expand Down
Loading

0 comments on commit 3686f71

Please sign in to comment.