Skip to content

Commit 55fa3a3

Browse files
author
Sergey Semenov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-32690
2 parents 76d73c2 + e85f2eb commit 55fa3a3

File tree

41 files changed

+776
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+776
-306
lines changed

‎app/code/Magento/Backend/etc/adminhtml/di.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@
1717
<preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
1818
<preference for="Magento\Framework\App\Response\Http\FileFactory" type="Magento\Backend\App\Response\Http\FileFactory" />
1919
<preference for="Magento\Framework\View\Layout\GeneratorPool" type="Magento\Backend\Model\View\Layout\GeneratorPool" />
20-
<preference for="pageLayoutGeneratorPool" type="Magento\Backend\Model\View\Layout\GeneratorPool" />
20+
<type name="Magento\Framework\View\Result\Page">
21+
<arguments>
22+
<argument name="layoutReaderPool" xsi:type="object">pageConfigRenderPool</argument>
23+
<argument name="generatorPool" xsi:type="object">Magento\Backend\Model\View\Layout\GeneratorPool</argument>
24+
<argument name="template" xsi:type="string">Magento_Theme::root.phtml</argument>
25+
</arguments>
26+
</type>
2127
<preference for="Magento\Framework\View\Layout\Reader\Block" type="Magento\Backend\Model\View\Layout\Reader\Block" />
2228
<preference for="Magento\Framework\Model\ActionValidator\RemoveAction" type="Magento\Framework\Model\ActionValidator\RemoveAction\Allowed" />
2329
<preference for="Magento\Framework\Session\Config\ConfigInterface" type="Magento\Backend\Model\Session\AdminConfig" />

‎app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<?php if ($detailedInfoGroup = $block->getGroupChildNames('detailed_info', 'getChildHtml')):?>
1111
<div class="product info detailed">
1212
<?php $layout = $block->getLayout(); ?>
13-
<div role="tablist" class="product data items" data-mage-init='{"tabs":{"openedState":"active"}}'>
13+
<div class="product data items" data-mage-init='{"tabs":{"openedState":"active"}}'>
1414
<?php foreach ($detailedInfoGroup as $name):?>
1515
<?php
1616
$html = $layout->renderElement($name);
@@ -20,10 +20,20 @@
2020
$alias = $layout->getElementAlias($name);
2121
$label = $block->getChildData($alias, 'title');
2222
?>
23-
<div class="data item title" data-role="collapsible">
24-
<a role="tab" class="data switch" data-toggle="switch" id="tab-label-<?php echo $alias;?>" href="#<?php echo $alias; ?>"><?php echo $label; ?></a>
23+
<div class="data item title"
24+
aria-labeledby="tab-label-<?php echo $alias;?>-title"
25+
data-role="collapsible" id="tab-label-<?php echo $alias;?>">
26+
<a class="data switch"
27+
tabindex="-1"
28+
data-toggle="switch"
29+
href="#<?php echo $alias; ?>"
30+
id="tab-label-<?php echo $alias;?>-title">
31+
<?php echo $label; ?>
32+
</a>
33+
</div>
34+
<div class="data item content" id="<?php echo $alias; ?>" data-role="content">
35+
<?php echo $html; ?>
2536
</div>
26-
<div role="tabpanel" aria-labelledby="tab-label-<?php echo $alias;?>" class="data item content" id="<?php echo $alias; ?>" data-role="content"><?php echo $html; ?></div>
2737
<?php endforeach;?>
2838
</div>
2939
</div>

‎app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
1818

1919
<div class="field file<?php echo $class; ?>">
20-
<label class="label">
20+
<label class="label" for="<?php echo $_fileName; ?>" id="<?php echo $_fileName; ?>-label">
2121
<span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
2222
<?php echo $block->getFormatedPrice() ?>
2323
</label>
@@ -44,6 +44,7 @@
4444
<?php echo $_fileExists ? 'style="display:none"' : '' ?>>
4545
<input type="file"
4646
name="<?php echo $_fileName; ?>"
47+
id="<?php echo $_fileName; ?>"
4748
class="product-custom-option<?php echo $_option->getIsRequire() ? ' required' : '' ?>"
4849
<?php echo $_fileExists ? 'disabled="disabled"' : '' ?> />
4950
<input type="hidden" name="<?php echo $_fieldNameAction; ?>" value="<?php echo $_fieldValueAction; ?>" />

‎app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $_option = $block->getOption();
1414
$class = ($_option->getIsRequire()) ? ' required' : '';
1515
?>
1616
<div class="field<?php echo $class; ?>">
17-
<label class="label">
17+
<label class="label" for="select_<?php echo $_option->getId() ?>">
1818
<span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
1919
</label>
2020
<div class="control">

‎app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
1515
<div class="field<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA) {
1616
echo ' textarea';
1717
} ?><?php echo $class ?>">
18-
<label class="label">
18+
<label class="label" for="options_<?php echo $_option->getId() ?>_text">
1919
<span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
2020
<?php echo $block->getFormatedPrice() ?>
2121
</label>

‎app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,26 @@
3737
</div>
3838
<div class="cart main actions">
3939
<?php if ($block->getContinueShoppingUrl()): ?>
40-
<a class="action continue" href="<?php echo $block->getContinueShoppingUrl() ?>" title="<?php echo __('Continue Shopping') ?>">
40+
<a class="action continue"
41+
href="<?php echo $block->getContinueShoppingUrl() ?>"
42+
title="<?php echo $block->escapeHtml(__('Continue Shopping')); ?>">
4143
<span><?php echo __('Continue Shopping') ?></span>
4244
</a>
4345
<?php endif; ?>
44-
<button type="submit" name="update_cart_action" value="update_qty" title="<?php echo __('Update Shopping Cart'); ?>" class="action update">
45-
<span><?php echo __('Update Shopping Cart'); ?></span>
46-
</button>
47-
<button type="submit" name="update_cart_action" value="empty_cart" title="<?php echo __('Clear Shopping Cart'); ?>" class="action clear" id="empty_cart_button">
46+
<button type="submit"
47+
name="update_cart_action"
48+
value="empty_cart"
49+
title="<?php echo $block->escapeHtml(__('Clear Shopping Cart')); ?>"
50+
class="action clear" id="empty_cart_button">
4851
<span><?php echo __('Clear Shopping Cart'); ?></span>
4952
</button>
53+
<button type="submit"
54+
name="update_cart_action"
55+
value="update_qty"
56+
title="<?php echo $block->escapeHtml(__('Update Shopping Cart')); ?>"
57+
class="action update">
58+
<span><?php echo __('Update Shopping Cart'); ?></span>
59+
</button>
5060
<!--[if lt IE 8]>
5161
<input type="hidden" value="" id="update_cart_action_container" />
5262
<![endif]-->

‎app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml

Lines changed: 123 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -16,110 +16,138 @@ $helper = $this->helper('Magento\Msrp\Helper\Data');
1616
$canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinimalPriceLessMsrp($product);
1717
?>
1818
<tbody class="cart item">
19-
<tr class="item-info">
20-
<td data-th="<?php echo $block->escapeHtml(__('Item')); ?>" class="col item">
21-
<?php if ($block->hasProductUrl()):?><a href="<?php echo $block->getProductUrl() ?>" title="<?php echo $block->escapeHtml($block->getProductName()) ?>" class="product-item-photo">
19+
<tr class="item-info">
20+
<td data-th="<?php echo $block->escapeHtml(__('Item')); ?>" class="col item">
21+
<?php if ($block->hasProductUrl()):?>
22+
<a href="<?php echo $block->getProductUrl() ?>"
23+
title="<?php echo $block->escapeHtml($block->getProductName()) ?>"
24+
tabindex="-1"
25+
class="product-item-photo">
2226
<?php else:?>
23-
<span class="product-item-photo">
24-
<?php endif;?>
25-
<?php echo $block->getLayout()->createBlock('Magento\Catalog\Block\Product\Image')->init($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml(); ?>
26-
<?php if ($block->hasProductUrl()):?></a><?php else: ?></span><?php endif; ?>
27-
<div class="product-item-details">
28-
<strong class="product-item-name">
29-
<?php if ($block->hasProductUrl()):?>
30-
<a href="<?php echo $block->getProductUrl() ?>"><?php echo $block->escapeHtml($block->getProductName()) ?></a>
31-
<?php else: ?>
32-
<?php echo $block->escapeHtml($block->getProductName()) ?>
33-
<?php endif; ?>
34-
</strong>
35-
<?php if ($_options = $block->getOptionList()):?>
36-
<dl class="item-options">
37-
<?php foreach ($_options as $_option) : ?>
38-
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
39-
<dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
40-
<dd>
41-
<?php if (isset($_formatedOptionValue['full_view'])): ?>
42-
<?php echo $_formatedOptionValue['full_view'] ?>
43-
<?php else: ?>
44-
<?php echo $_formatedOptionValue['value'] ?>
45-
<?php endif; ?>
46-
</dd>
47-
<?php endforeach; ?>
48-
</dl>
27+
<span class="product-item-photo">
4928
<?php endif;?>
50-
<?php if ($messages = $block->getMessages()): ?>
51-
<?php foreach ($messages as $message): ?>
52-
<div class="cart item message <?php echo $message['type'] ?>"><div><?php echo $block->escapeHtml($message['text']) ?></div></div>
53-
<?php endforeach; ?>
29+
<?php echo $block->getLayout()->createBlock('Magento\Catalog\Block\Product\Image')->init($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml(); ?>
30+
<?php if ($block->hasProductUrl()):?>
31+
</a>
32+
<?php else: ?>
33+
</span>
5434
<?php endif; ?>
55-
<?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
56-
<?php if ($addInfoBlock): ?>
57-
<?php echo $addInfoBlock->setItem($_item)->toHtml() ?>
58-
<?php endif;?>
59-
</div>
60-
<?php $cols = 1; ?>
61-
</td>
35+
<div class="product-item-details">
36+
<strong class="product-item-name">
37+
<?php if ($block->hasProductUrl()):?>
38+
<a href="<?php echo $block->getProductUrl() ?>"><?php echo $block->escapeHtml($block->getProductName()) ?></a>
39+
<?php else: ?>
40+
<?php echo $block->escapeHtml($block->getProductName()) ?>
41+
<?php endif; ?>
42+
</strong>
43+
<?php if ($_options = $block->getOptionList()):?>
44+
<dl class="item-options">
45+
<?php foreach ($_options as $_option) : ?>
46+
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
47+
<dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
48+
<dd>
49+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
50+
<?php echo $_formatedOptionValue['full_view'] ?>
51+
<?php else: ?>
52+
<?php echo $_formatedOptionValue['value'] ?>
53+
<?php endif; ?>
54+
</dd>
55+
<?php endforeach; ?>
56+
</dl>
57+
<?php endif;?>
58+
<?php if ($messages = $block->getMessages()): ?>
59+
<?php foreach ($messages as $message): ?>
60+
<div class="cart item message <?php echo $message['type'] ?>"><div><?php echo $block->escapeHtml($message['text']) ?></div></div>
61+
<?php endforeach; ?>
62+
<?php endif; ?>
63+
<?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
64+
<?php if ($addInfoBlock): ?>
65+
<?php echo $addInfoBlock->setItem($_item)->toHtml() ?>
66+
<?php endif;?>
67+
</div>
68+
<?php $cols = 1; ?>
69+
</td>
6270

63-
<?php if ($canApplyMsrp): ?>
64-
<td class="col msrp" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
65-
<span class="pricing msrp">
66-
<span class="msrp notice"><?php echo __('See price before order confirmation.'); ?></span>
67-
<?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
68-
<?php $coreHelper = $this->helper('Magento\Core\Helper\Data'); ?>
69-
<a href="#" class="action help map" id="<?php echo($helpLinkId); ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?php echo $helpLinkId;?>","productName": "<?php echo $product->getName(); ?>","showAddToCart": false}}'>
70-
<span><?php echo __("What's this?"); ?></span>
71-
</a>
72-
</span>
71+
<?php if ($canApplyMsrp): ?>
72+
<td class="col msrp" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
73+
<span class="pricing msrp">
74+
<span class="msrp notice"><?php echo __('See price before order confirmation.'); ?></span>
75+
<?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
76+
<?php $coreHelper = $this->helper('Magento\Core\Helper\Data'); ?>
77+
<a href="#" class="action help map" id="<?php echo($helpLinkId); ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?php echo $helpLinkId;?>","productName": "<?php echo $product->getName(); ?>","showAddToCart": false}}'>
78+
<span><?php echo __("What's this?"); ?></span>
79+
</a>
80+
</span>
81+
<?php $cols++; ?>
82+
</td>
83+
<?php else: ?>
84+
<td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
85+
<?php echo $block->getUnitPriceHtml($_item); ?>
86+
<?php $cols++; ?>
87+
</td>
88+
<?php endif; ?>
89+
<td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>">
90+
<div class="field qty">
91+
<label class="label" for="cart-<?php echo $_item->getId() ?>-qty">
92+
<span><?php echo __('Qty') ?></span>
93+
</label>
94+
<div class="control qty">
95+
<input id="cart-<?php echo $_item->getId() ?>-qty"
96+
name="cart[<?php echo $_item->getId() ?>][qty]"
97+
value="<?php echo $block->getQty() ?>"
98+
type="number"
99+
size="4"
100+
title="<?php echo $block->escapeHtml(__('Qty')); ?>"
101+
class="input-text qty"
102+
maxlength="12"
103+
data-validate="{required:true,'validate-greater-than-zero':true}" />
104+
</div>
105+
</div>
73106
<?php $cols++; ?>
74107
</td>
75-
<?php else: ?>
76-
<td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
77-
<?php echo $block->getUnitPriceHtml($_item); ?>
108+
109+
<td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal'));?>">
110+
<?php if ($canApplyMsrp): ?>
111+
<span class="cart msrp subtotal">--</span>
112+
<?php else: ?>
113+
<?php echo $block->getRowTotalHtml($_item); ?>
114+
<?php endif; ?>
78115
<?php $cols++; ?>
79116
</td>
80-
<?php endif; ?>
81-
<td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>">
82-
<div class="field qty">
83-
<label class="label" for="cart-<?php echo $_item->getId() ?>-qty">
84-
<span><?php echo __('Qty') ?></span>
85-
</label>
86-
<div class="control qty">
87-
<input id="cart-<?php echo $_item->getId() ?>-qty" name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $block->getQty() ?>" type="number" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" data-validate="{required:true,'validate-greater-than-zero':true}"/>
88-
</div>
89-
</div>
90-
<?php $cols++; ?>
91-
</td>
117+
</tr>
118+
<tr class="item-actions">
119+
<td colspan="<?php echo $cols;?>">
120+
<div class="actions-toolbar">
92121

93-
<td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal'));?>">
94-
<?php if ($canApplyMsrp): ?>
95-
<span class="cart msrp subtotal">--</span>
96-
<?php else: ?>
97-
<?php echo $block->getRowTotalHtml($_item); ?>
98-
<?php endif; ?>
99-
<?php $cols++; ?>
100-
</td>
101-
</tr>
102-
<tr class="item-actions">
103-
<td colspan="<?php echo $cols;?>">
104-
<div class="actions-toolbar">
105-
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
106-
<?php if ($isVisibleProduct): ?>
107-
<a href="#" data-post='<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getMoveFromCartParams($_item->getId()); ?>' class="use-ajax action towishlist">
108-
<span><?php echo __('Move to Wishlist'); ?></span>
109-
</a>
122+
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
123+
<?php if ($isVisibleProduct): ?>
124+
<a href="#"
125+
data-post='<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getMoveFromCartParams($_item->getId()); ?>'
126+
class="use-ajax action towishlist">
127+
<span><?php echo __('Move to Wishlist'); ?></span>
128+
</a>
129+
<?php endif ?>
110130
<?php endif ?>
111-
<?php endif ?>
112-
113-
<?php if ($isVisibleProduct): ?>
114-
<a class="action edit" href="<?php echo $block->getConfigureUrl() ?>" title="<?php echo __('Edit item parameters') ?>"><span><?php echo __('Edit') ?></span></a>
115-
<?php endif ?>
116131

117-
<a href="#" title="<?php echo __('Remove item') ?>"
118-
class="action delete"
119-
data-post='<?php echo $this->helper('Magento\Checkout\Helper\Cart')->getDeletePostJson($_item); ?>'>
120-
<span><?php echo __('Remove item')?></span>
121-
</a>
122-
</div>
123-
</td>
124-
</tr>
132+
<?php if ($isVisibleProduct): ?>
133+
<a class="action edit"
134+
href="<?php echo $block->getConfigureUrl() ?>"
135+
title="<?php echo $block->escapeHtml(__('Edit item parameters')); ?>">
136+
<span>
137+
<?php echo __('Edit') ?>
138+
</span>
139+
</a>
140+
<?php endif ?>
141+
142+
<a href="#"
143+
title="<?php echo $block->escapeHtml(__('Remove item')); ?>"
144+
class="action delete"
145+
data-post='<?php echo $this->helper('Magento\Checkout\Helper\Cart')->getDeletePostJson($_item); ?>'>
146+
<span>
147+
<?php echo __('Remove item')?>
148+
</span>
149+
</a>
150+
</div>
151+
</td>
152+
</tr>
125153
</tbody>

‎app/code/Magento/Checkout/view/frontend/templates/cart/sidebar/default.phtml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ $imageBlock = $block->getLayout()->createBlock('Magento\Catalog\Block\Product\Im
1919
<li class="item product product-item">
2020
<div class="product">
2121
<?php if ($block->hasProductUrl()): ?>
22-
<a href="<?php echo $block->getProductUrl()?>" title="<?php echo $block->escapeHtml($block->getProductName()) ?>" class="product-item-photo">
22+
<a href="<?php echo $block->getProductUrl()?>"
23+
title="<?php echo $block->escapeHtml($block->getProductName()) ?>"
24+
tabindex="-1"
25+
class="product-item-photo">
2326
<?php echo $imageBlock->init($block->getProductForThumbnail(), 'mini_cart_product_thumbnail')->toHtml() ?>
2427
</a>
2528
<?php else: ?>

0 commit comments

Comments
 (0)