Skip to content

Commit 4310d62

Browse files
pykettkpykettk
authored
feat: update branding
* Update Admin Branding * Update Copyright Notice + Remove Magento icon * Update Privacy Policy and Bug Report Links * Update Fallback Logo URL to Mage-OS Logo
1 parent db9ec29 commit 4310d62

File tree

31 files changed

+208
-98
lines changed

31 files changed

+208
-98
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,10 @@ password,password
240240
"Reload Data","Reload Data"
241241
"Browse Files...","Browse Files..."
242242
Magento,Magento
243+
"Mage-OS","Mage-OS"
243244
"Copyright © %1 Magento Commerce Inc. All rights reserved.","Copyright © %1 Magento Commerce Inc. All rights reserved."
245+
"Thank you for choosing Mage-OS.","Thank you for choosing Mage-OS."
246+
"Learn more about Mage-OS.","Learn more about Mage-OS."
244247
"ver. %1","ver. %1"
245248
"Magento Admin Panel","Magento Admin Panel"
246249
"Account Setting","Account Setting"

‎app/code/Magento/Backend/view/adminhtml/layout/admin_login.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<move element="logo" destination="login.header" before="-"/>
2525
<referenceBlock name="logo">
2626
<arguments>
27-
<argument name="logo_image_src" xsi:type="string">images/magento-logo.svg</argument>
27+
<argument name="logo_image_src" xsi:type="string">images/mage-os-logo.svg</argument>
2828
</arguments>
2929
</referenceBlock>
3030

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<arguments>
2727
<argument name="show_part" xsi:type="string">logo</argument>
2828
<argument name="edition" translate="true" xsi:type="string">Community Edition</argument>
29-
<argument name="logo_image_src" xsi:type="string">images/magento-icon.svg</argument>
29+
<argument name="logo_image_src" xsi:type="string">images/mage-os-icon.svg</argument>
3030
</arguments>
3131
</block>
3232
<block class="Magento\Backend\Block\GlobalSearch" name="global.search" as="search" after="logo" aclResource="Magento_Backend::global_search"/>
@@ -63,12 +63,12 @@
6363
<block class="Magento\Backend\Block\Page\Footer" name="version" as="version" />
6464
<block class="Magento\Framework\View\Element\Template" name="privacyPolicy" as="privacyPolicy" template="Magento_Backend::page/privacyPolicy.phtml">
6565
<arguments>
66-
<argument name="privacypolicy_url" xsi:type="string">https://www.adobe.com/privacy/policy.html</argument>
66+
<argument name="privacypolicy_url" xsi:type="string">https://mage-os.org/privacy-policy</argument>
6767
</arguments>
6868
</block>
6969
<block class="Magento\Framework\View\Element\Template" name="report" as="report" template="Magento_Backend::page/report.phtml">
7070
<arguments>
71-
<argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
71+
<argument name="bugreport_url" xsi:type="string">https://github.com/mage-os/mageos-magento2/issues</argument>
7272
</arguments>
7373
</block>
7474
</container>

‎app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
use Magento\Backend\Block\Page\Copyright;
8+
use Magento\Framework\Escaper;
9+
10+
/** @var Escaper $escaper */
11+
/** @var Copyright $block */
612
?>
7-
<a class="link-copyright" href="http://magento.com" target="_blank" title="<?= $block->escapeHtmlAttr(__('Magento')) ?>"></a>
8-
<?= $block->escapeHtml(__('Copyright &copy; %1 Magento Commerce Inc. All rights reserved.', date('Y'))) ?>
13+
<?= $escaper->escapeHtml(__('Thank you for choosing Mage-OS.')); ?>
14+
<a class="link-copyright"
15+
href="https://mage-os.org/"
16+
target="_blank"
17+
title="<?= $escaper->escapeHtmlAttr(__('Mage-OS')); ?>">
18+
<?= $escaper->escapeHtml(__('Learn more about Mage-OS.')); ?>
19+
</a>

‎app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
use Magento\Backend\Block\Page\Footer;
8+
use Magento\Framework\Escaper;
9+
10+
/** @var Escaper $escaper */
11+
/** @var Footer $block */
612
?>
713
<p class="magento-version">
8-
<strong><?= $block->escapeHtml(__('Magento')) ?></strong>
9-
<?= $block->escapeHtml(__('ver. %1', $block->getMagentoVersion())) ?>
14+
<strong><?= $escaper->escapeHtml(__('Mage-OS')); ?></strong>
15+
<?= $escaper->escapeHtml(__('ver. %1', $block->getMagentoVersion())); ?>
1016
</p>

‎app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml‎

Lines changed: 62 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,74 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
/** @var $block \Magento\Backend\Block\Page\Header */
8+
use Magento\Backend\Block\Page\Header;
9+
use Magento\Framework\Escaper;
10+
11+
/** @var Escaper $escaper */
12+
/** @var Header $block */
813
$part = $block->getShowPart();
914
?>
10-
<?php if ($part === 'logo') : ?>
11-
<?php $edition = $block->hasEdition() ? 'data-edition="' . $block->escapeHtml($block->getEdition()) . '"' : ''; ?>
12-
<?php $logoSrc = ($block->hasLogoImageSrc()) ? $block->escapeHtml($block->getLogoImageSrc()) : 'images/magento-logo.svg' ?>
13-
<a
14-
href="<?= $block->escapeUrl($block->getHomeLink()) ?>"
15-
<?= /* @noEscape */ $edition ?>
16-
class="logo">
17-
<img class="logo-img" src="<?= /* @noEscape */ $block->getViewFileUrl($logoSrc) ?>"
18-
alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>" title="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
19-
</a>
20-
<?php elseif ($part === 'user') : ?>
21-
<div class="admin-user admin__action-dropdown-wrap">
22-
<a
23-
href="<?= /* @noEscape */ $block->getUrl('adminhtml/system_account/index') ?>"
24-
class="admin__action-dropdown"
25-
title="<?= $block->escapeHtml(__('My Account')) ?>"
26-
data-mage-init='{"dropdown":{}}'
27-
data-toggle="dropdown">
28-
<span class="admin__action-dropdown-text">
29-
<span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>
15+
<?php if ($part === 'logo'): ?>
16+
<?php $edition = $block->hasEdition()
17+
? 'data-edition="' . $escaper->escapeHtml($block->getEdition()) . '"'
18+
: ''; ?>
19+
<?php $logoSrc = $block->hasLogoImageSrc()
20+
? $escaper->escapeHtml($block->getLogoImageSrc())
21+
: 'images/mage-os-logo.svg'; ?>
22+
<a href="<?= $escaper->escapeUrl($block->getHomeLink()); ?>"
23+
<?= /* @noEscape */ $edition; ?>
24+
class="logo">
25+
<img class="logo-img"
26+
src="<?= $escaper->escapeUrl($block->getViewFileUrl($logoSrc)); ?>"
27+
alt="<?= $escaper->escapeHtml(__('Magento Admin Panel')); ?>"
28+
title="<?= $escaper->escapeHtml(__('Magento Admin Panel')); ?>"/>
29+
</a>
30+
<?php elseif ($part === 'user'): ?>
31+
<div class="admin-user admin__action-dropdown-wrap">
32+
<a href="<?= $escaper->escapeUrl($block->getUrl('adminhtml/system_account/index')); ?>"
33+
class="admin__action-dropdown"
34+
title="<?= $escaper->escapeHtmlAttr(__('My Account')); ?>"
35+
data-mage-init='{"dropdown":{}}'
36+
data-toggle="dropdown">
37+
<span class="admin__action-dropdown-text">
38+
<span class="admin-user-account-text">
39+
<?= $escaper->escapeHtml($block->getUser()->getUserName()); ?>
3040
</span>
31-
</a>
32-
<ul class="admin__action-dropdown-menu">
33-
<?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')) : ?>
34-
<li>
35-
<a
36-
href="<?= /* @noEscape */ $block->getUrl('adminhtml/system_account/index') ?>"
37-
<?= /* @noEscape */ $block->getUiId('user', 'account', 'settings') ?>
38-
title="<?= $block->escapeHtml(__('Account Setting')) ?>">
39-
<?= $block->escapeHtml(__('Account Setting')) ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>)
40-
</a>
41-
</li>
42-
<?php endif; ?>
43-
<li>
44-
<a
45-
href="<?= /* @noEscape */ $block->getBaseUrl() ?>"
46-
title="<?= $block->escapeHtml(__('Customer View')) ?>"
47-
target="_blank" class="store-front">
48-
<?= $block->escapeHtml(__('Customer View')) ?>
49-
</a>
50-
</li>
41+
</span>
42+
</a>
43+
<ul class="admin__action-dropdown-menu">
44+
<?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')): ?>
5145
<li>
52-
<a
53-
href="<?= /* @noEscape */ $block->getLogoutLink() ?>"
54-
class="account-signout"
55-
title="<?= $block->escapeHtml(__('Sign Out')) ?>">
56-
<?= $block->escapeHtml(__('Sign Out')) ?>
46+
<a href="<?= $escaper->escapeUrl($block->getUrl('adminhtml/system_account/index')); ?>"
47+
<?= /* @noEscape */ $block->getUiId('user', 'account', 'settings'); ?>
48+
title="<?= $escaper->escapeHtml(__('Account Setting')); ?>">
49+
<?= $escaper->escapeHtml(__('Account Setting')); ?>
50+
(<span class="admin-user-name">
51+
<?= $escaper->escapeHtml($block->getUser()->getUserName()); ?>
52+
</span>)
5753
</a>
5854
</li>
59-
</ul>
60-
</div>
55+
<?php endif; ?>
6156

62-
<?php elseif ($part === 'other') : ?>
63-
<?= $block->getChildHtml() ?>
57+
<li>
58+
<a href="<?= $escaper->escapeUrl($block->getBaseUrl()); ?>"
59+
title="<?= $escaper->escapeHtml(__('Customer View')); ?>"
60+
target="_blank"
61+
class="store-front">
62+
<?= $escaper->escapeHtml(__('Customer View')); ?>
63+
</a>
64+
</li>
65+
<li>
66+
<a href="<?= $escaper->escapeUrl($block->getLogoutLink()); ?>"
67+
class="account-signout"
68+
title="<?= $escaper->escapeHtml(__('Sign Out')); ?>">
69+
<?= $escaper->escapeHtml(__('Sign Out')); ?>
70+
</a>
71+
</li>
72+
</ul>
73+
</div>
74+
<?php elseif ($part === 'other'): ?>
75+
<?= $block->getChildHtml(); ?>
6476
<?php endif; ?>

‎app/code/Magento/Email/view/frontend/web/logo_email.png‎

18.4 KB
Loading

‎app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/templates/html/notices.phtml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @var \Magento\Framework\View\Element\Template $block
99
* @var \Magento\Framework\Escaper $escaper
1010
*/
11-
$viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/magento-icon.svg');
11+
$viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/mage-os-icon.svg');
1212
?>
1313
<?php if ($block->getConfig()->isEnabled()): ?>
1414
<div class="lac-notification-sticky"
@@ -17,7 +17,9 @@ $viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images
1717
<div class="lac-notification clearfix" data-bind="visible: isVisible" style="display: none">
1818
<div class="top-container">
1919
<div class="lac-notification-icon wrapper">
20-
<img class="logo-img" src="<?= $escaper->escapeUrl($viewFileUrl) ?>" alt="Magento" />
20+
<img class="logo-img"
21+
src="<?= $escaper->escapeUrl($viewFileUrl) ?>"
22+
alt="<?= $escaper->escapeHtmlAttr(__('Mage-OS')); ?>"/>
2123
</div>
2224
<div class="lac-notification-text wrapper">
2325
<span data-bind="html: notificationText"></span>

‎app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/mage-os-icon.svg‎

Lines changed: 6 additions & 0 deletions
Loading

‎app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/magento-icon.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)