Merge pull request #469 from magento-webdev/PR-webdev

[WebDev] Bugfixes + Tasks
magento · Mar 22, 2016 · 066493c · 066493c
2 parents 4858f04 + 24d27aa
commit 066493c
Show file tree

Hide file tree

Showing 21 changed files with 502 additions and 471 deletions.
diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -16,7 +16,7 @@ class Switcher extends \Magento\Backend\Block\Template
     /**
      * URL for store switcher hint
      */
-    const HINT_URL = 'http://docs.magento.com/m2/ce/user_guide/stores/configuration.html';
+    const HINT_URL = 'http://docs.magento.com/m2/ce/user_guide/configuration/scope.html';
 
     /**
      * Name of website variable

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
@@ -10,38 +10,41 @@
 
 <form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}' autocomplete="off">
     <fieldset class="admin__fieldset">
-        <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Welcome, please sign in') ?></span></legend><br/>
+        <legend class="admin__legend">
+            <span><?php /* @escapeNotVerified */ echo __('Welcome, please sign in') ?></span>
+        </legend><br/>
         <input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>" />
         <div class="admin__field _required field-username">
-            <label for="username" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Username') ?></span></label>
+            <label for="username" class="admin__field-label">
+                <span><?php /* @escapeNotVerified */ echo __('Username') ?></span>
+            </label>
             <div class="admin__field-control">
-                <input
-                    id="username"
-                    class="admin__control-text"
-                    type="text"
-                    name="login[username]"
-                    autofocus
-                    value=""
-                    data-validate="{required:true}"
-                    placeholder="<?php /* @escapeNotVerified */ echo __('user name') ?>"/>
+                <input id="username"
+                       class="admin__control-text"
+                       type="text"
+                       name="login[username]"
+                       autofocus
+                       value=""
+                       data-validate="{required:true}"
+                       placeholder="<?php /* @escapeNotVerified */ echo __('user name') ?>"
+                       autocomplete="username"
+                    />
             </div>
         </div>
         <div class="admin__field _required field-password">
-            <label for="login" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Password') ?></span></label>
+            <label for="login" class="admin__field-label">
+                <span><?php /* @escapeNotVerified */ echo __('Password') ?></span>
+            </label>
             <div class="admin__field-control">
-                <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
-                <input
-                    id="dummy"
-                    class="admin__control-dummy"
-                    type="text"
-                    name="dummy"/>
-                <input
-                    id="login"
-                    class="admin__control-text"
-                    type="password"
-                    name="login[password]"
-                    data-validate="{required:true}"
-                    value="" placeholder="<?php /* @escapeNotVerified */ echo __('password') ?>" />
+                <input id="login"
+                       class="admin__control-text"
+                       type="password"
+                       name="login[password]"
+                       data-validate="{required:true}"
+                       value=""
+                       placeholder="<?php /* @escapeNotVerified */ echo __('password') ?>"
+                       autocomplete="current-password"
+                    />
             </div>
         </div>
         <?php echo $block->getChildHtml('form.additional.info'); ?>

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
@@ -151,7 +151,7 @@ protected function getFieldsForFieldset()
         $websitesList = $this->getWebsitesList();
         $isNewProduct = !$this->locator->getProduct()->getId();
         $tooltip = [
-            'link' => 'http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes',
+            'link' => 'http://docs.magento.com/m2/ce/user_guide/configuration/scope.html',
             'description' => __(
                 'If your Magento site has multiple views, ' .
                 'you can set the scope to apply to a specific view.'

diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml
@@ -45,6 +45,7 @@
                             <item name="dataType" xsi:type="string">text</item>
                             <item name="formElement" xsi:type="string">input</item>
                             <item name="dataScope" xsi:type="string">watermark_image_imageOpacity</item>
+                            <item name="addafter" xsi:type="string">%</item>
                             <item name="validation" xsi:type="array">
                                 <item name="validate-number" xsi:type="boolean">true</item>
                             </item>
@@ -61,9 +62,7 @@
                             <item name="validation" xsi:type="array">
                                 <item name="validate-digits" xsi:type="boolean">true</item>
                             </item>
-                            <item name="tooltip" xsi:type="array">
-                                <item name="description" xsi:type="string" translate="true">Example format: 200x300.</item>
-                            </item>
+                            <item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
                         </item>
                     </argument>
                 </field>
@@ -109,6 +108,7 @@
                             <item name="dataType" xsi:type="string">text</item>
                             <item name="formElement" xsi:type="string">input</item>
                             <item name="dataScope" xsi:type="string">watermark_thumbnail_imageOpacity</item>
+                            <item name="addafter" xsi:type="string">%</item>
                             <item name="validation" xsi:type="array">
                                 <item name="validate-number" xsi:type="boolean">true</item>
                             </item>
@@ -125,9 +125,7 @@
                             <item name="validation" xsi:type="array">
                                 <item name="validate-digits" xsi:type="boolean">true</item>
                             </item>
-                            <item name="tooltip" xsi:type="array">
-                                <item name="description" xsi:type="string" translate="true">Example format: 200x300.</item>
-                            </item>
+                            <item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
                         </item>
                     </argument>
                 </field>
@@ -173,6 +171,7 @@
                             <item name="dataType" xsi:type="string">text</item>
                             <item name="formElement" xsi:type="string">input</item>
                             <item name="dataScope" xsi:type="string">watermark_small_image_imageOpacity</item>
+                            <item name="addafter" xsi:type="string">%</item>
                             <item name="validation" xsi:type="array">
                                 <item name="validate-number" xsi:type="boolean">true</item>
                             </item>
@@ -189,9 +188,7 @@
                             <item name="validation" xsi:type="array">
                                 <item name="validate-digits" xsi:type="boolean">true</item>
                             </item>
-                            <item name="tooltip" xsi:type="array">
-                                <item name="description" xsi:type="string" translate="true">Example format: 200x300.</item>
-                            </item>
+                            <item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
                         </item>
                     </argument>
                 </field>

diff --git a/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml b/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml
@@ -130,7 +130,7 @@
                     <item name="source" xsi:type="string">catalog_rule</item>
                     <item name="dataScope" xsi:type="string">website_ids</item>
                     <item name="tooltip" xsi:type="array">
-                        <item name="link" xsi:type="string">http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes</item>
+                        <item name="link" xsi:type="string">http://docs.magento.com/m2/ce/user_guide/configuration/scope.html</item>
                         <item name="description" xsi:type="string">What is this?</item>
                     </item>
                 </item>

diff --git a/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml b/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->

diff --git a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
@@ -103,7 +103,7 @@
                         <item name="required-entry" xsi:type="boolean">true</item>
                     </item>
                     <item name="tooltip" xsi:type="array">
-                        <item name="link" xsi:type="string">http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes</item>
+                        <item name="link" xsi:type="string">http://docs.magento.com/m2/ce/user_guide/configuration/scope.html</item>
                         <item name="description" xsi:type="string" translate="true">If your Magento site has multiple views, you can set the scope to apply to a specific view.</item>
                     </item>
                 </item>

diff --git a/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml b/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml
@@ -123,7 +123,7 @@
                     <item name="source" xsi:type="string">sales_rule</item>
                     <item name="dataScope" xsi:type="string">website_ids</item>
                     <item name="tooltip" xsi:type="array">
-                        <item name="link" xsi:type="string">http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes</item>
+                        <item name="link" xsi:type="string">http://docs.magento.com/m2/ce/user_guide/configuration/scope.html</item>
                         <item name="description" xsi:type="string">What is this?</item>
                     </item>
                 </item>

diff --git a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml
@@ -38,6 +38,7 @@
                             <item name="dataType" xsi:type="string">text</item>
                             <item name="formElement" xsi:type="string">input</item>
                             <item name="dataScope" xsi:type="string">watermark_swatch_image_imageOpacity</item>
+                            <item name="addafter" xsi:type="string">%</item>
                             <item name="validation" xsi:type="array">
                                 <item name="validate-number" xsi:type="boolean">true</item>
                             </item>
@@ -54,9 +55,7 @@
                             <item name="validation" xsi:type="array">
                                 <item name="validate-digits" xsi:type="boolean">true</item>
                             </item>
-                            <item name="tooltip" xsi:type="array">
-                                <item name="description" xsi:type="string" translate="true">Example format: 200x300.</item>
-                            </item>
+                            <item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
                         </item>
                     </argument>
                 </field>

diff --git a/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html b/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html
@@ -9,7 +9,7 @@
      attr="'data-level': $data.level, 'data-index': index"
      data-bind="visible: $data.visible === undefined ? true: $data.visible">
     <div class="fieldset-wrapper-title"
-         tabindex="0"
+         attr="tabindex: !collapsible ? -1 : 0"
          click="toggleOpened"
          keyboard="13: toggleOpened"
          if="label">

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less
@@ -100,11 +100,6 @@
     }
 }
 
-// @todo ui - Find out if this trick still relevant app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml:23
-.admin__control-dummy {
-    display: none;
-}
-
 // Footer
 .login-footer {
     color: @color-heathered-grey;

diff --git a/...n/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_scheduled-changes.less b/...n/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_scheduled-changes.less
@@ -274,8 +274,25 @@
 .fieldset-schedule {
     border-bottom: 1px solid @collapsible__border-color;
 
+    .admin__fieldset {
+        padding: 0;
+
+        > :last-child {
+            margin-bottom: @indent__l;
+        }
+
+        > .fieldset-wrapper {
+            &:last-child {
+                margin-bottom: 0;
+            }
+        }
+    }
+
     .fieldset-wrapper-title {
+        border-bottom: 0;
         margin: @indent__base 0 @indent__s;
+        line-height: 1.2;
+        padding: 0;
 
         strong {
             font-size: 2rem;

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -306,6 +306,7 @@
 
     //  If there is a tooltip
     &._with-tooltip {
+        > .admin__control-addon,
         > .admin__field-option,
         > .admin__control-select,
         > .admin__control-text,
@@ -324,6 +325,7 @@
 
     //  If there is a fallback reset button
     &._with-reset {
+        > .admin__control-addon,
         > .admin__control-text,
         > .admin__control-textarea {
             width: ~'calc(100% - @{field-fallback-reset__width} - @{field-fallback-reset-icon__margin-left} - 4px)'; // Minus space size
@@ -337,6 +339,7 @@
 
         //  If both
         &._with-tooltip {
+            > .admin__control-addon,
             > .admin__control-text,
             > .admin__control-textarea {
                 width: ~'calc(100% - @{field-fallback-reset__width} - @{field-fallback-reset-icon__margin-left} - @{field-tooltip__width} - 8px)'; // Minus 2 space sizes

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
@@ -20,6 +20,7 @@
 @field-tooltip-content__border-color: @color-dark-grayish-orange;
 @field-tooltip-content__padding: 1.5rem 2.5rem;
 @field-tooltip-content__width: 32rem;
+@field-tooltip-content__z-index: 1;
 
 @field-tooltip-action__margin-left: 2rem;
 
@@ -47,6 +48,9 @@
     .admin__field-tooltip-action {
         display: inline-block;
         margin-left: @field-tooltip-action__margin-left;
+        position: relative;
+        z-index: @field-tooltip-content__z-index + 1;
+
         .lib-icon-font(
             @icon-help__content,
             @icons-admin__font-name,
@@ -104,5 +108,5 @@
     padding: @field-tooltip-content__padding;
     position: absolute;
     width: @field-tooltip-content__width;
-    z-index: 1;
+    z-index: @field-tooltip-content__z-index;
 }
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
@@ -4,57 +4,55 @@
 //  */
 
 //
-//    Common
-//--------------------------------------
+//  Common
+//  _____________________________________________
 
 & when (@media-common = true) {
-
-.block-product-link,
-.block-category-link {
-    &.widget {
-        display: block;
-        margin-bottom: @indent__base;
+    .block-product-link,
+    .block-category-link {
+        &.widget {
+            display: block;
+            margin-bottom: @indent__base;
+        }
     }
-}
 
-.block-product-link-inline {
-    &.widget {
-        margin: 0;
+    .block-product-link-inline {
+        &.widget {
+            margin: 0;
+        }
     }
-}
 
-.block.widget {
-    .product-item-info {
-        width: auto;
-    }
+    .block.widget {
+        .product-item-info {
+            width: auto;
+        }
 
-    .pager {
-        padding: 0;
+        .pager {
+            padding: 0;
 
-        .toolbar-amount {
-            float: none;
-            .lib-font-size(12);
-        }
+            .toolbar-amount {
+                float: none;
+                .lib-font-size(12);
+            }
 
-        .pages-item-previous {
-            padding-left: 0;
-        }
+            .pages-item-previous {
+                padding-left: 0;
+            }
 
-        .pages-item-next {
-            position: relative;
-        }
+            .pages-item-next {
+                position: relative;
+            }
 
-        .items {
-            white-space: nowrap;
+            .items {
+                white-space: nowrap;
+            }
         }
     }
 }
 
-}
-
 //
-//    Mobile
-//--------------------------------------
+//  Mobile
+//  _____________________________________________
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
     .block.widget .products-grid .product-item,
@@ -63,8 +61,8 @@
 }
 
 //
-//    Desktop
-//--------------------------------------
+//  Desktop
+//  _____________________________________________
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .block.widget .products-grid .product-item{ width: 100%/3 }