Merge pull request #128 from magento-webdev/bugfixes

[WebDev] Bugfixes
magento · Jul 5, 2016 · 6ee307f · 6ee307f
2 parents c29f3e7 + 6930d43
commit 6ee307f
Show file tree

Hide file tree

Showing 48 changed files with 483 additions and 355 deletions.
diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -41,14 +41,14 @@ public function render(\Magento\Framework\DataObject $row)
     {
         $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
             'Read Details'
-        ) . '</a> | ' : '';
+        ) . '</a>' : '';
 
         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
             '*/*/markAsRead/',
             ['_current' => true, 'id' => $row->getId()]
         ) . '">' . __(
             'Mark as Read'
-        ) . '</a> | ' : '';
+        ) . '</a>' : '';
 
         $encodedUrl = $this->_urlHelper->getEncodedUrl();
         return sprintf(

diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -9,6 +9,7 @@
     <head>
         <title>Magento Admin</title>
         <meta name="viewport" content="width=1024"/>
+        <meta name="format-detection" content="telephone=no"/>
         <link src="requirejs/require.js"/>
         <css src="extjs/resources/css/ext-all.css"/>
         <css src="extjs/resources/css/ytheme-magento.css"/>

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -314,9 +314,7 @@ public function addContainerChildren(
             ltrim(static::META_CONFIG_PATH, ArrayManager::DEFAULT_PATH_DELIMITER),
             $attributeContainer,
             [
-                'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER,
-                // TODO: Eliminate this in scope of MAGETWO-51364
-                'scopeLabel' => $this->getScopeLabel($attribute),
+                'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER
             ]
         );
 

diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
@@ -406,7 +406,6 @@
                                                                     </item>
                                                                 </item>
                                                             </item>
-
                                                         </item>
                                                     </item>
                                                     <item name="itemsAfter" xsi:type="array">
@@ -443,6 +442,5 @@
             </block>
         </referenceContainer>
         <referenceContainer name="page.messages" remove="true"/>
-        <move element="logo" destination="checkout.header.wrapper"/>
     </body>
 </page>
diff --git a/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml b/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml
@@ -12,4 +12,5 @@
             <container name="checkout.header.wrapper" label="Checkout Page Header" as="checkout_header_wrapper" htmlTag="div" htmlClass="header content"/>
         </container>
     </referenceContainer>
+    <move element="logo" destination="checkout.header.wrapper"/>
 </layout>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -10,7 +10,9 @@
     <!-- ko text: currentBillingAddress().street --><!-- /ko --><br/>
     <!-- ko text: currentBillingAddress().city --><!-- /ko -->, <!-- ko text: currentBillingAddress().region --><!-- /ko --> <!-- ko text: currentBillingAddress().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(currentBillingAddress().countryId) --><!-- /ko --><br/>
-    <!-- ko text: currentBillingAddress().telephone --><!-- /ko --><br/>
+    <!-- ko if: (currentBillingAddress().telephone) -->
+    <a data-bind="text: currentBillingAddress().telephone, attr: {'href': 'tel:' + currentBillingAddress().telephone}"></a>
+    <!-- /ko --><br/>
     <button type="button"
             class="action action-edit-address"
             data-bind="visible: !isAddressSameAsShipping(), click: editAddress">

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal/totals.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal/totals.html
@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 -->
-<div class="amount">
-    <span data-bind="html: cart().subtotal"></span>
+<div class="amount price-container">
+    <span class="price-wrapper" data-bind="html: cart().subtotal"></span>
 </div>
diff --git a/...agento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/...agento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -10,7 +10,9 @@
     <!-- ko text: address().street --><!-- /ko --><br/>
     <!-- ko text: address().city --><!-- /ko -->, <!-- ko text: address().region --><!-- /ko --> <!-- ko text: address().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
-    <!-- ko text: address().telephone --><!-- /ko --><br/>
+    <!-- ko if: (address().telephone) -->
+    <a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>
+    <!-- /ko --><br/>
     <!-- ko if: (address().isEditable()) -->
     <button type="button"
             class="action edit-address-link"

diff --git a/...to/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html b/...to/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
@@ -10,5 +10,7 @@
     <!-- ko text: address().street --><!-- /ko --><br/>
     <!-- ko text: address().city --><!-- /ko -->, <!-- ko text: address().region --><!-- /ko --> <!-- ko text: address().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
-    <!-- ko text: address().telephone --><!-- /ko --><br/>
+    <!-- ko if: (address().telephone) -->
+    <a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>
+    <!-- /ko --><br/>
 <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
@@ -5,10 +5,12 @@
  */
 -->
 <!-- ko if: isDisplayed() -->
-<tr>
-    <td colspan="2" data-bind="text: title"></td>
-    <td class="col grandtotal">
-        <span data-bind ="text: getValue(), attr:{'data-label': title}"></span>
+<tr class="grand totals">
+    <td class="mark" scope="row">
+        <strong data-bind="i18n: title"></strong>
+    </td>
+    <td class="amount" data-bind="attr: {'data-th': $t(title)}">
+        <strong><span class="price" data-bind="text: getValue()"></span></strong>
         <!-- ko foreach: elems() -->
             <!-- ko template: getTemplate() --><!-- /ko -->
         <!-- /ko -->

diff --git a/app/code/Magento/Customer/etc/config.xml b/app/code/Magento/Customer/etc/config.xml
@@ -76,7 +76,7 @@ T: {{var telephone}}
 {{depend street4}}{{var street4}}<br />{{/depend}}
 {{if city}}{{var city}},  {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br/>
 {{var country}}<br/>
-{{depend telephone}}T: {{var telephone}}{{/depend}}
+{{depend telephone}}T: <a href="tel:{{var telephone}}">{{var telephone}}</a>{{/depend}}
 {{depend fax}}<br/>F: {{var fax}}{{/depend}}
 {{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}]]></html>
                 <pdf><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|