Skip to content

Commit 6fa0904

Browse files
author
Momotenko,Natalia(nmomotenko)
committed
Merge pull request #700 from magento-webdev/MAGETWO-35059
[WebDev] Unify grid store selectors
2 parents fa9c569 + 5464f46 commit 6fa0904

File tree

25 files changed

+83
-180
lines changed

25 files changed

+83
-180
lines changed

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function getHtml()
4848

4949
$allShow = $this->getColumn()->getStoreAll();
5050

51-
$html = '<select name="' . $this->escapeHtml(
51+
$html = '<select class="admin__control-select" name="' . $this->escapeHtml(
5252
$this->_getHtmlName()
5353
) . '" ' . $this->getColumn()->getValidateClass() . $this->getUiId(
5454
'filter',

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,10 @@ public function getStoreName($storeId)
131131
public function getChooseFromStoreHtml($storeTo)
132132
{
133133
if (!$this->_storeFromHtml) {
134-
$this->_storeFromHtml = '<select name="copy_to_stores[__store_identifier__]" disabled="disabled">';
134+
$this->_storeFromHtml = '<select ' .
135+
'class="admin__control-select" ' .
136+
'name="copy_to_stores[__store_identifier__]" ' .
137+
'disabled="disabled">';
135138
$this->_storeFromHtml .= '<option value="0">' . __('Default Values') . '</option>';
136139
foreach ($this->getWebsiteCollection() as $_website) {
137140
if (!$this->hasWebsite($_website->getId())) {

‎app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
<argument name="data" xsi:type="array">
179179
<item name="config" xsi:type="array">
180180
<item name="dataScope" xsi:type="string">store_id</item>
181-
<item name="caption" xsi:type="string" translate="true">Select...</item>
181+
<item name="caption" xsi:type="string" translate="true">All Store Views</item>
182182
<item name="label" xsi:type="string" translate="true">Store View</item>
183183
<item name="imports" xsi:type="array">
184184
<item name="visible" xsi:type="string"></item>

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@
151151
</argument>
152152
<argument name="data" xsi:type="array">
153153
<item name="config" xsi:type="array">
154-
<item name="caption" xsi:type="string" translate="true">Select...</item>
155154
<item name="dataScope" xsi:type="string">store_id</item>
156155
<item name="label" xsi:type="string" translate="true">Store View</item>
156+
<item name="captionValue" xsi:type="string">0</item>
157157
</item>
158158
</argument>
159159
</filterSelect>

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@
153153
<argument name="data" xsi:type="array">
154154
<item name="config" xsi:type="array">
155155
<item name="dataScope" xsi:type="string">store_id</item>
156-
<item name="caption" xsi:type="string" translate="true">Select...</item>
157156
<item name="label" xsi:type="string" translate="true">Store View</item>
157+
<item name="captionValue" xsi:type="string">0</item>
158158
</item>
159159
</argument>
160160
</filterSelect>

‎app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
<div class="field field-store-switcher">
1313
<label class="label" for="store_switcher"><?php /* @escapeNotVerified */ echo __('Choose Store View:') ?></label>
1414
<div class="control">
15-
<select name="store_switcher" id="store_switcher">
15+
<select
16+
id="store_switcher"
17+
class="admin__control-select"
18+
name="store_switcher">
1619
<?php foreach ($websites as $website): ?>
1720
<?php $showWebsite = false; ?>
1821
<?php foreach ($website->getGroups() as $group): ?>

‎app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616
<div class="field field-store-switcher">
1717
<label class="label" for="store_switcher"><?php /* @escapeNotVerified */ echo __('Show Report For:') ?></label>
1818
<div class="control">
19-
<select name="store_switcher" id="store_switcher" onchange="return switchStore(this);">
19+
<select
20+
id="store_switcher"
21+
class="admin__control-select"
22+
name="store_switcher"
23+
onchange="return switchStore(this);">
2024
<option value=""><?php /* @escapeNotVerified */ echo __('All Websites') ?></option>
2125
<?php foreach ($block->getWebsiteCollection() as $_website): ?>
2226
<?php $showWebsite = false; ?>

‎app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
<div class="field field-store-switcher">
2222
<label class="label" for="store_switcher"><?php /* @escapeNotVerified */ echo __('Show Report For:') ?></label>
2323
<div class="control">
24-
<select name="store_switcher" id="store_switcher" onchange="return switchStore(this);">
24+
<select
25+
id="store_switcher"
26+
class="admin__control-select"
27+
name="store_switcher"
28+
onchange="return switchStore(this);">
2529
<option value=""><?php /* @escapeNotVerified */ echo __('All Websites') ?></option>
2630
<?php foreach ($block->getWebsiteCollection() as $_website): ?>
2731
<?php $showWebsite = false; ?>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
</argument>
243243
<argument name="data" xsi:type="array">
244244
<item name="config" xsi:type="array">
245-
<item name="caption" xsi:type="string" translate="true">Select...</item>
245+
<item name="caption" xsi:type="string" translate="true">All Store Views</item>
246246
<item name="dataScope" xsi:type="string">store_id</item>
247247
<item name="label" xsi:type="string" translate="true">Purchased From</item>
248248
</item>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
</argument>
120120
<argument name="data" xsi:type="array">
121121
<item name="config" xsi:type="array">
122-
<item name="caption" xsi:type="string" translate="true">Select...</item>
122+
<item name="caption" xsi:type="string" translate="true">All Store Views</item>
123123
<item name="dataScope" xsi:type="string">store_id</item>
124124
<item name="label" xsi:type="string" translate="true">Purchase Point</item>
125125
</item>

0 commit comments

Comments
 (0)