Merge pull request #718 from magento-webdev/PR-2

Korshenko, Olexii(okorshenko) · Korshenko, Olexii(okorshenko) · commit 9ae5bba8baea · 2015-10-14T12:53:41.000+03:00
[WebDev] Bugfixes
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml
@@ -8,7 +8,9 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main" name="adminhtml.catalog.product.set.edit" template="catalog/product/attribute/set/main.phtml"/>
+            <container name="adminhtml.catalog.product.set.edit.wrapper" htmlTag="div" htmlClass="admin__scope-old"><!-- @todo ui: remove arguments within .admin__scope-old -->
+                <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main" name="adminhtml.catalog.product.set.edit" template="catalog/product/attribute/set/main.phtml"/>
+            </container>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
@@ -225,14 +225,6 @@
                                 </div>
                             </fieldset>
                         </div>
-
-                        <button type="button"
-                                class="action-close"
-                                data-role="close-panel"
-                                title="<?= $block->escapeHtml(__('Close panel')) ?>">
-                            <span><?= /* @escapeNotVerified */  __('Close panel') ?></span>
-                        </button>
-                        <div class="image-pointer"></div>
                     </div>
                 </script>
 
@@ -441,14 +433,6 @@
                                         </div>
                                     </fieldset>
                                 </div>
-
-                                <button type="button"
-                                        class="action-close"
-                                        data-role="close-panel"
-                                        title="<?= $block->escapeHtml(__('Close panel')) ?>">
-                                    <span><?= /* @escapeNotVerified */  __('Close panel') ?></span>
-                                </button>
-                                <div class="image-pointer"></div>
                             </div>
                         </script>
 
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
diff --git a/app/code/Magento/Shipping/view/adminhtml/web/js/packages.js b/app/code/Magento/Shipping/view/adminhtml/web/js/packages.js
@@ -0,0 +1,39 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Ui/js/modal/modal',
+    'mage/translate'
+], function ($, modal, $t) {
+    'use strict';
+
+    return function (config, element) {
+        config.buttons = [
+            {
+                text: $t('Print'),
+                'class': 'action action-primary',
+
+                /**
+                 * Click handler
+                 */
+                click: function () {
+                    window.location.href = this.options.url;
+                }
+            }, {
+                text: $t('Cancel'),
+                'class': 'action action-secondary',
+
+                /**
+                 * Click handler
+                 */
+                click: function () {
+                    this.closeModal();
+                }
+            }
+        ];
+        modal(config, element);
+    };
+});
diff --git a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_bulk-images.less b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_bulk-images.less
@@ -361,16 +361,6 @@
     top: 5px;
 }
 
-.image-pointer {
-    background: url(../Magento_Backend/images/gallery-image-panel-corner.png) no-repeat;
-    height: 15px;
-    left: 50%;
-    margin-left: -14px;
-    position: absolute;
-    top: -11px;
-    width: 28px;
-}
-
 .image-panel-controls,
 .image-panel-preview {
     float: left;
@@ -431,28 +421,6 @@
     width: 100%;
 }
 
-.image-panel {
-    .action-close {
-        padding: 0;
-        position: absolute;
-        right: 29px;
-        top: 17px;
-        .lib-icon-font(
-        @_icon-font-content: @icon-close-mage__content,
-        @_icon-font: @icons-admin__font-name,
-        @_icon-font-size: 2rem,
-        @_icon-font-color: @color-brownie-vanilla,
-        @_icon-font-color-hover: @color-brownie-vanilla
-        );
-        span {
-            &:extend(.abs-visually-hidden all);
-        }
-        &:active {
-            padding: 0;
-        }
-    }
-}
-
 //
 //  Custom Multiselect
 //  _____________________________________________
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/_navigation-bar.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/_navigation-bar.less
@@ -40,11 +40,12 @@
 //  ---------------------------------------------
 
 .nav {
+    .extend__clearer();
     background-color: @nav__background-color;
     border-bottom: 1px solid @nav__border-color;
     border-top: 1px solid @nav__border-color;
-    .extend__clearer();
     display: none;
+    margin-bottom: @nav-bar__indent-top;
     padding: @nav-bar-dot__size @nav__indent-right 0 0;
 }
 
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
@@ -54,6 +54,9 @@
         margin-left: -(@tooltip-arrow__size / 2);
         padding: 0 @tooltip-arrow__size;
     }
+    p:last-child {
+        margin-bottom: 0;
+    }
 }
 
 //  Wrapper for the tooltip content
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_buttons.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_buttons.less
@@ -113,8 +113,7 @@
         );
         color: @btn-prime__color;
     }
-    &:active,
-    &:focus {
+    &:active {
         .lib-background-gradient(
         @_background-gradient: true,
         @_background-gradient-direction: horizontal,
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_structures.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_structures.less
@@ -3,6 +3,9 @@
 //  * See COPYING.txt for license details.
 //  */
 
+body:not([class]) {
+    min-width: 0;
+}
 .container {
     display: block;
     margin: 0 auto 4rem;
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less
@@ -156,7 +156,7 @@
 //  ---------------------------------------------
 
 @container__width: 100rem;
-@container__indent: 2rem;
+@container__indent: 0;
 
 @content__indent: @indent__l;
 
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_readiness-check.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_readiness-check.less
@@ -10,14 +10,20 @@
 //  Sizes
 
 @readiness-check-side__width: 22rem;
-@readiness-check-content__indent: 7.5rem;
+@readiness-check-content__indent: 5.7rem;
 
 //
 //  Common
 //  ---------------------------------------------
 
 .readiness-check-item {
     margin-bottom: 4rem;
+    min-height: 2.5rem;
+    .spinner {
+        font-size: 2.5rem;
+        float: left;
+        margin: -.4rem 0 0 1.7rem;
+    }
 }
 
 .readiness-check-title {
@@ -49,7 +55,7 @@
 
 .readiness-check-icon {
     float: left;
-    margin-left: 2rem;
+    margin-left: 1.7rem;
     margin-top: .7rem;
 }
 
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/setup.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/setup.less
@@ -98,7 +98,6 @@
 //  Updater pages
 @import '../../../updater/styles/less/pages/_common.less';
 @import '../../../updater/styles/less/pages/_home.less';
-@import '../../../updater/styles/less/pages/_readiness-check.less';
 @import '../../../updater/styles/less/pages/_component-manager.less';
 @import '../../../updater/styles/less/pages/_login.less';
 
diff --git a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_readiness-check.less b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_readiness-check.less
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
@@ -176,6 +176,15 @@ option:empty {
     }
 }
 
+//
+//  Service text or control. Can be used to add text or "Use Default Value" checkbox
+//  ---------------------------------------------
+
+.admin__control-service {
+    float: left;
+    margin: .8rem 0 0 3rem;
+}
+
 //
 //  Textarea
 //  ---------------------------------------------
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
@@ -194,20 +194,20 @@ protected function _optionToHtml($option)
     {
         $id = $this->getHtmlId() . '_' . $this->_escape($option['value']);
 
-        $html = '<div class="field choice"><input id="' . $id . '"';
+        $html = '<div class="field choice admin__field admin__field-option"><input id="' . $id . '"';
         foreach ($this->getHtmlAttributes() as $attribute) {
             if ($value = $this->getDataUsingMethod($attribute, $option['value'])) {
-                $html .= ' ' . $attribute . '="' . $value . '"';
+                $html .= ' ' . $attribute . '="' . $value . '" class="admin__control-checkbox"';
             }
         }
         $html .= ' value="' .
             $option['value'] .
             '" />' .
             ' <label for="' .
             $id .
-            '">' .
+            '" class="admin__field-label"><span>' .
             $option['label'] .
-            '</label></div>' .
+            '</span></label></div>' .
             "\n";
         return $html;
     }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Note.php b/lib/internal/Magento/Framework/Data/Form/Element/Note.php
@@ -39,7 +39,7 @@ public function getElementHtml()
         $html = $this->getBeforeElementHtml()
             . '<div id="'
             . $this->getHtmlId()
-            . '" class="control-value">'
+            . '" class="control-value admin__field-value">'
             . $this->getText()
             . '</div>'
             . $this->getAfterElementHtml();
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
@@ -63,7 +63,7 @@ public function testGetElementHtml()
         $this->_model->setValue('Note Text');
         $html = $this->_model->getElementHtml();
         $this->assertEquals(
-            "note_before<div id=\"note_id\" class=\"control-value\"></div>note_after",
+            "note_before<div id=\"note_id\" class=\"control-value admin__field-value\"></div>note_after",
             $html
         );
     }
diff --git a/setup/pub/styles/setup.css b/setup/pub/styles/setup.css
diff --git a/setup/view/magento/setup/home.phtml b/setup/view/magento/setup/home.phtml
@@ -6,27 +6,27 @@
 ?>
 
 <section class="home-page-inner-wrap ng-scope">
-    <p class="upgrade-home-title">
+    <p class="setup-home-title">
         Welcome to the Magento Setup Tool. Please choose a task below.
     </p>
 
     <div class="row" style="padding-left: 145px;" >
         <div class="col-m-4">
-            <a href="" class="upgrade-home-item upgrade-home-item-component" ui-sref="root.update">
-                <span class="upgrade-home-item-title">Component Manager</span>
-                <span class="upgrade-home-item-description">I want to manage my packages and modules.</span>
+            <a href="" class="setup-home-item setup-home-item-component" ui-sref="root.update">
+                <span class="setup-home-item-title">Component Manager</span>
+                <span class="setup-home-item-description">I want to manage my packages and modules.</span>
             </a>
         </div>
         <div class="col-m-4">
-            <a href="" class="upgrade-home-item upgrade-home-item-upgrade" ui-sref="root.upgrade">
-                <span class="upgrade-home-item-title">System Upgrade</span>
-                <span class="upgrade-home-item-description">I want to upgrade my Magento Admin version.</span>
+            <a href="" class="setup-home-item setup-home-item-upgrade" ui-sref="root.upgrade">
+                <span class="setup-home-item-title">System Upgrade</span>
+                <span class="setup-home-item-description">I want to upgrade my Magento Admin version.</span>
             </a>
         </div>
         <div class="col-m-4">
-            <a href="" class="upgrade-home-item upgrade-home-item-configuration" ui-sref="root.system-config">
-                <span class="upgrade-home-item-title">System Configuration</span>
-                <span class="upgrade-home-item-description">I want to change my Magento system configurations.</span>
+            <a href="" class="setup-home-item setup-home-item-configuration" ui-sref="root.system-config">
+                <span class="setup-home-item-title">System Configuration</span>
+                <span class="setup-home-item-description">I want to change my Magento system configurations.</span>
             </a>
         </div>
     </div>
diff --git a/setup/view/magento/setup/navigation/menu.phtml b/setup/view/magento/setup/navigation/menu.phtml
@@ -17,8 +17,8 @@
 
 </head>
 
-<div>
-    <nav ng-controller="navigationController" id="menu" class="nav ng-scope show"
+
+<nav ng-controller="navigationController" id="menu" class="nav ng-scope show"
          ng-hide="$state.current.noMenu || $state.current.main || $state.current.default">
     <ul class="nav-bar">
         <li ng-repeat="menuState in menu | filter: {type: $state.current.type}:true"
@@ -29,4 +29,4 @@
         </li>
     </ul>
 </nav>
-</div>
+
diff --git a/setup/view/magento/setup/select-version.phtml b/setup/view/magento/setup/select-version.phtml
@@ -5,8 +5,6 @@
  */
 ?>
 
-<h2 class="page-title">{{$state.current.header}}</h2>
-
 <div class="nav-bar-outer-actions">
 
     <div class="outer-actions-inner-wrap">
@@ -30,6 +28,8 @@
     </div>
 </div>
 
+<h2 class="page-sub-title">{{$state.current.header}}</h2>
+
 <div class="row form-row">
     <div class="message message-spinner" ng-show="!upgradeProcessed">
         <span class="spinner">

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@`
`54`	`54`	`margin-left: -(@tooltip-arrow__size / 2);`
`55`	`55`	`padding: 0 @tooltip-arrow__size;`
`56`	`56`	`}`
	`57`	`+ p:last-child {`
	`58`	`+ margin-bottom: 0;`
	`59`	`+ }`
`57`	`60`	`}`
`58`	`61`
`59`	`62`	`// Wrapper for the tooltip content`