Skip to content

Commit 72da958

Browse files
author
Evgeniy Kolesov
committed
MAGETWO-34984: Invert new admin styles scope
1 parent 8ae588a commit 72da958

File tree

31 files changed

+503
-5791
lines changed

31 files changed

+503
-5791
lines changed

‎Gruntfile.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ module.exports = function (grunt) {
6060
'less:luma',
6161
'less:backend'
6262
],
63-
/**
64-
* Styles for backend theme
65-
*/
66-
backend: [
67-
'less:backend',
68-
'replace:escapeCalc',
69-
'less:override'
70-
],
7163
/**
7264
* Documentation
7365
*/

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ if ($isField) {
6161
<?php endif; ?>
6262
<?php endif; ?>
6363

64-
<div class="admin__scope">
65-
<div class="messages">
66-
<?php if ($element->getComment() && !$isField): ?>
67-
<div class="message message-notice"><?php echo $block->escapeHtml($element->getComment()) ?></div>
68-
<?php endif; ?>
69-
</div>
64+
65+
<div class="messages">
66+
<?php if ($element->getComment() && !$isField): ?>
67+
<div class="message message-notice"><?php echo $block->escapeHtml($element->getComment()) ?></div>
68+
<?php endif; ?>
7069
</div>
7170

71+
7272
<?php echo($isField) ? '<div class="control">' : ''; ?>
7373

7474
<?php if ($element->hasHtmlContent() && !$isField): ?>

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

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,56 +10,54 @@
1010
?>
1111
<?php if (!empty($tabs)): ?>
1212

13-
<div class="admin__scope">
14-
<div class="admin__page-nav" data-role="container" id="<?php echo $block->getId() ?>">
15-
<?php if ($block->getTitle()): ?>
16-
<div class="admin__page-nav-title" data-role="title" <?php echo $block->getUiId('title') ?>>
17-
<strong><?php echo $block->getTitle() ?></strong>
18-
<span data-role="title-messages" class="admin__page-nav-title-messages"></span>
19-
</div>
20-
<?php endif ?>
21-
<ul <?php echo $block->getUiId('tab', $block->getId()) ?> class="<?php echo $block->getIsHoriz() ? 'tabs-horiz' : 'tabs admin__page-nav-items' ?>">
22-
<?php foreach ($tabs as $_tab): ?>
13+
<div class="admin__page-nav" data-role="container" id="<?php echo $block->getId() ?>">
14+
<?php if ($block->getTitle()): ?>
15+
<div class="admin__page-nav-title" data-role="title" <?php echo $block->getUiId('title') ?>>
16+
<strong><?php echo $block->getTitle() ?></strong>
17+
<span data-role="title-messages" class="admin__page-nav-title-messages"></span>
18+
</div>
19+
<?php endif ?>
20+
<ul <?php echo $block->getUiId('tab', $block->getId()) ?> class="<?php echo $block->getIsHoriz() ? 'tabs-horiz' : 'tabs admin__page-nav-items' ?>">
21+
<?php foreach ($tabs as $_tab): ?>
2322

24-
<?php if (!$block->canShowTab($_tab)): continue; endif; ?>
25-
<?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
26-
<?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
27-
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
23+
<?php if (!$block->canShowTab($_tab)): continue; endif; ?>
24+
<?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
25+
<?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
26+
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
2827

29-
<li class="admin__page-nav-item" <?php if ($block->getTabIsHidden($_tab)): ?> style="display:none"<?php endif; ?><?php echo $block->getUiId('tab', 'item', $_tab->getId()) ?>>
30-
<a href="<?php echo $_tabHref ?>" id="<?php echo $block->getTabId($_tab) ?>" name="<?php echo $block->getTabId($_tab, false) ?>" title="<?php echo $block->getTabTitle($_tab) ?>"
31-
class="admin__page-nav-link <?php echo $_tabClass;?>"
32-
data-tab-type="<?php echo $_tabType;?>"
33-
<?php echo $block->getUiId('tab', 'link', $_tab->getId()) ?>>
28+
<li class="admin__page-nav-item" <?php if ($block->getTabIsHidden($_tab)): ?> style="display:none"<?php endif; ?><?php echo $block->getUiId('tab', 'item', $_tab->getId()) ?>>
29+
<a href="<?php echo $_tabHref ?>" id="<?php echo $block->getTabId($_tab) ?>" name="<?php echo $block->getTabId($_tab, false) ?>" title="<?php echo $block->getTabTitle($_tab) ?>"
30+
class="admin__page-nav-link <?php echo $_tabClass;?>"
31+
data-tab-type="<?php echo $_tabType;?>"
32+
<?php echo $block->getUiId('tab', 'link', $_tab->getId()) ?>>
3433

35-
<span><?php echo $block->getTabLabel($_tab); ?></span>
34+
<span><?php echo $block->getTabLabel($_tab); ?></span>
3635

37-
<span class="admin__page-nav-item-messages" data-role="item-messages">
38-
<span class="admin__page-nav-item-message _changed">
39-
<span class="admin__page-nav-item-message-icon"></span>
40-
<span class="admin__page-nav-item-message-tooltip">
41-
<?php echo __('Changes have been made to this section that have not been saved.'); ?>
42-
</span>
36+
<span class="admin__page-nav-item-messages" data-role="item-messages">
37+
<span class="admin__page-nav-item-message _changed">
38+
<span class="admin__page-nav-item-message-icon"></span>
39+
<span class="admin__page-nav-item-message-tooltip">
40+
<?php echo __('Changes have been made to this section that have not been saved.'); ?>
4341
</span>
44-
<span class="admin__page-nav-item-message _error">
45-
<span class="admin__page-nav-item-message-icon"></span>
46-
<span class="admin__page-nav-item-message-tooltip">
47-
<?php echo __('This tab contains invalid data. Please solve the problem before saving.'); ?>
48-
</span>
42+
</span>
43+
<span class="admin__page-nav-item-message _error">
44+
<span class="admin__page-nav-item-message-icon"></span>
45+
<span class="admin__page-nav-item-message-tooltip">
46+
<?php echo __('This tab contains invalid data. Please solve the problem before saving.'); ?>
4947
</span>
50-
<span class="admin__page-nav-item-message-loader">
51-
<span class="spinner">
52-
<span></span><span></span><span></span><span></span>
53-
<span></span><span></span><span></span><span></span>
54-
</span>
48+
</span>
49+
<span class="admin__page-nav-item-message-loader">
50+
<span class="spinner">
51+
<span></span><span></span><span></span><span></span>
52+
<span></span><span></span><span></span><span></span>
5553
</span>
5654
</span>
57-
</a>
58-
<div id="<?php echo $block->getTabId($_tab) ?>_content" style="display:none;"<?php echo $block->getUiId('tab', 'content', $_tab->getId()) ?>><?php echo $block->getTabContent($_tab) ?></div>
59-
</li>
60-
<?php endforeach; ?>
61-
</ul>
62-
</div>
55+
</span>
56+
</a>
57+
<div id="<?php echo $block->getTabId($_tab) ?>_content" style="display:none;"<?php echo $block->getUiId('tab', 'content', $_tab->getId()) ?>><?php echo $block->getTabContent($_tab) ?></div>
58+
</li>
59+
<?php endforeach; ?>
60+
</ul>
6361
</div>
6462

6563
<script>

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
</head>
1414
<update handle="editor"/>
1515
<body>
16+
<referenceContainer name="admin.scope.col.wrap" htmlClass="" /> <!-- @todo ui: Removes .admin__scope-old class for edit product -->
1617
<referenceContainer name="content">
1718
<block class="Magento\Catalog\Block\Adminhtml\Product\Edit" name="product_edit">
1819
<container name="product-type-tabs" label="Tabs">

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,39 @@
1212
* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit
1313
*/
1414
?>
15+
<div class="admin__scope-old">
16+
<div class="product-actions">
17+
<div id="product-template-suggest-container" class="suggest-expandable">
18+
<div class="action-dropdown">
19+
<button type="button" class="action-toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
20+
<span><?php echo $block->getAttributeSetName()?></span>
21+
</button>
22+
<ul class="dropdown-menu">
23+
<li><input type="text" id="product-template-suggest" class="search"
24+
placeholder="start typing to search template"/></li>
25+
</ul>
26+
</div>
27+
</div>
1528

16-
<div class="product-actions">
17-
<div id="product-template-suggest-container" class="suggest-expandable">
18-
<div class="action-dropdown">
19-
<button type="button" class="action-toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
20-
<span><?php echo $block->getAttributeSetName()?></span>
21-
</button>
22-
<ul class="dropdown-menu">
23-
<li><input type="text" id="product-template-suggest" class="search"
24-
placeholder="start typing to search template"/></li>
25-
</ul>
29+
<div class="switcher" onselectstart='return false;'>
30+
<input type="checkbox" id="product-online-switcher" name="product-online-switcher" />
31+
<label class="switcher-label"
32+
for="product-online-switcher"
33+
data-text-on="<?php echo __('Product online'); ?>"
34+
data-text-off="<?php echo __('Product offline'); ?>"
35+
title="<?php echo __('Product online status'); ?>"></label>
2636
</div>
27-
</div>
2837

29-
<div class="switcher" onselectstart='return false;'>
30-
<input type="checkbox" id="product-online-switcher" name="product-online-switcher" />
31-
<label class="switcher-label"
32-
for="product-online-switcher"
33-
data-text-on="<?php echo __('Product online'); ?>"
34-
data-text-off="<?php echo __('Product offline'); ?>"
35-
title="<?php echo __('Product online status'); ?>"></label>
38+
<?php if ($block->getProductId()): ?>
39+
<?php echo $block->getDeleteButtonHtml() ?>
40+
<?php endif; ?>
41+
<?php if ($block->getProductSetId()): ?>
42+
<?php echo $block->getChangeAttributeSetButtonHtml() ?>
43+
<?php echo $block->getSaveSplitButtonHtml(); ?>
44+
<?php endif; ?>
45+
<?php echo $block->getBackButtonHtml() ?>
3646
</div>
37-
38-
<?php if ($block->getProductId()): ?>
39-
<?php echo $block->getDeleteButtonHtml() ?>
40-
<?php endif; ?>
41-
<?php if ($block->getProductSetId()): ?>
42-
<?php echo $block->getChangeAttributeSetButtonHtml() ?>
43-
<?php echo $block->getSaveSplitButtonHtml(); ?>
44-
<?php endif; ?>
45-
<?php echo $block->getBackButtonHtml() ?>
4647
</div>
47-
4848
<?php if ($block->getUseContainer()): ?>
4949
<form action="<?php echo $block->getSaveUrl() ?>" method="post" enctype="multipart/form-data"
5050
data-form="edit-product" data-product-id="<?php echo $block->getProduct()->getId()?>">

0 commit comments

Comments
 (0)