Merge pull request #259 from magento-webdev/WD

[UI] Sprint 36 + Bugs
magento · Apr 29, 2015 · a307ea0 · a307ea0
2 parents 237cbca + bad2d47
commit a307ea0
Show file tree

Hide file tree

Showing 104 changed files with 2,761 additions and 1,973 deletions.
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -104,7 +104,7 @@ public function getHtml()
         $html =
             '<div class="range" id="' . $htmlId . '_range"><div class="range-line date">' . '<input type="text" name="'
             . $this->_getHtmlName() . '[from]" id="' . $htmlId . '_from"' . ' value="' . $this->getEscapedValue('from')
-            . '" class="input-text no-changes" placeholder="' . __(
+            . '" class="input-text admin__control-text no-changes" placeholder="' . __(
                 'From'
             ) . '" ' . $this->getUiId(
                 'filter',
@@ -114,7 +114,7 @@ public function getHtml()
         $html .= '<div class="range-line date">' . '<input type="text" name="' . $this->_getHtmlName() . '[to]" id="'
             . $htmlId . '_to"' . ' value="' . $this->getEscapedValue(
                 'to'
-            ) . '" class="input-text no-changes" placeholder="' . __(
+            ) . '" class="input-text admin__control-text no-changes" placeholder="' . __(
                 'To'
             ) . '" ' . $this->getUiId(
                 'filter',

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
@@ -14,7 +14,7 @@ $numColumns = sizeof($block->getColumns());
 <?php if ($block->getCollection()): ?>
 <div class="dashboard-item-content">
     <?php if ($block->getCollection()->getSize()>0): ?>
-        <table class="table-info dashboard-data" id="<?php echo $block->getId() ?>_table">
+        <table class="admin__table-primary dashboard-data" id="<?php echo $block->getId() ?>_table">
             <?php
             /* This part is commented to remove all <col> tags from the code. */
             /* foreach ($block->getColumns() as $_column): ?>

diff --git a/...e/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml b/...e/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
@@ -11,7 +11,8 @@
 <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle */ ?>
 <?php $options = $block->decorateArray($block->getOptions()); ?>
 <?php if (count($options)): ?>
-<fieldset id="catalog_product_composite_configure_fields_bundle" class="fieldset admin__fieldset composite-bundle <?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
+<fieldset id="catalog_product_composite_configure_fields_bundle"
+          class="fieldset admin__fieldset composite-bundle<?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
     <legend class="legend admin__legend"><span><?php echo __('Bundle Items') ?></span></legend><br />
     <?php foreach ($options as $option) : ?>
         <?php if ($option->getSelections()) : ?>

diff --git a/...code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml b/...code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
@@ -50,8 +50,8 @@
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -67,46 +67,46 @@
         </td>
         <td class="col-ordered-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
+                        <th><?php echo __('Ordered') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
                     <tr>
-                        <td><?php echo __('Invoiced') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></strong></td>
+                        <th><?php echo __('Invoiced') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
                     <tr>
-                        <td><?php echo __('Refunded') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></strong></td>
+                        <th><?php echo __('Refunded') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
                     <tr>
-                        <td><?php echo __('Canceled') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></strong></td>
+                        <th><?php echo __('Canceled') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
+                        <th><?php echo __('Ordered') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -118,17 +118,24 @@
         <td class="col-return-to-stock">
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?php if ($block->canReturnItemToStock($_item)) : ?>
-                    <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]" value="1"<?php if ($_item->getBackToStock()):?> checked="checked"<?php endif;?> />
+                    <input type="checkbox"
+                           class="admin__control-checkbox"
+                           name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]"
+                           value="1"<?php if ($_item->getBackToStock()):?> checked="checked"<?php endif;?> />
+                    <label class="admin__field-label"></label>
                 <?php endif; ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <?php endif; ?>
-        <td class="col-refund">
+        <td class="col-refund col-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?php if ($block->canEditQty()) : ?>
-                    <input type="text" class="input-text qty-input" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]" value="<?php echo $_item->getQty()*1 ?>" />
+                    <input type="text"
+                           class="input-text admin__control-text qty-input"
+                           name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]"
+                           value="<?php echo $_item->getQty()*1 ?>" />
                 <?php else: ?>
                     <?php echo $_item->getQty()*1 ?>
                 <?php endif; ?>

diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
@@ -48,8 +48,8 @@
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>

diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
@@ -49,8 +49,8 @@
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -68,46 +68,46 @@
         </td>
         <td class="col-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
+                        <th><?php echo __('Ordered') ?></th>
                         <td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
                     <tr>
-                        <td><?php echo __('Invoiced') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></strong></td>
+                        <th><?php echo __('Invoiced') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
                     <tr>
-                        <td><?php echo __('Refunded') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></strong></td>
+                        <th><?php echo __('Refunded') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
                     <tr>
-                        <td><?php echo __('Canceled') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></strong></td>
+                        <th><?php echo __('Canceled') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></strong></td>
+                        <th><?php echo __('Ordered') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -118,7 +118,10 @@
         <td class="col-qty-invoice">
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?php if ($block->canEditQty()) : ?>
-                    <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>" />
+                    <input type="text"
+                           class="input-text admin__control-text qty-input"
+                           name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
+                           value="<?php echo $_item->getQty()*1 ?>" />
                 <?php else : ?>
                     <?php echo $_item->getQty()*1 ?>
                 <?php endif; ?>

diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
@@ -48,8 +48,8 @@
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         <?php else: ?>

diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
@@ -53,8 +53,8 @@
             <div class="product-title" id="order_item_<?php echo $_item->getId() ?>_title">
                 <?php echo $block->escapeHtml($_item->getName()) ?>
             </div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -86,46 +86,46 @@
         </td>
         <td class="col-ordered-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
-                        <td><strong><?php echo $_item->getQtyOrdered()*1 ?></strong></td>
+                        <th><?php echo __('Ordered') ?></th>
+                        <td><?php echo $_item->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getQtyInvoiced()): ?>
                     <tr>
-                        <td><?php echo __('Invoiced') ?></td>
-                        <td><strong><?php echo $_item->getQtyInvoiced()*1 ?></strong></td>
+                        <th><?php echo __('Invoiced') ?></th>
+                        <td><?php echo $_item->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyRefunded()): ?>
                     <tr>
-                        <td><?php echo __('Refunded') ?></td>
-                        <td><strong><?php echo $_item->getQtyRefunded()*1 ?></strong></td>
+                        <th><?php echo __('Refunded') ?></th>
+                        <td><?php echo $_item->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyCanceled()): ?>
                     <tr>
-                        <td><?php echo __('Canceled') ?></td>
-                        <td><strong><?php echo $_item->getQtyCanceled()*1 ?></strong></td>
+                        <th><?php echo __('Canceled') ?></th>
+                        <td><?php echo $_item->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
-                <table cellspacing="0" class="qty-table">
+                <table class="data-table qty-table">
                     <tr>
-                        <td><?php echo __('Ordered') ?></td>
-                        <td><strong><?php echo $_item->getQtyOrdered()*1 ?></strong></td>
+                        <th><?php echo __('Ordered') ?></th>
+                        <td><?php echo $_item->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getQtyShipped()): ?>
                     <tr>
-                        <td><?php echo __('Shipped') ?></td>
-                        <td><strong><?php echo $_item->getQtyShipped()*1 ?></strong></td>
+                        <th><?php echo __('Shipped') ?></th>
+                        <td><?php echo $_item->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>

diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
@@ -43,8 +43,8 @@
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -60,7 +60,10 @@
         </td>
         <td class="col-qty last">
             <?php if ($block->isShipmentSeparately($_item)): ?>
-                <input type="text" class="input-text" name="shipment[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>" />
+                <input type="text"
+                       class="input-text admin__control-text"
+                       name="shipment[items][<?php echo $_item->getOrderItemId() ?>]"
+                       value="<?php echo $_item->getQty()*1 ?>" />
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>

diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
@@ -43,8 +43,8 @@
         <?php if (!$_item->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
-            <div>
-                <strong><?php echo __('SKU') ?>:</strong>
+            <div class="product-sku-block">
+                <span><?php echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>