Skip to content

[Backport][2.2] Made logo clickable on home page #19199

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
magento-engcom-team merged 2 commits into from
Jan 2, 2019
Merged

[Backport][2.2] Made logo clickable on home page #19199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd3cb9b
Made logo clickable on home page
Nov 13, 2018
2ad7fd6
Deprecated the isHomePage() function. No longer used.
gwharton Dec 11, 2018
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
4 changes: 4 additions & 0 deletions app/code/Magento/Theme/Block/Html/Header/Logo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ public function __construct(
/**
* Check if current url is url for home page
*
* @deprecated This function is no longer used. It was previously used by
* Magento/Theme/view/frontend/templates/html/header/logo.phtml
* to check if the logo should be clickable on the homepage.
*
* @return bool
*/
public function isHomePage()
Expand Down
24 changes: 8 additions & 16 deletions app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,11 @@
?>
<?php $storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAlt();?>
<span data-action="toggle-nav" class="action nav-toggle"><span><?= /* @escapeNotVerified */ __('Toggle Nav') ?></span></span>
<?php if ($block->isHomePage()):?>
<strong class="logo">
<?php else: ?>
<a class="logo" href="<?= $block->getUrl('') ?>" title="<?= /* @escapeNotVerified */ $storeName ?>">
<?php endif ?>
<img src="<?= /* @escapeNotVerified */ $block->getLogoSrc() ?>"
title="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
alt="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
<?= $block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
<?= $block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
/>
<?php if ($block->isHomePage()):?>
</strong>
<?php else:?>
</a>
<?php endif?>
<a class="logo" href="<?= $block->getUrl('') ?>" title="<?= /* @escapeNotVerified */ $storeName ?>">
<img src="<?= /* @escapeNotVerified */ $block->getLogoSrc() ?>"
title="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
alt="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
<?= $block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
<?= $block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
/>
</a>