Skip to content

Commit

Permalink
Apply some Brand Changes, to have Magento appearing less (OpenMage#989)
Browse files Browse the repository at this point in the history
* change copyright notice to OpenMage

* change admin Footer to show OpenMage Version

* change url and name related to BugReport message

* replace favicon with OpenMage one
  • Loading branch information
Flyingmana authored May 21, 2020
1 parent a946552 commit 66e699b
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/code/core/Mage/Page/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<welcome>Default welcome msg!</welcome>
</header>
<footer translate="copyright" module="page">
<copyright>&amp;copy; 2020 Magento Demo Store. All Rights Reserved.</copyright>
<copyright>&amp;copy; 2020 OpenMage Demo Store. All Rights Reserved.</copyright>
</footer>
</design>
<system>
Expand Down
4 changes: 2 additions & 2 deletions app/design/adminhtml/default/default/layout/main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ Default layout, loads most of the pages
<block type="core/messages" name="messages" as="messages"/>
<block type="core/text_list" name="js" as="js"/>
<block type="adminhtml/page_footer" name="footer" as="footer">
<action method="setBugreportUrl"><url>http://www.magentocommerce.com/bug-tracking</url></action>
<action method="setConnectWithMagentoUrl"><url>http://magento.com/resources/technical</url></action>
<action method="setBugreportUrl"><url>https://github.com/OpenMage/magento-lts/issues</url></action>
<action method="setConnectWithMagentoUrl"><url>http://www.openmage.org/</url></action>
</block>
<block type="core/profiler" name="profiler" as="profiler"/>
<block type="core/text_list" name="before_body_end" as="before_body_end"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@
*/
?>
<p class="bug-report">
<a href="<?php echo $this->getBugreportUrl() ?>" id="footer_bug_tracking"><?php echo $this->__('Help Us Keep Magento Healthy - Report All Bugs') ?></a><br/>
<a href="<?php echo $this->getBugreportUrl() ?>" id="footer_bug_tracking"><?php echo $this->__('Help Us Keep OpenMage Healthy - Report All Bugs') ?></a><br/>
<?php echo $this->__('Interface Locale: %s', $this->getLanguageSelect()) ?>
</p>
<p class="legality">
<a href="<?php echo $this->getConnectWithMagentoUrl() ?>" id="footer_connect"><?php echo $this->__('Connect with the Magento Community') ?></a><br/>
<img src="<?php echo $this->getSkinUrl('images/varien_logo.gif') ?>" class="v-middle" alt="" />&nbsp;&nbsp;
<?php echo $this->__('Magento&trade; is a trademark of Magento Inc.<br/>Copyright &copy; %s Magento Inc.', date('Y')) ?>
</p>
<?php echo $this->__('Magento ver. %s', Mage::getVersion()) ?>
<?php echo $this->__('OpenMage ver. %s', Mage::getOpenMageVersion()) ?>
&nbsp;(<?php echo $this->__('based on Magento ver. %s', Mage::getVersion()) ?>)
<script type="text/javascript">
$('footer_bug_tracking').target = 'Varien_External';
$('footer_connect').target = 'Varien_External';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<div class="footer-container">
<div class="footer">
<?php echo $this->getChildHtml() ?>
<p class="bugs"><?php echo $this->__('Help Us to Keep Magento Healthy') ?> - <a href="http://www.magentocommerce.com/bug-tracking" onclick="this.target='_blank'"><strong><?php echo $this->__('Report All Bugs') ?></strong></a> <?php echo $this->__('(ver. %s)', Mage::getVersion()) ?></p>
<p class="bugs"><?php echo $this->__('Help Us to Keep OpenMage Healthy') ?> - <a href="https://github.com/OpenMage/magento-lts/issues" onclick="this.target='_blank'"><strong><?php echo $this->__('Report All Bugs') ?></strong></a> <?php echo $this->__('(ver. %s)', Mage::getOpenMageVersion()) ?></p>
<address><?php echo $this->getCopyright() ?></address>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<?php echo $this->getChildHtml('cms_footer_links') ?>
<?php echo $this->getChildHtml('footer_links') ?>
<?php echo $this->getChildHtml('newsletter') ?>
<p class="bugs"><?php echo $this->__('Help Us to Keep Magento Healthy') ?> - <a href="http://www.magentocommerce.com/bug-tracking" onclick="this.target='_blank'"><strong><?php echo $this->__('Report All Bugs') ?></strong></a> <?php echo $this->__('(ver. %s)', Mage::getVersion()) ?></p>
<p class="bugs"><?php echo $this->__('Help Us to Keep OpenMage Healthy') ?> - <a href="https://github.com/OpenMage/magento-lts/issues" onclick="this.target='_blank'"><strong><?php echo $this->__('Report All Bugs') ?></strong></a> <?php echo $this->__('(ver. %s)', Mage::getOpenMageVersion()) ?></p>
<address><?php echo $this->getCopyright() ?></address>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/design/install/default/default/template/page.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<div class="footer-container">
<div class="footer">
<p class="legality">
<?php echo Mage::helper('install')->__('Help Us to Keep Magento Healthy') ?> - <a href="http://www.magentocommerce.com/bug-tracking" id="bug_tracking_link"><strong><?php echo Mage::helper('install')->__('Report All Bugs') ?></strong></a> <?php echo Mage::helper('install')->__('(ver. %s)', Mage::getVersion()) ?><br/>
<?php echo Mage::helper('install')->__('Help Us to Keep OpenMage Healthy') ?> - <a href="https://github.com/OpenMage/magento-lts/issues" id="bug_tracking_link"><strong><?php echo Mage::helper('install')->__('Report All Bugs') ?></strong></a> <?php echo Mage::helper('install')->__('(ver. %s)', Mage::getOpenMageVersion()) ?><br/>
<script type="text/javascript">
//<![CDATA[
$('bug_tracking_link').target = "varien_external";
Expand Down
3 changes: 2 additions & 1 deletion app/locale/en_US/Mage_Adminhtml.csv
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,8 @@
"Magento Logo","Magento Logo"
"Magento is a trademark of Magento Inc. Copyright &copy; %s Magento Inc.","Magento is a trademark of Magento Inc. Copyright &copy; %s Magento Inc."
"Magento root directory","Magento root directory"
"Magento ver. %s","Magento ver. %s"
"OpenMage ver. %s","OpenMage ver. %s"
"based on Magento ver. %s","based on Magento ver. %s"
"Magento&trade; is a trademark of Magento Inc.<br/>Copyright &copy; %s Magento Inc.","Magento&trade; is a trademark of Magento Inc.<br/>Copyright &copy; %s Magento Inc."
"Make sure that data encoding in the file is consistent and saved in one of supported encodings (UTF-8 or ANSI).","Make sure that data encoding in the file is consistent and saved in one of supported encodings (UTF-8 or ANSI)."
"Manage Attribute Sets","Manage Attribute Sets"
Expand Down
4 changes: 2 additions & 2 deletions app/locale/en_US/Mage_Page.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"%s Item(s)","%s Item(s)"
"%s-%s of %s","%s-%s of %s"
"&copy; 2013 Magento Demo Store. All Rights Reserved.","&copy; 2013 Magento Demo Store. All Rights Reserved."
"&copy; 2020 Magento Demo Store. All Rights Reserved.","&copy; 2020 Magento Demo Store. All Rights Reserved."
"&copy; 2013 OpenMage Demo Store. All Rights Reserved.","&copy; 2013 OpenMage Demo Store. All Rights Reserved."
"&copy; 2020 OpenMage Demo Store. All Rights Reserved.","&copy; 2020 OpenMage Demo Store. All Rights Reserved."
"(Shift-)Click or drag to change value","(Shift-)Click or drag to change value"
"(ver. %s)","(ver. %s)"
"- Click on any of the time parts to increase it","- Click on any of the time parts to increase it"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Footer extends Block
/**
* @var string
*/
protected $versionPath = '//div[@class="footer" and contains(.,"Magento ver. ';
protected $versionPath = '//div[@class="footer" and contains(.,"OpenMage ver. ';

/**
* @param $currentVersion
Expand Down
Binary file modified favicon.ico
Binary file not shown.
Binary file modified skin/adminhtml/default/default/favicon.ico
Binary file not shown.
Binary file modified skin/frontend/base/default/favicon.ico
Binary file not shown.
Binary file modified skin/frontend/default/default/favicon.ico
Binary file not shown.

0 comments on commit 66e699b

Please sign in to comment.