Skip to content

Commit 8239220

Browse files
author
Mykhailo Miroshnikov
committed
Merge branch 'admin-styles-migration' of github.corp.ebay.com:magento-webdev/magento2ce into MAGETWO-34476
2 parents bb3b0f9 + dd5afd8 commit 8239220

File tree

44 files changed

+494
-248
lines changed

Some content is hidden

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

44 files changed

+494
-248
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,10 @@ public function getSystemMessageDialogJson()
121121
[
122122
'systemMessageDialog' => [
123123
'autoOpen' => false,
124-
'width' => 600,
125-
'ajaxUrl' => $this->_getMessagesUrl(),
124+
'width' => '75%',
125+
'modal' => true,
126+
'dialogClass' => 'ui-dialog-active',
127+
'ajaxUrl' => $this->_getMessagesUrl()
126128
],
127129
]
128130
);

‎app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<a href="<?php echo $block->getNoticeMessageUrl(); ?>"><?php echo $block->getReadDetailsText(); ?></a>
2727
</div>
28-
<span class="action close" data-dismiss="popup" title="<?php echo __('Close popup'); ?>"><?php echo __('Close'); ?></span>
28+
<span class="action close" data-dismiss="popup" title="<?php echo $block->escapeHtml(__('Close popup'));?>"><?php echo __('Close'); ?></span>
2929
</div>
3030
</div>
3131
</div>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ require([
3333
modal: true,
3434
dialogClass: 'ui-dialog-active',
3535
position: {
36-
using: function(pos) {
37-
$(this).css({
38-
"position": "absolute",
39-
"top": Math.ceil($(window).height()/2 - $(this).height()/2),
40-
"left": "12.5%"
41-
});
42-
}
36+
my: 'center top',
37+
at: 'center top',
38+
of: 'body'
39+
},
40+
open: function() {
41+
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight();
42+
$(this).closest('.ui-dialog').css('margin-top', topMargin);
4343
}
4444
});
4545
});

‎app/code/Magento/Backend/view/adminhtml/layout/admin_login.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-login" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<update handle="styles" />
1010
<body>
11-
<!-- ToDo: delete after bugfix -->
11+
<!-- @todo ui: - delete after bugfix -->
1212
<remove name="legal"/>
1313
<remove name="page.menu"/>
1414
<remove name="header"/>
@@ -18,7 +18,7 @@
1818

1919
<remove name="global.search"/>
2020
<remove name="notification.messages"/>
21-
<!-- ToDo: end -->
21+
<!-- @todo ui: - end -->
2222

2323
<move element="messages" destination="login.content" before="-"/>
2424
<move element="copyright" destination="login.footer" before="-"/>

‎app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<button
99
<?php $block->getUiId(); ?>
1010
class="action-login action-primary"
11-
title="<?php echo __('Log in')?>" type="submit">
1211
<span><?php echo __('Sign in')?></span>
1312
</button>
1413
</div>

‎app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
?>
1111
<?php switch ($block->getShowPart()):
1212
case 'logo': ?>
13-
<?php $edition = $block->getEdition() ? 'data-edition="' . $block->getEdition() . '"' : ''; ?>
13+
<?php $edition = $block->hasEdition() ? 'data-edition="' . $block->escapeHtml($block->getEdition()) . '"' : ''; ?>
1414
<?php $logoSrc = ($block->hasLogoImageSrc()) ? $block->escapeHtml($block->getLogoImageSrc()) : 'images/magento-logo.svg' ?>
1515
<a
1616
href="<?php echo $block->getHomeLink() ?>"
1717
<?php echo $edition; ?>
18-
class="logo"
19-
title="<?php echo $block->escapeHtml(__('Magento Admin Panel')) ?>">
20-
<img class="logo-img" src="<?php echo $block->getViewFileUrl($logoSrc) ?>" alt="<?php echo __('Magento Admin Panel') ?>"/>
18+
class="logo">
19+
<img class="logo-img" src="<?php echo $block->getViewFileUrl($logoSrc) ?>"
20+
alt="<?php echo $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
2121
</a>
2222
<?php break; ?>
2323
<?php case 'user': ?>

‎app/code/Magento/Bundle/view/adminhtml/web/js/bundle-product.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,20 @@ define([
149149
$selectionGrid.dialog('close');
150150
}
151151
}],
152+
position: {
153+
my: 'left top',
154+
at: 'center top',
155+
of: 'body'
156+
},
152157
open: function () {
153158
$(this).closest('.ui-dialog').addClass('ui-dialog-active');
159+
160+
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 45;
161+
$(this).closest('.ui-dialog').css('margin-top', topMargin);
154162
},
155163
close: function() {
156164
$(this).closest('.ui-dialog').removeClass('ui-dialog-active');
157165
$(this).dialog('destroy');
158-
},
159-
position: {
160-
my: "left+12.5% top",
161-
of: "body"
162166
}
163167
});
164168

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,13 @@ $categoryId = $block->getCategoryId();
5151
</div>
5252
<div id="category_tab_content"></div>
5353
</form>
54-
<div data-id="information-dialog-category" style="display: none;">
55-
<span class="information-message"><?php echo __('This operation can take much time'); ?><span>
54+
55+
<div data-id="information-dialog-category" class="messages admin__scope" style="display: none;">
56+
<div class="message message-notice">
57+
<div><?php echo __('This operation can take much time'); ?></div>
58+
</div>
5659
</div>
60+
5761
<script>
5862
require(['jquery', 'jquery/ui', "mage/mage", "mage/translate"], function($){
5963
var mageDialog = (function($) {
@@ -76,21 +80,24 @@ require(['jquery', 'jquery/ui', "mage/mage", "mage/translate"], function($){
7680
width: '75%',
7781
title: $.mage.__('Warning message'),
7882
buttons: [{
79-
text: $.mage.__('Ok'),
80-
'class' :'action-primary',
81-
click: function () {
82-
onEvent('ok', this);
83-
}
84-
}, {
85-
text: $.mage.__('Cancel'),
86-
'class' :'action-close',
87-
click: function () {
88-
onEvent('cancel', this);
89-
}
90-
83+
text: $.mage.__('Ok'),
84+
'class': 'action-primary',
85+
click: function () {
86+
onEvent('ok', this);
87+
}
88+
}, {
89+
text: $.mage.__('Cancel'),
90+
'class': 'action-close',
91+
click: function () {
92+
onEvent('cancel', this);
93+
}
9194
}],
9295
open: function () {
9396
$(this).closest('.ui-dialog').addClass('ui-dialog-active');
97+
98+
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 30;
99+
$(this).closest('.ui-dialog').css('margin-top', topMargin);
100+
94101
self.dialogOpened = true;
95102
self.callback.ok.push(function() {
96103
self.needShow = false;

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,13 @@
2929
<div id="tree-div" class="tree-wrapper"></div>
3030
</div>
3131
</div>
32-
<div data-id="information-dialog-tree" style="display: none;">
33-
<span class="messages"><?php echo __('This operation can take much time'); ?><span>
32+
33+
<div data-id="information-dialog-tree" class="messages admin__scope" style="display: none;">
34+
<div class="message message-notice">
35+
<div><?php echo __('This operation can take much time'); ?></div>
36+
</div>
3437
</div>
38+
3539
<script>
3640
var tree;
3741
require([
@@ -419,15 +423,20 @@ var mageDialog = (function($) {
419423
resizable: false,
420424
width: '75%',
421425
title: $.mage.__('Warning message'),
426+
position: {
427+
my: 'left top',
428+
at: 'center top',
429+
of: 'body'
430+
},
422431
buttons: [{
423432
text: $.mage.__('Ok'),
424-
'class' :'action-primary',
433+
'class': 'action-primary',
425434
click: function () {
426435
onEvent('ok', this);
427436
}
428437
}, {
429438
text: $.mage.__('Cancel'),
430-
'class' :'action-close',
439+
'class': 'action-close',
431440
click: function () {
432441
onEvent('cancel', this);
433442
}
@@ -436,6 +445,9 @@ var mageDialog = (function($) {
436445
open: function () {
437446
$(this).closest('.ui-dialog').addClass('ui-dialog-active');
438447
self.dialogOpened = true;
448+
449+
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 30;
450+
$(this).closest('.ui-dialog').css('margin-top', topMargin);
439451
},
440452
close: function(event, ui) {
441453
$(this).dialog('destroy');

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ define([
3030
iframe;
3131

3232
wrapper = $('<div id="create_new_attribute"/>').appendTo('body').dialog({
33+
// ToDo: refactor to a sliding panel
3334
title: 'New Attribute',
3435
width: '75%',
3536
minHeight: 650,
@@ -39,8 +40,16 @@ define([
3940
iframe.height($(this).outerHeight() + 'px');
4041
iframe.width($(this).outerWidth() + 'px');
4142
},
43+
position: {
44+
my: 'left top',
45+
at: 'center top',
46+
of: 'body'
47+
},
4248
open: function () {
4349
$(this).closest('.ui-dialog').addClass('ui-dialog-active');
50+
51+
var topMargin = jQuery(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 45;
52+
jQuery(this).closest('.ui-dialog').css('margin-top', topMargin);
4453
},
4554
close: function () {
4655
$(this).closest('.ui-dialog').removeClass('ui-dialog-active');

0 commit comments

Comments
 (0)