Skip to content

Commit 1c7bbd1

Browse files
author
Volodymyr Zaets
committed
Merge remote-tracking branch 'origin/MAGETWO-44477' into PR
2 parents 3253282 + bf02b8a commit 1c7bbd1

File tree

2 files changed

+128
-187
lines changed

2 files changed

+128
-187
lines changed

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

Lines changed: 104 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -8,164 +8,132 @@
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">
13-
<div class="popup-inner">
14-
<div class="popup-header">
15-
<div class="popup-title"><?php /* @escapeNotVerified */ echo __('Warning') ?></div>
16-
</div>
17-
<div class="popup-content">
18-
<div class="messages">
19-
<div class="message message-warning">
20-
<p><?php /* @escapeNotVerified */ echo __('You will lose any data created since the backup was made, including admin users, customers and orders.')?></p>
21-
<p><?php /* @escapeNotVerified */ echo __('Are you sure you want to continue?')?></p>
11+
<script type="text/x-magento-template" id="rollback-warning-template">
12+
<p><?php /* @escapeNotVerified */ echo __('You will lose any data created since the backup was made, including admin users, customers and orders.')?></p>
13+
<p><?php /* @escapeNotVerified */ echo __('Are you sure you want to continue?')?></p>
14+
</script>
15+
<script type="text/x-magento-template" id="backup-options-template">
16+
<div class="backup-messages" style="display: none;">
17+
<div class="messages"></div>
18+
</div>
19+
<div class="messages">
20+
<div class="message message-warning">
21+
<?php /* @escapeNotVerified */ echo __('This may take a few moments.')?>
22+
<?php /* @escapeNotVerified */ echo __('Be sure your store is in maintenance mode during backup.')?></div>
23+
</div>
24+
<form action="" method="post" id="backup-form" class="form-inline">
25+
<fieldset class="admin__fieldset form-list question">
26+
<div class="admin__field field _required">
27+
<label for="backup_name" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Backup Name')?></span></label>
28+
<div class="admin__field-control">
29+
<input type="text" name="backup_name" id="backup_name"
30+
class="admin__control-text required-entry validate-alphanum-with-spaces validate-length maximum-length-50"
31+
maxlength="50" />
32+
<div class="admin__field-note">
33+
<?php /* @escapeNotVerified */ echo __('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.'); ?>
2234
</div>
2335
</div>
36+
</div>
2437

25-
<div class="actions">
26-
<button type="button" class="action primary" onclick="backup.requestPassword()"><?php /* @escapeNotVerified */ echo __('OK')?></button>
27-
<button type="button" class="action cancel" onclick="backup.hidePopups()"><?php /* @escapeNotVerified */ echo __('Cancel')?></button>
38+
<div class="admin__field field maintenance-checkbox-container">
39+
<label for="backup_maintenance_mode" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Maintenance mode')?></span></label>
40+
<div class="admin__field-control">
41+
<div class="admin__field-option">
42+
<input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="backup_maintenance_mode"/>
43+
<label class="admin__field-label" for="backup_maintenance_mode"><?php /* @escapeNotVerified */ echo __('Please put your store into maintenance mode during backup.')?></label>
44+
</div>
2845
</div>
2946
</div>
30-
</div>
31-
</div>
32-
</div>
3347

34-
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="backup-warning" style="display: none;">
35-
<div class="popup">
36-
<div class="popup-inner">
37-
<div class="popup-header">
38-
<div class="popup-title"><?php /* @escapeNotVerified */ echo __('Warning') ?></div>
39-
</div>
40-
<div class="popup-content">
41-
<div class="messages">
42-
<div class="message message-warning">
43-
<?php /* @escapeNotVerified */ echo __("It will take time to create a backup. ")?><?php /* @escapeNotVerified */ echo __('Please wait while we create your backup.')?><br>
44-
<?php /* @escapeNotVerified */ echo __('Are you sure you want to continue?')?>
48+
<div class="admin__field field maintenance-checkbox-container" id="exclude-media-checkbox-container" style="display: none;">
49+
<label for="exclude_media" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Exclude')?></span></label>
50+
<div class="admin__field-control">
51+
<div class="admin__field-option">
52+
<input class="admin__control-checkbox" type="checkbox" name="exclude_media" value="1" id="exclude_media"/>
53+
<label class="admin__field-label" for="exclude_media"><?php /* @escapeNotVerified */ echo __('Exclude media folder from backup') ?></label>
4554
</div>
4655
</div>
47-
<div class="actions">
48-
<button type="button" class="action primary" onclick="backup.requestBackupOptions()"><?php /* @escapeNotVerified */ echo __('OK')?></button>
49-
<button type="button" class="action cancel" onclick="backup.hidePopups()"><?php /* @escapeNotVerified */ echo __('Cancel')?></button>
50-
</div>
5156
</div>
57+
</fieldset>
58+
</form>
59+
</script>
60+
61+
<script type="text/x-magento-template" id="rollback-request-password-template">
62+
<div class="backup-messages" style="display: none;">
63+
<div class="messages"></div>
64+
</div>
65+
<div class="messages">
66+
<div class="message message-warning">
67+
<?php /* @escapeNotVerified */ echo __('Please enter the password to confirm rollback.')?><br>
68+
<?php /* @escapeNotVerified */ echo __('This action cannot be undone.')?>
69+
<p><?php /* @escapeNotVerified */ echo __('Are you sure you want to continue?')?></p>
5270
</div>
5371
</div>
54-
</div>
55-
56-
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="backup-options" style="display: none;">
57-
<div class="popup">
58-
<div class="popup-inner">
59-
<div class="popup-header">
60-
<div class="popup-title"><?php /* @escapeNotVerified */ echo __('Backup options') ?></div>
72+
<form action="" method="post" id="rollback-form" class="form-inline">
73+
<fieldset class="admin__fieldset password-box-container">
74+
<div class="admin__field field _required">
75+
<label for="password" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('User Password')?></span></label>
76+
<div class="admin__field-control"><input type="password" name="password" id="password" class="admin__control-text required-entry" autocomplete="off"></div>
6177
</div>
62-
<div class="popup-content">
63-
<div class="backup-messages" style="display: none;"><div class="messages"></div></div>
64-
<div class="messages">
65-
<div class="message message-warning">
66-
<?php /* @escapeNotVerified */ echo __('This may take a few moments.')?>
67-
<?php /* @escapeNotVerified */ echo __('Be sure your store is in maintenance mode during backup.')?></div>
68-
</div>
69-
<form action="" method="post" id="backup-form" class="form-inline">
70-
<fieldset class="admin__fieldset form-list question">
71-
<div class="admin__field field _required">
72-
<label for="backup_name" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Backup Name')?></span></label>
73-
<div class="admin__field-control">
74-
<input type="text" name="backup_name" id="backup_name"
75-
class="admin__control-text required-entry validate-alphanum-with-spaces validate-length maximum-length-50"
76-
maxlength="50" />
77-
<div class="admin__field-note">
78-
<?php /* @escapeNotVerified */ echo __('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.'); ?>
79-
</div>
80-
</div>
81-
</div>
82-
83-
<div class="admin__field field maintenance-checkbox-container">
84-
<label for="backup_maintenance_mode" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Maintenance mode')?></span></label>
85-
<div class="admin__field-control">
86-
<div class="admin__field-option">
87-
<input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="backup_maintenance_mode"/>
88-
<label class="admin__field-label" for="backup_maintenance_mode"><?php /* @escapeNotVerified */ echo __('Please put your store into maintenance mode during backup.')?></label>
89-
</div>
90-
</div>
91-
</div>
9278

93-
<div class="admin__field field maintenance-checkbox-container" id="exclude-media-checkbox-container" style="display: none;">
94-
<label for="exclude_media" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Exclude')?></span></label>
95-
<div class="admin__field-control">
96-
<div class="admin__field-option">
97-
<input class="admin__control-checkbox" type="checkbox" name="exclude_media" value="1" id="exclude_media"/>
98-
<label class="admin__field-label" for="exclude_media"><?php /* @escapeNotVerified */ echo __('Exclude media folder from backup') ?></label>
99-
</div>
100-
</div>
101-
</div>
102-
</fieldset>
103-
</form>
79+
<div class="admin__field field maintenance-checkbox-container">
80+
<label for="rollback_maintenance_mode" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Maintenance mode')?></span></label>
81+
<div class="admin__field-control">
82+
<div class="admin__field-option">
83+
<input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="rollback_maintenance_mode"/>
84+
<label class="admin__field-label" for="rollback_maintenance_mode"><?php /* @escapeNotVerified */ echo __('Please put your store into maintenance mode during rollback processing.')?></label>
85+
</div>
86+
</div>
10487
</div>
105-
</div>
106-
</div>
107-
</div>
10888

109-
<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="rollback-request-password" style="display: none;">
110-
<div class="popup popup-notice">
111-
<div class="popup-inner">
112-
<div class="popup-header">
113-
<div class="popup-title"><?php /* @escapeNotVerified */ echo __('Please enter a password.') ?></div>
89+
<div class="admin__field field maintenance-checkbox-container" id="use-ftp-checkbox-row" style="display: none;">
90+
<label for="use_ftp" class="admin__field-label">
91+
<span><?php /* @escapeNotVerified */ echo __('FTP')?></span>
92+
</label>
93+
<div class="admin__field-control">
94+
<div class="admin__field-option">
95+
<input class="admin__control-checkbox" type="checkbox" name="use_ftp" value="1" id="use_ftp" onclick="backup.toggleFtpCredentialsForm(event)"/>
96+
<label class="admin__field-label" for="use_ftp"><?php /* @escapeNotVerified */ echo __('Use FTP Connection')?></label>
97+
</div>
98+
</div>
11499
</div>
115-
<div class="popup-content">
116-
<div class="backup-messages" style="display: none;"><div class="messages"></div></div>
117-
<div class="messages">
118-
<div class="message message-warning">
119-
<?php /* @escapeNotVerified */ echo __('Please enter the password to confirm rollback.')?><br>
120-
<?php /* @escapeNotVerified */ echo __('This action cannot be undone.')?>
121-
<p><?php /* @escapeNotVerified */ echo __('Are you sure you want to continue?')?></p>
100+
</fieldset>
101+
<div class="entry-edit" id="ftp-credentials-container" style="display: none;">
102+
<fieldset class="admin__fieldset">
103+
<legend class="admin__legend legend"><span><?php /* @escapeNotVerified */ echo __('FTP credentials')?></span></legend><br />
104+
<div class="admin__field field _required">
105+
<label class="admin__field-label" for="ftp_host"><span><?php /* @escapeNotVerified */ echo __('FTP Host') ?></span></label>
106+
<div class="admin__field-control">
107+
<input type="text" class="admin__control-text" name="ftp_host" id="ftp_host">
122108
</div>
123109
</div>
124-
<form action="" method="post" id="rollback-form" class="form-inline">
125-
<div class="password-box-container">
126-
127-
<div class="field required">
128-
<label for="password" class="label"><span><?php /* @escapeNotVerified */ echo __('User Password')?></span></label>
129-
<div class="control"><input type="password" name="password" id="password" class="required-entry" autocomplete="off"></div>
130-
</div>
131110

132-
<div class="field maintenance-checkbox-container">
133-
<input type="checkbox" name="maintenance_mode" value="1" id="rollback_maintenance_mode"/>
134-
<label for="rollback_maintenance_mode"><?php /* @escapeNotVerified */ echo __('Please put your store into maintenance mode during rollback processing.')?></label>
135-
</div>
136-
137-
<div class="field maintenance-checkbox-container" id="use-ftp-checkbox-row" style="display: none;">
138-
<input type="checkbox" name="use_ftp" value="1" id="use_ftp" onClick="backup.toggleFtpCredentialsForm();"/> <label for="use_ftp"><?php /* @escapeNotVerified */ echo __('Use FTP Connection')?></label>
139-
</div>
111+
<div class="admin__field field _required">
112+
<label class="admin__field-label" for="ftp_user"><span><?php /* @escapeNotVerified */ echo __('FTP Login') ?></span></label>
113+
<div class="admin__field-control">
114+
<input type="text" class="admin__control-text" name="ftp_user" id="ftp_user">
140115
</div>
141-
<div class="entry-edit" id="ftp-credentials-container" style="display: none;">
142-
<fieldset class="fieldset">
143-
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('FTP credentials')?></span></legend><br />
144-
<div class="field required">
145-
<label for="ftp_host"><span><?php /* @escapeNotVerified */ echo __('FTP Host') ?></span></label>
146-
<div class="control"><input type="text" name="ftp_host" id="ftp_host"></div>
147-
</div>
148-
149-
<div class="field required">
150-
<label for="ftp_user"><span><?php /* @escapeNotVerified */ echo __('FTP Login') ?></span></label>
151-
<div class="control"><input type="text" name="ftp_user" id="ftp_user"></div>
152-
</div>
153-
<div class="field required">
154-
<label for="ftp_pass"><span><?php /* @escapeNotVerified */ echo __('FTP Password') ?></span></label>
155-
<div class="control"><input type="password" name="ftp_pass" id="ftp_pass" autocomplete="off"></div>
156-
</div>
157-
<div class="field">
158-
<label for="ftp_path"><span><?php /* @escapeNotVerified */ echo __('Magento root directory') ?></span></label>
159-
<div class="control"><input type="text" name="ftp_path" id="ftp_path"></div>
160-
</div>
161-
</fieldset>
116+
</div>
117+
<div class="admin__field field _required">
118+
<label class="admin__field-label" for="ftp_pass">
119+
<span><?php /* @escapeNotVerified */ echo __('FTP Password') ?></span>
120+
</label>
121+
<div class="admin__field-control">
122+
<input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass" autocomplete="off">
162123
</div>
163-
</form>
164-
</div>
124+
</div>
125+
<div class="admin__field field">
126+
<label class="admin__field-label" for="ftp_path">
127+
<span><?php /* @escapeNotVerified */ echo __('Magento root directory') ?></span>
128+
</label>
129+
<div class="admin__field-control">
130+
<input type="text" class="admin__control-text" name="ftp_path" id="ftp_path">
131+
</div>
132+
</div>
133+
</fieldset>
165134
</div>
166-
</div>
167-
</div>
168-
135+
</form>
136+
</script>
169137
<?php
170138
$rollbackUrl = $block->getUrl('*/*/rollback');
171139
$backupUrl = $block->getUrl('*/*/create');

0 commit comments

Comments
 (0)