Skip to content

Commit 6a19508

Browse files
zanileezanilee
committed
MAGETWO-32310: Pop-ups
1 parent 0085ba0 commit 6a19508

File tree

30 files changed

+388
-199
lines changed

30 files changed

+388
-199
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/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');

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,17 @@ ProductConfigure.prototype = {
5050
minWidth: 500,
5151
width: '75%',
5252
dialogClass: 'popup-window',
53+
position: {
54+
my: 'left top',
55+
at: 'center top',
56+
of: 'body'
57+
},
5358
open: function () {
5459
jQuery(this).addClass('magento_message').css('max-height', '500px');
5560
jQuery(this).closest('.ui-dialog').addClass('ui-dialog-active');
61+
62+
var topMargin = jQuery(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 30;
63+
jQuery(this).closest('.ui-dialog').css('margin-top', topMargin);
5664
},
5765
close: function() {
5866
jQuery(this).closest('.ui-dialog').removeClass('ui-dialog-active');

‎app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,16 @@ define([
127127
width: '75%',
128128
modal: true,
129129
resizable: true,
130+
position: {
131+
my: 'left top',
132+
at: 'center top',
133+
of: 'body'
134+
},
130135
open: function () {
131136
$(this).closest('.ui-dialog').addClass('ui-dialog-active');
137+
"
138+
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 135;
139+
$(this).closest('.ui-dialog').css('margin-top', topMargin);
132140
},
133141
close: function () {
134142
$(this).closest('.ui-dialog').removeClass('ui-dialog-active');

‎app/code/Magento/Catalog/view/adminhtml/web/js/new-category-dialog.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ define([
6060
modal: true,
6161
multiselect: true,
6262
resizable: false,
63+
position: {
64+
my: 'left top',
65+
at: 'center top',
66+
of: 'body'
67+
},
6368
open: function () {
6469
// fix for suggest field - overlapping dialog z-index
6570
$('#new_category_parent-suggest').css('z-index', $.ui.dialog.maxZ + 1);
@@ -70,6 +75,9 @@ define([
7075
}
7176
$('#new_category_messages').html('');
7277
$(this).closest('.ui-dialog').addClass('ui-dialog-active');
78+
79+
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 15;
80+
$(this).closest('.ui-dialog').css('margin-top', topMargin);
7381
},
7482
close: function () {
7583
$('#new_category_name, #new_category_parent-suggest').val('');

0 commit comments

Comments
 (0)