Skip to content

Commit fd46e3a

Browse files
monkeyseemonkeysee
committed
Merge remote-tracking branch 'mainline/develop' into PR_Branch
Conflicts: app/code/Magento/Backend/view/adminhtml/templates/system/info.phtml dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
2 parents 0d67220 + 9db84b2 commit fd46e3a

File tree

270 files changed

+4790
-3030
lines changed

Some content is hidden

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

270 files changed

+4790
-3030
lines changed

‎Gruntfile.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ module.exports = function (grunt) {
2323
require('load-grunt-config')(grunt, {
2424
configPath: path.join(__dirname, configDir),
2525
init: true,
26-
loadGruntTasks: {
27-
pattern: [
28-
'grunt-*'
29-
]
26+
jitGrunt: {
27+
staticMappings: {
28+
usebanner: 'grunt-banner'
29+
}
3030
}
3131
});
3232

3333
_.each({
3434
/**
3535
* Assembling tasks.
36-
* ToDo UI: define default tasks.
36+
* ToDo: define default tasks.
3737
*/
3838
default: function () {
3939
grunt.log.subhead('I\'m default task and at the moment I\'m empty, sorry :/');
@@ -43,17 +43,19 @@ module.exports = function (grunt) {
4343
* Production preparation task.
4444
*/
4545
prod: function (component) {
46-
if (component === 'setup') {
47-
grunt.task.run([
48-
'less:' + component,
49-
'autoprefixer:' + component,
50-
'cssmin:' + component,
51-
'usebanner:' + component
52-
]);
53-
}
46+
var tasks = [
47+
'less',
48+
'autoprefixer',
49+
'cssmin',
50+
'usebanner'
51+
].map(function(task){
52+
return task + ':' + component;
53+
});
5454

5555
if (typeof component === 'undefined') {
5656
grunt.log.subhead('Tip: Please make sure that u specify prod subtask. By default prod task do nothing');
57+
} else {
58+
grunt.task.run(tasks);
5759
}
5860
},
5961

‎app/code/Magento/AdminNotification/Block/System/Messages.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ public function getSystemMessageDialogJson()
123123
'autoOpen' => false,
124124
'width' => '75%',
125125
'modal' => true,
126+
'minHeight' => '0',
126127
'dialogClass' => 'ui-dialog-active ui-popup-message',
127128
'ajaxUrl' => $this->_getMessagesUrl()
128129
],

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ require([
3131
resizable: false,
3232
width: '75%',
3333
modal: true,
34+
minHeight: '0',
3435
dialogClass: 'ui-popup-message',
3536
position: {
3637
my: 'left+12.5% top',

‎app/code/Magento/Backend/Block/Widget/Grid.php

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -436,12 +436,12 @@ protected function _prepareFilterButtons()
436436
$this->getLayout()->createBlock(
437437
'Magento\Backend\Block\Widget\Button'
438438
)->setData(
439-
['label' => __('Reset Filter'), 'onclick' => $this->getJsObjectName() . '.resetFilter()', 'class' => 'action-reset']
440-
)->setDataAttribute(
441439
[
442-
'action' => 'grid-filter-reset'
440+
'label' => __('Reset Filter'),
441+
'onclick' => $this->getJsObjectName() . '.resetFilter()',
442+
'class' => 'action-reset action-tertiary'
443443
]
444-
)
444+
)->setDataAttribute(['action' => 'grid-filter-reset'])
445445
);
446446
$this->setChild(
447447
'search_button',
@@ -451,13 +451,9 @@ protected function _prepareFilterButtons()
451451
[
452452
'label' => __('Search'),
453453
'onclick' => $this->getJsObjectName() . '.doFilter()',
454-
'class' => 'task',
454+
'class' => 'action-secondary',
455455
]
456-
)->setDataAttribute(
457-
[
458-
'action' => 'grid-filter-apply'
459-
]
460-
)
456+
)->setDataAttribute(['action' => 'grid-filter-apply'])
461457
);
462458
}
463459

@@ -820,8 +816,8 @@ public function getMainButtonsHtml()
820816
{
821817
$html = '';
822818
if ($this->getColumnSet()->isFilterVisible()) {
823-
$html .= $this->getResetFilterButtonHtml();
824819
$html .= $this->getSearchButtonHtml();
820+
$html .= $this->getResetFilterButtonHtml();
825821
}
826822
return $html;
827823
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function getHtml()
5858
' value="' .
5959
$this->getEscapedValue(
6060
'from'
61-
) . '" class="input-text no-changes" placeholder="' . __(
61+
) . '" class="admin__control-text input-text no-changes" placeholder="' . __(
6262
'From'
6363
) . '" ' . $this->getUiId(
6464
'filter',
@@ -74,7 +74,7 @@ public function getHtml()
7474
' value="' .
7575
$this->getEscapedValue(
7676
'to'
77-
) . '" class="input-text no-changes" placeholder="' . __(
77+
) . '" class="input-text admin__control-text no-changes" placeholder="' . __(
7878
'To'
7979
) . '" ' . $this->getUiId(
8080
'filter',

‎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="admin__control-select no-changes">';
69+
) . 'class="no-changes admin__control-select">';
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Text extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilt
1717
*/
1818
public function getHtml()
1919
{
20-
$html = '<div class="field-100"><input type="text" name="' .
20+
$html = '<input type="text" name="' .
2121
$this->_getHtmlName() .
2222
'" id="' .
2323
$this->_getHtmlId() .
@@ -27,7 +27,7 @@ public function getHtml()
2727
$this->getUiId(
2828
'filter',
2929
$this->_getHtmlName()
30-
) . ' /></div>';
30+
) . ' />';
3131
return $html;
3232
}
3333
}

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

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ public function render(Object $row)
5252
{
5353
if ($this->getColumn()->getEditable()) {
5454
$value = $this->_getValue($row);
55-
return $value . ($this->getColumn()->getEditOnly() ? '' : ($value !=
56-
'' ? '' : '&nbsp;')) . $this->_getInputValueElement(
57-
$row
58-
);
55+
return '<div class="admin__grid-control">' .
56+
'<span class="admin__grid-control-value">' . $value . '</span>' .
57+
$this->_getInputValueElement($row) . '</div>' ;
5958
}
6059
return $this->_getValue($row);
6160
}
@@ -123,26 +122,23 @@ public function renderHeader()
123122
$dir = strtolower($this->getColumn()->getDir());
124123
$nDir = $dir == 'asc' ? 'desc' : 'asc';
125124
if ($this->getColumn()->getDir()) {
126-
$className = 'sort-arrow-' . $dir;
125+
$className = '_' . $dir . 'end';
127126
}
128-
$out = '<a href="#" name="' .
127+
$out = '<th data-sort="' .
129128
$this->getColumn()->getId() .
130-
'" title="' .
129+
'" data-direction="' .
131130
$nDir .
132-
'" class="' .
133-
$className .
134-
'">' .
135-
'<label class="sort-title" for=' .
136-
$this->getColumn()->getHtmlId() .
137-
'>' .
131+
'" class="data-grid-th _sortable ' .
132+
$className . ' ' .
133+
$this->getColumn()->getHeaderCssClass() .
134+
'"><span>' .
138135
$this->getColumn()->getHeader() .
139-
'</label></a>';
136+
'</span></th>';
140137
} else {
141-
$out = '<label for=' .
142-
$this->getColumn()->getHtmlId() .
143-
'>' .
138+
$out = '<th class="data-grid-th ' .
139+
$this->getColumn()->getHeaderCssClass() . '"><span>' .
144140
$this->getColumn()->getHeader() .
145-
'</label>';
141+
'</span></th>';
146142
}
147143
return $out;
148144
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function render(\Magento\Framework\Object $row)
5555
}
5656
}
5757

58-
$out = '<select class="action-select" onchange="varienGridAction.execute(this);">' .
58+
$out = '<select class="admin__control-select" onchange="varienGridAction.execute(this);">' .
5959
'<option value=""></option>';
6060
$i = 0;
6161
foreach ($actions as $action) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ public function renderHeader()
141141
if ($this->getColumn()->getDisabled()) {
142142
$disabled = ' disabled="disabled"';
143143
}
144-
$html = '<input type="checkbox" ';
144+
$html = '<th class="data-grid-th data-grid-actions-cell"><input type="checkbox" ';
145145
$html .= 'name="' . $this->getColumn()->getFieldName() . '" ';
146146
$html .= 'onclick="' . $this->getColumn()->getGrid()->getJsObjectName() . '.checkCheckboxes(this)" ';
147-
$html .= 'class="checkbox"' . $checked . $disabled . ' ';
148-
$html .= 'title="' . __('Select All') . '"/>';
147+
$html .= 'class="admin__control-checkbox"' . $checked . $disabled . ' ';
148+
$html .= 'title="' . __('Select All') . '"/><label></label></th>';
149149
return $html;
150150
}
151151
}

0 commit comments

Comments
 (0)