Skip to content

Instantly share code, notes, and snippets.

@mklooss
Last active August 29, 2015 14:10
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mklooss/ba15198d62c4c038e8dd to your computer and use it in GitHub Desktop.
Save mklooss/ba15198d62c4c038e8dd to your computer and use it in GitHub Desktop.
Magento design/skin compare between 1.9.0.1 and 1.9.1.0
diff -ru magento-1.9.0.1-compare/app/design/adminhtml/default/default/template/page/header.phtml magento-1.9.1.0/app/design/adminhtml/default/default/template/page/header.phtml
--- magento-1.9.0.1-compare/app/design/adminhtml/default/default/template/page/header.phtml 2014-11-28 09:48:45.439825935 +0100
+++ magento-1.9.1.0/app/design/adminhtml/default/default/template/page/header.phtml 2014-11-05 10:07:59.000000000 +0100
@@ -30,7 +30,7 @@
<a href="<?php echo $this->getHomeLink() ?>"><img src="<?php echo $this->getSkinUrl('images/logo.gif') ?>" alt="<?php echo $this->__('Magento Logo') ?>" class="logo"/></a>
<div class="header-right">
<p class="super">
- <?php echo $this->__("Logged in as %s", $this->escapeHtml($this->getUser()->getUsername())) ?><span class="separator">|</span><?php echo $this->formatDate(null, 'full') ?><span class="separator">|</span><a href="http://golinks.magento.com/CE15" onclick="this.target='_blank'" class="go-try"><?php echo $this->__('Try Magento Go for Free') ?></a><span class="separator">|</span><a href="<?php echo $this->getLogoutLink() ?>" class="link-logout"><?php echo $this->__('Log Out') ?></a>
+ <?php echo $this->__("Logged in as %s", $this->escapeHtml($this->getUser()->getUsername())) ?><span class="separator">|</span><?php echo $this->formatDate(null, 'full') ?><span class="separator">|</span><a href="<?php echo $this->getLogoutLink() ?>" class="link-logout"><?php echo $this->__('Log Out') ?></a>
</p>
<?php if ( Mage::getSingleton('admin/session')->isAllowed('admin/global_search') ): ?>
<fieldset>
diff -ru magento-1.9.0.1-compare/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml magento-1.9.1.0/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml
--- magento-1.9.0.1-compare/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml 2014-11-28 09:48:45.291829183 +0100
+++ magento-1.9.1.0/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml 2014-11-05 10:07:56.000000000 +0100
@@ -55,7 +55,7 @@
<?php endif; ?>
</strong></small>
<br/>
- <?php echo $this->escapeHtml($_comment->getComment(), array('b','br','strong','i','u')) ?>
+ <?php echo $this->escapeHtml($_comment->getComment(), array('b', 'br', 'strong', 'i', 'u', 'a')) ?>
</li>
<?php endforeach; ?>
</ul>
diff -ru magento-1.9.0.1-compare/app/design/adminhtml/default/default/template/sales/order/view/history.phtml magento-1.9.1.0/app/design/adminhtml/default/default/template/sales/order/view/history.phtml
--- magento-1.9.0.1-compare/app/design/adminhtml/default/default/template/sales/order/view/history.phtml 2014-11-28 09:48:45.239830325 +0100
+++ magento-1.9.1.0/app/design/adminhtml/default/default/template/sales/order/view/history.phtml 2014-11-05 10:07:56.000000000 +0100
@@ -69,7 +69,7 @@
<?php endif; ?>
</strong></small>
<?php if ($_item->getComment()): ?>
- <br/><?php echo $this->escapeHtml($_item->getComment(), array('b','br','strong','i','u')) ?>
+ <br/><?php echo $this->escapeHtml($_item->getComment(), array('b', 'br', 'strong', 'i', 'u', 'a')) ?>
<?php endif; ?>
</li>
<?php endforeach; ?>
diff -ru magento-1.9.0.1-compare/app/design/adminhtml/default/default/template/system/cache/additional.phtml magento-1.9.1.0/app/design/adminhtml/default/default/template/system/cache/additional.phtml
--- magento-1.9.0.1-compare/app/design/adminhtml/default/default/template/system/cache/additional.phtml 2014-11-28 09:48:45.007835418 +0100
+++ magento-1.9.1.0/app/design/adminhtml/default/default/template/system/cache/additional.phtml 2014-11-05 10:07:56.000000000 +0100
@@ -43,6 +43,14 @@
</tr>
<tr>
<td class="scope-label">
+ <button onclick="setLocation('<?php echo $this->getCleanSwatchesUrl()?>')" type="button" class="scalable"><span><span><span><?php echo Mage::helper('adminhtml')->__('Flush Swatch Images Cache') ?></span></span></span></button>
+ </td>
+ <td class="scope-label">
+ <?php echo Mage::helper('adminhtml')->__('Pregenerated configurable swatches image files.')?>
+ </td>
+ </tr>
+ <tr>
+ <td class="scope-label">
<button onclick="setLocation('<?php echo $this->getCleanMediaUrl()?>')" type="button" class="scalable"><span><span><span><?php echo Mage::helper('adminhtml')->__('Flush JavaScript/CSS Cache') ?></span></span></span></button>
</td>
<td class="scope-label">
diff -ru magento-1.9.0.1-compare/app/design/adminhtml/default/default/template/system/email/template/preview.phtml magento-1.9.1.0/app/design/adminhtml/default/default/template/system/email/template/preview.phtml
--- magento-1.9.0.1-compare/app/design/adminhtml/default/default/template/system/email/template/preview.phtml 2014-11-28 09:48:45.011835330 +0100
+++ magento-1.9.1.0/app/design/adminhtml/default/default/template/system/email/template/preview.phtml 2014-11-05 10:07:56.000000000 +0100
@@ -24,14 +24,5 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html lang="en">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title><?php echo $this->__('Email Preview'); ?></title>
-</head>
-<body>
- <?php echo $this->getChildHtml('content') ?>
- <?php echo $this->getChildHtml('profiler') ?>
-</body>
-</html>
+<?php echo $this->getChildHtml('content') ?>
+<?php echo $this->getChildHtml('profiler') ?>
diff -ru magento-1.9.0.1-compare/skin/adminhtml/default/default/boxes.css magento-1.9.1.0/skin/adminhtml/default/default/boxes.css
--- magento-1.9.0.1-compare/skin/adminhtml/default/default/boxes.css 2014-11-28 09:31:42.878231175 +0100
+++ magento-1.9.1.0/skin/adminhtml/default/default/boxes.css 2014-11-05 10:06:43.000000000 +0100
@@ -956,7 +956,7 @@
.pp-method-express > .config-heading .heading strong,
.pp-method-general > .config-heading .heading strong { padding-left:56px; background:url(images/paypal/logo-paypal.png) no-repeat 0 2px; }
.pp-method-general > .config-heading .button-container { padding:8px 0 0 180px; background:url(images/paypal/pp-allinone.png) no-repeat 0 0; height:26px; }
-.pp-method-express > .config-heading .button-container { padding:0 0 0 160px; background:url(images/paypal/pp-alt.png) no-repeat 0 0; height:29px; }
+.pp-method-express > .config-heading .button-container { padding:0 0 0 174px; background:url(images/paypal/pp-alt.png) no-repeat 0 0; height:29px; }
.pp-method-payflow > .config-heading .button-container { padding:0px 0 0 99px; background:url(images/paypal/pp-gateways.png) no-repeat 1px 0; height:36px; }
.pp-general-uk > .config-heading .button-container { padding:9px 0 0 201px; background:url(images/paypal/pp-uk.png) no-repeat 0 0; height:27px; }
.payflow-settings-notice {padding-bottom: 1em;max-width: 660px;}
Binary files magento-1.9.0.1-compare/skin/adminhtml/default/default/images/paypal/pp-alt.png and magento-1.9.1.0/skin/adminhtml/default/default/images/paypal/pp-alt.png differ
Only in magento-1.9.0.1-compare/skin/adminhtml/default/default/media: editor.swf
Binary files magento-1.9.0.1-compare/skin/adminhtml/default/default/media/uploader.swf and magento-1.9.1.0/skin/adminhtml/default/default/media/uploader.swf differ
Binary files magento-1.9.0.1-compare/skin/adminhtml/default/default/media/uploaderSingle.swf and magento-1.9.1.0/skin/adminhtml/default/default/media/uploaderSingle.swf differ
Diff Between Magento 1.9.0.1 and Magento 1.9.1.0
- No Licence Header changes in this diff
So it looks like an Magento 1.9.0.1 Design will work in Magento 1.9.1.0
The MessageBlock has been Changed in every file (old method exists in Message Class), the output is excatly the same as before!
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
to
<?php echo $this->getMessagesBlock()->toHtml() ?>
Could not found any changes in
skin/frontend/default/blank
skin/frontend/default/default
skin/frontend/default/modern
There are many changes in the RWD Design, and here is also the new Configurableswatches
diff -ru magento-1.9.0.1-compare/app/design/frontend/base/default/template/catalog/product/price_msrp.phtml magento-1.9.1.0/app/design/frontend/base/default/template/catalog/product/price_msrp.phtml
--- magento-1.9.0.1-compare/app/design/frontend/base/default/template/catalog/product/price_msrp.phtml 2014-11-28 09:48:44.399848764 +0100
+++ magento-1.9.1.0/app/design/frontend/base/default/template/catalog/product/price_msrp.phtml 2014-11-05 10:07:54.000000000 +0100
@@ -44,7 +44,7 @@
<span class="old-price" id="product-price-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo $_msrpPrice ?></span>
<?php endif; ?>
<?php $helpLinkId = 'msrp-click-' . $_product->getId() . $this->helper('core')->getRandomString(20); ?>
- <a href="#" id="<?php echo($helpLinkId);?>"><?php echo $this->__('Click for price') ?></a>
+ <a href="#" class="map-link" id="<?php echo($helpLinkId);?>"><?php echo $this->__('Click for price') ?></a>
<script type="text/javascript">
<?php if ($this->helper('catalog')->isShowPriceOnGesture($_product)): ?>
var newLink = Catalog.Map.addHelpLink(
diff -ru magento-1.9.0.1-compare/app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml magento-1.9.1.0/app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml
--- magento-1.9.0.1-compare/app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml 2014-11-28 09:48:44.419848325 +0100
+++ magento-1.9.1.0/app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml 2014-11-05 10:07:54.000000000 +0100
@@ -44,7 +44,7 @@
<span class="old-price" id="product-price-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo $_msrpPrice ?></span>
<?php endif; ?>
<?php $helpLinkId = 'msrp-click-' . $_product->getId() . $this->helper('core')->getRandomString(20); ?>
- <a href="#" id="<?php echo($helpLinkId);?>"><?php echo $this->__('Click for price') ?></a>
+ <a href="#" class="map-link" id="<?php echo($helpLinkId);?>"><?php echo $this->__('Click for price') ?></a>
<script type="text/javascript">
<?php if ($this->helper('catalog')->isShowPriceOnGesture($_product)): ?>
var productLink = {
diff -ru magento-1.9.0.1-compare/app/design/frontend/base/default/template/googleanalytics/ga.phtml magento-1.9.1.0/app/design/frontend/base/default/template/googleanalytics/ga.phtml
--- magento-1.9.0.1-compare/app/design/frontend/base/default/template/googleanalytics/ga.phtml 2014-11-28 09:48:44.479847008 +0100
+++ magento-1.9.1.0/app/design/frontend/base/default/template/googleanalytics/ga.phtml 2014-11-05 10:07:52.000000000 +0100
@@ -24,22 +24,42 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php if (!Mage::helper('core/cookie')->isUserNotAllowSaveCookie()): ?>
-<?php $accountId = Mage::getStoreConfig(Mage_GoogleAnalytics_Helper_Data::XML_PATH_ACCOUNT) ?>
-<!-- BEGIN GOOGLE ANALYTICS CODEs -->
-<script type="text/javascript">
-//<![CDATA[
- var _gaq = _gaq || [];
- <?php echo $this->_getPageTrackingCode($accountId) ?>
- <?php echo $this->_getOrdersTrackingCode() ?>
+<?php
+$_helper = $this->helper('googleanalytics');
+$_accountId = $_helper->getAccountId();
+?>
+<?php if (!$this->helper('core/cookie')->isUserNotAllowSaveCookie()): ?>
+ <?php if($_helper->isUseUniversalAnalytics()): ?>
+ <!-- BEGIN GOOGLE UNIVERSAL ANALYTICS CODE -->
+ <script type="text/javascript">
+ //<![CDATA[
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ <?php echo $this->_getPageTrackingCode($_accountId) ?>
+ <?php echo $this->_getOrdersTrackingCode() ?>
+
+ //]]>
+ </script>
+ <!-- END GOOGLE UNIVERSAL ANALYTICS CODE -->
+ <?php else: ?>
+ <!-- BEGIN GOOGLE ANALYTICS CODE -->
+ <script type="text/javascript">
+ //<![CDATA[
+ var _gaq = _gaq || [];
+ <?php echo $this->_getPageTrackingCode($_accountId) ?>
+ <?php echo $this->_getOrdersTrackingCode() ?>
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
-//]]>
-</script>
-<!-- END GOOGLE ANALYTICS CODE -->
+ //]]>
+ </script>
+ <!-- END GOOGLE ANALYTICS CODE -->
+ <?php endif; ?>
<?php endif; ?>
diff -ru magento-1.9.0.1-compare/app/design/frontend/base/default/template/paypal/express/shortcut.phtml magento-1.9.1.0/app/design/frontend/base/default/template/paypal/express/shortcut.phtml
--- magento-1.9.0.1-compare/app/design/frontend/base/default/template/paypal/express/shortcut.phtml 2014-11-28 09:48:44.579844813 +0100
+++ magento-1.9.1.0/app/design/frontend/base/default/template/paypal/express/shortcut.phtml 2014-11-05 10:07:54.000000000 +0100
@@ -42,7 +42,7 @@
<li class="bml-checkout-type">
<p class="paypal-logo">
<span class="bml_button">
- <a id="<?php echo $bmlShortcutHtmlId ?>" href="<?php echo $this->getBmlCheckoutUrl()?>"><img src="<?php echo $this->getBmlImageUrl()?>" alt="<?php echo Mage::helper('paypal')->__('Checkout with PayPal Bill Me Later');?>" title="<?php echo Mage::helper('paypal')->__('Checkout with PayPal Bill Me Later');?>" /></a>
+ <a id="<?php echo $bmlShortcutHtmlId ?>" href="<?php echo $this->getBmlCheckoutUrl()?>"><img src="<?php echo $this->getBmlImageUrl()?>" alt="<?php echo Mage::helper('paypal')->__('Checkout with PayPal Paypal Credit');?>" title="<?php echo Mage::helper('paypal')->__('Checkout with PayPal Paypal Credit');?>" /></a>
<a href="<?php echo $this->getMarketMessageUrl()?>"><img src="<?php echo $this->getMarketMessage()?>" /></a>
</span>
</p>
Only in magento-1.9.1.0/app/design/frontend/base/default/template/paypal/partner: us_logo.phtml
Only in magento-1.9.0.1-compare/app/design/frontend/base/default/template/paypal/payflowadvanced: form.phtml
diff -ru magento-1.9.0.1-compare/app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml magento-1.9.1.0/app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml
--- magento-1.9.0.1-compare/app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml 2014-11-28 09:48:44.567845076 +0100
+++ magento-1.9.1.0/app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml 2014-11-05 10:07:54.000000000 +0100
@@ -23,12 +23,13 @@
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/** @var $this Mage_Paypal_Block_Payflow_Advanced_Form */
+/** @var $this Mage_Paypal_Block_Payflow_Advanced_Iframe */
?>
<div id="iframe-warning" class="warning-message">
<?php echo $this->__('Please do not refresh the page until you complete payment.') ?>
</div>
-<iframe id="payflow-advanced-iframe" style="display:none;" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
+<iframe id="payflow-advanced-iframe" style="display:none;" scrolling="no" frameborder="0"
+ src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="100%"></iframe>
<script type="text/javascript">
//<![CDATA[
var headers = $$('#' + checkout.accordion.container.readAttribute('id') + ' .section');
Only in magento-1.9.0.1-compare/app/design/frontend/base/default/template/paypal/payflowlink: form.phtml
diff -ru magento-1.9.0.1-compare/app/design/frontend/base/default/template/wishlist/email/items.phtml magento-1.9.1.0/app/design/frontend/base/default/template/wishlist/email/items.phtml
--- magento-1.9.0.1-compare/app/design/frontend/base/default/template/wishlist/email/items.phtml 2014-11-28 09:48:44.815839632 +0100
+++ magento-1.9.1.0/app/design/frontend/base/default/template/wishlist/email/items.phtml 2014-11-05 10:07:54.000000000 +0100
@@ -38,7 +38,7 @@
<p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($_product) ?>" style="color:#203548;"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
<?php if($this->hasDescription($item)): ?><p align="center" style="font-size:12px;"><?php echo $this->__('Comment') ?>:<br /><?php echo $this->getEscapedDescription($item) ?></p><?php endif; ?>
<p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($_product) ?>" style="color:#1E7EC8;"><?php echo $this->__('View Product') ?></a> <small>
- <?php if ($_product->getIsSalable()): ?>|</small> <a href="<?php echo $this->getAddToCartUrl($_product) ?>" style="color:#1E7EC8;"><strong><?php echo $this->__('Add to Cart') ?></strong></a><?php endif;?>
+ <?php if ($_product->getIsSalable()): ?>|</small> <a href="<?php echo $this->getSharedItemAddToCartUrl($item) ?>" style="color:#1E7EC8;"><strong><?php echo $this->__('Add to Cart') ?></strong></a><?php endif;?>
</p></td>
<?php if ($i%3!=0): ?>
<td width="2%"></td>
Only in magento-1.9.1.0/skin/frontend/base/default/css: email-inline.css
Only in magento-1.9.1.0/skin/frontend/base/default/css: email-non-inline.css
diff -ru magento-1.9.0.1-compare/skin/frontend/base/default/js/msrp.js magento-1.9.1.0/skin/frontend/base/default/js/msrp.js
--- magento-1.9.0.1-compare/skin/frontend/base/default/js/msrp.js 2014-11-28 10:04:20.659230768 +0100
+++ magento-1.9.1.0/skin/frontend/base/default/js/msrp.js 2014-11-05 10:06:43.000000000 +0100
@@ -96,7 +96,6 @@
Event.observe(element, 'click', function(event) {
setLocation(this.href);
Catalog.Map.hideHelp();
- window.opener.focus();
event.stop();
});
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment