Skip to content

Commit d86f0e5

Browse files
author
Joan He
committed
MAGETWO-94790: Fatal error during Magento installation via browser
1 parent ed8b676 commit d86f0e5

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_common.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
padding-top: @main__indent-top;
2020
}
2121

22+
.menu-wrapper {
23+
.logo-static {
24+
pointer-events: none;
25+
}
26+
}
27+
2228
//
2329
// Header
2430
// _____________________________________________

setup/pub/styles/setup.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

setup/view/magento/setup/navigation/side-menu.phtml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66

77
// @codingStandardsIgnoreFile
88

9-
use Magento\Backend\Model\UrlInterface;
10-
use Magento\Framework\App\ObjectManager;
11-
12-
$objectManager = ObjectManager::getInstance();
13-
/** @var Magento\Backend\Model\UrlInterface $backendUrl */
14-
$backendUrl = $objectManager->get(UrlInterface::class);
15-
169
?>
1710
<?php $expressions = []; foreach ( $this->main as $item ): ?>
1811
<?php $expressions[] = '!$state.is(\'' . $item['id'] . '\')';
@@ -27,13 +20,13 @@ $backendUrl = $objectManager->get(UrlInterface::class);
2720
ng-show="<?= implode( '&&', $expressions) ?>"
2821
>
2922
<nav class="admin__menu" ng-controller="mainController">
30-
<a href="<?= $backendUrl->getBaseUrl() . $backendUrl->getAreaFrontName(); ?>"
31-
class="logo"
23+
<span
24+
class="logo logo-static"
3225
data-edition="Community Edition">
3326
<img class="logo-img"
3427
src="./pub/images/logo.svg"
3528
alt="Magento Admin Panel">
36-
</a>
29+
</span>
3730
<ul id="nav" role="menubar">
3831
<li class="item-home level-0" ng-class="{_active: $state.current.name === 'root.home'}">
3932
<a href="" ui-sref="root.home">

0 commit comments

Comments
 (0)