Skip to content

Commit 9368ecf

Browse files
author
Kolesov, Ievgen(ikolesov)
committed
Merge pull request #344 from magento-webdev/PR
[WebDev] Bugfixes and Tasks
2 parents 320e1dc + 28855c1 commit 9368ecf

File tree

11 files changed

+116
-103
lines changed

11 files changed

+116
-103
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2868,7 +2868,7 @@ Tests:
28682868
* Fixed a 404 error after saving mass update product attributes form
28692869
* Fixed an issue when it was impossible to perform search by all tax classes on the Advanced Search page
28702870
* Fixed an issue when attribute order for configurable product was not preserved after saving product
2871-
* Fixed an issue with no results for the Product Best Sellers report
2871+
* Fixed an issue with no results for the Product Bestsellers report
28722872
* Fixed a fatal error when opening tax configuration page in the backend
28732873
* Fixed an error occurring when opening the Tax Zones and Rates page in the backend
28742874
* Fixed a 404 error occurring while searching products on the New Review page

‎app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Bestsellers.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class Bestsellers extends \Magento\Reports\Controller\Adminhtml\Report\Sales
1212
{
1313
/**
14-
* Best sellers report action
14+
* Bestsellers report action
1515
*
1616
* @return void
1717
*/
@@ -25,7 +25,7 @@ public function execute()
2525
__('Products Bestsellers Report'),
2626
__('Products Bestsellers Report')
2727
);
28-
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Best Sellers Report'));
28+
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Bestsellers Report'));
2929

3030
$gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_bestsellers.grid');
3131
$filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');

‎app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/Sales.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function execute()
2525
__('Sales Report'),
2626
__('Sales Report')
2727
);
28-
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Sales Report'));
28+
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Orders Report'));
2929

3030
$gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_sales.grid');
3131
$filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');

‎app/code/Magento/Reports/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Reviews,Reviews
147147
"Customers Report","Customers Report"
148148
"Product Reviews Report","Product Reviews Report"
149149
"Sales Report","Sales Report"
150-
"Best Sellers Report","Best Sellers Report"
150+
"Bestsellers Report","Bestsellers Report"
151151
"Tax Report","Tax Report"
152152
"Shipping Report","Shipping Report"
153153
"Invoice Report","Invoice Report"

‎app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,27 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10-
<div id="tax-rate-titles-table" class="form-inline">
10+
<fieldset id="tax-rate-titles-table" class="admin__fieldset">
1111
<?php $_labels = $block->getTitles() ?>
1212
<?php foreach ($block->getStores() as $_store): ?>
13-
<div class="field">
14-
<label class="label"><span><?php /* @escapeNotVerified */ echo $_store->getName() ?></span></label>
15-
<div class="control">
16-
<input class="input-text<?php if ($_store->getId() == 0): ?> required-entry<?php endif; ?>" type="text" name="title[<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<?php /* @escapeNotVerified */ echo $_labels[$_store->getId()] ?>"/>
13+
<div class="admin__field">
14+
<label class="admin__field-label"><span><?php /* @escapeNotVerified */ echo $_store->getName() ?></span></label>
15+
<div class="admin__field-control">
16+
<input
17+
class="admin__control-text<?php if ($_store->getId() == 0): ?> required-entry<?php endif; ?>"
18+
type="text"
19+
name="title[<?php /* @escapeNotVerified */ echo $_store->getId() ?>]"
20+
value="<?php /* @escapeNotVerified */ echo $_labels[$_store->getId()] ?>" />
1721
</div>
1822
</div>
1923
<?php endforeach; ?>
20-
<div class="tax-rate-titles-note-td">
21-
<strong><?php /* @escapeNotVerified */ echo __('Note:'); ?></strong> <?php /* @escapeNotVerified */ echo __('Leave this field empty if you wish to use the tax identifier.'); ?>
24+
25+
<div class="messages">
26+
<div class="message message-notice">
27+
<div>
28+
<strong><?php /* @escapeNotVerified */ echo __('Note:'); ?></strong>
29+
<?php /* @escapeNotVerified */ echo __('Leave this field empty if you wish to use the tax identifier.'); ?>
30+
</div>
31+
</div>
2232
</div>
23-
</div>
33+
</fieldset>

‎app/code/Magento/Theme/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Disallow: /*SID=
4747
<welcome>Default welcome msg!</welcome>
4848
</header>
4949
<footer translate="copyright">
50-
<copyright>Copyright &#169; 2015 Magento. All rights reserved.</copyright>
50+
<copyright>Copyright &#169; 2016 Magento. All rights reserved.</copyright>
5151
</footer>
5252
</design>
5353
<theme>

‎app/design/adminhtml/Magento/backend/web/css/styles-old.less

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5067,10 +5067,9 @@
50675067

50685068
// System -> Notifications
50695069
.adminhtml-notification-index {
5070-
.admin__scope-old {
5071-
.col-actions a {
5072-
&:extend(.col-actions-links);
5073-
}
5070+
.col-actions a {
5071+
&:extend(.col-actions-links);
5072+
white-space: nowrap;
50745073
}
50755074
}
50765075

‎app/design/frontend/Magento/blank/web/css/source/_navigation.less

Lines changed: 72 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -97,41 +97,40 @@
9797
}
9898

9999
&:last-child {
100-
border-bottom: 1px solid @color-gray82;
100+
border-bottom: 1px solid @color-gray82;
101101
}
102+
}
102103

103-
&-trigger {
104-
strong {
105-
display: inline-block !important;
106-
position: relative;
107-
.lib-icon-font(
108-
@_icon-font-content: @icon-down,
109-
@_icon-font-size: 42px,
110-
@_icon-font-position: after,
111-
@_icon-font-display: block
112-
);
113-
114-
&:after {
115-
position: absolute;
116-
right: -40px;
117-
top: -18px;
118-
}
119-
}
104+
.switcher-trigger {
105+
strong {
106+
position: relative;
107+
.lib-icon-font(
108+
@_icon-font-content: @icon-down,
109+
@_icon-font-size: 42px,
110+
@_icon-font-position: after,
111+
@_icon-font-display: block
112+
);
120113

121-
&.active strong {
122-
.lib-icon-font-symbol(
123-
@_icon-font-content: @icon-up,
124-
@_icon-font-position: after
125-
);
114+
&:after {
115+
position: absolute;
116+
right: -40px;
117+
top: -16px;
126118
}
127119
}
128120

129-
&-dropdown {
130-
.lib-list-reset-styles();
131-
padding: @indent__s 0;
121+
&.active strong {
122+
.lib-icon-font-symbol(
123+
@_icon-font-content: @icon-up,
124+
@_icon-font-position: after
125+
);
132126
}
133127
}
134128

129+
.switcher-dropdown {
130+
.lib-list-reset-styles();
131+
padding: @indent__s 0;
132+
}
133+
135134
.header.links {
136135
.lib-list-reset-styles();
137136
border-bottom: 1px solid @color-gray82;
@@ -216,50 +215,48 @@
216215
}
217216
}
218217

219-
.nav-sections {
220-
&-items {
221-
.lib-clearfix();
222-
position: relative;
223-
z-index: 1;
224-
}
218+
.nav-sections-items {
219+
.lib-clearfix();
220+
position: relative;
221+
z-index: 1;
222+
}
225223

226-
&-item-title {
227-
background: darken(@navigation__background,5%);
228-
border: solid darken(@navigation__background,10%);
229-
border-width: 0 0 1px 1px;
230-
box-sizing: border-box;
231-
float: left;
232-
height: 71px;
233-
padding-top: 24px;
234-
text-align: center;
235-
width: 33.33%;
236-
237-
&.active {
238-
background: transparent;
239-
border-bottom: 0;
240-
}
224+
.nav-sections-item-title {
225+
background: darken(@navigation__background, 5%);
226+
border: solid darken(@navigation__background, 10%);
227+
border-width: 0 0 1px 1px;
228+
box-sizing: border-box;
229+
float: left;
230+
height: 71px;
231+
padding-top: 24px;
232+
text-align: center;
233+
width: 33.33%;
234+
235+
&.active {
236+
background: transparent;
237+
border-bottom: 0;
238+
}
241239

242-
.nav-sections-item-switch {
243-
&:hover {
244-
text-decoration: none;
245-
}
240+
.nav-sections-item-switch {
241+
&:hover {
242+
text-decoration: none;
246243
}
247244
}
245+
}
248246

249-
&-item-content {
250-
.lib-clearfix();
251-
box-sizing: border-box;
252-
float: right;
253-
margin-left: -100%;
254-
margin-top: 71px;
255-
width: 100%;
256-
257-
&.active {
258-
display: block;
259-
}
247+
.nav-sections-item-content {
248+
.lib-clearfix();
249+
box-sizing: border-box;
250+
float: right;
251+
margin-left: -100%;
252+
margin-top: 71px;
253+
width: 100%;
260254

261-
padding: @indent__m 0;
255+
&.active {
256+
display: block;
262257
}
258+
259+
padding: @indent__m 0;
263260
}
264261

265262
.lib-main-navigation();
@@ -278,20 +275,22 @@
278275
.lib-vendor-prefix-flex-shrink(0);
279276
.lib-vendor-prefix-flex-basis(auto);
280277
margin-bottom: @indent__m;
278+
}
281279

282-
&-item-title {
283-
display: none;
284-
}
280+
.nav-sections-item-title {
281+
display: none;
282+
}
285283

286-
&-item-content {
287-
display: block !important;
288-
}
284+
.nav-sections-item-content {
285+
display: block !important;
286+
}
289287

290-
&-item-content > * {
291-
display: none;
292-
}
288+
.nav-sections-item-content > * {
289+
display: none;
290+
}
293291

294-
&-item-content > .navigation {
292+
.nav-sections-item-content {
293+
> .navigation {
295294
display: block;
296295
}
297296
}

‎app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -323,15 +323,20 @@
323323
}
324324

325325
&.options {
326-
.tooltip.toggle {
327-
.lib-icon-font(
328-
@icon-down,
329-
@_icon-font-size: 12px,
330-
@_icon-font-line-height: 12px,
331-
@_icon-font-text-hide: true,
332-
@_icon-font-margin: -3px 0 0 7px,
333-
@_icon-font-position: after
334-
);
326+
.toggle {
327+
&.tooltip {
328+
.lib-icon-font(
329+
@icon-down,
330+
@_icon-font-size: 12px,
331+
@_icon-font-line-height: 12px,
332+
@_icon-font-text-hide: true,
333+
@_icon-font-margin: -3px 0 0 7px,
334+
@_icon-font-position: after
335+
);
336+
}
337+
> span {
338+
&:extend(.abs-visually-hidden-reset all);
339+
}
335340
}
336341

337342
.details {

‎app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
.nav-sections .switcher-trigger strong:after {
328328
.lib-font-size(16);
329329
right: -25px;
330-
top: 2px;
330+
top: -2px;
331331
}
332332

333333
.navigation .parent .level-top:after {

0 commit comments

Comments
 (0)