Skip to content

Commit fbfb4de

Browse files
author
Natalia Momotenko
committed
MAGETWO-31855: UI improvements
- Merge remote-tracking branch 'origin/MAGETWO-31855' into UI Conflicts: app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module.less app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/listings.less app/design/frontend/Magento/luma/Magento_Theme/web/css/source/module.less
2 parents a7818a5 + e5e076e commit fbfb4de

File tree

467 files changed

+12913
-16943
lines changed

Some content is hidden

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

467 files changed

+12913
-16943
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<?php endforeach;?>
1414
</ul>
1515
</div>
16-
<script type="text/javascript">
16+
<script>
1717
require([
1818
"jquery",
1919
"jquery/ui"

app/code/Magento/Backend/Block/Widget/Form/Container.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public function getFormHtml()
177177
public function getFormInitScripts()
178178
{
179179
if (!empty($this->_formInitScripts) && is_array($this->_formInitScripts)) {
180-
return '<script type="text/javascript">' . implode("\n", $this->_formInitScripts) . '</script>';
180+
return '<script>' . implode("\n", $this->_formInitScripts) . '</script>';
181181
}
182182
return '';
183183
}
@@ -188,7 +188,7 @@ public function getFormInitScripts()
188188
public function getFormScripts()
189189
{
190190
if (!empty($this->_formScripts) && is_array($this->_formScripts)) {
191-
return '<script type="text/javascript">' . implode("\n", $this->_formScripts) . '</script>';
191+
return '<script>' . implode("\n", $this->_formScripts) . '</script>';
192192
}
193193
return '';
194194
}

app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ protected function _toHtml()
119119
if (!$this->_depends) {
120120
return '';
121121
}
122-
return '<script type="text/javascript">
122+
return '<script>
123123
require(["mage/adminhtml/form"], function(){
124124
new FormElementDependenceController(' .
125125
$this->_getDependsJson() .

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function getHtml()
8585
' value="' .
8686
$this->_localeResolver->getLocaleCode() .
8787
'"/>';
88-
$html .= '<script type="text/javascript">
88+
$html .= '<script>
8989
require(["jquery", "mage/calendar"], function($){
9090
$("#' .
9191
$htmlId .

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public function getHtml()
129129
) . '/>' . '</div></div>';
130130
$html .= '<input type="hidden" name="' . $this->_getHtmlName() . '[locale]"' . ' value="'
131131
. $this->_localeResolver->getLocaleCode() . '"/>';
132-
$html .= '<script type="text/javascript">
132+
$html .= '<script>
133133
require(["jquery", "mage/calendar"],function($){
134134
$("#' . $htmlId . '_range").dateRange({
135135
dateFormat: "' . $format . '",

app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedIframe.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __construct(
3131
*/
3232
protected function _getDeniedIframe()
3333
{
34-
return '<script type="text/javascript">parent.window.location = \''
34+
return '<script>parent.window.location = \''
3535
. $this->_helper->getHomePageUrl() . '\';</script>';
3636
}
3737

app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</div>
3838
</fieldset>
3939
</form>
40-
<script type="text/javascript">
40+
<script>
4141
function initForm($){
4242
$('#login-form').form().validation();
4343
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ $numColumns = sizeof($this->getColumns());
4444
</table>
4545
</div>
4646
<?php if ($this->canDisplayContainer()): ?>
47-
<script type="text/javascript">
47+
<script>
4848
var deps = ['mage/adminhtml/grid'];
4949

5050
<?php if (strpos($this->getRowClickCallback(), 'order.') !== false): ?>

app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
?>
66

77
<?php if (is_array($this->getChildBlock('diagrams')->getTabsIds())) : ?>
8-
<script type="text/javascript">
8+
<script>
99
function changeDiagramsPeriod(periodObj) {
1010
periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : '';
1111
<?php foreach ($this->getChildBlock('diagrams')->getTabsIds() as $tabId): ?>

app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<?php endforeach; ?>
3131
</select>
3232
</p>
33-
<script type="text/javascript">
33+
<script>
3434
function switchStore(obj){
3535
if (obj.options[obj.selectedIndex].getAttribute('website') == 'true') {
3636
var selectionType = 'website';

0 commit comments

Comments
 (0)