Skip to content

Commit 6ee307f

Browse files
MomotenkoNataliaMomotenkoNatalia
authored
Merge pull request #128 from magento-webdev/bugfixes
[WebDev] Bugfixes
2 parents c29f3e7 + 6930d43 commit 6ee307f

File tree

48 files changed

+483
-355
lines changed

Some content is hidden

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

48 files changed

+483
-355
lines changed

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ public function render(\Magento\Framework\DataObject $row)
4141
{
4242
$readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
4343
'Read Details'
44-
) . '</a> | ' : '';
44+
) . '</a>' : '';
4545

4646
$markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
4747
'*/*/markAsRead/',
4848
['_current' => true, 'id' => $row->getId()]
4949
) . '">' . __(
5050
'Mark as Read'
51-
) . '</a> | ' : '';
51+
) . '</a>' : '';
5252

5353
$encodedUrl = $this->_urlHelper->getEncodedUrl();
5454
return sprintf(

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<head>
1010
<title>Magento Admin</title>
1111
<meta name="viewport" content="width=1024"/>
12+
<meta name="format-detection" content="telephone=no"/>
1213
<link src="requirejs/require.js"/>
1314
<css src="extjs/resources/css/ext-all.css"/>
1415
<css src="extjs/resources/css/ytheme-magento.css"/>

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,7 @@ public function addContainerChildren(
314314
ltrim(static::META_CONFIG_PATH, ArrayManager::DEFAULT_PATH_DELIMITER),
315315
$attributeContainer,
316316
[
317-
'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER,
318-
// TODO: Eliminate this in scope of MAGETWO-51364
319-
'scopeLabel' => $this->getScopeLabel($attribute),
317+
'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER
320318
]
321319
);
322320

‎app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@
406406
</item>
407407
</item>
408408
</item>
409-
410409
</item>
411410
</item>
412411
<item name="itemsAfter" xsi:type="array">
@@ -443,6 +442,5 @@
443442
</block>
444443
</referenceContainer>
445444
<referenceContainer name="page.messages" remove="true"/>
446-
<move element="logo" destination="checkout.header.wrapper"/>
447445
</body>
448446
</page>

‎app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@
1212
<container name="checkout.header.wrapper" label="Checkout Page Header" as="checkout_header_wrapper" htmlTag="div" htmlClass="header content"/>
1313
</container>
1414
</referenceContainer>
15+
<move element="logo" destination="checkout.header.wrapper"/>
1516
</layout>

‎app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<!-- ko text: currentBillingAddress().street --><!-- /ko --><br/>
1111
<!-- ko text: currentBillingAddress().city --><!-- /ko -->, <!-- ko text: currentBillingAddress().region --><!-- /ko --> <!-- ko text: currentBillingAddress().postcode --><!-- /ko --><br/>
1212
<!-- ko text: getCountryName(currentBillingAddress().countryId) --><!-- /ko --><br/>
13-
<!-- ko text: currentBillingAddress().telephone --><!-- /ko --><br/>
13+
<!-- ko if: (currentBillingAddress().telephone) -->
14+
<a data-bind="text: currentBillingAddress().telephone, attr: {'href': 'tel:' + currentBillingAddress().telephone}"></a>
15+
<!-- /ko --><br/>
1416
<button type="button"
1517
class="action action-edit-address"
1618
data-bind="visible: !isAddressSameAsShipping(), click: editAddress">

‎app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal/totals.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<div class="amount">
8-
<span data-bind="html: cart().subtotal"></span>
7+
<div class="amount price-container">
8+
<span class="price-wrapper" data-bind="html: cart().subtotal"></span>
99
</div>

‎app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<!-- ko text: address().street --><!-- /ko --><br/>
1111
<!-- ko text: address().city --><!-- /ko -->, <!-- ko text: address().region --><!-- /ko --> <!-- ko text: address().postcode --><!-- /ko --><br/>
1212
<!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
13-
<!-- ko text: address().telephone --><!-- /ko --><br/>
13+
<!-- ko if: (address().telephone) -->
14+
<a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>
15+
<!-- /ko --><br/>
1416
<!-- ko if: (address().isEditable()) -->
1517
<button type="button"
1618
class="action edit-address-link"

‎app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@
1010
<!-- ko text: address().street --><!-- /ko --><br/>
1111
<!-- ko text: address().city --><!-- /ko -->, <!-- ko text: address().region --><!-- /ko --> <!-- ko text: address().postcode --><!-- /ko --><br/>
1212
<!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
13-
<!-- ko text: address().telephone --><!-- /ko --><br/>
13+
<!-- ko if: (address().telephone) -->
14+
<a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>
15+
<!-- /ko --><br/>
1416
<!-- /ko -->

‎app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
*/
66
-->
77
<!-- ko if: isDisplayed() -->
8-
<tr>
9-
<td colspan="2" data-bind="text: title"></td>
10-
<td class="col grandtotal">
11-
<span data-bind ="text: getValue(), attr:{'data-label': title}"></span>
8+
<tr class="grand totals">
9+
<td class="mark" scope="row">
10+
<strong data-bind="i18n: title"></strong>
11+
</td>
12+
<td class="amount" data-bind="attr: {'data-th': $t(title)}">
13+
<strong><span class="price" data-bind="text: getValue()"></span></strong>
1214
<!-- ko foreach: elems() -->
1315
<!-- ko template: getTemplate() --><!-- /ko -->
1416
<!-- /ko -->

‎app/code/Magento/Customer/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ T: {{var telephone}}
7676
{{depend street4}}{{var street4}}<br />{{/depend}}
7777
{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br/>
7878
{{var country}}<br/>
79-
{{depend telephone}}T: {{var telephone}}{{/depend}}
79+
{{depend telephone}}T: <a href="tel:{{var telephone}}">{{var telephone}}</a>{{/depend}}
8080
{{depend fax}}<br/>F: {{var fax}}{{/depend}}
8181
{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}]]></html>
8282
<pdf><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|

0 commit comments

Comments
 (0)