Skip to content

Commit 818519e

Browse files
authored
Merge pull request #3 from Karlasa/2.1-develop-PR-port-16190
[Backport] #16079 translation possibility for moreButtonText
2 parents 1a099cb + d09dbe4 commit 818519e

File tree

130 files changed

+734
-199
lines changed

Some content is hidden

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

130 files changed

+734
-199
lines changed

app/code/Magento/Backend/App/AbstractAction.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
214214
$this->_view->loadLayout(['default', 'adminhtml_denied'], true, true, false);
215215
$this->_view->renderLayout();
216216
$this->_request->setDispatched(true);
217+
217218
return $this->_response;
218219
}
219220

@@ -223,6 +224,11 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
223224

224225
$this->_processLocaleSettings();
225226

227+
// Need to preload isFirstPageAfterLogin (see https://github.com/magento/magento2/issues/15510)
228+
if ($this->_auth->isLoggedIn()) {
229+
$this->_auth->getAuthStorage()->isFirstPageAfterLogin();
230+
}
231+
226232
return parent::dispatch($request);
227233
}
228234

app/code/Magento/Backend/Block/Dashboard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Dashboard extends \Magento\Backend\Block\Template
1818
/**
1919
* @var string
2020
*/
21-
protected $_template = 'dashboard/index.phtml';
21+
protected $_template = 'Magento_Backend::dashboard/index.phtml';
2222

2323
/**
2424
* @return void

app/code/Magento/Backend/Block/Dashboard/Graph.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
9090
/**
9191
* @var string
9292
*/
93-
protected $_template = 'dashboard/graph.phtml';
93+
protected $_template = 'Magento_Backend::dashboard/graph.phtml';
9494

9595
/**
9696
* Adminhtml dashboard data

app/code/Magento/Backend/Block/Dashboard/Grid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'dashboard/grid.phtml';
18+
protected $_template = 'Magento_Backend::dashboard/grid.phtml';
1919

2020
/**
2121
* Setting default for every grid on dashboard

app/code/Magento/Backend/Block/Dashboard/Sales.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
1616
/**
1717
* @var string
1818
*/
19-
protected $_template = 'dashboard/salebar.phtml';
19+
protected $_template = 'Magento_Backend::dashboard/salebar.phtml';
2020

2121
/**
2222
* @var \Magento\Framework\Module\Manager

app/code/Magento/Backend/Block/Dashboard/Totals.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
1717
/**
1818
* @var string
1919
*/
20-
protected $_template = 'dashboard/totalbar.phtml';
20+
protected $_template = 'Magento_Backend::dashboard/totalbar.phtml';
2121

2222
/**
2323
* @var \Magento\Framework\Module\Manager

app/code/Magento/Backend/Block/Menu.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,12 @@ protected function _renderItemCssClass($menuItem, $level)
211211
protected function _renderAnchor($menuItem, $level)
212212
{
213213
if ($level == 1 && $menuItem->getUrl() == '#') {
214-
$output = '<strong class="submenu-group-title" role="presentation">'
215-
. '<span>' . $this->_getAnchorLabel($menuItem) . '</span>'
216-
. '</strong>';
214+
$output = '';
215+
if ($menuItem->hasChildren()) {
216+
$output = '<strong class="submenu-group-title" role="presentation">'
217+
. '<span>' . $this->_getAnchorLabel($menuItem) . '</span>'
218+
. '</strong>';
219+
}
217220
} else {
218221
$output = '<a href="' . $menuItem->getUrl() . '" ' . $this->_renderItemAnchorTitle(
219222
$menuItem

app/code/Magento/Backend/Block/Page/Copyright.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ class Copyright extends \Magento\Backend\Block\Template
1515
*
1616
* @var string
1717
*/
18-
protected $_template = 'page/copyright.phtml';
18+
protected $_template = 'Magento_Backend::page/copyright.phtml';
1919
}

app/code/Magento/Backend/Block/Page/Footer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Footer extends \Magento\Backend\Block\Template
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'page/footer.phtml';
18+
protected $_template = 'Magento_Backend::page/footer.phtml';
1919

2020
/**
2121
* @var \Magento\Framework\App\ProductMetadataInterface

app/code/Magento/Backend/Block/Page/Header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Header extends \Magento\Backend\Block\Template
1818
/**
1919
* @var string
2020
*/
21-
protected $_template = 'page/header.phtml';
21+
protected $_template = 'Magento_Backend::page/header.phtml';
2222

2323
/**
2424
* Backend data

0 commit comments

Comments
 (0)