Skip to content
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

Jump to bottom

[BC] Converted RWD's default logos to SVG (and removed some Magento names) #3148

Merged
merged 16 commits into from
May 13, 2023
Merged

[BC] Converted RWD's default logos to SVG (and removed some Magento names) #3148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
de5f605
Converted RWD's default logos to SVG
fballiano Apr 5, 2023
5c314bf
Using the gray logo
fballiano Apr 5, 2023
c1af310
reverted mistake
fballiano Apr 6, 2023
7648485
replaced some other Magento names
fballiano Apr 6, 2023
2a8a8ee
suggestions by @addison74
fballiano Apr 8, 2023
f815eb2
Merge branch 'next' into logo
fballiano Apr 21, 2023
719dcb2
revert to GIF for email logo
fballiano Apr 21, 2023
c9e1d28
revert to GIF for email logo
fballiano Apr 21, 2023
f2d1810
revert commit error
fballiano Apr 21, 2023
ade7b7f
Reverted to GIF for emails
fballiano Apr 21, 2023
f20049a
Reverted to GIF for emails
fballiano Apr 21, 2023
a9b864a
Reverted to GIF for emails
fballiano Apr 21, 2023
6b57a6c
Removed large/small logos from template since with SVG there is no ne…
fballiano Apr 21, 2023
d363777
Fixed whitespaces
fballiano Apr 21, 2023
d2e1530
removed more styles
fballiano Apr 21, 2023
5d2ef88
deprecated method getLogoSrcSmall
fballiano Apr 21, 2023
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
1 change: 1 addition & 0 deletions app/code/core/Mage/Page/Block/Html/Header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public function getLogoSrc()

/**
* @return string
* @deprecated Use SVG or srcset
*/
public function getLogoSrcSmall()
{
Expand Down
14 changes: 7 additions & 7 deletions app/code/core/Mage/Page/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,21 +105,21 @@
<default>
<design>
<head translate="default_description" module="page">
<default_title>Magento Commerce</default_title>
<default_title>OpenMage</default_title>
<default_description>Default Description</default_description>
<default_keywords>Magento, Varien, E-commerce</default_keywords>
<default_keywords>OpenMage, e-commerce</default_keywords>
<default_robots>*</default_robots>
<default_media_type>text/html</default_media_type>
<default_charset>utf-8</default_charset>
</head>
<header translate="welcome" module="page">
<logo_src>images/logo.gif</logo_src>
<logo_alt>Magento Commerce</logo_alt>
<logo_src_small>images/logo.gif</logo_src_small>
<welcome>Default welcome msg!</welcome>
<logo_src>images/logo.svg</logo_src>
<logo_alt>OpenMage</logo_alt>
<logo_src_small>images/logo.svg</logo_src_small>
<welcome>Welcome!</welcome>
</header>
<footer translate="copyright" module="page">
<copyright>&amp;copy; 2020 OpenMage Demo Store. All Rights Reserved.</copyright>
<copyright>&amp;copy; 2023 OpenMage Demo Store. All Rights Reserved.</copyright>
</footer>
</design>
<system>
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

$installer->run("

UPDATE {$this->getTable('core_email_template')} set template_text='<style type=\"text/css\">\r\nbody,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }\r\n</style>\r\n\r\n<div style=\"font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;\">\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"98%\" style=\"margin-top:10px; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; margin-bottom:10px;\"\">\r\n <tr>\r\n <td align=\"center\" valign=\"top\">\r\n <!-- [ header starts here] -->\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"650\">\r\n <tr>\r\n <td valign=\"top\">\r\n <a href=\"{{store url=\"\"}}\"><img src=\"{{skin url=\"images/logo_email.gif\"}}\" alt=\"Magento\" style=\"margin-bottom:10px;\" border=\"0\"/></a></td>\r\n </tr>\r\n </table>\r\n\r\n <!-- [ middle starts here] -->\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"650\">\r\n <tr>\r\n <td valign=\"top\">\r\n <p><strong>Hello {{var billing.name}}</strong>,<br/>\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by <a href=\"{{store url=\"customer/account/\"}}\" style=\"color:#1E7EC8;\">logging into your account</a>. If you have any questions about your order please contact us at <a href=\"mailto:dummyemail@openmage.org\" style=\"color:#1E7EC8;\">dummyemail@openmage.org</a> or call us at <span class=\"nobr\">(555) 555-0123</span> Monday - Friday, 8am - 5pm PST.</p>\r\n <p>Your order confirmation is below. Thank you again for your business.</p>\r\n \r\n <h3 style=\"border-bottom:2px solid #eee; font-size:1.05em; padding-bottom:1px; \">Your Order #{{var order.increment_id}} <small>(placed on {{var order.getCreatedAtFormated(\'long\')}})</small></h3>\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\r\n <thead>\r\n <tr>\r\n <th align=\"left\" width=\"48.5%\" bgcolor=\"#d9e5ee\" style=\"padding:5px 9px 6px 9px; border:1px solid #bebcb7; border-bottom:none; line-height:1em;\">Billing \r\n Information:</th>\r\n <th width=\"3%\"></th>\r\n <th align=\"left\" width=\"48.5%\" bgcolor=\"#d9e5ee\" style=\"padding:5px 9px 6px 9px; border:1px solid #bebcb7; border-bottom:none; line-height:1em;\">Payment \r\n Method:</th>\r\n </tr>\r\n </thead>\r\n <tbody>\r\n <tr>\r\n <td valign=\"top\" style=\"padding:7px 9px 9px 9px; border:1px solid #bebcb7; border-top:0; background:#f8f7f5;\">{{var order.billing_address.getFormated(\'html\')}}</td>\r\n <td>&nbsp;</td>\r\n <td valign=\"top\" style=\"padding:7px 9px 9px 9px; border:1px solid #bebcb7; border-top:0; background:#f8f7f5;\"> {{var payment_html}}</td>\r\n </tr>\r\n </tbody>\r\n </table><br/>\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\r\n <thead>\r\n <tr>\r\n <th align=\"left\" width=\"48.5%\" bgcolor=\"#d9e5ee\" style=\"padding:5px 9px 6px 9px; border:1px solid #bebcb7; border-bottom:none; line-height:1em;\">Shipping \r\n Information:</th>\r\n <th width=\"3%\"></th>\r\n <th align=\"left\" width=\"48.5%\" bgcolor=\"#d9e5ee\" style=\"padding:5px 9px 6px 9px; border:1px solid #bebcb7; border-bottom:none; line-height:1em;\">Shipping \r\n Method:</th>\r\n </tr>\r\n </thead>\r\n <tbody>\r\n <tr>\r\n <td valign=\"top\" style=\"padding:7px 9px 9px 9px; border:1px solid #bebcb7; border-top:0; background:#f8f7f5;\">{{var order.shipping_address.getFormated(\'html\')}}</td>\r\n <td>&nbsp;</td>\r\n <td valign=\"top\" style=\"padding:7px 9px 9px 9px; border:1px solid #bebcb7; border-top:0; background:#f8f7f5;\">{{var order.shipping_description}}</td>\r\n </tr>\r\n </tbody>\r\n </table><br/>\r\n\r\n{{var items_html}}<br/>\r\n {{var order.getEmailCustomerNote()}} \r\n <p>Thank you again,<br/><strong>Magento Demo Store</strong></p>\r\n\r\n\r\n </td>\r\n </tr>\r\n </table>\r\n \r\n </td>\r\n </tr>\r\n </table>\r\n </div>\r\n' WHERE template_code='New order (HTML)';
fballiano marked this conversation as resolved.
Show resolved Hide resolved
UPDATE {$this->getTable('core_email_template')} set template_text='<style type=\"text/css\">body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }</style>\r\n<div style=\"font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;\">\r\n<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"98%\" style=\"margin-top:10px; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; margin-bottom:10px;\"\">\r\n <tr>\r\n <td align=\"center\" valign=\"top\">\r\n <!-- [ header starts here] -->\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"650\">\r\n <tr>\r\n <td valign=\"top\">\r\n <a href=\"{{store url=\"\"}}\"><img src=\"{{skin url=\"images/logo_email.gif\"}}\" alt=\"Magento\" style=\"margin-bottom:10px;\" border=\"0\"/></a></td>\r\n </tr>\r\n </table>\r\n\r\n <!-- [ middle starts here] -->\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"650\">\r\n <tr>\r\n <td valign=\"top\">\r\n <p><strong>Dear {{var billing.name}}</strong>,<br/>\r\n Your order # {{var order.increment_id}} has been <strong>{{var order.getStatusLabel()}}</strong>.</p>\r\n <p>{{var comment}}</p>\r\n <p>If you have any questions, please feel free to contact us at \r\n <a href=\"mailto:magento@varien.com\" style=\"color:#1E7EC8;\">dummyemail@openmage.org</a> or by phone at (555) 555-0123.</p>\r\n <p>Thank you again,<br/><strong>Magento Demo Store</strong></p>\r\n </td>\r\n </tr>\r\n </table>\r\n </td>\r\n </tr>\r\n </table>\r\n</div>\r\n' WHERE template_code='Order update (HTML)';
UPDATE {$this->getTable('core_email_template')} set template_text='<style type=\"text/css\">\r\nbody,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }\r\n</style>\r\n\r\n<div style=\"font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;\">\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"98%\" style=\"margin-top:10px; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; margin-bottom:10px;\"\">\r\n <tr>\r\n <td align=\"center\" valign=\"top\">\r\n <!-- [ header starts here] -->\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"650\">\r\n <tr>\r\n <td valign=\"top\">\r\n <a href=\"{{store url=\"\"}}\"><img src=\"{{skin url=\"images/logo_email.gif\"}}\" alt=\"OpenMage\" style=\"margin-bottom:10px;\" border=\"0\"/></a></td>\r\n </tr>\r\n </table>\r\n\r\n <!-- [ middle starts here] -->\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"650\">\r\n <tr>\r\n <td valign=\"top\">\r\n <p><strong>Hello {{var billing.name}}</strong>,<br/>\r\n Thank you for your order from OpenMage Demo Store. Once your package ships we will send an email with a link to track your order. You can check the status of your order by <a href=\"{{store url=\"customer/account/\"}}\" style=\"color:#1E7EC8;\">logging into your account</a>. If you have any questions about your order please contact us at <a href=\"mailto:dummyemail@openmage.org\" style=\"color:#1E7EC8;\">dummyemail@openmage.org</a> or call us at <span class=\"nobr\">(555) 555-0123</span> Monday - Friday, 8am - 5pm PST.</p>\r\n <p>Your order confirmation is below. Thank you again for your business.</p>\r\n \r\n <h3 style=\"border-bottom:2px solid #eee; font-size:1.05em; padding-bottom:1px; \">Your Order #{{var order.increment_id}} <small>(placed on {{var order.getCreatedAtFormated(\'long\')}})</small></h3>\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\r\n <thead>\r\n <tr>\r\n <th align=\"left\" width=\"48.5%\" bgcolor=\"#d9e5ee\" style=\"padding:5px 9px 6px 9px; border:1px solid #bebcb7; border-bottom:none; line-height:1em;\">Billing \r\n Information:</th>\r\n <th width=\"3%\"></th>\r\n <th align=\"left\" width=\"48.5%\" bgcolor=\"#d9e5ee\" style=\"padding:5px 9px 6px 9px; border:1px solid #bebcb7; border-bottom:none; line-height:1em;\">Payment \r\n Method:</th>\r\n </tr>\r\n </thead>\r\n <tbody>\r\n <tr>\r\n <td valign=\"top\" style=\"padding:7px 9px 9px 9px; border:1px solid #bebcb7; border-top:0; background:#f8f7f5;\">{{var order.billing_address.getFormated(\'html\')}}</td>\r\n <td>&nbsp;</td>\r\n <td valign=\"top\" style=\"padding:7px 9px 9px 9px; border:1px solid #bebcb7; border-top:0; background:#f8f7f5;\"> {{var payment_html}}</td>\r\n </tr>\r\n </tbody>\r\n </table><br/>\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\r\n <thead>\r\n <tr>\r\n <th align=\"left\" width=\"48.5%\" bgcolor=\"#d9e5ee\" style=\"padding:5px 9px 6px 9px; border:1px solid #bebcb7; border-bottom:none; line-height:1em;\">Shipping \r\n Information:</th>\r\n <th width=\"3%\"></th>\r\n <th align=\"left\" width=\"48.5%\" bgcolor=\"#d9e5ee\" style=\"padding:5px 9px 6px 9px; border:1px solid #bebcb7; border-bottom:none; line-height:1em;\">Shipping \r\n Method:</th>\r\n </tr>\r\n </thead>\r\n <tbody>\r\n <tr>\r\n <td valign=\"top\" style=\"padding:7px 9px 9px 9px; border:1px solid #bebcb7; border-top:0; background:#f8f7f5;\">{{var order.shipping_address.getFormated(\'html\')}}</td>\r\n <td>&nbsp;</td>\r\n <td valign=\"top\" style=\"padding:7px 9px 9px 9px; border:1px solid #bebcb7; border-top:0; background:#f8f7f5;\">{{var order.shipping_description}}</td>\r\n </tr>\r\n </tbody>\r\n </table><br/>\r\n\r\n{{var items_html}}<br/>\r\n {{var order.getEmailCustomerNote()}} \r\n <p>Thank you again,<br/><strong>OpenMage Demo Store</strong></p>\r\n\r\n\r\n </td>\r\n </tr>\r\n </table>\r\n \r\n </td>\r\n </tr>\r\n </table>\r\n </div>\r\n' WHERE template_code='New order (HTML)';
UPDATE {$this->getTable('core_email_template')} set template_text='<style type=\"text/css\">body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }</style>\r\n<div style=\"font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;\">\r\n<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"98%\" style=\"margin-top:10px; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; margin-bottom:10px;\"\">\r\n <tr>\r\n <td align=\"center\" valign=\"top\">\r\n <!-- [ header starts here] -->\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"650\">\r\n <tr>\r\n <td valign=\"top\">\r\n <a href=\"{{store url=\"\"}}\"><img src=\"{{skin url=\"images/logo_email.gif\"}}\" alt=\"OpenMage\" style=\"margin-bottom:10px;\" border=\"0\"/></a></td>\r\n </tr>\r\n </table>\r\n\r\n <!-- [ middle starts here] -->\r\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"650\">\r\n <tr>\r\n <td valign=\"top\">\r\n <p><strong>Dear {{var billing.name}}</strong>,<br/>\r\n Your order # {{var order.increment_id}} has been <strong>{{var order.getStatusLabel()}}</strong>.</p>\r\n <p>{{var comment}}</p>\r\n <p>If you have any questions, please feel free to contact us at \r\n <a href=\"mailto:dummyemail@openmage.org\" style=\"color:#1E7EC8;\">dummyemail@openmage.org</a> or by phone at (555) 555-0123.</p>\r\n <p>Thank you again,<br/><strong>OpenMage Demo Store</strong></p>\r\n </td>\r\n </tr>\r\n </table>\r\n </td>\r\n </tr>\r\n </table>\r\n</div>\r\n' WHERE template_code='Order update (HTML)';

DROP TABLE IF EXISTS {$this->getTable('sales_order_status')};

Expand Down
Loading