Skip to content

Commit bce20df

Browse files
author
Korshenko, Olexii(okorshenko)
committed
Merge pull request #2 from magento-vanilla/PR
[Vanilla] Stories + Tasks + Bugs
2 parents fcaeea9 + e364ebe commit bce20df

File tree

411 files changed

+10437
-10816
lines changed

Some content is hidden

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

411 files changed

+10437
-10816
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,8 @@ public function getSystemMessageDialogJson()
120120
return $this->jsonHelper->jsonEncode(
121121
[
122122
'systemMessageDialog' => [
123-
'autoOpen' => false,
124-
'width' => '75%',
125-
'modal' => true,
126-
'minHeight' => '0',
127-
'dialogClass' => 'ui-dialog-active ui-popup-message',
123+
'buttons' => [],
124+
'modalClass' => 'ui-dialog-active ui-popup-message modal-system-messages',
128125
'ajaxUrl' => $this->_getMessagesUrl()
129126
],
130127
]

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

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
?>
1010
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
1111

12-
<div style="display:none" id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
13-
<ul class="message-system-list">
12+
<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
13+
<ul class="message-system-list messages">
1414
<?php foreach ($block->getUnreadMessages() as $message): ?>
1515
<li class="message message-warning <?php /* @escapeNotVerified */ echo $block->getItemClass($message);?>">
1616
<?php /* @escapeNotVerified */ echo $message->getText();?>
@@ -22,29 +22,17 @@
2222
<script>
2323
require([
2424
"jquery",
25-
"jquery/ui"
25+
"Magento_Ui/js/modal/modal"
2626
], function($){
27-
28-
$(function() {
29-
$("#system_messages_list").dialog({
30-
autoOpen: true,
31-
resizable: false,
32-
width: '75%',
33-
modal: true,
34-
minHeight: '0',
35-
dialogClass: 'ui-popup-message',
36-
position: {
37-
my: 'left+12.5% top',
38-
at: 'center top',
39-
of: 'body'
40-
},
41-
open: function() {
42-
$(this).closest('.ui-dialog').addClass('ui-dialog-active');
43-
44-
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 10;
45-
$(this).closest('.ui-dialog').css('margin-top', topMargin);
46-
}
27+
if (this.modal) {
28+
this.modal.html($('[data-role="system_messages_list"]').html());
29+
} else {
30+
this.modal = $('[data-role="system_messages_list"]').modal({
31+
modalClass: 'modal-system-messages ui-popup-message',
32+
type: 'popup',
33+
buttons: []
4734
});
48-
});
35+
}
36+
this.modal.modal('openModal');
4937
});
5038
</script>

‎app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
define([
66
'jquery',
77
'mage/template',
8-
'jquery/ui'
8+
'jquery/ui',
9+
'Magento_Ui/js/modal/modal'
910
], function ($, mageTemplate) {
1011
'use strict';
1112

12-
$.widget('mage.systemMessageDialog', $.ui.dialog, {
13+
$.widget('mage.systemMessageDialog', $.mage.modal, {
1314
options: {
15+
modalClass: 'modal-system-messages',
1416
systemMessageTemplate:
1517
'<% _.each(data.items, function(item) { %>' +
1618
'<li class="message message-warning <% if (item.severity == 1) { %>error<% } else { %>warning<% } %>">' +
@@ -19,8 +21,14 @@ define([
1921
'<% }); %>'
2022
},
2123

22-
open: function (severity) {
24+
_create: function() {
25+
this.options.title = $('#message-system-all').attr('title');
26+
this._super();
27+
},
28+
29+
openModal: function (severity) {
2330
var superMethod = $.proxy(this._super, this);
31+
//this.modal.options
2432

2533
$.ajax({
2634
url: this.options.ajaxUrl,
@@ -47,16 +55,19 @@ define([
4755
}, this));
4856

4957
return this;
58+
},
59+
closeModal: function () {
60+
this._super();
5061
}
5162
});
5263

5364
$(document).ready(function () {
5465
$('#system_messages .message-system-short .error').on('click', function () {
55-
$('#message-system-all').systemMessageDialog('open', 1);
66+
$('#message-system-all').systemMessageDialog('openModal', 1);
5667
});
5768

5869
$('#system_messages .message-system-short .warning').on('click', function () {
59-
$('#message-system-all').systemMessageDialog('open', 2);
70+
$('#message-system-all').systemMessageDialog('openModal', 2);
6071
});
6172
});
6273

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010

1111
<?php if (is_array($block->getChildBlock('diagrams')->getTabsIds())) : ?>
1212
<script>
13-
require(['prototype'], function(){
13+
require([
14+
'Magento_Ui/js/modal/alert',
15+
'prototype'
16+
], function(alert){
1417

1518
window.changeDiagramsPeriod = function(periodObj) {
1619
periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : '';
@@ -25,7 +28,9 @@ window.changeDiagramsPeriod = function(periodObj) {
2528
if (transport.responseText.isJSON()) {
2629
var response = transport.responseText.evalJSON()
2730
if (response.error) {
28-
alert(response.message);
31+
alert({
32+
content: response.message
33+
});
2934
}
3035
if(response.ajaxExpired && response.ajaxRedirect) {
3136
setLocation(response.ajaxRedirect);
@@ -47,9 +52,11 @@ window.changeDiagramsPeriod = function(periodObj) {
4752
tabContentElementId = 'dashboard_diagram_totals';
4853
try {
4954
if (transport.responseText.isJSON()) {
50-
var response = transport.responseText.evalJSON()
55+
var response = transport.responseText.evalJSON();
5156
if (response.error) {
52-
alert(response.message);
57+
alert({
58+
content: response.message
59+
});
5360
}
5461
if(response.ajaxExpired && response.ajaxRedirect) {
5562
setLocation(response.ajaxRedirect);

‎app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@
3131
require([
3232
"jquery",
3333
'mage/template',
34+
'Magento_Ui/js/modal/alert',
3435
"mage/translate",
3536
"jquery/file-uploader"
36-
], function ($, mageTemplate) {
37+
], function ($, mageTemplate, alert) {
3738

3839
$('#fileupload').fileupload({
3940
dataType: 'json',
@@ -75,7 +76,9 @@ require([
7576
$('#' + data.fileId)
7677
.delay(2000)
7778
.hide('highlight');
78-
alert($.mage.__('We don\'t recognize or support this file extension type.'));
79+
alert({
80+
content: $.mage.__('We don\'t recognize or support this file extension type.')
81+
});
7982
}
8083
$('#' + data.fileId).remove();
8184
},

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,21 @@
1111
<label class="label" for="footer_interface_locale"><span><?php /* @escapeNotVerified */ echo __('Interface Locale'); ?></span></label>
1212
<?php /* @escapeNotVerified */ echo $block->getLocaleSelect(); ?>
1313
<script>
14-
(function () {
15-
'use strict';
14+
require([
15+
'mage/validation/url'
16+
],
17+
function (urlValidator) {
18+
'use strict';
1619

17-
var elem = document.getElementById('footer_interface_locale');
20+
var elem = document.getElementById('footer_interface_locale');
1821

19-
function onChange() {
20-
window.location.href = '<?php /* @escapeNotVerified */ echo $block->getChangeLocaleUrl() ?>locale/' + elem.value + '/<?php /* @escapeNotVerified */ echo $block->getUrlForReferer() ?>';
21-
}
22+
function onChange() {
23+
urlValidator.redirect('<?php /* @escapeNotVerified */ echo $block->getChangeLocaleUrl() ?>locale/' +
24+
elem.value +
25+
'/<?php /* @escapeNotVerified */ echo $block->getUrlForReferer() ?>');
26+
}
2227

23-
elem.addEventListener('change', onChange);
24-
})();
28+
elem.addEventListener('change', onChange);
29+
});
2530
</script>
2631
</div>

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,10 @@
130130
</div>
131131

132132
<script>
133-
require(['jquery'], function(jQuery){
133+
require([
134+
'jquery',
135+
'Magento_Ui/js/modal/confirm'
136+
], function(jQuery, confirm){
134137

135138
(function($) {
136139
var $storesList = $('[data-role=stores-list]');
@@ -171,11 +174,19 @@ require(['jquery'], function(jQuery){
171174
} else {
172175

173176
<?php if ($block->getUseConfirm()): ?>
174-
if (confirm("<?php /* @escapeNotVerified */ echo __('Please confirm scope switching. All data that hasn\'t been saved will be lost.') ?>")) {
175-
reload();
176-
} else {
177-
obj.value = '<?php echo $block->escapeHtml($block->getStoreId()) ?>';
178-
}
177+
178+
confirm({
179+
content: "<?php /* @escapeNotVerified */ echo __('Please confirm scope switching. All data that hasn\'t been saved will be lost.') ?>",
180+
actions: {
181+
confirm: function() {
182+
reload();
183+
},
184+
cancel: function() {
185+
obj.value = '<?php echo $block->escapeHtml($block->getStoreId()) ?>';
186+
}
187+
}
188+
});
189+
179190
<?php else: ?>
180191
reload();
181192
<?php endif; ?>

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
3838
<?php else: ?>
3939
<?php echo $element->getLabelHtml() ?>
4040
<div class="admin__field-control control">
41-
<?php /* @escapeNotVerified */ echo($addOn) ? '<div class="admin__field admin__field-option">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
41+
<?php /* @escapeNotVerified */ echo($addOn) ? '<div class="admin__field">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
4242
<?php /* @escapeNotVerified */ echo $note ?>
4343
</div>
4444
<?php endif; ?>

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

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,42 +62,45 @@
6262
<div class="popup-content">
6363
<div class="backup-messages" style="display: none;"><div class="messages"></div></div>
6464
<div class="messages">
65-
<div class="message message-warning"><?php /* @escapeNotVerified */ echo __('Please specify backup creation option.')?></div>
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>
6668
</div>
6769
<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 /* @escapeNotVerified */ echo __('Backup Name')?></span></label>
71-
<div class="control">
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">
7274
<input type="text" name="backup_name" id="backup_name"
73-
class="required-entry validate-alphanum-with-spaces validate-length maximum-length-50"
75+
class="admin__control-text required-entry validate-alphanum-with-spaces validate-length maximum-length-50"
7476
maxlength="50" />
75-
<div class="note">
77+
<div class="admin__field-note">
7678
<?php /* @escapeNotVerified */ echo __('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.'); ?>
7779
</div>
7880
</div>
7981
</div>
8082

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 /* @escapeNotVerified */ echo __('Please put your store into maintenance mode during backup.')?></label>
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>
8590
</div>
8691
</div>
8792

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 /* @escapeNotVerified */ echo __('Exclude media folder from backup') ?></label>
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>
92100
</div>
93101
</div>
94102
</fieldset>
95103
</form>
96-
97-
<div class="actions">
98-
<button type="button" class="action primary" data-mage-init='{"button":{"event":"submit","target":"#backup-form"}}'><?php /* @escapeNotVerified */ echo __('OK')?></button>
99-
<button type="button" class="action cancel" onclick="backup.hidePopups()"><?php /* @escapeNotVerified */ echo __('Cancel')?></button>
100-
</div>
101104
</div>
102105
</div>
103106
</div>
@@ -158,11 +161,6 @@
158161
</fieldset>
159162
</div>
160163
</form>
161-
162-
<div class="actions">
163-
<button type="button" class="action primary" data-mage-init='{"button":{"event":"submit","target":"#rollback-form"}}'><?php /* @escapeNotVerified */ echo __('OK')?></button>
164-
<button type="button" class="action cancel" onclick="backup.hidePopups()"><?php /* @escapeNotVerified */ echo __('Cancel')?></button>
165-
</div>
166164
</div>
167165
</div>
168166
</div>

‎app/code/Magento/Braintree/view/frontend/web/js/cc-edit-form.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ define([
77
"jquery",
88
"braintree",
99
'mage/translate',
10+
'Magento_Ui/js/modal/alert',
1011
"jquery/ui"
11-
], function ($, braintree, $t) {
12+
], function ($, braintree, $t, alert) {
1213
'use strict';
1314

1415
$.widget('mage.braintreeEditForm', {
@@ -199,13 +200,17 @@ define([
199200
}
200201
},
201202
error: function (response) {
202-
alert($t('There was error during saving card data'));
203+
alert({
204+
content: $t('There was error during saving card data')
205+
});
203206
}
204207
});
205208
} else {
206209
//handle error
207210
$('body').trigger('processStop');
208-
alert($t('There was error during saving card data'));
211+
alert({
212+
content: $t('There was error during saving card data')
213+
});
209214
}
210215
});
211216
}

0 commit comments

Comments
 (0)