Skip to content

Commit d363ea2

Browse files
slavvkaslavvka
committed
Merge remote-tracking branch 'mainline/develop' into BUGS
Conflicts: app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
2 parents 07b8026 + 07f9f16 commit d363ea2

File tree

156 files changed

+5468
-3800
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+5468
-3800
lines changed

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getHtml()
6666
'From'
6767
) . '" value="' . $this->getEscapedValue(
6868
'from'
69-
) . '" class="input-text no-changes" ' . $this->getUiId(
69+
) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
7070
'filter',
7171
$this->_getHtmlName(),
7272
'from'
@@ -81,7 +81,7 @@ public function getHtml()
8181
'To'
8282
) . '" value="' . $this->getEscapedValue(
8383
'to'
84-
) . '" class="input-text no-changes" ' . $this->getUiId(
84+
) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
8585
'filter',
8686
$this->_getHtmlName(),
8787
'to'

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Range.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function getHtml()
2828
'From'
2929
) . '" value="' . $this->getEscapedValue(
3030
'from'
31-
) . '" class="input-text no-changes" ' . $this->getUiId(
31+
) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
3232
'filter',
3333
$this->_getHtmlName(),
3434
'from'
@@ -43,7 +43,7 @@ public function getHtml()
4343
'To'
4444
) . '" value="' . $this->getEscapedValue(
4545
'to'
46-
) . '" class="input-text no-changes" ' . $this->getUiId(
46+
) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
4747
'filter',
4848
$this->_getHtmlName(),
4949
'to'

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getHtml()
6666
$html = '<select name="' . $this->_getHtmlName() . '" id="' . $this->_getHtmlId() . '"' . $this->getUiId(
6767
'filter',
6868
$this->_getHtmlName()
69-
) . 'class="no-changes">';
69+
) . 'class="admin__control-select no-changes">';
7070
$value = $this->getValue();
7171
foreach ($this->_getOptions() as $option) {
7272
if (is_array($option['value'])) {

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Text.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function getHtml()
2323
$this->_getHtmlId() .
2424
'" value="' .
2525
$this->getEscapedValue() .
26-
'" class="input-text no-changes"' .
26+
'" class="input-text admin__control-text no-changes"' .
2727
$this->getUiId(
2828
'filter',
2929
$this->_getHtmlName()

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function getHtml()
4444
array_unshift($options, ['value' => '', 'label' => '']);
4545
}
4646
$html = sprintf(
47-
'<select name="%s" id="%s" class="no-changes" %s>%s</select>',
47+
'<select name="%s" id="%s" class="admin__control-select no-changes" %s>%s</select>',
4848
$this->_getHtmlName(),
4949
$this->_getHtmlId(),
5050
$this->getUiId('filter', $this->_getHtmlName()),

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,11 @@ protected function _getCheckboxHtml($value, $checked)
113113
$html .= 'value="' . $this->escapeHtml($value) . '" ';
114114
$html .= 'class="' .
115115
($this->getColumn()->getInlineCss() ? $this->getColumn()->getInlineCss() : 'checkbox') .
116+
' admin__control-checkbox' .
116117
'"';
117118
$html .= $checked . $this->getDisabled() . '/>';
119+
$html .= '<label></label>';
120+
/* ToDo UI: add class="admin__field-label" after some refactoring _fields.less */
118121
return $html;
119122
}
120123

‎app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $numColumns = sizeof($block->getColumns());
1414
<?php if ($block->getCollection()): ?>
1515
<div class="dashboard-item-content">
1616
<?php if ($block->getCollection()->getSize()>0): ?>
17-
<table class="table dashboard-data" id="<?php echo $block->getId() ?>_table">
17+
<table class="table-info dashboard-data" id="<?php echo $block->getId() ?>_table">
1818
<?php
1919
/* This part is commented to remove all <col> tags from the code. */
2020
/* foreach ($block->getColumns() as $_column): ?>

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
/** @var $block \Magento\Backend\Block\Widget\Form */
1010
?>
1111
<?php /* @todo replace .form-inline with better class name */?>
12+
<?php /* ToDo UI: check if we need this wrapper in the process of global forms refactoring */ ?>
13+
1214
<div class="entry-edit form-inline">
1315
<?php echo $block->getFormHtml();?>
1416
</div>

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if (!isset($advancedLabel)) {
2222
$advancedLabel = __('Additional Settings');
2323
}
2424

25-
$cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset ' . $element->getClass();
25+
$cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset admin__fieldset ' . $element->getClass();
2626

2727
if ($isField) {
2828
$count = $element->getCountBasicChildren();
@@ -41,13 +41,13 @@ if ($isField) {
4141
<div class="fieldset-wrapper <?php echo($isCollapsable) ? 'collapsable-wrapper ' : ''; ?>"
4242
id="<?php echo $containerId ? $containerId : $id . '-wrapper';?>"
4343
data-role="<?php echo $id ?>-wrapper">
44-
<div class="fieldset-wrapper-title">
44+
<div class="fieldset-wrapper-title admin__fieldset-wrapper-title">
4545
<strong class="title"<?php echo($isCollapsable) ? ' data-toggle="collapse" data-target="#' . $id . '-content"' : ''; ?>>
4646
<span><?php echo $element->getLegend() ?></span>
4747
</strong>
4848
<?php echo $titleActions; ?>
4949
</div>
50-
<div class="fieldset-wrapper-content<?php echo($isCollapsable) ? ' collapse' : ''; ?>"
50+
<div class="fieldset-wrapper-content admin__fieldset-wrapper-content<?php echo($isCollapsable) ? ' collapse' : ''; ?>"
5151
id="<?php echo $id ?>-content"
5252
data-role="<?php echo $id ?>-content">
5353
<?php endif; ?>
@@ -69,7 +69,7 @@ if ($isField) {
6969
</div>
7070

7171

72-
<?php echo($isField) ? '<div class="control">' : ''; ?>
72+
<?php echo($isField) ? '<div class="control admin__field-control">' : ''; ?>
7373

7474
<?php if ($element->hasHtmlContent() && !$isField): ?>
7575
<?php echo $element->getHtmlContent(); ?>

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
/* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
1212
$element = $block->getElement();
1313
$note = $element->getNote() ? '<div class="note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
14-
$elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
14+
$elementBeforeLabel = $element->getExtType() == 'checkbox admin__control-checkbox' || $element->getExtType() == 'radio admin__control-radio';
1515
$addOn = $element->getBeforeElementHtml() || $element->getAfterElementHtml();
1616
$fieldId = ($element->getHtmlContainerId()) ? ' id="' . $element->getHtmlContainerId() . '"' : '';
17-
$fieldClass = "field field-{$element->getId()} {$element->getCssClass()}";
17+
$fieldClass = "admin__field field field-{$element->getId()} {$element->getCssClass()}";
1818
$fieldClass .= ($elementBeforeLabel) ? ' choice' : '';
1919
$fieldClass .= ($addOn) ? ' with-addon' : '';
20-
$fieldClass .= ($element->getRequired()) ? ' required' : '';
20+
$fieldClass .= ($element->getRequired()) ? ' required _required' : '';
2121
$fieldClass .= ($note) ? ' with-note' : '';
2222
$fieldClass .= (!$element->getLabelHtml()) ? ' no-label' : '';
2323

@@ -36,8 +36,8 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
3636
<?php echo $note ?>
3737
<?php else: ?>
3838
<?php echo $element->getLabelHtml() ?>
39-
<div class="control">
40-
<?php echo($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
39+
<div class="admin__field-control control">
40+
<?php echo($addOn) ? '<div class="admin__field admin__field-option">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
4141
<?php echo $note ?>
4242
</div>
4343
<?php endif; ?>

0 commit comments

Comments
 (0)