Skip to content

[Forwardport] Link logo in web setup wizard to back-end base URL #17610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2018
Merged

[Forwardport] Link logo in web setup wizard to back-end base URL #17610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_common.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
padding-top: @main__indent-top;
}

.menu-wrapper {
.logo-static {
pointer-events: none;
}
}

//
// Header
// _____________________________________________
Expand Down
2 changes: 1 addition & 1 deletion setup/pub/styles/setup.css
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 10 additions & 3 deletions setup/view/magento/setup/navigation/side-menu.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@

// @codingStandardsIgnoreFile

use Magento\Backend\Model\UrlInterface;
use Magento\Framework\App\ObjectManager;

$objectManager = ObjectManager::getInstance();
/** @var Magento\Backend\Model\UrlInterface $backendUrl */
$backendUrl = $objectManager->get(UrlInterface::class);

?>
<?php $expressions = []; foreach ( $this->main as $item ): ?>
<?php $expressions[] = '!$state.is(\'' . $item['id'] . '\')';
Expand All @@ -20,13 +27,13 @@
ng-show="<?= implode( '&&', $expressions) ?>"
>
<nav class="admin__menu" ng-controller="mainController">
<span
class="logo logo-static"
<a href="<?= $backendUrl->getBaseUrl() . $backendUrl->getAreaFrontName(); ?>"
class="logo"
data-edition="Community Edition">
<img class="logo-img"
src="./pub/images/logo.svg"
alt="Magento Admin Panel">
</span>
</a>
<ul id="nav" role="menubar">
<li class="item-home level-0" ng-class="{_active: $state.current.name === 'root.home'}">
<a href="" ui-sref="root.home">
Expand Down