Skip to content

Commit e28caa0

Browse files
committed
MAGETWO-32310: Pop-ups
1 parent 85c56cb commit e28caa0

File tree

53 files changed

+1554
-562
lines changed

Some content is hidden

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

53 files changed

+1554
-562
lines changed

app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
*/
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
9-
<head>
10-
<css src="Magento_Theme::prototype/magento.css"/>
11-
</head>
129
<body>
1310
<referenceContainer name="notifications">
1411
<block class="Magento\AdminNotification\Block\System\Messages" name="system_messages" as="system_messages" before="-" template="Magento_AdminNotification::system/messages.phtml"/>

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,20 @@
1212
* @see \Magento\AdminNotification\Block\Window
1313
*/
1414
?>
15-
<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
15+
<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification admin__scope">
1616
<div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
1717
<div class="popup-inner">
18-
<header class="popup-header">
19-
<h2 class="popup-title"><?php echo $block->getHeaderText(); ?></h2>
20-
</header>
18+
<div class="popup-header">
19+
<div class="popup-title"><?php echo $block->getHeaderText(); ?></div>
20+
</div>
2121
<div class="popup-content">
2222
<span><?php echo $block->getSeverityText();?></span>
23+
2324
<p class="message-text"><?php echo $block->getNoticeMessageText(); ?></p>
2425

2526
<a href="<?php echo $block->getNoticeMessageUrl(); ?>"><?php echo $block->getReadDetailsText(); ?></a>
2627
</div>
27-
<span class="close" data-dismiss="popup" title="<?php echo __('Close popup'); ?>"><?php echo __('Close'); ?></span>
28+
<span class="action close" data-dismiss="popup" title="<?php echo __('Close popup'); ?>"><?php echo __('Close'); ?></span>
2829
</div>
2930
</div>
3031
</div>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,19 @@ require([
2929
$("#system_messages_list").dialog({
3030
autoOpen: true,
3131
resizable: false,
32-
width: 650,
32+
width: '75%',
33+
modal: true,
34+
dialogClass: 'ui-dialog-active',
3335
position: {
3436
using: function(pos) {
3537
$(this).css({
3638
"position": "absolute",
3739
"top": Math.ceil($(window).height()/2 - $(this).height()/2),
38-
"left": pos.left
40+
"left": "12.5%"
3941
});
4042
}
4143
}
4244
});
4345
});
44-
4546
});
4647
</script>

app/code/Magento/Backend/Block/Widget/Button.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function getAttributesHtml()
5959
$title = $this->getLabel();
6060
}
6161
$classes = [];
62-
$classes[] = 'action-';
62+
$classes[] = 'action-default';
6363
$classes[] = 'scalable';
6464
if ($this->getClass()) {
6565
$classes[] = $this->getClass();

app/code/Magento/Backend/view/adminhtml/layout/editor.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<head>
1010
<link src="Magento_Backend::js/bootstrap/editor.js"/>
1111
<css src="prototype/windows/themes/default.css"/>
12-
<css src="Magento_Theme::prototype/magento.css"/>
1312
</head>
1413
<body/>
1514
</page>

app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml

Lines changed: 108 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -8,124 +8,161 @@
88

99
?>
1010
<!-- TODO: refactor form styles and js -->
11-
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="rollback-warning" style="display: none;">
12-
<div class="popup popup-notice">
11+
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="rollback-warning" style="display: none;">
12+
<div class="popup">
1313
<div class="popup-inner">
14-
<header class="popup-header">
15-
<h2 class="popup-title"><?php echo __('Warning') ?></h2>
16-
</header>
14+
<div class="popup-header">
15+
<div class="popup-title"><?php echo __('Warning') ?></div>
16+
</div>
1717
<div class="popup-content">
18-
<p class="message-text"><?php echo __('Any data created since the backup was made will be lost including admin users, customers and orders.')?></p>
19-
<p class="message-text"><?php echo __('Are you sure you want to proceed?')?></p>
20-
<button type="button" onclick="backup.requestPassword()"><?php echo __('OK')?></button>
21-
<button type="button" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
18+
<div class="messages">
19+
<div class="message message-warning">
20+
<p><?php echo __('Any data created since the backup was made will be lost including admin users, customers and orders.')?></p>
21+
<p><?php echo __('Are you sure you want to proceed?')?></p>
22+
</div>
23+
</div>
24+
25+
<div class="actions">
26+
<button type="button" class="action primary" onclick="backup.requestPassword()"><?php echo __('OK')?></button>
27+
<button type="button" class="action cancel" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
28+
</div>
2229
</div>
2330
</div>
2431
</div>
2532
</div>
2633

27-
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="backup-warning" style="display: none;">
28-
<div class="popup popup-notice">
34+
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="backup-warning" style="display: none;">
35+
<div class="popup">
2936
<div class="popup-inner">
30-
<header class="popup-header">
31-
<h2 class="popup-title"><?php echo __('Warning') ?></h2>
32-
</header>
37+
<div class="popup-header">
38+
<div class="popup-title"><?php echo __('Warning') ?></div>
39+
</div>
3340
<div class="popup-content">
34-
<p class="message-text">
35-
<?php echo __("It will take time to create a backup.")?><br>
36-
<?php echo __('Please wait until the action ends.')?><br>
37-
<?php echo __('Are you sure you want to continue?')?>
38-
</p>
39-
<button type="button" onclick="backup.requestBackupOptions()"><?php echo __('OK')?></button>
40-
<button type="button" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
41+
<div class="messages">
42+
<div class="message message-warning">
43+
<?php echo __("It will take time to create a backup. ")?><?php echo __('Please wait until the action ends.')?><br>
44+
<?php echo __('Are you sure you want to continue?')?>
45+
</div>
46+
</div>
47+
<div class="actions">
48+
<button type="button" class="action primary" onclick="backup.requestBackupOptions()"><?php echo __('OK')?></button>
49+
<button type="button" class="action cancel" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
50+
</div>
4151
</div>
4252
</div>
4353
</div>
4454
</div>
4555

46-
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="backup-options" style="display: none;">
47-
<div class="popup popup-notice">
56+
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="backup-options" style="display: none;">
57+
<div class="popup">
4858
<div class="popup-inner">
49-
<header class="popup-header">
50-
<h2 class="popup-title"><?php echo __('Backup options') ?></h2>
51-
</header>
59+
<div class="popup-header">
60+
<div class="popup-title"><?php echo __('Backup options') ?></div>
61+
</div>
5262
<div class="popup-content">
5363
<div class="backup-messages" style="display: none;"><div class="messages"></div></div>
54-
<p class="message-text"><?php echo __('Please specify backup creation option.')?></p>
55-
<form action="" method="post" id="backup-form">
56-
<div class="form-list question">
57-
58-
<label for="backup_name" class="nobr"><?php echo __('Backup Name')?></label>
59-
<input type="text" name="backup_name" id="backup_name" class="required-entry validate-alphanum-with-spaces validate-length maximum-length-50" maxlength="50" />
60-
<div class="note"><?php echo __('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.'); ?></div>
64+
<div class="messages">
65+
<div class="message message-warning"><?php echo __('Please specify backup creation option.')?></div>
66+
</div>
67+
<form action="" method="post" id="backup-form" class="form-inline">
68+
<fieldset class="fieldset form-list question">
69+
<div class="field">
70+
<label for="backup_name" class="label"><span><?php echo __('Backup Name')?></span></label>
71+
<div class="control">
72+
<input type="text" name="backup_name" id="backup_name"
73+
class="required-entry validate-alphanum-with-spaces validate-length maximum-length-50"
74+
maxlength="50" />
75+
<div class="note">
76+
<?php echo __('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.'); ?>
77+
</div>
78+
</div>
79+
</div>
6180

62-
<div class="maintenance-checkbox-container">
63-
<input type="checkbox" name="maintenance_mode" value="1" id="backup_maintenance_mode"/>
64-
<label for="backup_maintenance_mode"><?php echo __('Please put your store into maintenance mode during backup.')?></label>
81+
<div class="field maintenance-checkbox-container">
82+
<div class="control">
83+
<input type="checkbox" name="maintenance_mode" value="1" id="backup_maintenance_mode"/>
84+
<label for="backup_maintenance_mode"><?php echo __('Please put your store into maintenance mode during backup.')?></label>
85+
</div>
6586
</div>
6687

67-
<div id="exclude-media-checkbox-container" style="display: none;">
68-
<input type="checkbox" name="exclude_media" value="1" id="exclude_media"/>
69-
<label for="exclude_media"><?php echo __('Exclude media folder from backup')?></label>
88+
<div class="field maintenance-checkbox-container" id="exclude-media-checkbox-container" style="display: none;">
89+
<div class="control">
90+
<input type="checkbox" name="exclude_media" value="1" id="exclude_media"/>
91+
<label for="exclude_media"><?php echo __('Exclude media folder from backup') ?></label>
92+
</div>
7093
</div>
71-
</div>
94+
</fieldset>
7295
</form>
7396

74-
<button type="button" data-mage-init='{"button":{"event":"submit","target":"#backup-form"}}'><?php echo __('OK')?></button>
75-
<button type="button" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
97+
<div class="actions">
98+
<button type="button" class="action primary" data-mage-init='{"button":{"event":"submit","target":"#backup-form"}}'><?php echo __('OK')?></button>
99+
<button type="button" class="action cancel" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
100+
</div>
76101
</div>
77102
</div>
78103
</div>
79104
</div>
80105

81-
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="rollback-request-password" style="display: none;">
106+
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="rollback-request-password" style="display: none;">
82107
<div class="popup popup-notice">
83108
<div class="popup-inner">
84-
<header class="popup-header">
85-
<h2 class="popup-title"><?php echo __('Please enter a password.') ?></h2>
86-
</header>
109+
<div class="popup-header">
110+
<div class="popup-title"><?php echo __('Please enter a password.') ?></div>
111+
</div>
87112
<div class="popup-content">
88113
<div class="backup-messages" style="display: none;"><div class="messages"></div></div>
89-
<p class="message-text">
90-
<?php echo __('Please enter the password to confirm rollback.')?><br>
91-
<?php echo __('This action cannot be undone.')?>
92-
</p>
93-
<p class="message-text"><?php echo __('Are you sure you want to proceed?')?></p>
94-
<form action="" method="post" id="rollback-form">
114+
<div class="messages">
115+
<div class="message message-warning">
116+
<?php echo __('Please enter the password to confirm rollback.')?><br>
117+
<?php echo __('This action cannot be undone.')?>
118+
<p><?php echo __('Are you sure you want to proceed?')?></p>
119+
</div>
120+
</div>
121+
<form action="" method="post" id="rollback-form" class="form-inline">
95122
<div class="password-box-container">
96123

97-
<label for="password" class="nobr"><?php echo __('User Password')?> <span class="required">*</span></label>
98-
<input type="password" name="password" id="password" class="required-entry">
124+
<div class="field required">
125+
<label for="password" class="label"><span><?php echo __('User Password')?></span></label>
126+
<div class="control"><input type="password" name="password" id="password" class="required-entry"></div>
127+
</div>
99128

100-
<div class="maintenance-checkbox-container">
129+
<div class="field maintenance-checkbox-container">
101130
<input type="checkbox" name="maintenance_mode" value="1" id="rollback_maintenance_mode"/>
102131
<label for="rollback_maintenance_mode"><?php echo __('Please put your store into maintenance mode during rollback processing.')?></label>
103132
</div>
104133

105-
<div id="use-ftp-checkbox-row" style="display: none;">
134+
<div class="field maintenance-checkbox-container" id="use-ftp-checkbox-row" style="display: none;">
106135
<input type="checkbox" name="use_ftp" value="1" id="use_ftp" onClick="backup.toggleFtpCredentialsForm();"/> <label for="use_ftp"><?php echo __('Use FTP Connection')?></label>
107136
</div>
108137
</div>
109138
<div class="entry-edit" id="ftp-credentials-container" style="display: none;">
110-
<h4><?php echo __('FTP credentials')?></h4>
111-
<fieldset>
112-
<label for="ftp_host"><?php echo __('FTP Host')?> <span class="required">*</span></label>
113-
<input type="text" name="ftp_host" id="ftp_host">
114-
<br>
115-
<label for="ftp_user"><?php echo __('FTP Login')?> <span class="required">*</span></label>
116-
<input type="text" name="ftp_user" id="ftp_user">
117-
<br>
118-
<label for="ftp_pass"><?php echo __('FTP Password')?> <span class="required">*</span></label>
119-
<input type="password" name="ftp_pass" id="ftp_pass">
120-
<br>
121-
<label for="ftp_path"><?php echo __('Magento root directory')?></label>
122-
<input type="text" name="ftp_path" id="ftp_path">
139+
<fieldset class="fieldset">
140+
<legend class="legend"><span><?php echo __('FTP credentials')?></span></legend><br />
141+
<div class="field required">
142+
<label for="ftp_host"><span><?php echo __('FTP Host') ?></span></label>
143+
<div class="control"><input type="text" name="ftp_host" id="ftp_host"></div>
144+
</div>
145+
146+
<div class="field required">
147+
<label for="ftp_user"><span><?php echo __('FTP Login') ?></span></label>
148+
<div class="control"><input type="text" name="ftp_user" id="ftp_user"></div>
149+
</div>
150+
<div class="field required">
151+
<label for="ftp_pass"><span><?php echo __('FTP Password') ?></span></label>
152+
<div class="control"><input type="password" name="ftp_pass" id="ftp_pass"></div>
153+
</div>
154+
<div class="field">
155+
<label for="ftp_path"><span><?php echo __('Magento root directory') ?></span></label>
156+
<div class="control"><input type="text" name="ftp_path" id="ftp_path"></div>
157+
</div>
123158
</fieldset>
124159
</div>
125160
</form>
126161

127-
<button type="button" data-mage-init='{"button":{"event":"submit","target":"#rollback-form"}}'><?php echo __('OK')?></button>
128-
<button type="button" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
162+
<div class="actions">
163+
<button type="button" class="action primary" data-mage-init='{"button":{"event":"submit","target":"#rollback-form"}}'><?php echo __('OK')?></button>
164+
<button type="button" class="action cancel" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
165+
</div>
129166
</div>
130167
</div>
131168
</div>

0 commit comments

Comments
 (0)