From 672e4667e70bd048a080d33d5cbfb2fe6577d508 Mon Sep 17 00:00:00 2001
From: Dubovyk Oleksandr <odubovyk@ebay.com>
Date: Thu, 27 Aug 2015 18:43:23 +0300
Subject: [PATCH 01/18] MAGETWO-41680: [UI] Accessibility Improvements

- Added first bunch of accessability fixed to main pages
---
 .../view/frontend/templates/product/view/addto.phtml |  2 --
 .../frontend/templates/product/view/addtocart.phtml  |  4 ++--
 .../frontend/templates/product/view/mailto.phtml     |  3 +--
 .../templates/product/view/options/wrapper.phtml     |  4 ++--
 .../view/frontend/templates/cart/shipping.phtml      |  1 +
 .../Checkout/view/frontend/templates/success.phtml   |  2 +-
 .../Checkout/view/frontend/web/js/region-updater.js  |  2 +-
 .../frontend/web/template/minicart/item/default.html |  5 +++--
 .../frontend/web/template/shipping-address/form.html |  4 ++--
 .../view/frontend/web/template/shipping.html         | 12 ++++++++----
 .../view/frontend/templates/checkout/link.phtml      |  2 +-
 .../Sales/view/frontend/templates/order/recent.phtml |  2 +-
 .../Ui/view/frontend/web/templates/group/group.html  |  8 ++++----
 13 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
index 547c54ef0a1b7..03f757094337b 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
@@ -18,13 +18,11 @@ $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');
     <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
         <a href="#"
             class="action towishlist"
-            title="<?php echo __('Add to Wish List') ?>"
             data-post='<?php echo $_wishlistSubmitParams; ?>'
             data-action="add-to-wishlist"><span><?php echo __('Add to Wish List') ?></span></a>
     <?php endif; ?>
     <a href="#" data-post='<?php echo $compareHelper->getPostDataParams($_product);?>'
         data-role="add-to-links"
-        title="<?php echo __('Add to Compare') ?>"
         class="action tocompare"><span><?php echo __('Add to Compare') ?></span></a>
 </div>
 <script type="text/x-magento-init">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
index 90c6533461042..e2897cc8c640c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
@@ -12,7 +12,7 @@
 <?php $buttonTitle = __('Add to Cart'); ?>
 <?php if ($_product->isSaleable()): ?>
 <div class="box-tocart">
-    <fieldset class="fieldset">
+    <div class="fieldset">
         <?php if ($block->shouldRenderQuantity()): ?>
         <div class="field qty">
             <label class="label" for="qty"><span><?php echo __('Qty') ?></span></label>
@@ -37,7 +37,7 @@
             </button>
             <?php echo $block->getChildHtml('', true) ?>
         </div>
-    </fieldset>
+    </div>
 </div>
 <?php endif; ?>
 <?php if ($block->isRedirectToCartEnabled()) : ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
index f9eac3a082c57..c9e2dbf92dcf8 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
@@ -9,7 +9,6 @@
 ?>
 <?php $_product = $block->getProduct() ?>
 <?php if ($block->canEmailToFriend()): ?>
-    <a title="<?php echo __('Email') ?>"
-       href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>"
+    <a href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>"
        class="action mailto friend"><span><?php echo __('Email') ?></span></a>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
index 5e2b883207ba5..efe18cfb55c10 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
@@ -11,7 +11,7 @@ if ($block->hasRequiredOptions()) {
 }
 ?>
 <div class="product-options-wrapper" id="product-options-wrapper"<?php echo $required; ?>>
-    <fieldset class="fieldset" tabindex="0">
+    <div class="fieldset" tabindex="0">
         <?php echo $block->getChildHtml('', true);?>
-    </fieldset>
+    </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
index c38df0934ee59..621ad727e77cf 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -80,6 +80,7 @@
     <?php if (($_shippingRateGroups = $block->getEstimateRates())): ?>
     <form id="co-shipping-method-form" action="<?php echo $block->getUrl('checkout/cart/estimateUpdatePost') ?>" method="post">
         <fieldset class="fieldset rates">
+            <legend>Shipping Methods</legend>
             <dl class="items methods">
                 <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
                     <dt class="item-title"><span><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></span></dt>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/success.phtml b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
index 9a5162afc572f..39af0730e430f 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/success.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
@@ -22,7 +22,7 @@
 
     <div class="actions-toolbar">
         <div class="primary">
-            <a class="action primary continue" title="<?php echo __('Continue Shopping') ?>" href="<?php echo $block->getUrl() ?>"><span><?php echo __('Continue Shopping') ?></span></a>
+            <a class="action primary continue" href="<?php echo $block->getUrl() ?>"><span><?php echo __('Continue Shopping') ?></span></a>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
index f4c2213022caf..7ffcee8d6e11e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -15,7 +15,7 @@ define([
     $.widget('mage.regionUpdater', {
         options: {
             regionTemplate:
-                '<option value="<%- data.value %>" title="<%- data.title %>" <% if (data.isSelected) { %>selected="selected"<% } %>>' +
+                '<option value="<%- data.value %>" <% if (data.isSelected) { %>selected="selected"<% } %>>' +
                     '<%- data.title %>' +
                 '</option>',
             isRegionRequired: true,
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
index 3331ff0296fdd..9aedd4e7ffeeb 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -24,7 +24,7 @@
         <div class="product-item-details">
             <strong class="product-item-name">
                 <!-- ko if: product_has_url -->
-                <a data-bind="attr: {href: product_url, title: product_name}, text: product_name"></a>
+                <a data-bind="attr: {href: product_url}, text: product_name"></a>
                 <!-- /ko -->
                 <!-- ko ifnot: product_has_url -->
                     <!-- ko text: product_name --><!-- /ko -->
@@ -69,7 +69,8 @@
                 <!-- /ko -->
 
                 <div class="details-qty qty">
-                    <span class="label" data-bind="i18n: 'Qty'"></span>
+                    <label class="label" data-bind="i18n: 'Qty', attr: {
+                           for: 'cart-item-'+item_id+'-qty'}"></label>
                     <input data-bind="attr: {
                            id: 'cart-item-'+item_id+'-qty',
                            'data-cart-item': item_id,
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html
index f0257cfdfda44..d032b09f0a604 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html
@@ -8,7 +8,7 @@
     <!-- ko foreach: getRegion('before-fields') -->
     <!-- ko template: getTemplate() --><!-- /ko -->
     <!--/ko-->
-    <fieldset id="shipping-new-address-form" class="fieldset address">
+    <div id="shipping-new-address-form" class="fieldset address">
         <!-- ko foreach: getRegion('additional-fieldsets') -->
         <!-- ko template: getTemplate() --><!-- /ko -->
         <!--/ko-->
@@ -20,5 +20,5 @@
             </label>
         </div>
         <!-- /ko -->
-    </fieldset>
+    </div>
 </form>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
index c529aab467b2f..5979236cc7a2f 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -68,7 +68,7 @@
                     <table class="table-checkout-shipping-method">
                         <thead>
                             <tr class="row">
-                                <th class="col">&nbsp;</th>
+                                <th class="col">Select Method</th>
                                 <th class="col col-price" data-bind="i18n: 'Price'"></th>
                                 <th class="col col-method" data-bind="i18n: 'Method Title'"></th>
                                 <th class="col col-carrier" data-bind="i18n: 'Carrier Title'"></th>
@@ -84,7 +84,7 @@
                                 <input name="shipping_method"
                                        class="radio"
                                        type="radio"
-                                       data-bind="attr: {checked: $parent.rates().length == 1, 'value' : method.carrier_code + '_' + method.method_code, 'id': 's_method_' + method.method_code}" />
+                                       data-bind="attr: {checked: $parent.rates().length == 1, 'value' : method.carrier_code + '_' + method.method_code, 'id': 's_method_' + method.method_code, 'aria-labelledby': 'label_' + method.method_code + ' ' + 'label_' + method.carrier_code}" />
                                 <!-- /ko -->
                                 <!--ko ifnot: ($parent.rates().length == 1)-->
                                 <input name="shipping_method" type="radio"
@@ -102,8 +102,12 @@
                                 <!-- ko template: getTemplate() --><!-- /ko -->
                                 <!-- /ko -->
                             </td>
-                            <td class="col col-method" data-bind="i18n: method.method_title"></td>
-                            <td class="col col-carrier" data-bind="i18n: method.carrier_title"></td>
+
+                            <td class="col col-method"
+                                    data-bind="i18n: method.method_title, attr: {'id': 'label_' + method.method_code}"></td>
+
+                            <td class="col col-carrier"
+                                    data-bind="i18n: method.carrier_title, attr: {'id': 'label_' + method.carrier_code}"></td>
                         </tr>
 
                         <!-- ko if:  method.error_message -->
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
index 7af7299bc13a1..3a4eb1c9492e2 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<a class="action multicheckout" href="<?php echo $block->getCheckoutUrl()?>" title="<?php echo __('Check Out with Multiple Addresses');?>"><span><?php echo __('Check Out with Multiple Addresses');?></span></a>
+<a class="action multicheckout" href="<?php echo $block->getCheckoutUrl()?>"><span><?php echo __('Check Out with Multiple Addresses');?></span></a>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
index d38342f88661e..59f5fcf8510af 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
@@ -30,7 +30,7 @@
                         <th scope="col" class="col shipping"><?php echo __('Ship To') ?></th>
                         <th scope="col" class="col total"><?php echo __('Order Total') ?></th>
                         <th scope="col" class="col status"><?php echo __('Status') ?></th>
-                        <th scope="col" class="col actions">&nbsp;</th>
+                        <th scope="col" class="col actions"><?php echo __('Action') ?></th>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/app/code/Magento/Ui/view/frontend/web/templates/group/group.html b/app/code/Magento/Ui/view/frontend/web/templates/group/group.html
index 762cc4595c55e..c31399dded398 100644
--- a/app/code/Magento/Ui/view/frontend/web/templates/group/group.html
+++ b/app/code/Magento/Ui/view/frontend/web/templates/group/group.html
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 -->
-<div class="field" data-bind="css: additionalClasses">
-    <label class="label">
+<fieldset class="field" data-bind="css: additionalClasses">
+    <legend class="label">
         <span data-bind="text: element.label"></span>
-    </label>
+    </legend>
     <div class="control">
         <!-- ko foreach: { data: elems, as: 'element' } -->
 
@@ -33,4 +33,4 @@
         <!-- /ko -->
         <!-- /ko -->
     </div>
-</div>
+</fieldset>

From 172b1e554c5910dfacacd8ae842f4d85013bd9fb Mon Sep 17 00:00:00 2001
From: Dubovyk Oleksandr <odubovyk@ebay.com>
Date: Fri, 28 Aug 2015 19:06:57 +0300
Subject: [PATCH 02/18] MAGETWO-41680: [UI] Accessibility Improvements

- Added second bunch of accessability fixes
---
 .../Magento/Checkout/view/frontend/web/template/payment.html  | 3 +++
 .../view/frontend/web/js/view/authentication-popup.js         | 4 +++-
 .../blank/Magento_Checkout/layout/checkout_cart_index.xml     | 2 +-
 .../blank/Magento_Checkout/layout/checkout_index_index.xml    | 1 -
 .../web/css/source/module/checkout/_checkout.less             | 4 ++++
 .../web/css/source/module/checkout/_checkout.less             | 4 ++++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
index 51e8f46d8f16e..982ab0b1bc409 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -19,6 +19,9 @@
         <form id="co-payment-form" class="form payments" novalidate="novalidate">
             <input data-bind='attr: {value: getFormKey()}' type="hidden" name="form_key"/>
             <fieldset class="fieldset">
+                <legend class="legend">
+                    <span><?php echo __('Payment Information') ?></span>
+                </legend>
                 <!-- ko foreach: getRegion('beforeMethods') -->
                     <!-- ko template: getTemplate() --><!-- /ko -->
                 <!-- /ko -->
diff --git a/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js b/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
index dfef07a4b87af..324b0711f6b03 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js
@@ -39,7 +39,9 @@ define(
 
             /** Init popup login window */
             setModalElement: function (element) {
-                authenticationPopup.createPopUp(element);
+                if (authenticationPopup.modalWindow == null) {
+                    authenticationPopup.createPopUp(element);
+                }
             },
 
             /** Is login form enabled for current customer */
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
index 427bca31bbc00..928d037855e69 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
@@ -15,7 +15,7 @@
                             <argument translate="true" name="text" xsi:type="string">Summary</argument>
                             <argument name="tag" xsi:type="string">strong</argument>
                             <argument name="attributes" xsi:type="array">
-                                <item name="title" translate="true" xsi:type="string">Summary</item>
+                                <!--<item name="title" translate="true" xsi:type="string">Summary</item>-->
                             </argument>
                             <argument name="css_class" xsi:type="string">summary title</argument>
                         </arguments>
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_index_index.xml b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_index_index.xml
index bf14f518dd866..f21e152805c07 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_index_index.xml
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_index_index.xml
@@ -11,7 +11,6 @@
         <remove name="header.panel"/>
         <remove name="top.search"/>
         <remove name="catalog.compare.link"/>
-        <remove name="page.main.title"/>
         <remove name="catalog.topnav"/>
         <remove name="footer-container"/>
     </body>
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less
index a539e57d02e09..7931a2e71567c 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less
@@ -23,6 +23,10 @@
 
 & when (@media-common = true) {
 
+    .page-title-wrapper {
+        &:extend(.abs-visually-hidden all);
+    }
+
     .checkout-container {
         &:extend(.abs-add-clearfix all);
         .css(margin, 0 0 @checkout-wrapper__margin);
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
index df24eab2b3479..5306c90bf227e 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
@@ -27,6 +27,10 @@
 
 & when (@media-common = true) {
 
+    .page-title-wrapper {
+        &:extend(.abs-visually-hidden all);
+    }
+
     .checkout-container {
         &:extend(.abs-add-clearfix all);
         .css(margin, 0 0 @checkout-wrapper__margin);

From 916296ffadf62ad5803f29026604f4a2611d2f80 Mon Sep 17 00:00:00 2001
From: Dubovyk Oleksandr <odubovyk@ebay.com>
Date: Tue, 1 Sep 2015 13:27:42 +0300
Subject: [PATCH 03/18] MAGETWO-41680: [UI] Accessibility Improvements

- Added translation functions
---
 .../Checkout/view/frontend/templates/cart/shipping.phtml        | 2 +-
 .../Magento/Checkout/view/frontend/web/template/shipping.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
index 621ad727e77cf..5cea8e3b84356 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -80,7 +80,7 @@
     <?php if (($_shippingRateGroups = $block->getEstimateRates())): ?>
     <form id="co-shipping-method-form" action="<?php echo $block->getUrl('checkout/cart/estimateUpdatePost') ?>" method="post">
         <fieldset class="fieldset rates">
-            <legend>Shipping Methods</legend>
+            <legend><?php echo __('Shipping Methods') ?></legend>
             <dl class="items methods">
                 <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
                     <dt class="item-title"><span><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></span></dt>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
index 5979236cc7a2f..a675147610cc8 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -68,7 +68,7 @@
                     <table class="table-checkout-shipping-method">
                         <thead>
                             <tr class="row">
-                                <th class="col">Select Method</th>
+                                <th class="col"><?php echo __('Select Method') ?></th>
                                 <th class="col col-price" data-bind="i18n: 'Price'"></th>
                                 <th class="col col-method" data-bind="i18n: 'Method Title'"></th>
                                 <th class="col col-carrier" data-bind="i18n: 'Carrier Title'"></th>

From fb602699b96b18055c2983118407464bef81c1b6 Mon Sep 17 00:00:00 2001
From: Dubovyk Oleksandr <odubovyk@ebay.com>
Date: Tue, 1 Sep 2015 15:47:48 +0300
Subject: [PATCH 04/18] MAGETWO-41680: [UI] Accessibility Improvements

---
 .../Checkout/view/frontend/templates/cart/shipping.phtml     | 5 ++++-
 .../Magento/Checkout/view/frontend/web/template/payment.html | 1 +
 .../blank/Magento_Checkout/layout/checkout_cart_index.xml    | 3 ---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
index 5cea8e3b84356..16d8f0182084b 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -80,7 +80,10 @@
     <?php if (($_shippingRateGroups = $block->getEstimateRates())): ?>
     <form id="co-shipping-method-form" action="<?php echo $block->getUrl('checkout/cart/estimateUpdatePost') ?>" method="post">
         <fieldset class="fieldset rates">
-            <legend><?php echo __('Shipping Methods') ?></legend>
+            <legend class="legend">
+                <span><?php echo __('Shipping Methods') ?></span>
+            </legend>
+            <br />
             <dl class="items methods">
                 <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
                     <dt class="item-title"><span><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></span></dt>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
index 982ab0b1bc409..d8fb4a411dafa 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -22,6 +22,7 @@
                 <legend class="legend">
                     <span><?php echo __('Payment Information') ?></span>
                 </legend>
+                <br />
                 <!-- ko foreach: getRegion('beforeMethods') -->
                     <!-- ko template: getTemplate() --><!-- /ko -->
                 <!-- /ko -->
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
index 928d037855e69..dd89b55736f90 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
@@ -14,9 +14,6 @@
                         <arguments>
                             <argument translate="true" name="text" xsi:type="string">Summary</argument>
                             <argument name="tag" xsi:type="string">strong</argument>
-                            <argument name="attributes" xsi:type="array">
-                                <!--<item name="title" translate="true" xsi:type="string">Summary</item>-->
-                            </argument>
                             <argument name="css_class" xsi:type="string">summary title</argument>
                         </arguments>
                     </block>

From 399446adc068fa4e79287162b52ebf5947fc427f Mon Sep 17 00:00:00 2001
From: Dubovyk Oleksandr <odubovyk@ebay.com>
Date: Tue, 1 Sep 2015 16:17:38 +0300
Subject: [PATCH 05/18] MAGETWO-41680: [UI] Accessibility Improvements

---
 .../Checkout/view/frontend/templates/cart/shipping.phtml    | 3 +--
 .../Checkout/view/frontend/web/template/payment.html        | 3 +--
 .../Checkout/view/frontend/web/template/shipping.html       | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
index 16d8f0182084b..50769d16dd561 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -82,8 +82,7 @@
         <fieldset class="fieldset rates">
             <legend class="legend">
                 <span><?php echo __('Shipping Methods') ?></span>
-            </legend>
-            <br />
+            </legend><br />
             <dl class="items methods">
                 <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
                     <dt class="item-title"><span><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></span></dt>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
index d8fb4a411dafa..14a1a351ba99c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -21,8 +21,7 @@
             <fieldset class="fieldset">
                 <legend class="legend">
                     <span><?php echo __('Payment Information') ?></span>
-                </legend>
-                <br />
+                </legend><br />
                 <!-- ko foreach: getRegion('beforeMethods') -->
                     <!-- ko template: getTemplate() --><!-- /ko -->
                 <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
index a675147610cc8..ef100acdc3873 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -84,7 +84,7 @@
                                 <input name="shipping_method"
                                        class="radio"
                                        type="radio"
-                                       data-bind="attr: {checked: $parent.rates().length == 1, 'value' : method.carrier_code + '_' + method.method_code, 'id': 's_method_' + method.method_code, 'aria-labelledby': 'label_' + method.method_code + ' ' + 'label_' + method.carrier_code}" />
+                                       data-bind="attr: {checked: $parent.rates().length == 1, 'value' : method.carrier_code + '_' + method.method_code, 'id': 's_method_' + method.method_code, 'aria-labelledby': 'label_method_' + method.method_code + ' ' + 'label_carrier_' + method.carrier_code}" />
                                 <!-- /ko -->
                                 <!--ko ifnot: ($parent.rates().length == 1)-->
                                 <input name="shipping_method" type="radio"
@@ -104,10 +104,10 @@
                             </td>
 
                             <td class="col col-method"
-                                    data-bind="i18n: method.method_title, attr: {'id': 'label_' + method.method_code}"></td>
+                                    data-bind="i18n: method.method_title, attr: {'id': 'label_method_' + method.method_code}"></td>
 
                             <td class="col col-carrier"
-                                    data-bind="i18n: method.carrier_title, attr: {'id': 'label_' + method.carrier_code}"></td>
+                                    data-bind="i18n: method.carrier_title, attr: {'id': 'label_carrier_' + method.carrier_code}"></td>
                         </tr>
 
                         <!-- ko if:  method.error_message -->

From 6442de768aa4256962e70f777c41fcb6df962139 Mon Sep 17 00:00:00 2001
From: Dubovyk Oleksandr <odubovyk@ebay.com>
Date: Tue, 1 Sep 2015 17:32:42 +0300
Subject: [PATCH 06/18] MAGETWO-41680: [UI] Accessibility Improvements

---
 .../view/frontend/web/template/shipping.html     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
index ef100acdc3873..50e85093cbb22 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -84,14 +84,22 @@
                                 <input name="shipping_method"
                                        class="radio"
                                        type="radio"
-                                       data-bind="attr: {checked: $parent.rates().length == 1, 'value' : method.carrier_code + '_' + method.method_code, 'id': 's_method_' + method.method_code, 'aria-labelledby': 'label_method_' + method.method_code + ' ' + 'label_carrier_' + method.carrier_code}" />
+                                       data-bind="attr: {
+                                                    checked: $parent.rates().length == 1,
+                                                    'value' : method.carrier_code + '_' + method.method_code,
+                                                    'id': 's_method_' + method.method_code,
+                                                    'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code
+                                                 }" />
                                 <!-- /ko -->
                                 <!--ko ifnot: ($parent.rates().length == 1)-->
                                 <input name="shipping_method" type="radio"
                                        data-bind="
                                                 value: method.carrier_code + '_' + method.method_code,
                                                 checked: $parent.isSelected,
-                                                attr: {'id': 's_method_' + method.carrier_code + '_' + method.method_code},
+                                                attr: {
+                                                    'id': 's_method_' + method.carrier_code + '_' + method.method_code,
+                                                    'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code
+                                                },
                                                 click: $parent.selectShippingMethod"
                                        class="radio"/>
                                 <!--/ko-->
@@ -104,10 +112,10 @@
                             </td>
 
                             <td class="col col-method"
-                                    data-bind="i18n: method.method_title, attr: {'id': 'label_method_' + method.method_code}"></td>
+                                    data-bind="i18n: method.method_title, attr: {'id': 'label_method_' + method.method_code + '_' + method.carrier_code}"></td>
 
                             <td class="col col-carrier"
-                                    data-bind="i18n: method.carrier_title, attr: {'id': 'label_carrier_' + method.carrier_code}"></td>
+                                    data-bind="i18n: method.carrier_title, attr: {'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code}"></td>
                         </tr>
 
                         <!-- ko if:  method.error_message -->

From 001063eb356dea4f34d1c5e6569894a57fc9b117 Mon Sep 17 00:00:00 2001
From: Evgeniy Kolesov <ikolesov@ebay.com>
Date: Fri, 4 Sep 2015 12:45:08 +0300
Subject: [PATCH 07/18] MAGETWO-42187: Lang attribute on <html> tag is missing

---
 .../Magento/Framework/View/Page/Config.php    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index f01721a2704d4..aa2f824a6b463 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -37,6 +37,11 @@ class Config
      */
     const BODY_ATTRIBUTE_CLASS = 'class';
 
+    /**
+     * Constant html language attribute
+     */
+    const HTML_ATTRIBUTE_LANG = 'lang';
+
     /**
      * Allowed group of types
      *
@@ -85,6 +90,11 @@ class Config
      */
     protected $favicon;
 
+    /**
+     * @var \Magento\Framework\Locale\ResolverInterface
+     */
+    protected $_localeResolver;
+
     /**
      * @var \Magento\Framework\View\Layout\BuilderInterface
      */
@@ -113,19 +123,27 @@ class Config
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\View\Page\FaviconInterface $favicon
      * @param Title $title
+     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      */
     public function __construct(
         View\Asset\Repository $assetRepo,
         View\Asset\GroupedCollection $pageAssets,
         App\Config\ScopeConfigInterface $scopeConfig,
         View\Page\FaviconInterface $favicon,
-        Title $title
+        Title $title,
+        \Magento\Framework\Locale\ResolverInterface $localeResolver
     ) {
         $this->assetRepo = $assetRepo;
         $this->pageAssets = $pageAssets;
         $this->scopeConfig = $scopeConfig;
         $this->favicon = $favicon;
         $this->title = $title;
+        $this->_localeResolver = $localeResolver;
+        $this->setElementAttribute(
+            self::ELEMENT_TYPE_HTML,
+            self::HTML_ATTRIBUTE_LANG,
+            str_replace('_','-',$this->_localeResolver->getLocale())
+        );
     }
 
     /**

From 9fec2080089d085c33c1c3a36eb7aba67f48d493 Mon Sep 17 00:00:00 2001
From: Evgeniy Kolesov <ikolesov@ebay.com>
Date: Fri, 4 Sep 2015 18:32:04 +0300
Subject: [PATCH 08/18] MAGETWO-42187: Lang attribute on <html> tag is missing

- CR changes
---
 lib/internal/Magento/Framework/View/Page/Config.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index aa2f824a6b463..63489f996c98e 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -93,7 +93,7 @@ class Config
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
      */
-    protected $_localeResolver;
+    protected $localeResolver;
 
     /**
      * @var \Magento\Framework\View\Layout\BuilderInterface
@@ -138,11 +138,11 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->favicon = $favicon;
         $this->title = $title;
-        $this->_localeResolver = $localeResolver;
+        $this->localeResolver = $localeResolver;
         $this->setElementAttribute(
             self::ELEMENT_TYPE_HTML,
             self::HTML_ATTRIBUTE_LANG,
-            str_replace('_','-',$this->_localeResolver->getLocale())
+            str_replace('_','-',$this->localeResolver->getLocale())
         );
     }
 

From fc1e80206486bd688da5a9c376213e35d973eede Mon Sep 17 00:00:00 2001
From: Evgeniy Kolesov <ikolesov@ebay.com>
Date: Fri, 4 Sep 2015 19:47:17 +0300
Subject: [PATCH 09/18] MAGETWO-42051: New checkout condition page mark up is
 broken

---
 app/code/Magento/Backend/Block/Store/Switcher.php         | 4 ++--
 .../templates/store/switcher/form/renderer/fieldset.phtml | 4 ++--
 .../store/switcher/form/renderer/fieldset/element.phtml   | 8 ++++----
 .../templates/widget/form/renderer/fieldset.phtml         | 2 +-
 .../Magento/backend/web/css/source/forms/_fields.less     | 1 +
 .../web/css/source/forms/fields/_field-tooltips.less      | 3 +++
 .../Magento/Framework/Data/Form/Element/Textarea.php      | 2 +-
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
index a224e2a3b40d9..5f0b194df4020 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -548,11 +548,11 @@ public function getHintHtml()
         $html = '';
         $url = $this->getHintUrl();
         if ($url) {
-            $html = '<div class="tooltip">' . '<span class="help"><a' . ' href="' . $this->escapeUrl(
+            $html = '<div class="admin__field-tooltip tooltip">' . '<a' . ' href="' . $this->escapeUrl(
                 $url
             ) . '"' . ' onclick="this.target=\'_blank\'"' . ' title="' . __(
                 'What is this?'
-            ) . '"' . ' class="link-store-scope"><span>' . __(
+            ) . '"' . ' class="admin__field-tooltip-action action-help"><span>' . __(
                 'What is this?'
             ) . '</span></a></span>' . ' </div>';
         }
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
index 6cb7cfa2c5d1f..4222b26108452 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
@@ -13,11 +13,11 @@
 <?php endif; ?>
 
 <?php if (!$_element->getNoContainer()): ?>
-    <fieldset class="fieldset <?php echo $_element->getClass() ?>" id="<?php echo $_element->getHtmlId() ?>">
+    <fieldset class="admin__fieldset fieldset<?php echo $_element->getClass() ?>" id="<?php echo $_element->getHtmlId() ?>">
 <?php endif; ?>
 
     <?php if ($_element->getLegend()): ?>
-        <legend class="legend">
+        <legend class="admin__legend legend">
             <span><?php echo $_element->getLegend() ?></span>
         </legend>
         <?php echo $_element->getHeaderBar() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
index 4f597407e1f07..9eb9202a95f4a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
@@ -14,10 +14,10 @@ $note = $element->getNote() ? '<div class="note">' . $element->getNote() . '</di
 $elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
 $addOn = $element->getBeforeElementHtml() || $element->getAfterElementHtml();
 $fieldId = ($element->getHtmlContainerId()) ? ' id="' . $element->getHtmlContainerId() . '"' : '';
-$fieldClass = "field field-{$element->getId()} {$element->getCssClass()}";
+$fieldClass = "admin__field field field-{$element->getId()} {$element->getCssClass()}";
 $fieldClass .= ($elementBeforeLabel) ? ' choice' : '';
 $fieldClass .= ($addOn) ? ' with-addon' : '';
-$fieldClass .= ($element->getRequired()) ? ' required' : '';
+$fieldClass .= ($element->getRequired()) ? ' _required' : '';
 $fieldClass .= ($note) ? ' with-note' : '';
 
 $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
@@ -35,8 +35,9 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
             <?php echo $note ?>
         <?php else: ?>
             <?php echo $element->getLabelHtml() ?>
-            <div class="control">
+            <div class="admin__field-control control">
                 <?php echo($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
+                <?php echo $block->getHintHtml() ?>
                 <?php echo $note ?>
             </div>
         <?php endif; ?>
@@ -44,7 +45,6 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
             <div class="field-service" value-scope="<?php echo $element->getScopeLabel()?>">
             </div>
         <?php endif;?>
-        <?php echo $block->getHintHtml() ?>
     </div>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
index ed79720277308..a2881bc37e06b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
@@ -57,7 +57,7 @@ if ($isField) {
     <?php if (!$element->getNoContainer()): ?>
         <fieldset class="<?php echo $cssClass ?>" id="<?php echo $id ?>">
         <?php if ($element->getLegend() && !$isWrapped): ?>
-            <legend class="<?php echo $isField ? 'label' : 'legend'?>">
+            <legend class="<?php echo $isField ? 'label admin__field-label' : 'admin__legend legend'?>">
                 <span><?php echo $element->getLegend() ?></span>
             </legend><br />
         <?php endif; ?>
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
index 7958cdb81d7b9..2d70b965fcfa7 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -300,6 +300,7 @@
     float: left;
     position: static;
     width: 100%;
+    &:extend(.abs-fieldset-legend);
     & + br {
         display: block;
         height: 0;
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
index 49aa1b091bb65..3914d2492ca8b 100644
--- 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
@@ -38,6 +38,9 @@
             @_icon-font-line-height: 1,
             @_icon-font-color: @field-tooltip-icon__color
         );
+        span {
+            &:extend(.abs-visually-hidden);
+        }
     }
     .admin__control-text:focus + .admin__field-tooltip-content,
     &:hover .admin__field-tooltip-content {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php b/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php
index 9fb3041882565..0876aeed4ab63 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Textarea.php
@@ -80,7 +80,7 @@ public function getHtmlAttributes()
      */
     public function getElementHtml()
     {
-        $this->addClass('textarea');
+        $this->addClass('textarea admin__control-textarea');
         $html = '<textarea id="' . $this->getHtmlId() . '" name="' . $this->getName() . '" '
             . $this->serialize($this->getHtmlAttributes()) . $this->_getUiId() . ' >';
         $html .= $this->getEscapedValue();

From d8e8e5ee3b8da3f4568f82b47e716cf0c347ab48 Mon Sep 17 00:00:00 2001
From: Dubovyk Oleksandr <odubovyk@ebay.com>
Date: Mon, 7 Sep 2015 20:54:49 +0300
Subject: [PATCH 10/18] MAGETWO-41680: [UI] Accessibility Improvements

---
 .../Magento/Checkout/view/frontend/web/template/shipping.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
index 50e85093cbb22..e82316ad8f468 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -68,7 +68,7 @@
                     <table class="table-checkout-shipping-method">
                         <thead>
                             <tr class="row">
-                                <th class="col"><?php echo __('Select Method') ?></th>
+                                <th class="col" data-bind="i18n: 'Select Method'"></th>
                                 <th class="col col-price" data-bind="i18n: 'Price'"></th>
                                 <th class="col col-method" data-bind="i18n: 'Method Title'"></th>
                                 <th class="col col-carrier" data-bind="i18n: 'Carrier Title'"></th>

From 7b7432cd2a44cf610388d3ca8ffdee8c94d66b9e Mon Sep 17 00:00:00 2001
From: Dubovyk Oleksandr <odubovyk@ebay.com>
Date: Wed, 9 Sep 2015 13:54:08 +0300
Subject: [PATCH 11/18] MAGETWO-41680: [UI] Accessibility Improvements

---
 .../Checkout/view/frontend/web/template/shipping.html      | 4 ++--
 .../blank/Magento_Checkout/layout/checkout_index_index.xml | 1 -
 .../web/css/source/module/checkout/_checkout.less          | 7 +++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
index e82316ad8f468..7c981e83bc978 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -68,7 +68,7 @@
                     <table class="table-checkout-shipping-method">
                         <thead>
                             <tr class="row">
-                                <th class="col" data-bind="i18n: 'Select Method'"></th>
+                                <th class="col col-method" data-bind="i18n: 'Select Method'"></th>
                                 <th class="col col-price" data-bind="i18n: 'Price'"></th>
                                 <th class="col col-method" data-bind="i18n: 'Method Title'"></th>
                                 <th class="col col-carrier" data-bind="i18n: 'Carrier Title'"></th>
@@ -78,7 +78,7 @@
 
                         <!--ko foreach: { data: rates(), as: 'method'}-->
                         <tr class="row" data-bind="click: $parent.selectShippingMethod">
-                            <td class="col">
+                            <td class="col col-method">
                                 <!-- ko ifnot: method.error_message -->
                                 <!-- ko if: $parent.rates().length == 1 -->
                                 <input name="shipping_method"
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_index_index.xml b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_index_index.xml
index 9e2266e17b91a..6bd1e12ef8417 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_index_index.xml
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_index_index.xml
@@ -11,7 +11,6 @@
         <referenceContainer name="header.panel" remove="true"/>
         <referenceBlock name="top.search" remove="true"/>
         <referenceBlock name="catalog.compare.link" remove="true"/>
-        <referenceBlock name="page.main.title" remove="true"/>
         <referenceBlock name="catalog.topnav" remove="true"/>
         <referenceContainer name="footer-container" remove="true"/>
     </body>
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less
index 7e76b85c6f5be..66ebb311e70ac 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less
@@ -23,8 +23,11 @@
 
 & when (@media-common = true) {
 
-    .page-title-wrapper {
-        &:extend(.abs-visually-hidden all);
+    .checkout-index-index,
+    .checkout-onepage-success {
+        .page-title-wrapper {
+            &:extend(.abs-visually-hidden all);
+        }
     }
 
     .checkout-container {

From ac9817b8ea1e099a39bbf1ac2cab139c208bbaf1 Mon Sep 17 00:00:00 2001
From: Dubovyk Oleksandr <odubovyk@ebay.com>
Date: Thu, 10 Sep 2015 19:05:24 +0300
Subject: [PATCH 12/18] MAGETWO-41680: [UI] Accessibility Improvements

---
 .../web/css/source/module/checkout/_checkout.less          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
index 2985ea7d2cf59..1c832e6c03daf 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
@@ -27,8 +27,11 @@
 
 & when (@media-common = true) {
 
-    .page-title-wrapper {
-        &:extend(.abs-visually-hidden all);
+    .checkout-index-index,
+    .checkout-onepage-success {
+        .page-title-wrapper {
+            &:extend(.abs-visually-hidden all);
+        }
     }
 
     .checkout-container {

From 95f5b4a23b3c8213f67698e3558405b1537e3281 Mon Sep 17 00:00:00 2001
From: Dubovyk Oleksandr <odubovyk@ebay.com>
Date: Thu, 10 Sep 2015 19:45:16 +0300
Subject: [PATCH 13/18] MAGETWO-41680: [UI] Accessibility Improvements

---
 .../Magento/Checkout/view/frontend/web/template/payment.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
index 14a1a351ba99c..d73f8ff5cb343 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -20,7 +20,7 @@
             <input data-bind='attr: {value: getFormKey()}' type="hidden" name="form_key"/>
             <fieldset class="fieldset">
                 <legend class="legend">
-                    <span><?php echo __('Payment Information') ?></span>
+                    <span data-bind="i18n: 'Payment Information'"></span>
                 </legend><br />
                 <!-- ko foreach: getRegion('beforeMethods') -->
                     <!-- ko template: getTemplate() --><!-- /ko -->

From 0bf0d1e7bcf8a171d69771272d1ed2c679002f34 Mon Sep 17 00:00:00 2001
From: Evgeniy Kolesov <ikolesov@ebay.com>
Date: Thu, 10 Sep 2015 19:46:02 +0300
Subject: [PATCH 14/18] MAGETWO-42187: Lang attribute on <html> tag is missing

---
 lib/internal/Magento/Framework/View/Page/Config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index 63489f996c98e..1816c6a1b6d61 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -142,7 +142,7 @@ public function __construct(
         $this->setElementAttribute(
             self::ELEMENT_TYPE_HTML,
             self::HTML_ATTRIBUTE_LANG,
-            str_replace('_','-',$this->localeResolver->getLocale())
+            str_replace('_', '-', $this->localeResolver->getLocale())
         );
     }
 

From f1f925adb0d2bec9b3b777f848f250dbf9e919f1 Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Mon, 21 Sep 2015 16:34:54 +0300
Subject: [PATCH 15/18] MAGETWO-38961: "Treat Balance as Store Credit" field is
 overlapped by its label

---
 .../Magento/backend/web/css/styles-old.less       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index 011360c86ba18..8f6ed5cd1a338 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -4243,6 +4243,21 @@ input.no-display,
             word-wrap: normal;
         }
     }
+
+    .giftcard-info-container {
+        .fieldset-wrapper {
+            .fieldset-wrapper-content {
+                .admin__field {
+                    .admin__field-label {
+                        display: table;
+                        span {
+                            display: table-cell;
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 }
 

From 05b0bd9330e6436a3f9a5b88791a6fd2c1d56997 Mon Sep 17 00:00:00 2001
From: Dmytro Vilchynskyi <dvilchynskyi@ebay.com>
Date: Wed, 23 Sep 2015 19:20:28 +0300
Subject: [PATCH 16/18] MAGETWO-42187: Lang attribute on <html> tag is missing

- fix tests
---
 .../View/Test/Unit/Page/ConfigTest.php        | 50 +++++++++++++------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
index ae61cf0509216..3519062bbc3ec 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
@@ -9,10 +9,13 @@
  */
 namespace Magento\Framework\View\Test\Unit\Page;
 
+use Magento\Framework\Locale\Resolver;
+use Magento\Framework\View\Page\Config;
+
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\View\Page\Config
+     * @var Config
      */
     protected $model;
 
@@ -66,6 +69,10 @@ public function setUp()
         $this->asset = $this->getMock('Magento\Framework\View\Asset\File', [], [], '', false);
         $this->remoteAsset = $this->getMock('\Magento\Framework\View\Asset\Remote', [], [], '', false);
         $this->title = $this->getMock('Magento\Framework\View\Page\Title', [], [], '', false);
+        $locale = $this->getMockForAbstractClass('Magento\Framework\Locale\ResolverInterface', [], '', false);
+        $locale->expects($this->any())
+            ->method('getLocale')
+            ->willReturn(Resolver::DEFAULT_LOCALE);
         $this->model = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
             ->getObject(
                 'Magento\Framework\View\Page\Config',
@@ -73,7 +80,8 @@ public function setUp()
                     'assetRepo' => $this->assetRepo,
                     'pageAssets' => $this->pageAssets,
                     'scopeConfig' => $this->scopeConfig,
-                    'favicon' => $this->favicon
+                    'favicon' => $this->favicon,
+                    'localeResolver' => $locale,
                 ]
             );
     }
@@ -338,16 +346,16 @@ public function elementAttributeDataProvider()
                 'class',
                 'test',
             ],
-            [
-                'html',
-                'context',
-                'value'
-            ],
             [
                 'body',
                 'class',
                 'value'
-            ]
+            ],
+            [
+                Config::ELEMENT_TYPE_HTML,
+                Config::HTML_ATTRIBUTE_LANG,
+                str_replace('_', '-', Resolver::DEFAULT_LOCALE)
+            ],
         ];
     }
 
@@ -387,15 +395,29 @@ public function elementAttributeExceptionDataProvider()
 
     /**
      * @param string $elementType
-     * @param string $attribute
-     * @param string $value
+     * @param string $attributes
      *
-     * @dataProvider elementAttributeDataProvider
+     * @dataProvider elementAttributesDataProvider
      */
-    public function testElementAttributes($elementType, $attribute, $value)
+    public function testElementAttributes($elementType, $attributes)
     {
-        $this->model->setElementAttribute($elementType, $attribute, $value);
-        $this->assertEquals([$attribute => $value], $this->model->getElementAttributes($elementType));
+        foreach ($attributes as $attribute => $value) {
+            $this->model->setElementAttribute($elementType, $attribute, $value);
+        }
+        $this->assertEquals($attributes, $this->model->getElementAttributes($elementType));
+    }
+
+    public function elementAttributesDataProvider()
+    {
+        return [
+            [
+                'html',
+                [
+                    'context' => 'value',
+                    Config::HTML_ATTRIBUTE_LANG => str_replace('_', '-', Resolver::DEFAULT_LOCALE)
+                ],
+            ],
+        ];
     }
 
     /**

From ac816138c458386a7ffbb7380da366225060105c Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Thu, 24 Sep 2015 18:54:42 +0300
Subject: [PATCH 17/18] MAGETWO-38961: "Treat Balance as Store Credit" field is
 overlapped by its label

---
 .../Magento/backend/web/css/styles-old.less       | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index 8f6ed5cd1a338..011360c86ba18 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -4243,21 +4243,6 @@ input.no-display,
             word-wrap: normal;
         }
     }
-
-    .giftcard-info-container {
-        .fieldset-wrapper {
-            .fieldset-wrapper-content {
-                .admin__field {
-                    .admin__field-label {
-                        display: table;
-                        span {
-                            display: table-cell;
-                        }
-                    }
-                }
-            }
-        }
-    }
 }
 }
 

From 6ecf1f6a00c585d459f00152fe5455d4d9fb530c Mon Sep 17 00:00:00 2001
From: Dmytro Vilchynskyi <dvilchynskyi@ebay.com>
Date: Fri, 25 Sep 2015 17:27:00 +0300
Subject: [PATCH 18/18] MAGETWO-38961: "Treat Balance as Store Credit" field is
 overlapped by its label

- fix tests
---
 .../Test/Block/Product/View/CustomOptions.php   | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index 9f5421ed86ead..7e4608bc008a1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -23,21 +23,21 @@ class CustomOptions extends Form
      *
      * @var string
      */
-    protected $optionsContext = '#product-options-wrapper > fieldset';
+    protected $optionsContext = '#product-options-wrapper';
 
     /**
      * Selector for single option block
      *
      * @var string
      */
-    protected $optionElement = './div[contains(@class,"field")][%d]';
+    protected $optionElement = '#product-options-wrapper .field';
 
     /**
      * Selector for title of option
      *
      * @var string
      */
-    protected $title = './/span[1]';
+    protected $title = 'label';
 
     /**
      * Selector for required option
@@ -156,16 +156,13 @@ public function getOptions(FixtureInterface $product)
     protected function getListOptions()
     {
         $customOptions = [];
-        $context = $this->_rootElement->find($this->optionsContext);
 
-        $count = 1;
-        $optionElement = $context->find(sprintf($this->optionElement, $count), Locator::SELECTOR_XPATH);
-        while ($optionElement->isVisible()) {
-            $title = $optionElement->find($this->title, Locator::SELECTOR_XPATH)->getText();
+        $optionElements = $this->_rootElement->getElements($this->optionElement);
+        foreach ($optionElements as $optionElement) {
+            $title = $optionElement->find($this->title)->getText();
             $customOptions[$title] = $optionElement;
-            ++$count;
-            $optionElement = $context->find(sprintf($this->optionElement, $count), Locator::SELECTOR_XPATH);
         }
+
         return $customOptions;
     }