Skip to content

Commit f19663c

Browse files
author
Oleg Zinoviev
committed
MAGETWO-32315: Side Panels
- CR tabs updates
1 parent ce2aab6 commit f19663c

File tree

3 files changed

+10
-9
lines changed
  • app/code/Magento
    • Backend/view/adminhtml/templates/widget
    • Catalog/view/adminhtml/templates/product/edit
  • lib/web/mage/backend

3 files changed

+10
-9
lines changed

app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<?php if (!empty($tabs)): ?>
1212

1313
<div class="admin__scope">
14-
<div class="admin__page-nav" id="<?php echo $block->getId() ?>">
14+
<div class="admin__page-nav" data-role="container" id="<?php echo $block->getId() ?>">
1515
<?php if ($block->getTitle()): ?>
16-
<div class="admin__page-nav-title" <?php echo $block->getUiId('title') ?>>
16+
<div class="admin__page-nav-title" data-role="title" <?php echo $block->getUiId('title') ?>>
1717
<strong><?php echo $block->getTitle() ?></strong>
18-
<span class="admin__page-nav-title-messages"></span>
18+
<span data-role="title-messages" class="admin__page-nav-title-messages"></span>
1919
</div>
2020
<?php endif ?>
2121
<ul <?php echo $block->getUiId('tab', $block->getId()) ?> class="<?php echo $block->getIsHoriz() ? 'tabs-horiz' : 'tabs admin__page-nav-items' ?>">
@@ -34,7 +34,7 @@
3434

3535
<span><?php echo $block->getTabLabel($_tab); ?></span>
3636

37-
<span class="admin__page-nav-item-messages">
37+
<span class="admin__page-nav-item-messages" data-role="item-messages">
3838
<span class="admin__page-nav-item-message _changed">
3939
<span class="admin__page-nav-item-message-icon"></span>
4040
<span class="admin__page-nav-item-message-tooltip">

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
?>
3333

3434
<div class="admin__page-nav <?php if (!$isBasic): ?> <?php echo '_collapsed';?> <?php endif;?>"
35+
data-role="container"
3536
id="<?php echo $tabGroupId ?>"
3637
<?php if (!$isBasic): ?>
3738
data-mage-init='{"collapsible":{
@@ -49,7 +50,7 @@
4950
<strong>
5051
<?php echo $isBasic ? __('Basic Settings') : __('Advanced Settings') ?>
5152
</strong>
52-
<span class="admin__page-nav-title-messages"></span>
53+
<span data-role="title-messages" class="admin__page-nav-title-messages"></span>
5354
</div>
5455
</div>
5556

@@ -71,7 +72,7 @@
7172

7273
<span><?php echo $block->escapeHtml($block->getTabLabel($_tab)); ?></span>
7374

74-
<span class="admin__page-nav-item-messages">
75+
<span class="admin__page-nav-item-messages" data-role="item-messages">
7576
<span class="admin__page-nav-item-message _changed">
7677
<span class="admin__page-nav-item-message-icon"></span>
7778
<span class="admin__page-nav-item-message-tooltip">

lib/web/mage/backend/tabs.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,14 +292,14 @@
292292
*/
293293
_updateNavTitleMessages: function(e, messageType) {
294294
var curAnchor = this.anchors.eq(e.data.index),
295-
curItem = curAnchor.parents('.admin__page-nav').find('.admin__page-nav-title'),
296-
curItemMessages = curItem.find('.admin__page-nav-title-messages'),
295+
curItem = curAnchor.parents('[data-role="container"]').find('[data-role="title"]'),
296+
curItemMessages = curItem.find('[data-role="title-messages"]'),
297297
curItemMessage,
298298
activeClass = "_active";
299299

300300
if ((curItemMessages).is(":empty")) {
301301
curAnchor
302-
.find('.admin__page-nav-item-messages')
302+
.find('[data-role="item-messages"]')
303303
.clone()
304304
.appendTo(curItemMessages);
305305
}

0 commit comments

Comments
 (0)