Merge remote-tracking branch 'mainline/develop' into BUGS

Conflicts: app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
magento · Apr 15, 2015 · d363ea2 · d363ea2
2 parents 07b8026 + 07f9f16
commit d363ea2
Show file tree

Hide file tree

Showing 156 changed files with 5,468 additions and 3,800 deletions.
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
@@ -66,7 +66,7 @@ public function getHtml()
                 'From'
             ) . '" value="' . $this->getEscapedValue(
                 'from'
-            ) . '" class="input-text no-changes"  ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes"  ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'from'
@@ -81,7 +81,7 @@ public function getHtml()
                 'To'
             ) . '" value="' . $this->getEscapedValue(
                 'to'
-            ) . '" class="input-text no-changes" ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'to'

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php
@@ -28,7 +28,7 @@ public function getHtml()
                 'From'
             ) . '" value="' . $this->getEscapedValue(
                 'from'
-            ) . '" class="input-text no-changes" ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'from'
@@ -43,7 +43,7 @@ public function getHtml()
                 'To'
             ) . '" value="' . $this->getEscapedValue(
                 'to'
-            ) . '" class="input-text no-changes" ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'to'

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php
@@ -66,7 +66,7 @@ public function getHtml()
         $html = '<select name="' . $this->_getHtmlName() . '" id="' . $this->_getHtmlId() . '"' . $this->getUiId(
             'filter',
             $this->_getHtmlName()
-        ) . 'class="no-changes">';
+        ) . 'class="admin__control-select no-changes">';
         $value = $this->getValue();
         foreach ($this->_getOptions() as $option) {
             if (is_array($option['value'])) {

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php
@@ -23,7 +23,7 @@ public function getHtml()
             $this->_getHtmlId() .
             '" value="' .
             $this->getEscapedValue() .
-            '" class="input-text no-changes"' .
+            '" class="input-text admin__control-text no-changes"' .
             $this->getUiId(
                 'filter',
                 $this->_getHtmlName()

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
@@ -44,7 +44,7 @@ public function getHtml()
             array_unshift($options, ['value' => '', 'label' => '']);
         }
         $html = sprintf(
-            '<select name="%s" id="%s" class="no-changes" %s>%s</select>',
+            '<select name="%s" id="%s" class="admin__control-select no-changes" %s>%s</select>',
             $this->_getHtmlName(),
             $this->_getHtmlId(),
             $this->getUiId('filter', $this->_getHtmlName()),

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
@@ -113,8 +113,11 @@ protected function _getCheckboxHtml($value, $checked)
         $html .= 'value="' . $this->escapeHtml($value) . '" ';
         $html .= 'class="' .
             ($this->getColumn()->getInlineCss() ? $this->getColumn()->getInlineCss() : 'checkbox') .
+            ' admin__control-checkbox' .
             '"';
         $html .= $checked . $this->getDisabled() . '/>';
+        $html .= '<label></label>';
+        /* ToDo UI: add class="admin__field-label" after some refactoring _fields.less */
         return $html;
     }
 

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 dashboard-data" id="<?php echo $block->getId() ?>_table">
+        <table class="table-info 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/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
@@ -9,6 +9,8 @@
 /** @var $block \Magento\Backend\Block\Widget\Form */
 ?>
 <?php /* @todo replace .form-inline with better class name */?>
+<?php /* ToDo UI: check if we need this wrapper in the process of global forms refactoring */ ?>
+
 <div class="entry-edit form-inline">
     <?php echo $block->getFormHtml();?>
 </div>

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
@@ -22,7 +22,7 @@ if (!isset($advancedLabel)) {
     $advancedLabel = __('Additional Settings');
 }
 
-$cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset ' . $element->getClass();
+$cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset admin__fieldset ' . $element->getClass();
 
 if ($isField) {
     $count = $element->getCountBasicChildren();
@@ -41,13 +41,13 @@ if ($isField) {
     <div class="fieldset-wrapper <?php echo($isCollapsable) ? 'collapsable-wrapper ' : ''; ?>"
         id="<?php echo $containerId ? $containerId : $id . '-wrapper';?>"
         data-role="<?php echo $id ?>-wrapper">
-        <div class="fieldset-wrapper-title">
+        <div class="fieldset-wrapper-title admin__fieldset-wrapper-title">
             <strong class="title"<?php echo($isCollapsable) ? ' data-toggle="collapse" data-target="#' . $id . '-content"' : ''; ?>>
                 <span><?php echo $element->getLegend() ?></span>
             </strong>
             <?php echo $titleActions; ?>
         </div>
-        <div class="fieldset-wrapper-content<?php echo($isCollapsable) ? ' collapse' : ''; ?>"
+        <div class="fieldset-wrapper-content admin__fieldset-wrapper-content<?php echo($isCollapsable) ? ' collapse' : ''; ?>"
             id="<?php echo $id ?>-content"
             data-role="<?php echo $id ?>-content">
 <?php endif; ?>
@@ -69,7 +69,7 @@ if ($isField) {
     </div>
 
 
-    <?php echo($isField) ? '<div class="control">' : ''; ?>
+    <?php echo($isField) ? '<div class="control admin__field-control">' : ''; ?>
 
     <?php if ($element->hasHtmlContent() && !$isField): ?>
         <?php echo $element->getHtmlContent(); ?>

diff --git a/...code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml b/...code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
@@ -11,13 +11,13 @@
 /* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
 $element = $block->getElement();
 $note = $element->getNote() ? '<div class="note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
-$elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
+$elementBeforeLabel = $element->getExtType() == 'checkbox admin__control-checkbox' || $element->getExtType() == 'radio admin__control-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 _required' : '';
 $fieldClass .= ($note) ? ' with-note' : '';
 $fieldClass .= (!$element->getLabelHtml()) ? ' no-label' : '';
 
@@ -36,8 +36,8 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
             <?php echo $note ?>
         <?php else: ?>
             <?php echo $element->getLabelHtml() ?>
-            <div class="control">
-                <?php echo($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
+            <div class="admin__field-control control">
+                <?php echo($addOn) ? '<div class="admin__field admin__field-option">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
                 <?php echo $note ?>
             </div>
         <?php endif; ?>

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -55,7 +55,7 @@ $numColumns = sizeof($block->getColumns());
                             <?php echo __('View') ?>
                             <select name="<?php echo $block->getVarNameLimit() ?>"
                                     onchange="<?php echo $block->getJsObjectName() ?>.loadByElement(this)" <?php echo $block->getUiId('per-page') ?>
-                                    class="select">
+                                    class="select admin__control-select">
                                 <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
                                     selected="selected"<?php endif; ?>>20
                                 </option>
@@ -108,11 +108,11 @@ $numColumns = sizeof($block->getColumns());
                             <a href="#" title="<?php echo __('Previous page') ?>" class="action-previous"
                                onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage - 1) ?>');return false;"><span><?php echo __('Previous page') ?></span></a>
                         <?php else: ?>
-                            <span class="action-previous disabled"><span><?php echo __('Previous page') ?></span></span>
+                            <span class="action-default action-previous disabled"><span><?php echo __('Previous page') ?></span></span>
                         <?php endif; ?>
 
                         <input type="text" name="<?php echo $block->getVarNamePage() ?>" value="<?php echo $_curPage ?>"
-                               class="input-text page"
+                               class="input-text admin__control-text page"
                                onkeypress="<?php echo $block->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')" <?php echo $block->getUiId('current-page') ?> />
 
                         <span class="pages-total">
@@ -123,7 +123,7 @@ $numColumns = sizeof($block->getColumns());
                             <a href="#" title="<?php echo __('Next page') ?>" class="action-next"
                                onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage + 1) ?>');return false;"><span><?php echo __('Next page') ?></span></a>
                         <?php else: ?>
-                            <span class="action-next disabled"><span><?php echo __('Next page') ?></span></span>
+                            <span class="action-default action-next disabled"><span><?php echo __('Next page') ?></span></span>
                         <?php endif; ?>
                         <?php if ($block->getChildBlock('grid.bottom.links')): ?>
                             <?php echo $block->getChildHtml('grid.bottom.links') ?>

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -42,7 +42,7 @@ $numColumns = sizeof($block->getColumns());
                     <label for="<?php echo $block->getId() ?>_export"
                            class="label"><?php echo __('Export to:') ?></label>
                     <select name="<?php echo $block->getId() ?>_export" id="<?php echo $block->getId() ?>_export"
-                            class="select">
+                            class="select admin__control-select">
                         <?php foreach ($block->getExportTypes() as $_type): ?>
                             <option value="<?php echo $_type->getUrl() ?>"><?php echo $_type->getLabel() ?></option>
                         <?php endforeach; ?>
@@ -63,7 +63,8 @@ $numColumns = sizeof($block->getColumns());
                     <label class="view-pages">
                         <?php echo __('View') ?>
                         <select name="<?php echo $block->getVarNameLimit() ?>"
-                                onchange="<?php echo $block->getJsObjectName() ?>.loadByElement(this)" class="select">
+                                onchange="<?php echo $block->getJsObjectName() ?>.loadByElement(this)"
+                                class="select admin__control-select">
                             <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
                                 selected="selected"<?php endif; ?>>20
                             </option>
@@ -199,11 +200,11 @@ $numColumns = sizeof($block->getColumns());
                     <a href="#" title="<?php echo __('Previous page') ?>" class="action-previous"
                        onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage - 1) ?>');return false;"><span><?php echo __('Previous page') ?></span></a>
                 <?php else: ?>
-                    <span class="action-previous disabled"><span><?php echo __('Previous page') ?></span></span>
+                    <span class="action-default action-previous disabled"><span><?php echo __('Previous page') ?></span></span>
                 <?php endif; ?>
 
                 <input type="text" name="<?php echo $block->getVarNamePage() ?>" value="<?php echo $_curPage ?>"
-                       class="input-text page"
+                       class="input-text admin__control-text page"
                        onkeypress="<?php echo $block->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')"/>
 
                 <span class="pages-total">
@@ -214,7 +215,7 @@ $numColumns = sizeof($block->getColumns());
                     <a href="#" title="<?php echo __('Next page') ?>" class="action-next"
                        onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage + 1) ?>');return false;"><span><?php echo __('Next page') ?></span></a>
                 <?php else: ?>
-                    <span class="action-next disabled"><span><?php echo __('Next page') ?></span></span>
+                    <span class="action-default action-next disabled"><span><?php echo __('Next page') ?></span></span>
                 <?php endif; ?>
                 <?php if ($block->getChildBlock('grid.bottom.links')): ?>
                     <?php echo $block->getChildHtml('grid.bottom.links') ?>

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,15 +11,13 @@
 <?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 bundle<?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
-    <legend class="legend"><span><?php echo __('Bundle Items') ?></span></legend><br />
-    <div class="fields options">
-        <?php foreach ($options as $option) : ?>
-            <?php if ($option->getSelections()) : ?>
-                <?php echo $block->getOptionHtml($option); ?>
-            <?php endif; ?>
-        <?php endforeach; ?>
-    </div>
+<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()) : ?>
+            <?php echo $block->getOptionHtml($option); ?>
+        <?php endif; ?>
+    <?php endforeach; ?>
 </fieldset>
 
 <script>