Merge pull request #604 from magento-webdev/PR

[WebDev] Bugfixes
magento · Sep 16, 2015 · 2dc1854 · 2dc1854
2 parents 488cd04 + 75b5ed2
commit 2dc1854
Show file tree

Hide file tree

Showing 27 changed files with 246 additions and 82 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -9,6 +9,7 @@ module.exports = function (grunt) {
 
     var _ = require('underscore'),
         path = require('path'),
+        themes = require('./dev/tools/grunt/configs/themes'),
         configDir = './dev/tools/grunt/configs',
         taskDir = './dev/tools/grunt/tasks';
 
@@ -63,14 +64,18 @@ module.exports = function (grunt) {
         },
 
         /**
-         * Refresh magento frontend & backend.
+         * Refresh themes.
          */
-        refresh: [
-            'exec:all',
-            'less:blank',
-            'less:luma',
-            'less:backend'
-        ],
+        refresh: function () {
+            var tasks = [
+                'clean',
+                'exec:all'
+            ];
+            _.each(themes, function(theme, name) {
+                tasks.push('less:' + name);
+            });
+            grunt.task.run(tasks);
+        },
 
         /**
          * Documentation

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
@@ -6,31 +6,31 @@
 
 // @codingStandardsIgnoreFile
 ?>
-<div class="fieldset additional-cache-management">
-    <div class="legend">
+<div class="additional-cache-management">
+    <h2>
         <span><?php /* @escapeNotVerified */ echo __('Additional Cache Management') ?></span>
-    </div>
-    <div class="field">
+    </h2>
+    <p>
         <button onclick="setLocation('<?php /* @escapeNotVerified */ echo $block->getCleanImagesUrl() ?>')" type="button">
             <?php /* @escapeNotVerified */ echo __('Flush Catalog Images Cache') ?>
         </button>
-        <label class="label"><?php /* @escapeNotVerified */ echo __('Pregenerated product images files') ?></label>
-    </div>
-    <div class="field">
+        <span><?php /* @escapeNotVerified */ echo __('Pregenerated product images files') ?></span>
+    </p>
+    <p>
         <button onclick="setLocation('<?php /* @escapeNotVerified */ echo $block->getCleanMediaUrl() ?>')" type="button">
             <?php /* @escapeNotVerified */ echo __('Flush JavaScript/CSS Cache') ?>
         </button>
-        <label class="label"><?php /* @escapeNotVerified */ echo __('Themes JavaScript and CSS files combined to one file.') ?></label>
-    </div>
+        <span><?php /* @escapeNotVerified */ echo __('Themes JavaScript and CSS files combined to one file.') ?></span>
+    </p>
     <?php
     if (!$block->isInProductionMode()):
         ?>
-        <div class="field">
+        <p>
             <button onclick="setLocation('<?php /* @escapeNotVerified */ echo $block->getCleanStaticFilesUrl() ?>')" type="button">
                 <?php /* @escapeNotVerified */ echo __('Flush Static Files Cache') ?>
             </button>
-            <label class="label"><?php /* @escapeNotVerified */ echo __('Preprocessed view files and static files') ?></label>
-        </div>
+            <span><?php /* @escapeNotVerified */ echo __('Preprocessed view files and static files') ?></span>
+        </p>
     <?php
     endif;
     ?>

diff --git a/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Cctypes.php b/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Cctypes.php
@@ -9,7 +9,7 @@ class Cctypes extends \Magento\Framework\View\Element\Html\Select
 {
     /**
      * All possible credit card types
-     * 
+     *
      * @var array
      */
     protected $ccTypes = [];
@@ -49,13 +49,14 @@ public function _toHtml()
                 }
             }
         }
-        $this->setExtraParams('multiple="multiple" style="height:80px;"');
+        $this->setClass('cc-type-select');
+        $this->setExtraParams('multiple="multiple"');
         return parent::_toHtml();
     }
 
     /**
      * All possible credit card types
-     * 
+     *
      * @return array
      */
     protected function _getCcTypes()

diff --git a/app/code/Magento/Braintree/Test/Unit/Block/Adminhtml/Form/Field/CctypesTest.php b/app/code/Magento/Braintree/Test/Unit/Block/Adminhtml/Form/Field/CctypesTest.php
@@ -27,7 +27,7 @@ public function testToHtml()
         );
 
         $result = $ccTypes->_toHtml();
-        $expected = '<select name="" id="" class="" title="" multiple="multiple" style="height:80px;">'
+        $expected = '<select name="" id="" class="cc-type-select" title="" multiple="multiple">'
             . '<option value="" ></option></select>';
         $this->assertSame($expected, $result);
     }

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
@@ -66,11 +66,13 @@ var tierPriceRowTemplate = '<tr>'
     + '<option value="<?php /* @escapeNotVerified */ echo $_groupId ?>"><?php /* @escapeNotVerified */ echo $block->escapeJsQuote($block->escapeHtml($_groupName)) ?></option>'
     <?php endforeach ?>
     + '</select></td>'
-    + '<td class="col-qty"><small class="nobr" title="<?php /* @escapeNotVerified */ echo __("and above")?>"><?php /* @escapeNotVerified */ echo __("and above")?></small><input class="<?php /* @escapeNotVerified */ echo $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?php /* @escapeNotVerified */ echo $_htmlName ?>[<%- data.index %>][price_qty]" value="<%- data.qty %>" id="tier_price_row_<%- data.index %>_qty" />'
+    + '<td class="col-qty">'
+        + '<input class="<?php /* @escapeNotVerified */ echo $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?php /* @escapeNotVerified */ echo $_htmlName ?>[<%- data.index %>][price_qty]" value="<%- data.qty %>" id="tier_price_row_<%- data.index %>_qty" />'
+        + '<span><?php /* @escapeNotVerified */ echo __("and above") ?></span>'
     + '</td>'
     + '<td class="col-price"><input class="<?php /* @escapeNotVerified */ echo $_htmlClass ?> required-entry <?php /* @escapeNotVerified */ echo $_priceValueValidation ?>" type="text" name="<?php /* @escapeNotVerified */ echo $_htmlName ?>[<%- data.index %>][price]" value="<%- data.price %>" id="tier_price_row_<%- data.index %>_price" /></td>'
     + '<td class="col-delete"><input type="hidden" name="<?php /* @escapeNotVerified */ echo $_htmlName ?>[<%- data.index %>][delete]" class="delete" value="" id="tier_price_row_<%- data.index %>_delete" />'
-    + '<button title="<?php /* @escapeNotVerified */ echo __("Delete Tier") ?>" type="button" class="action- scalable delete icon-btn delete-product-option" id="tier_price_row_<%- data.index %>_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
+    + '<button title="<?php /* @escapeNotVerified */ echo $block->escapeHtml(__('Delete Tier')); ?>" type="button" class="action- scalable delete icon-btn delete-product-option" id="tier_price_row_<%- data.index %>_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
     + '<span><?php /* @escapeNotVerified */ echo __("Delete") ?></span></button></td>'
     + '</tr>';
 

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/product.css b/app/code/Magento/Catalog/view/adminhtml/web/product/product.css
@@ -87,6 +87,10 @@
     user-select: none;
 }
 
+.admin__scope-old .image .actions [class^="action-"] {
+    z-index: 10;
+}
+
 .admin__scope-old .image .actions [class^="action-"],
 .admin__scope-old .image .image-label,
 .admin__scope-old .image[data-image-hidden] .actions [class^="action-"],
@@ -308,26 +312,27 @@
 /*
     Tier Price Table
 -------------------------------------- */
+
+.admin__scope-old .tiers_table td {
+    vertical-align: top;
+}
+
 .admin__scope-old .tiers_table .col-qty {
     text-align: left;
     width: 150px;
 }
 
 .admin__scope-old .tiers_table .col-qty > input[type="text"] {
-    width: 40%;
+    width: 60px;
     margin-right: 5px;
 }
 
-.admin__scope-old .tiers_table .col-qty > .nobr {
-    width: 50%;
-    float: right;
-    margin-top: 6px;
-    text-overflow: ellipsis;
-    overflow: hidden;
+.admin__scope-old .tiers_table .col-qty span {
+    font-size: 1rem;
 }
 
-.admin__scope-old .tiers_table .col-price {
-    width: 16%;
+.admin__scope-old .tiers_table .col-price .input-text {
+    width: 90px;
 }
 
 .admin__scope-old .new-variation-set {

diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
@@ -19,7 +19,7 @@
     <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
     <?php foreach ($block->getAgreements() as $agreement): ?>
         <li class="item">
-            <div class="agreement content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
+            <div class="checkout-agreement-item-content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
                 <?php if ($agreement->getIsHtml()):?>
                     <?php /* @escapeNotVerified */ echo $agreement->getContent() ?>
                 <?php else:?>

diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
@@ -19,7 +19,7 @@
     <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
     <?php foreach ($block->getAgreements() as $agreement): ?>
         <li class="item">
-            <div class="agreement content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
+            <div class="checkout-agreement-item-content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
                 <?php if ($agreement->getIsHtml()):?>
                     <?php /* @escapeNotVerified */ echo $agreement->getContent() ?>
                 <?php else:?>

diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
@@ -19,7 +19,7 @@
     <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
     <?php foreach ($block->getAgreements() as $agreement): ?>
         <li class="item">
-            <div class="agreement content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
+            <div class="checkout-agreement-item-content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
                 <?php if ($agreement->getIsHtml()):?>
                     <?php /* @escapeNotVerified */ echo $agreement->getContent() ?>
                 <?php else:?>

diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
@@ -10,7 +10,7 @@
 <?php if ($instructions = $block->getInstructions()): ?>
     <ul class="form-list checkout-agreements" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none;">
         <li>
-            <div class="<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>-instructions-content agreement-content">
+            <div class="<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>-instructions-content checkout-agreement-item-content">
                 <?php /* @escapeNotVerified */ echo nl2br($instructions) ?>
             </div>
         </li>

diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
@@ -13,7 +13,7 @@
 <?php if ($block->getInstructions()): ?>
     <ul class="form-list checkout-agreements" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none;">
         <li>
-            <div class="<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>-instructions-content agreement-content">
+            <div class="<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>-instructions-content checkout-agreement-item-content">
                 <?php /* @escapeNotVerified */ echo nl2br($block->getInstructions()) ?>
             </div>
         </li>

diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <?php if ($instructions = $block->getInstructions()): ?>
-    <div class="items <?php /* @escapeNotVerified */ echo $block->getMethodCode() ?> instructions agreement content" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display: none;">
+    <div class="items <?php /* @escapeNotVerified */ echo $block->getMethodCode() ?> instructions checkout-agreement-item-content" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display: none;">
         <?php /* @escapeNotVerified */ echo nl2br($instructions) ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -1159,11 +1159,8 @@ protected function _involveNewCustomer()
         $customer = $this->_quote->getCustomer();
         $confirmationStatus = $this->_accountManagement->getConfirmationStatus($customer->getId());
         if ($confirmationStatus === AccountManagement::ACCOUNT_CONFIRMATION_REQUIRED) {
-            $url = $this->_customerUrl->getEmailConfirmationUrl($customer->getEmail());
             $this->_messageManager->addSuccess(
-            // @codingStandardsIgnoreStart
-                __('Account confirmation is required. Please check your email for confirmation link. To resend confirmation email please <a href="%1">click here</a>.', $url)
-            // @codingStandardsIgnoreEnd
+                __('Thank you for registering with Main Website Store.')
             );
         } else {
             $this->getCustomerSession()->regenerateId();

diff --git a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <head>
         <meta name="x_ua_compatible" content="IE=edge,chrome=1"/>
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no"/>
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
         <css src="mage/calendar.css"/>
         <script src="requirejs/require.js"/>
     </head>

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
@@ -13,21 +13,26 @@
                 data-bind="title: $t('Select Items'), click: toggleOpened">
             <span data-bind="text: $t('Actions')"></span>
         </button>
-        <ul
-            class="action-menu"
-            data-bind="css: {'_active': opened},
-                foreach: {data: actions, as: 'action'}">
-            <li data-bind="css: { '_visible': $data.visible}">
-                <span
-                    class="action-menu-item"
-                    data-bind="text: label,
-                        click: $parent.applyAction.bind($parent, type)">
-                </span>
-                    <!-- ko if: $data.actions -->
-                        <!-- ko template: {name: $parent.submenuTemplate, data: $parent} -->
-                        <!-- /ko -->
-                    <!-- /ko-->
-            </li>
-        </ul>
+        <div class="action-menu-items">
+            <ul
+                class="action-menu"
+                data-bind="css: {'_active': opened},
+                    foreach: {data: actions, as: 'action'}">
+                <li
+                    data-bind="css: {
+                        '_visible': $data.visible,
+                        '_parent': $data.actions}">
+                    <span
+                        class="action-menu-item"
+                        data-bind="text: label,
+                            click: $parent.applyAction.bind($parent, type)">
+                    </span>
+                        <!-- ko if: $data.actions -->
+                            <!-- ko template: {name: $parent.submenuTemplate, data: $parent} -->
+                            <!-- /ko -->
+                        <!-- /ko-->
+                </li>
+            </ul>
+        </div>
     </div>
 </div>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module.less
@@ -18,3 +18,4 @@
 
 @import 'module/pages/_dashboard.less';
 @import 'module/pages/_login.less';
+@import 'module/pages/_cache-management.less';
diff --git a/...nhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/...nhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -292,6 +292,9 @@
                     padding-left: 1.5rem;
                 }
             }
+            .cc-type-select {
+                min-width: 20rem;
+            }
         }
         input[type='text'],
         input[type='password'],
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@

		@import 'module/pages/_dashboard.less';
		@import 'module/pages/_login.less';
		@import 'module/pages/_cache-management.less';