Skip to content

Commit 57e6121

Browse files
author
Oleg Zinoviev
committed
MAGETWO-34520: [UI] Updates messaging styles.
- html updates for backend messages
1 parent 766a81f commit 57e6121

File tree

8 files changed

+43
-20
lines changed

8 files changed

+43
-20
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,14 @@ $categoryId = $block->getCategoryId();
2424
<?php if ($block->hasStoreRootCategory()): ?>
2525
<?php echo $block->getTabsHtml() ?>
2626
<?php else: ?>
27-
<div class="message info">
28-
<div><?php echo __('Set root category for this store in the <a href="%1">configuration</a>.', $block->getStoreConfigurationUrl()) ?></div>
27+
<div class="admin__scope">
28+
<div class="messages">
29+
<div class="message message-notice">
30+
<div><?php echo __('Set root category for this store in the <a href="%1">configuration</a>.', $block->getStoreConfigurationUrl()) ?></div>
31+
</div>
32+
</div>
2933
</div>
34+
3035
<?php endif; ?>
3136
<iframe name="iframeSave" style="display:none; width:100%;"
3237
src="<?php echo $block->getViewFileUrl('blank.html') ?>"></iframe>

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,12 @@
4747
<span><?php echo __('Remove Product From Websites') ?></span>
4848
</legend>
4949
<br>
50-
<div class="message info">
51-
<div><?php echo __("Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.") ?></div>
50+
<div class="admin__scope">
51+
<div class="messages">
52+
<div class="message message-notice">
53+
<div><?php echo __("Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.") ?></div>
54+
</div>
55+
</div>
5256
</div>
5357
<div class="store-scope">
5458
<div class="store-tree" id="remove-products-to-website-content">

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@
1111
<legend class="legend"><span><?php echo __('Product In Websites') ?></span></legend>
1212
<br>
1313
<?php if ($block->getProductId()): ?>
14-
<div class="message info">
15-
<div><?php echo __("Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.") ?></div>
14+
<div class="admin__scope">
15+
<div class="messages">
16+
<div class="message message-notice">
17+
<?php echo __("Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.") ?>
18+
</div>
19+
</div>
1620
</div>
1721
<?php endif; ?>
1822
<div class="store-scope">

app/code/Magento/GoogleShopping/view/adminhtml/templates/captcha.phtml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
?>
1010

1111
<?php if ($block->getGcontentCaptchaToken() && $block->getGcontentCaptchaUrl()): ?>
12-
<div class="messages">
13-
<div class="message error">
14-
<div><img src="<?php echo $block->getGcontentCaptchaUrl() ?>"> <input type="text" id="user_confirm"> <?php echo $block->getConfirmButtonHtml() ?></div>
12+
<div class="admin__scope">
13+
<div class="messages">
14+
<div class="message message-error error">
15+
<div><img src="<?php echo $block->getGcontentCaptchaUrl() ?>"> <input type="text" id="user_confirm"> <?php echo $block->getConfirmButtonHtml() ?></div>
16+
</div>
1517
</div>
1618
</div>
1719
<?php endif; ?>

app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
<div class="legend">
99
<span><?php echo __('Status'); ?></span>
1010
</div><br>
11-
<div class="messages">
12-
<div class="message success message-success">
13-
<div><?php echo $block->getStatusMessage(); ?>hh</div>
11+
<div class="admin__scope">
12+
<div class="messages">
13+
<div class="message message-success success">
14+
<div><?php echo $block->getStatusMessage(); ?>hh</div>
15+
</div>
1416
</div>
1517
</div>
1618
</div>

app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10-
<div class="message info">
11-
<div><?php echo __('Please specify a rating title for a store, or we\'ll just use the default value.'); ?></div>
10+
<div class="admin__scope">
11+
<div class="messages">
12+
<div class="message message-notice">
13+
<div><?php echo __('Please specify a rating title for a store, or we\'ll just use the default value.'); ?></div>
14+
</div>
15+
</div>
1216
</div>
1317

1418
<?php echo $block->getFormHtml() ?>

app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
<?php $_code = $_rate->getCode() ?>
2222
<li>
2323
<?php if ($_rate->getErrorMessage()): ?>
24-
<div class="messages">
25-
<div class="message error">
26-
<div><?php echo $block->escapeHtml($_rate->getErrorMessage()) ?></div>
27-
</div>
28-
</div>
24+
<div class="admin__scope">
25+
<div class="messages">
26+
<div class="message message-error error">
27+
<div><?php echo $block->escapeHtml($_rate->getErrorMessage()) ?></div>
28+
</div>
29+
</div>
30+
</div>
2931
<?php else: ?>
3032
<?php $_checked = $block->isMethodActive($_code) ? 'checked="checked"' : '' ?>
3133
<input <?php echo $_radioProperty ?> value="<?php echo $_code ?>" id="s_method_<?php echo $_code ?>" <?php echo $_checked ?>/>

lib/web/mage/adminhtml/backup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ define([
151151
},
152152

153153
getErrorMessageHtml: function(message) {
154-
return '<div class="message error"><div>' + message + '</div></div>';
154+
return '<div class="message message-error error"><div>' + message + '</div></div>';
155155
},
156156

157157
getPostData: function() {

0 commit comments

Comments
 (0)