Skip to content
Snippets Groups Projects
Commit 257bbdf5 authored by Natalia Momotenko's avatar Natalia Momotenko
Browse files

Merge remote-tracking branch 'origin/MAGETWO-42365' into PR-4

parents 0efa2bc8 84d3c819
Branches
No related merge requests found
......@@ -108,15 +108,18 @@ class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
*/
protected function _getCheckboxHtml($value, $checked)
{
$html = '<input type="checkbox" ';
$html = '<label class="data-grid-checkbox-cell-inner" ';
$html .= ' for="id_' . $this->escapeHtml($value) . '">';
$html .= '<input type="checkbox" ';
$html .= 'name="' . $this->getColumn()->getFieldName() . '" ';
$html .= 'value="' . $this->escapeHtml($value) . '" ';
$html .= 'id="id_' . $this->escapeHtml($value) . '" ';
$html .= 'class="' .
($this->getColumn()->getInlineCss() ? $this->getColumn()->getInlineCss() : 'checkbox') .
' admin__control-checkbox' .
'"';
' admin__control-checkbox' . '"';
$html .= $checked . $this->getDisabled() . '/>';
$html .= '<label></label>';
$html .= '<label for="id_' . $this->escapeHtml($value) . '"></label>';
$html .= '</label>';
/* ToDo UI: add class="admin__field-label" after some refactoring _fields.less */
return $html;
}
......
......@@ -120,7 +120,7 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
{
$html = '<input type="text" name="' . $this->getFilterElementName(
$attribute->getAttributeCode()
) . '" class="input-text input-text-export-filter"';
) . '" class="admin__control-text input-text input-text-export-filter"';
if ($value) {
$html .= ' value="' . $this->escapeHtml($value) . '"';
}
......@@ -190,7 +190,7 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
':</strong>&nbsp;' .
'<input type="text" name="' .
$name .
'[]" class="input-text input-text-range"' .
'[]" class="admin__control-text input-text input-text-range"' .
' value="' .
$fromValue .
'"/>&nbsp;' .
......@@ -200,7 +200,7 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
) .
':</strong>&nbsp;<input type="text" name="' .
$name .
'[]" class="input-text input-text-range" value="' .
'[]" class="admin__control-text input-text input-text-range" value="' .
$toValue .
'" />';
}
......@@ -236,7 +236,7 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
$arguments = [
'name' => $this->getFilterElementName($attribute->getAttributeCode()),
'id' => $this->getFilterElementId($attribute->getAttributeCode()),
'class' => 'select select-export-filter',
'class' => 'admin__control-select select select-export-filter',
];
/** @var $selectBlock \Magento\Framework\View\Element\Html\Select */
$selectBlock = $this->_layout->createBlock(
......
......@@ -6,8 +6,8 @@
// @codingStandardsIgnoreFile
?>
<fieldset class="fieldset" id="export_filter_container" style="display:none;">
<legend class="legend">
<fieldset class="admin__fieldset" id="export_filter_container" style="display:none;">
<legend class="admin__legend">
<span><?php /* @escapeNotVerified */ echo __('Entity Attributes'); ?></span>
</legend>
<br />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment