Merge pull request #605 from magento-webdev/bugs

[WebDev] Bugfixes + Tasks
magento · May 12, 2016 · 32e7ab6 · 32e7ab6
2 parents ffe26b0 + 99eb32f
commit 32e7ab6
Show file tree

Hide file tree

Showing 218 changed files with 3,969 additions and 3,821 deletions.
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
@@ -80,7 +80,14 @@ protected function _prepareColumns()
 
         $this->addColumn(
             'orders_count',
-            ['header' => __('Orders'), 'sortable' => false, 'index' => 'orders_count', 'type' => 'number']
+            [
+                'header' => __('Orders'),
+                'sortable' => false,
+                'index' => 'orders_count',
+                'type' => 'number',
+                'header_css_class' => 'col-orders',
+                'column_css_class' => 'col-orders'
+            ]
         );
 
         $baseCurrencyCode = (string)$this->_storeManager->getStore(

diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
@@ -78,7 +78,14 @@ protected function _prepareColumns()
 
         $this->addColumn(
             'orders_count',
-            ['header' => __('Orders'), 'sortable' => false, 'index' => 'orders_count', 'type' => 'number']
+            [
+                'header' => __('Orders'),
+                'sortable' => false,
+                'index' => 'orders_count',
+                'type' => 'number',
+                'header_css_class' => 'col-orders',
+                'column_css_class' => 'col-orders'
+            ]
         );
 
         $baseCurrencyCode = (string)$this->_storeManager->getStore(

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
@@ -8,4 +8,4 @@
 
 ?>
 <a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
-<?php /* @escapeNotVerified */ echo __('Copyright&copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>
+<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
@@ -5,12 +5,12 @@
  */
 -->
 
-<div class="admin_field-complex" if="element.addButton">
-    <div class="admin_field-complex-title">
+<div class="admin__field-complex" if="element.addButton">
+    <div class="admin__field-complex-title">
         <span class="label" translate="'User Agent Rules'"></span>
     </div>
 
-    <div class="admin_field-complex-elements">
+    <div class="admin__field-complex-elements">
         <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
         <button attr="{disabled: disabled}"
                 class="action-secondary"
@@ -20,7 +20,7 @@
         </button>
     </div>
 
-    <div class="admin_field-complex-content"
+    <div class="admin__field-complex-content"
          translate="'User agent exceptions override product and CMS pages rules.'"></div>
 </div>
 

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
@@ -149,7 +149,7 @@ private function customizeAddAttributeModal(array $meta)
                 'arguments' => [
                     'data' => [
                         'config' => [
-                            'additionalClasses' => 'admin_field-complex-attributes',
+                            'additionalClasses' => 'admin__field-complex-attributes',
                             'formElement' => Container::NAME,
                             'componentType' => Container::NAME,
                             'content' => __('Select Attribute'),

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
@@ -17,7 +17,7 @@
     <?php echo $block->getButtonsHtml('header') ?>
 </div>
 
-<form id="edit_form" class="admin__scope-old" action="<?php echo $block->escapeHtml($block->getSaveUrl()) ?>" method="post">
+<form id="edit_form" class="admin__scope-old edit-form" action="<?php echo $block->escapeHtml($block->getSaveUrl()) ?>" method="post">
     <input name="form_key" type="hidden" value="<?php echo $block->escapeHtml($block->getFormKey()) ?>" />
     <?php echo $block->getChildHtml('form') ?>
 </form>

diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
@@ -9,7 +9,7 @@
 ?>
 
 <?php if ($block->getChildHtml()) :?>
-<div id="gift_options_configure_new" class="gift_options-popup product-configure-popup" style="display: none;">
+<div id="gift_options_configure_new" class="gift-options-popup product-configure-popup" style="display: none;">
     <div id="gift_options_form_contents">
         <div class="content">
             <?php echo $block->getChildHtml();?>

diff --git a/app/code/Magento/ProductVideo/Block/Adminhtml/Product/Edit/NewVideo.php b/app/code/Magento/ProductVideo/Block/Adminhtml/Product/Edit/NewVideo.php
@@ -150,7 +150,7 @@ protected function _prepareForm()
             'new_video_screenshot_preview',
             'button',
             [
-                'class' => 'preview_hidden_image_input_button',
+                'class' => 'preview-image-hidden-input',
                 'label' => '',
                 'name' => '_preview',
             ]
@@ -232,7 +232,7 @@ protected function getProduct()
      */
     protected function addMediaRoleAttributes(Fieldset $fieldset)
     {
-        $fieldset->addField('roleLabel', 'note', ['text' => __('Role')]);
+        $fieldset->addField('role-label', 'note', ['text' => __('Role')]);
         $mediaRoles = $this->getProduct()->getMediaAttributes();
         ksort($mediaRoles);
         foreach ($mediaRoles as $mediaRole) {

diff --git a/app/code/Magento/Review/Block/Adminhtml/Add/Form.php b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
@@ -63,7 +63,7 @@ protected function _prepareForm()
         $fieldset->addField('product_name', 'note', ['label' => __('Product'), 'text' => 'product_name']);
 
         $fieldset->addField(
-            'detailed_rating',
+            'detailed-rating',
             'note',
             [
                 'label' => __('Product Rating'),

diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
@@ -128,7 +128,7 @@ protected function _prepareForm()
         $fieldset->addField('customer', 'note', ['label' => __('Author'), 'text' => $customerText]);
 
         $fieldset->addField(
-            'summary_rating',
+            'summary-rating',
             'note',
             [
                 'label' => __('Summary Rating'),
@@ -137,7 +137,7 @@ protected function _prepareForm()
         );
 
         $fieldset->addField(
-            'detailed_rating',
+            'detailed-rating',
             'note',
             [
                 'label' => __('Detailed Rating'),

diff --git a/app/code/Magento/Review/view/adminhtml/layout/review_product_edit.xml b/app/code/Magento/Review/view/adminhtml/layout/review_product_edit.xml
@@ -5,7 +5,8 @@
  * See COPYING.txt for license details.
  */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="review_product_new"/>
+    <update handle="styles"/>
     <body/>
 </page>
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
@@ -205,7 +205,9 @@ protected function _prepareColumns()
                 'name' => 'in_products',
                 'values' => $this->_getSelectedProducts(),
                 'index' => 'entity_id',
-                'sortable' => false
+                'sortable' => false,
+                'header_css_class' => 'col-select',
+                'column_css_class' => 'col-select'
             ]
         );
 

diff --git a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
@@ -46,12 +46,12 @@
             </ol>
             <div id="cart-sidebar-reorder-advice-container"></div>
             <div class="actions-toolbar">
-                    <div class="primary no-display"
-                         data-bind="css: {'no-display': !lastOrderedItems().isShowAddToCart}">
-                        <button type="submit" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>" class="action tocart primary">
-                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                        </button>
-                    </div>
+                <div class="primary no-display"
+                     data-bind="css: {'no-display': !lastOrderedItems().isShowAddToCart}">
+                    <button type="submit" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>" class="action tocart primary">
+                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                    </button>
+                </div>
                 <div class="secondary">
                     <a class="action view" href="<?php /* @escapeNotVerified */ echo $block->getUrl('customer/account') ?>">
                         <span><?php /* @escapeNotVerified */ echo __('View All'); ?></span>

diff --git a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
@@ -91,7 +91,9 @@ protected function _prepareColumns()
                 'header' => __('Search Term'),
                 'sortable' => false,
                 'index' => 'query_text',
-                'renderer' => 'Magento\Backend\Block\Dashboard\Searches\Renderer\Searchquery'
+                'renderer' => 'Magento\Backend\Block\Dashboard\Searches\Renderer\Searchquery',
+                'header_css_class' => 'col-search-query',
+                'column_css_class' => 'col-search-query'
             ]
         );
 

diff --git a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
@@ -92,7 +92,9 @@ protected function _prepareColumns()
                 'header' => __('Search Term'),
                 'sortable' => false,
                 'index' => 'query_text',
-                'renderer' => 'Magento\Backend\Block\Dashboard\Searches\Renderer\Searchquery'
+                'renderer' => 'Magento\Backend\Block\Dashboard\Searches\Renderer\Searchquery',
+                'header_css_class' => 'col-search-query',
+                'column_css_class' => 'col-search-query'
             ]
         );
 

diff --git a/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml b/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
@@ -20,24 +20,25 @@
     <div class="actions dropdown options switcher-options">
         <?php foreach ($block->getGroups() as $_group): ?>
         <?php if ($_group->getId() == $block->getCurrentGroupId()): ?>
-            <div class="action toggle switcher-trigger" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" id="switcher-store-trigger">
+            <div class="action toggle switcher-trigger"
+                 role="button"
+                 tabindex="0"
+                 data-mage-init='{"dropdown":{}}'
+                 data-toggle="dropdown"
+                 data-trigger-keypress-button="true"
+                 id="switcher-store-trigger">
                 <strong>
                     <span><?php echo $block->escapeHtml($_group->getName()) ?></span>
                 </strong>
             </div>
         <?php endif; ?>
         <?php endforeach; ?>
-        <ul class="dropdown switcher-dropdown" data-mage-init='{"dropdownDialog":{
-            "appendTo":"#switcher-store > .options",
-            "triggerTarget":"#switcher-store-trigger",
-            "closeOnMouseLeave": false,
-            "triggerClass":"active",
-            "parentClass":"active",
-            "buttons":null}}'>
+        <ul class="dropdown switcher-dropdown" data-target="dropdown">
             <?php foreach ($block->getGroups() as $_group): ?>
             <?php if (!($_group->getId() == $block->getCurrentGroupId())): ?>
                 <li class="switcher-option">
-                    <a href="#" data-post='<?php /* @escapeNotVerified */ echo $block->getTargetStorePostData($_group->getDefaultStore()); ?>'>
+                    <a href="#"
+                       data-post='<?php /* @escapeNotVerified */ echo $block->getTargetStorePostData($_group->getDefaultStore()); ?>'>
                         <?php echo $block->escapeHtml($_group->getName()) ?>
                     </a>
                 </li>

diff --git a/app/code/Magento/Theme/view/adminhtml/web/prototype/magento.css b/app/code/Magento/Theme/view/adminhtml/web/prototype/magento.css
@@ -101,46 +101,46 @@
     padding-right: 0;
 }
 
-.magento_message {
+.magento-message {
     padding: 19px;
     position: relative;
 }
-.magento_message > .page-actions {
+.magento-message > .page-actions {
     padding-top: 0;
 }
 
-.popup-window .magento_message .fieldset {
+.popup-window .magento-message .fieldset {
     border: 0;
 }
 
-.popup-window .magento_message .fieldset select {
+.popup-window .magento-message .fieldset select {
     border-radius: 4px;
 }
 
-.popup-window .magento_message .fieldset select {
+.popup-window .magento-message .fieldset select {
     border-radius: 4px;
 }
 
-.popup-window .magento_message .fieldset .addon select {
+.popup-window .magento-message .fieldset .addon select {
     display: block;
 }
 
-.popup-window .magento_message .fieldset .addon .addafter {
+.popup-window .magento-message .fieldset .addon .addafter {
     border: 0;
     color: #666;
     display: block;
 }
 
-.popup-window .magento_message .fieldset .nm {
+.popup-window .magento-message .fieldset .nm {
     margin: 4px 0 0;
 }
 
-.popup-window .magento_message .fieldset .nm small {
+.popup-window .magento-message .fieldset .nm small {
     font-size: 11px;
     font-weight: normal;
 }
 
-.popup-window .magento_message .fieldset .widget-option-label {
+.popup-window .magento-message .fieldset .widget-option-label {
     padding: 6px 0 0;
 }
 
@@ -201,53 +201,53 @@
 /*
     Upload images
 -------------------------------------- */
-.magento_message .main-col-inner .uploader {
+.magento-message .main-col-inner .uploader {
     background: #fbfaf6;
     border: 1px solid #cac2b5;
     margin: 0 0 10px;
     padding: 5px;
 }
 
-.magento_message .breadcrumbs {
+.magento-message .breadcrumbs {
     padding-left: 0;
 }
 
-.magento_message .breadcrumbs li:after {
+.magento-message .breadcrumbs li:after {
     content: "";
     margin: 0 5px 0 0;
 }
 
-.magento_message #contents-uploader {
+.magento-message #contents-uploader {
     margin: 0 0 18px;
 }
 
-.magento_message .fileinput-button {
+.magento-message .fileinput-button {
     display: inline-block;
     cursor: pointer;
     float: none;
     vertical-align: middle;
 }
 
-.magento_message .fileinput-button span {
+.magento-message .fileinput-button span {
     display: none;
 }
 
-.magento_message .fileinput-button input {
+.magento-message .fileinput-button input {
     position: static;
     border: none;
     opacity: 1;
     filter: alpha(opacity=1);
     -moz-transform: none;
 }
 
-.magento_message .file-row {
+.magento-message .file-row {
     background: #fff;
     border: 1px solid #cac2b5;
     margin: 5px 0;
     padding: 2px;
 }
 
-.magento_message .filecnt {
+.magento-message .filecnt {
     border: 1px solid #cac2b5;
     display: inline-block;
     margin: 0 4px 15px 0;
@@ -256,25 +256,25 @@
     overflow: hidden;
 }
 
-.magento_message .filecnt.selected {
+.magento-message .filecnt.selected {
     border-color: #19a3d1;
 }
 
-.magento_message .filecnt p {
+.magento-message .filecnt p {
     text-align: center;
 }
 
-.magento_message #contents-uploader:after,
-.magento_message #contents-uploader:before {
+.magento-message #contents-uploader:after,
+.magento-message #contents-uploader:before {
     content: "";
     display: table;
 }
 
-.magento_message #contents-uploader:after {
+.magento-message #contents-uploader:after {
     clear: both;
 }
 
-.magento_message .x-tree {
+.magento-message .x-tree {
     margin-bottom: 20px;
 }