Skip to content

Commit f42b305

Browse files
zanileezanilee
committed
MAGETWO-34984: Invert new admin styles scope
- Merge remote-tracking branch 'origin/MAGETWO-32315' into admin-styles-migration - Conflicts: - app/code/Magento/Ui/view/base/web/templates/tab.html - app/design/adminhtml/Magento/backend/web/css/styles-old.less
2 parents 3898383 + 5cd71e0 commit f42b305

File tree

200 files changed

+7236
-5843
lines changed

Some content is hidden

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

200 files changed

+7236
-5843
lines changed

‎.htaccess

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -167,6 +172,8 @@
167172
## http://developer.yahoo.com/performance/rules.html#expires
168173

169174
ExpiresDefault "access plus 1 year"
175+
ExpiresByType text/html A0
176+
ExpiresByType text/plain A0
170177

171178
</IfModule>
172179

‎.htaccess.sample

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -164,6 +169,8 @@
164169
## http://developer.yahoo.com/performance/rules.html#expires
165170

166171
ExpiresDefault "access plus 1 year"
172+
ExpiresByType text/html A0
173+
ExpiresByType text/plain A0
167174

168175
</IfModule>
169176

‎CHANGELOG.md

Lines changed: 212 additions & 41 deletions
Large diffs are not rendered by default.

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta11",
7-
"magento/module-backend": "0.42.0-beta11",
8-
"magento/module-media-storage": "0.42.0-beta11",
9-
"magento/framework": "0.42.0-beta11",
6+
"magento/module-store": "0.74.0-beta1",
7+
"magento/module-backend": "0.74.0-beta1",
8+
"magento/module-media-storage": "0.74.0-beta1",
9+
"magento/framework": "0.74.0-beta1",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta11",
14+
"version": "0.74.0-beta1",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta11",
7-
"magento/framework": "0.42.0-beta11",
6+
"magento/module-backend": "0.74.0-beta1",
7+
"magento/framework": "0.74.0-beta1",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta11",
11+
"version": "0.74.0-beta1",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta11",
7-
"magento/module-directory": "0.42.0-beta11",
8-
"magento/module-developer": "0.42.0-beta11",
9-
"magento/module-eav": "0.42.0-beta11",
10-
"magento/module-cron": "0.42.0-beta11",
11-
"magento/module-theme": "0.42.0-beta11",
12-
"magento/module-reports": "0.42.0-beta11",
13-
"magento/module-sales": "0.42.0-beta11",
14-
"magento/module-quote": "0.42.0-beta11",
15-
"magento/module-catalog": "0.42.0-beta11",
16-
"magento/module-user": "0.42.0-beta11",
17-
"magento/module-backup": "0.42.0-beta11",
18-
"magento/module-customer": "0.42.0-beta11",
19-
"magento/module-translation": "0.42.0-beta11",
20-
"magento/module-require-js": "0.42.0-beta11",
21-
"magento/module-config": "0.42.0-beta11",
22-
"magento/framework": "0.42.0-beta11",
6+
"magento/module-store": "0.74.0-beta1",
7+
"magento/module-directory": "0.74.0-beta1",
8+
"magento/module-developer": "0.74.0-beta1",
9+
"magento/module-eav": "0.74.0-beta1",
10+
"magento/module-cron": "0.74.0-beta1",
11+
"magento/module-theme": "0.74.0-beta1",
12+
"magento/module-reports": "0.74.0-beta1",
13+
"magento/module-sales": "0.74.0-beta1",
14+
"magento/module-quote": "0.74.0-beta1",
15+
"magento/module-catalog": "0.74.0-beta1",
16+
"magento/module-user": "0.74.0-beta1",
17+
"magento/module-backup": "0.74.0-beta1",
18+
"magento/module-customer": "0.74.0-beta1",
19+
"magento/module-translation": "0.74.0-beta1",
20+
"magento/module-require-js": "0.74.0-beta1",
21+
"magento/module-config": "0.74.0-beta1",
22+
"magento/framework": "0.74.0-beta1",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.42.0-beta11",
26+
"version": "0.74.0-beta1",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

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

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

64-
<?php if ($element->getComment() && !$isField): ?>
65-
<div class="comment"><?php echo $block->escapeHtml($element->getComment()) ?></div>
66-
<?php endif; ?>
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>
70+
</div>
6771

6872
<?php echo($isField) ? '<div class="control">' : ''; ?>
6973

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

Lines changed: 52 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,59 @@
99
/** @var $block \Magento\Backend\Block\Widget\Tabs */
1010
?>
1111
<?php if (!empty($tabs)): ?>
12-
<div id="<?php echo $block->getId() ?>">
13-
<?php if ($block->getTitle()): ?>
14-
<h3 <?php echo $block->getUiId('title') ?>><?php echo $block->getTitle() ?></h3>
15-
<?php endif ?>
16-
<ul <?php echo $block->getUiId('tab', $block->getId()) ?> class="<?php echo $block->getIsHoriz() ? 'tabs-horiz' : 'tabs' ?>">
17-
<?php foreach ($tabs as $_tab): ?>
18-
<?php if (!$block->canShowTab($_tab)): continue; endif; ?>
19-
<?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
20-
<?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
21-
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
22-
<li <?php if ($block->getTabIsHidden($_tab)): ?> style="display:none"<?php endif; ?><?php echo $block->getUiId('tab', 'item', $_tab->getId()) ?>>
23-
<a href="<?php echo $_tabHref ?>" id="<?php echo $block->getTabId($_tab) ?>" name="<?php echo $block->getTabId($_tab, false) ?>" title="<?php echo $block->getTabTitle($_tab) ?>" class="<?php echo $_tabClass;?>" data-tab-type="<?php echo $_tabType;?>" <?php echo $block->getUiId('tab', 'link', $_tab->getId()) ?>>
24-
<span>
25-
<span class="changed" title="<?php echo __('The information in this tab has been changed.') ?>"></span>
26-
<span class="error" title="<?php echo __('This tab contains invalid data. Please solve the problem before saving.') ?>"></span>
27-
<span class="loader" title="<?php echo __('Loading...') ?>"></span>
28-
<?php echo $block->getTabLabel($_tab); ?>
29-
</span>
30-
</a>
31-
<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>
32-
</li>
33-
<?php endforeach; ?>
34-
</ul>
12+
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): ?>
23+
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) ?>
28+
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()) ?>>
34+
35+
<span><?php echo $block->getTabLabel($_tab); ?></span>
36+
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>
43+
</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>
49+
</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>
55+
</span>
56+
</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>
3563
</div>
64+
3665
<script>
3766
require(['jquery',"mage/backend/tabs"], function($){
3867
$(function() {

‎app/code/Magento/Backup/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta11",
7-
"magento/module-backend": "0.42.0-beta11",
8-
"magento/module-cron": "0.42.0-beta11",
9-
"magento/framework": "0.42.0-beta11",
6+
"magento/module-store": "0.74.0-beta1",
7+
"magento/module-backend": "0.74.0-beta1",
8+
"magento/module-cron": "0.74.0-beta1",
9+
"magento/framework": "0.74.0-beta1",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.42.0-beta11",
13+
"version": "0.74.0-beta1",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

‎app/code/Magento/Bundle/Model/Resource/Indexer/Price.php

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -529,27 +529,6 @@ protected function _prepareBundlePrice($entityIds = null)
529529
$this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED, $entityIds);
530530
$this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC, $entityIds);
531531

532-
/**
533-
* Add possibility modify prices from external events
534-
*/
535-
$select = $this->_getWriteAdapter()->select()->join(
536-
['wd' => $this->_getWebsiteDateTable()],
537-
'i.website_id = wd.website_id',
538-
[]
539-
);
540-
$this->_eventManager->dispatch(
541-
'prepare_catalog_product_price_index_table',
542-
[
543-
'index_table' => ['i' => $this->_getBundlePriceTable()],
544-
'select' => $select,
545-
'entity_id' => 'i.entity_id',
546-
'customer_group_id' => 'i.customer_group_id',
547-
'website_id' => 'i.website_id',
548-
'website_date' => 'wd.website_date',
549-
'update_fields' => ['price', 'min_price', 'max_price']
550-
]
551-
);
552-
553532
$this->_calculateBundleOptionPrice();
554533
$this->_applyCustomOption();
555534

0 commit comments

Comments
 (0)