Interface_Frontend_Rwd_Default - Version 1.9.2.0

Version Notes

1.9.2.0

Download this release

Release Info

Developer Magento Core Team
Extension Interface_Frontend_Rwd_Default
Version 1.9.2.0
Comparing to
See all releases


Code changes from version 1.9.1.1 to 1.9.2.0

Files changed (85) hide show
  1. app/design/frontend/rwd/default/layout/persistent.xml +6 -0
  2. app/design/frontend/rwd/default/template/authorizenet/directpost/form.phtml +4 -4
  3. app/design/frontend/rwd/default/template/captcha/zend.phtml +1 -1
  4. app/design/frontend/rwd/default/template/catalog/layer/state.phtml +2 -2
  5. app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml +1 -1
  6. app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml +5 -5
  7. app/design/frontend/rwd/default/template/catalog/product/compare/sidebar.phtml +5 -3
  8. app/design/frontend/rwd/default/template/catalog/product/list.phtml +4 -4
  9. app/design/frontend/rwd/default/template/catalog/product/list/related.phtml +2 -2
  10. app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml +4 -4
  11. app/design/frontend/rwd/default/template/catalog/product/view.phtml +1 -1
  12. app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml +2 -2
  13. app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml +3 -3
  14. app/design/frontend/rwd/default/template/catalog/product/view/type/grouped.phtml +1 -1
  15. app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml +2 -2
  16. app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml +1 -1
  17. app/design/frontend/rwd/default/template/cataloginventory/stockqty/composite.phtml +1 -1
  18. app/design/frontend/rwd/default/template/catalogsearch/advanced/form.phtml +1 -1
  19. app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml +2 -2
  20. app/design/frontend/rwd/default/template/checkout/cart.phtml +6 -6
  21. app/design/frontend/rwd/default/template/checkout/cart/coupon.phtml +3 -3
  22. app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml +4 -4
  23. app/design/frontend/rwd/default/template/checkout/cart/item/configure/updatecart.phtml +2 -2
  24. app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml +8 -6
  25. app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml +4 -2
  26. app/design/frontend/rwd/default/template/checkout/cart/minicart/items.phtml +2 -2
  27. app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml +4 -2
  28. app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml +4 -2
  29. app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml +6 -6
  30. app/design/frontend/rwd/default/template/checkout/cart/sidebar.phtml +1 -1
  31. app/design/frontend/rwd/default/template/checkout/cart/sidebar/default.phtml +2 -2
  32. app/design/frontend/rwd/default/template/checkout/multishipping/addresses.phtml +11 -5
  33. app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml +5 -4
  34. app/design/frontend/rwd/default/template/checkout/multishipping/overview.phtml +3 -3
  35. app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml +3 -3
  36. app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml +2 -2
  37. app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml +15 -15
  38. app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/state/swatch.phtml +2 -2
  39. app/design/frontend/rwd/default/template/contacts/form.phtml +5 -5
  40. app/design/frontend/rwd/default/template/customer/address/edit.phtml +13 -13
  41. app/design/frontend/rwd/default/template/customer/form/address.phtml +11 -11
  42. app/design/frontend/rwd/default/template/customer/form/changepassword.phtml +4 -4
  43. app/design/frontend/rwd/default/template/customer/form/confirmation.phtml +2 -2
  44. app/design/frontend/rwd/default/template/customer/form/edit.phtml +6 -6
  45. app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml +1 -1
  46. app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml +1 -1
  47. app/design/frontend/rwd/default/template/directory/currency.phtml +1 -1
  48. app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml +9 -7
  49. app/design/frontend/rwd/default/template/downloadable/customer/products/list.phtml +2 -2
  50. app/design/frontend/rwd/default/template/email/catalog/product/list.phtml +4 -4
  51. app/design/frontend/rwd/default/template/newsletter/subscribe.phtml +2 -2
  52. app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml +3 -2
  53. app/design/frontend/rwd/default/template/page/html/header.phtml +1 -1
  54. app/design/frontend/rwd/default/template/page/html/pager.phtml +3 -3
  55. app/design/frontend/rwd/default/template/page/print.phtml +1 -1
  56. app/design/frontend/rwd/default/template/payment/form/cc.phtml +4 -4
  57. app/design/frontend/rwd/default/template/payment/form/ccsave.phtml +5 -5
  58. app/design/frontend/rwd/default/template/paypal/express/minicart/shortcut.phtml +2 -2
  59. app/design/frontend/rwd/default/template/paypal/express/product/shortcut.phtml +2 -2
  60. app/design/frontend/rwd/default/template/paypal/express/review.phtml +1 -1
  61. app/design/frontend/rwd/default/template/paypal/express/review/address.phtml +12 -12
  62. app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml +19 -19
  63. app/design/frontend/rwd/default/template/persistent/customer/form/login.phtml +4 -4
  64. app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml +13 -13
  65. app/design/frontend/rwd/default/template/persistent/header/links.phtml +41 -0
  66. app/design/frontend/rwd/default/template/persistent/remember_me.phtml +1 -1
  67. app/design/frontend/rwd/default/template/persistent/remember_me_tooltip.phtml +2 -2
  68. app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml +1 -1
  69. app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml +1 -1
  70. app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml +1 -1
  71. app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml +1 -1
  72. app/design/frontend/rwd/default/template/review/form.phtml +2 -2
  73. app/design/frontend/rwd/default/template/sales/billing/agreement/view.phtml +1 -1
  74. app/design/frontend/rwd/default/template/sales/order/items.phtml +3 -3
  75. app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml +2 -2
  76. app/design/frontend/rwd/default/template/sales/recurring/profile/view.phtml +4 -4
  77. app/design/frontend/rwd/default/template/sendfriend/send.phtml +3 -3
  78. app/design/frontend/rwd/default/template/wishlist/button/update.phtml +1 -1
  79. app/design/frontend/rwd/default/template/wishlist/item/column/cart.phtml +1 -1
  80. app/design/frontend/rwd/default/template/wishlist/item/column/info.phtml +1 -1
  81. app/design/frontend/rwd/default/template/wishlist/shared.phtml +2 -2
  82. app/design/frontend/rwd/default/template/wishlist/sidebar.phtml +1 -1
  83. package.xml +6 -6
  84. skin/frontend/rwd/default/css/styles.css +4 -1
  85. skin/frontend/rwd/default/js/minicart.js +14 -1
app/design/frontend/rwd/default/layout/persistent.xml CHANGED
@@ -27,6 +27,12 @@
27
 
28
  -->
29
  <layout version="0.1.0">
 
 
 
 
 
 
30
  <customer_account_login>
31
  <reference name="customer_form_login">
32
  <action method="setTemplate"><template>persistent/customer/form/login.phtml</template></action>
27
 
28
  -->
29
  <layout version="0.1.0">
30
+ <default>
31
+ <reference name="header">
32
+ <block type="page/template_links" name="account.links" as="accountLinks" template="persistent/header/links.phtml"/>
33
+ </reference>
34
+ </default>
35
+
36
  <customer_account_login>
37
  <reference name="customer_form_login">
38
  <action method="setTemplate"><template>persistent/customer/form/login.phtml</template></action>
app/design/frontend/rwd/default/template/authorizenet/directpost/form.phtml CHANGED
@@ -60,7 +60,7 @@ $_orderUrl = $this->helper('authorizenet')->getPlaceOrderFrontUrl();
60
  <li>
61
  <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('Credit Card Number') ?></label>
62
  <div class="input-box">
63
- <input type="text" pattern="\d*" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo $this->__('Credit Card Number') ?>" class="input-text validate-cc-number validate-cc-type" value="" />
64
  </div>
65
  </li>
66
  <li id="<?php echo $_code ?>_cc_type_exp_div">
@@ -90,7 +90,7 @@ $_orderUrl = $this->helper('authorizenet')->getPlaceOrderFrontUrl();
90
  <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('Card Verification Number') ?></label>
91
  <div class="input-box">
92
  <div class="v-fix">
93
- <input type="text" pattern="\d*" title="<?php echo $this->__('Card Verification Number') ?>" class="input-text cvv required-entry validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" />
94
  </div>
95
  <a href="#" id="directpost-cvv-what-is-this" style="cursor:help; margin-left:5px;"><?php echo $this->__('What is this?') ?></a>
96
  </div>
@@ -103,8 +103,8 @@ $_orderUrl = $this->helper('authorizenet')->getPlaceOrderFrontUrl();
103
  </form>
104
  </div>
105
  <div class="tool-tip" id="directpost-tool-tip" style="display:none;">
106
- <div class="btn-close"><a href="#" id="directpost-tool-tip-close" title="<?php echo $this->__('Close') ?>"><?php echo $this->__('Close') ?></a></div>
107
- <div class="tool-tip-content"><img src="<?php echo $this->getSkinUrl('images/cvv.gif') ?>" alt="<?php echo $this->__('Card Verification Number Visual Reference') ?>" title="<?php echo $this->__('Card Verification Number Visual Reference') ?>" /></div>
108
  </div>
109
  <script type="text/javascript">
110
  //<![CDATA[
60
  <li>
61
  <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('Credit Card Number') ?></label>
62
  <div class="input-box">
63
+ <input type="text" pattern="\d*" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Credit Card Number')) ?>" class="input-text validate-cc-number validate-cc-type" value="" />
64
  </div>
65
  </li>
66
  <li id="<?php echo $_code ?>_cc_type_exp_div">
90
  <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('Card Verification Number') ?></label>
91
  <div class="input-box">
92
  <div class="v-fix">
93
+ <input type="text" pattern="\d*" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Card Verification Number')) ?>" class="input-text cvv required-entry validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" />
94
  </div>
95
  <a href="#" id="directpost-cvv-what-is-this" style="cursor:help; margin-left:5px;"><?php echo $this->__('What is this?') ?></a>
96
  </div>
103
  </form>
104
  </div>
105
  <div class="tool-tip" id="directpost-tool-tip" style="display:none;">
106
+ <div class="btn-close"><a href="#" id="directpost-tool-tip-close" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close')) ?>"><?php echo $this->__('Close') ?></a></div>
107
+ <div class="tool-tip-content"><img src="<?php echo $this->getSkinUrl('images/cvv.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Card Verification Number Visual Reference')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Card Verification Number Visual Reference')) ?>" /></div>
108
  </div>
109
  <script type="text/javascript">
110
  //<![CDATA[
app/design/frontend/rwd/default/template/captcha/zend.phtml CHANGED
@@ -36,7 +36,7 @@
36
  </li>
37
  <li class="captcha-img-container">
38
  <div class="captcha-image" id="captcha-image-box-<?php echo $this->getFormId()?>">
39
- <img id="captcha-reload" class="captcha-reload" src="<?php echo $this->getSkinUrl('images/reload.png') ?>" alt="<?php echo $this->__('Reload captcha') ?>" onclick="$('<?php echo $this->getFormId()?>').captcha.refresh(this)">
40
  <img id="<?php echo $this->getFormId() ?>" class="captcha-img" height="<?php echo $this->getImgHeight() ?>" src="<?php echo $captcha->getImgSrc() ?>"/>
41
  <?php if ($captcha->isCaseSensitive()) :?>
42
  <div class="captcha-note">
36
  </li>
37
  <li class="captcha-img-container">
38
  <div class="captcha-image" id="captcha-image-box-<?php echo $this->getFormId()?>">
39
+ <img id="captcha-reload" class="captcha-reload" src="<?php echo $this->getSkinUrl('images/reload.png') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Reload captcha')) ?>" onclick="$('<?php echo $this->getFormId()?>').captcha.refresh(this)">
40
  <img id="<?php echo $this->getFormId() ?>" class="captcha-img" height="<?php echo $this->getImgHeight() ?>" src="<?php echo $captcha->getImgSrc() ?>"/>
41
  <?php if ($captcha->isCaseSensitive()) :?>
42
  <div class="captcha-note">
app/design/frontend/rwd/default/template/catalog/layer/state.phtml CHANGED
@@ -59,10 +59,10 @@ $_renderers = $this->getParentBlock()->getChild('state_renderers')->getSortedChi
59
  $clearLinkUrl = $_filter->getClearLinkUrl();
60
  if ($clearLinkUrl):
61
  ?>
62
- <a class="btn-previous" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo $this->__('Previous') ?>"><?php echo $this->__('Previous') ?></a>
63
  <a class="btn-remove" title="<?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>" href="<?php echo $clearLinkUrl ?>"><?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></a>
64
  <?php else: ?>
65
- <a class="btn-remove" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo $this->__('Remove This Item') ?>"><?php echo $this->__('Remove This Item') ?></a>
66
  <?php endif; ?>
67
  <span class="label"><?php echo $this->__($_filter->getName()) ?>:</span> <span class="value"><?php echo $this->stripTags($_filter->getLabel()) ?></span>
68
  </li>
59
  $clearLinkUrl = $_filter->getClearLinkUrl();
60
  if ($clearLinkUrl):
61
  ?>
62
+ <a class="btn-previous" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Previous')) ?>"><?php echo $this->__('Previous') ?></a>
63
  <a class="btn-remove" title="<?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>" href="<?php echo $clearLinkUrl ?>"><?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></a>
64
  <?php else: ?>
65
+ <a class="btn-remove" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove This Item')) ?>"><?php echo $this->__('Remove This Item') ?></a>
66
  <?php endif; ?>
67
  <span class="label"><?php echo $this->__($_filter->getName()) ?>:</span> <span class="value"><?php echo $this->stripTags($_filter->getLabel()) ?></span>
68
  </li>
app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml CHANGED
@@ -49,7 +49,7 @@
49
  <div class="additional-addtocart-box">
50
  <?php echo $this->getChildHtml(); ?>
51
  </div>
52
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" id="map-popup-button"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
53
  </form>
54
  </div>
55
  <script type="text/javascript">
49
  <div class="additional-addtocart-box">
50
  <?php echo $this->getChildHtml(); ?>
51
  </div>
52
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" id="map-popup-button"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
53
  </form>
54
  </div>
55
  <script type="text/javascript">
app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml CHANGED
@@ -47,7 +47,7 @@
47
  <?php if($_i++%10==0): ?>
48
  <th>&nbsp;</th>
49
  <?php endif; ?>
50
- <td class="a-right"><a href="#" class="btn-remove" onclick="removeItem('<?php echo $this->helper('catalog/product_compare')->getRemoveUrl($_item) ?>');" title="<?php echo $this->__('Remove This Item') ?>"><?php echo $this->__('Remove This Item') ?></a></td>
51
  <?php endforeach; ?>
52
  </tr>
53
  </thead>
@@ -75,7 +75,7 @@
75
  <?php endif; ?>
76
  <td>
77
  <?php if($_item->isSaleable()): ?>
78
- <p><button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setPLocation('<?php echo $this->helper('catalog/product_compare')->getAddToCartUrl($_item) ?>', true)"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button></p>
79
  <?php else: ?>
80
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
81
  <?php endif; ?>
@@ -128,7 +128,7 @@
128
  <td>
129
  <?php echo $this->getPriceHtml($_item, true, '-compare-list-bottom') ?>
130
  <?php if($_item->isSaleable()): ?>
131
- <p><button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setPLocation('<?php echo $this->helper('catalog/product_compare')->getAddToCartUrl($_item) ?>', true)"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button></p>
132
  <?php else: ?>
133
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
134
  <?php endif; ?>
@@ -143,9 +143,9 @@
143
  </tbody>
144
  </table>
145
  <div class="buttons-set">
146
- <button type="button" title="<?php echo $this->__('Close Window') ?>" class="button" onclick="window.close();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
147
  <span class="please-wait" id="compare-list-please-wait" style="display:none;">
148
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Please wait...') ?>" title="<?php echo $this->__('Please wait...') ?>" class="v-middle" /> <?php echo $this->__('Please wait...') ?>
149
  </span>
150
  </div>
151
  <script type="text/javascript">
47
  <?php if($_i++%10==0): ?>
48
  <th>&nbsp;</th>
49
  <?php endif; ?>
50
+ <td class="a-right"><a href="#" class="btn-remove" onclick="removeItem('<?php echo $this->helper('catalog/product_compare')->getRemoveUrl($_item) ?>');" title="<?php echo $this->quoteEscape($this->__('Remove This Item')) ?>"><?php echo $this->__('Remove This Item') ?></a></td>
51
  <?php endforeach; ?>
52
  </tr>
53
  </thead>
75
  <?php endif; ?>
76
  <td>
77
  <?php if($_item->isSaleable()): ?>
78
+ <p><button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setPLocation('<?php echo $this->helper('catalog/product_compare')->getAddToCartUrl($_item) ?>', true)"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button></p>
79
  <?php else: ?>
80
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
81
  <?php endif; ?>
128
  <td>
129
  <?php echo $this->getPriceHtml($_item, true, '-compare-list-bottom') ?>
130
  <?php if($_item->isSaleable()): ?>
131
+ <p><button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setPLocation('<?php echo $this->helper('catalog/product_compare')->getAddToCartUrl($_item) ?>', true)"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button></p>
132
  <?php else: ?>
133
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
134
  <?php endif; ?>
143
  </tbody>
144
  </table>
145
  <div class="buttons-set">
146
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
147
  <span class="please-wait" id="compare-list-please-wait" style="display:none;">
148
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->quoteEscape($this->__('Please wait...')) ?>" title="<?php echo $this->quoteEscape($this->__('Please wait...')) ?>" class="v-middle" /> <?php echo $this->__('Please wait...') ?>
149
  </span>
150
  </div>
151
  <script type="text/javascript">
app/design/frontend/rwd/default/template/catalog/product/compare/sidebar.phtml CHANGED
@@ -29,6 +29,7 @@
29
  $_helper = $this->helper('catalog/product_compare');
30
  $_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
31
  ?>
 
32
  <div class="block block-list block-compare">
33
  <div class="block-title">
34
  <strong><span><?php echo $this->__('Compare Products') ?>
@@ -43,18 +44,19 @@ $_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
43
  <?php foreach($_items as $_index => $_item): ?>
44
  <li class="item">
45
  <input type="hidden" class="compare-item-id" value="<?php echo $_item->getId() ?>" />
46
- <a href="<?php echo $_helper->getRemoveUrl($_item) ?>" title="<?php echo $this->__('Remove This Item') ?>" class="btn-remove" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove this item from the compare products?') ?>');"><?php echo $this->__('Remove This Item') ?></a>
47
  <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('catalog/output')->productAttribute($_item, $_item->getName(), 'name') ?></a></p>
48
  </li>
49
  <?php endforeach; ?>
50
  </ol>
51
  <script type="text/javascript">decorateList('compare-items')</script>
52
  <div class="actions">
53
- <button type="button" title="<?php echo $this->__('Compare') ?>" class="button" onclick="popWin('<?php echo $_helper->getListUrl() ?>','compare','top:0,left:0,width=820,height=600,resizable=yes,scrollbars=yes')"><span><span><?php echo $this->__('Compare') ?></span></span></button>
54
- <a href="<?php echo $_helper->getClearListUrl() ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove all products from your comparison?') ?>');"><?php echo $this->__('Clear All') ?></a>
55
  </div>
56
  <?php else: ?>
57
  <p class="empty"><?php echo $this->__('You have no items to compare.') ?></p>
58
  <?php endif; ?>
59
  </div>
60
  </div>
 
29
  $_helper = $this->helper('catalog/product_compare');
30
  $_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
31
  ?>
32
+ <?php if ($_items): ?>
33
  <div class="block block-list block-compare">
34
  <div class="block-title">
35
  <strong><span><?php echo $this->__('Compare Products') ?>
44
  <?php foreach($_items as $_index => $_item): ?>
45
  <li class="item">
46
  <input type="hidden" class="compare-item-id" value="<?php echo $_item->getId() ?>" />
47
+ <a href="<?php echo $_helper->getRemoveUrl($_item) ?>" title="<?php echo $this->quoteEscape($this->__('Remove This Item')) ?>" class="btn-remove" onclick="return confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure you would like to remove this item from the compare products?')) ?>');"><?php echo $this->__('Remove This Item') ?></a>
48
  <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('catalog/output')->productAttribute($_item, $_item->getName(), 'name') ?></a></p>
49
  </li>
50
  <?php endforeach; ?>
51
  </ol>
52
  <script type="text/javascript">decorateList('compare-items')</script>
53
  <div class="actions">
54
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Compare')) ?>" class="button" onclick="popWin('<?php echo $_helper->getListUrl() ?>','compare','top:0,left:0,width=820,height=600,resizable=yes,scrollbars=yes')"><span><span><?php echo $this->__('Compare') ?></span></span></button>
55
+ <a href="<?php echo $_helper->getClearListUrl() ?>" onclick="return confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure you would like to remove all products from your comparison?')) ?>');"><?php echo $this->__('Clear All') ?></a>
56
  </div>
57
  <?php else: ?>
58
  <p class="empty"><?php echo $this->__('You have no items to compare.') ?></p>
59
  <?php endif; ?>
60
  </div>
61
  </div>
62
+ <?php endif; ?>
app/design/frontend/rwd/default/template/catalog/product/list.phtml CHANGED
@@ -87,9 +87,9 @@
87
  </div>
88
  <div class="product-secondary">
89
  <?php if(!$_product->canConfigure() && $_product->isSaleable()): ?>
90
- <p class="action"><button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button></p>
91
  <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
92
- <p class="action"><a title="<?php echo $this->__('View Details') ?>" class="button" href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->__('View Details') ?></a></p>
93
  <?php else: ?>
94
  <p class="action availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
95
  <?php endif; ?>
@@ -150,9 +150,9 @@
150
  <?php endif; ?>
151
  <div class="actions">
152
  <?php if(!$_product->canConfigure() && $_product->isSaleable()): ?>
153
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
154
  <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
155
- <a title="<?php echo $this->__('View Details') ?>" class="button" href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->__('View Details') ?></a>
156
  <?php else: ?>
157
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
158
  <?php endif; ?>
87
  </div>
88
  <div class="product-secondary">
89
  <?php if(!$_product->canConfigure() && $_product->isSaleable()): ?>
90
+ <p class="action"><button type="button" title="<?php echo $this->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button></p>
91
  <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
92
+ <p class="action"><a title="<?php echo $this->quoteEscape($this->__('View Details')) ?>" class="button" href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->__('View Details') ?></a></p>
93
  <?php else: ?>
94
  <p class="action availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
95
  <?php endif; ?>
150
  <?php endif; ?>
151
  <div class="actions">
152
  <?php if(!$_product->canConfigure() && $_product->isSaleable()): ?>
153
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
154
  <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
155
+ <a title="<?php echo $this->quoteEscape($this->__('View Details')) ?>" class="button" href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->__('View Details') ?></a>
156
  <?php else: ?>
157
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
158
  <?php endif; ?>
app/design/frontend/rwd/default/template/catalog/product/list/related.phtml CHANGED
@@ -67,13 +67,13 @@
67
  elem.checked = true;
68
  });
69
  relatedProductsCheckFlag = true;
70
- txt.innerHTML="<?php echo $this->__('unselect all') ?>";
71
  } else {
72
  $$('.related-checkbox').each(function(elem){
73
  elem.checked = false;
74
  });
75
  relatedProductsCheckFlag = false;
76
- txt.innerHTML="<?php echo $this->__('select all') ?>";
77
  }
78
  addRelatedToProduct();
79
  }
67
  elem.checked = true;
68
  });
69
  relatedProductsCheckFlag = true;
70
+ txt.innerHTML="<?php echo Mage::helper('core')->jsQuoteEscape($this->__('unselect all')) ?>";
71
  } else {
72
  $$('.related-checkbox').each(function(elem){
73
  elem.checked = false;
74
  });
75
  relatedProductsCheckFlag = false;
76
+ txt.innerHTML="<?php echo Mage::helper('core')->jsQuoteEscape($this->__('select all')) ?>";
77
  }
78
  addRelatedToProduct();
79
  }
app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml CHANGED
@@ -53,7 +53,7 @@
53
 
54
  <div class="sort-by">
55
  <label><?php echo $this->__('Sort By') ?></label>
56
- <select onchange="setLocation(this.value)" title="<?php echo $this->__('Sort By') ?>">
57
  <?php foreach($this->getAvailableOrders() as $_key=>$_order): ?>
58
  <option value="<?php echo $this->getOrderUrl($_key, 'asc') ?>"<?php if($this->isOrderCurrent($_key)): ?> selected="selected"<?php endif; ?>>
59
  <?php echo $this->__($_order) ?>
@@ -61,9 +61,9 @@
61
  <?php endforeach; ?>
62
  </select>
63
  <?php if($this->getCurrentDirection() == 'desc'): ?>
64
- <a href="<?php echo $this->getOrderUrl(null, 'asc') ?>" class="sort-by-switcher sort-by-switcher--desc" title="<?php echo $this->__('Set Ascending Direction') ?>"><?php echo $this->__('Set Ascending Direction') ?></a>
65
  <?php else: ?>
66
- <a href="<?php echo $this->getOrderUrl(null, 'desc') ?>" class="sort-by-switcher sort-by-switcher--asc" title="<?php echo $this->__('Set Descending Direction') ?>"><?php echo $this->__('Set Descending Direction') ?></a>
67
  <?php endif; ?>
68
  </div>
69
  </div>
@@ -82,7 +82,7 @@
82
 
83
  <div class="limiter">
84
  <label><?php echo $this->__('Show') ?></label>
85
- <select onchange="setLocation(this.value)" title="<?php echo $this->__('Results per page'); ?>">
86
  <?php foreach ($this->getAvailableLimit() as $_key=>$_limit): ?>
87
  <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
88
  <?php echo $_limit ?>
53
 
54
  <div class="sort-by">
55
  <label><?php echo $this->__('Sort By') ?></label>
56
+ <select onchange="setLocation(this.value)" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Sort By')) ?>">
57
  <?php foreach($this->getAvailableOrders() as $_key=>$_order): ?>
58
  <option value="<?php echo $this->getOrderUrl($_key, 'asc') ?>"<?php if($this->isOrderCurrent($_key)): ?> selected="selected"<?php endif; ?>>
59
  <?php echo $this->__($_order) ?>
61
  <?php endforeach; ?>
62
  </select>
63
  <?php if($this->getCurrentDirection() == 'desc'): ?>
64
+ <a href="<?php echo $this->getOrderUrl(null, 'asc') ?>" class="sort-by-switcher sort-by-switcher--desc" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Ascending Direction')) ?>"><?php echo $this->__('Set Ascending Direction') ?></a>
65
  <?php else: ?>
66
+ <a href="<?php echo $this->getOrderUrl(null, 'desc') ?>" class="sort-by-switcher sort-by-switcher--asc" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Descending Direction')) ?>"><?php echo $this->__('Set Descending Direction') ?></a>
67
  <?php endif; ?>
68
  </div>
69
  </div>
82
 
83
  <div class="limiter">
84
  <label><?php echo $this->__('Show') ?></label>
85
+ <select onchange="setLocation(this.value)" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Results per page')); ?>">
86
  <?php foreach ($this->getAvailableLimit() as $_key=>$_limit): ?>
87
  <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
88
  <?php echo $_limit ?>
app/design/frontend/rwd/default/template/catalog/product/view.phtml CHANGED
@@ -39,7 +39,7 @@
39
  <div id="messages_product_view"><?php echo $this->getMessagesBlock()->toHtml() ?></div>
40
  <div class="product-view">
41
  <div class="product-essential">
42
- <form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post" id="product_addtocart_form"<?php if($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
43
  <?php echo $this->getBlockHtml('formkey') ?>
44
  <div class="no-display">
45
  <input type="hidden" name="product" value="<?php echo $_product->getId() ?>" />
39
  <div id="messages_product_view"><?php echo $this->getMessagesBlock()->toHtml() ?></div>
40
  <div class="product-view">
41
  <div class="product-essential">
42
+ <form action="<?php echo $this->getSubmitUrl($_product, array('_secure' => $this->_isSecure())) ?>" method="post" id="product_addtocart_form"<?php if($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
43
  <?php echo $this->getBlockHtml('formkey') ?>
44
  <div class="no-display">
45
  <input type="hidden" name="product" value="<?php echo $_product->getId() ?>" />
app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml CHANGED
@@ -25,13 +25,13 @@
25
  */
26
  ?>
27
  <?php $_product = $this->getProduct(); ?>
28
- <?php $buttonTitle = $this->__('Add to Cart'); ?>
29
  <?php if($_product->isSaleable()): ?>
30
  <div class="add-to-cart">
31
  <?php if(!$_product->isGrouped()): ?>
32
  <div class="qty-wrapper">
33
  <label for="qty"><?php echo $this->__('Qty:') ?></label>
34
- <input type="text" pattern="\d*" name="qty" id="qty" maxlength="12" value="<?php echo max($this->getProductDefaultQty() * 1, 1) ?>" title="<?php echo $this->__('Qty') ?>" class="input-text qty" />
35
  </div>
36
  <?php endif; ?>
37
  <div class="add-to-cart-buttons">
25
  */
26
  ?>
27
  <?php $_product = $this->getProduct(); ?>
28
+ <?php $buttonTitle = Mage::helper('core')->quoteEscape($this->__('Add to Cart')); ?>
29
  <?php if($_product->isSaleable()): ?>
30
  <div class="add-to-cart">
31
  <?php if(!$_product->isGrouped()): ?>
32
  <div class="qty-wrapper">
33
  <label for="qty"><?php echo $this->__('Qty:') ?></label>
34
+ <input type="text" pattern="\d*" name="qty" id="qty" maxlength="12" value="<?php echo max($this->getProductDefaultQty() * 1, 1) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" />
35
  </div>
36
  <?php endif; ?>
37
  <div class="add-to-cart-buttons">
app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml CHANGED
@@ -30,7 +30,7 @@
30
 
31
  <ul class="sharing-links">
32
  <?php if ($this->canEmailToFriend()): ?>
33
- <li><a href="<?php echo $this->helper('catalog/product')->getEmailToFriendUrl($_product) ?>" class="link-email-friend" title="<?php echo $this->__('Email to a Friend') ?>"><?php echo $this->__('Email to a Friend') ?></a></li>
34
  <?php endif; ?>
35
 
36
  <?php $_helper = $this->helper('catalog/output'); ?>
@@ -39,12 +39,12 @@
39
  <?php $_productUrl = urlencode(trim($_product->getProductUrl()))?>
40
  <li>
41
  <?php $_u = 'p[url]=' . $_productUrl . '&p[images][0]=' . $_productImageUrl . '&p[title]=' . $_productName . '&p[summary]=' . urlencode(trim($_helper->productAttribute($_product, nl2br($_product->getShortDescription()), 'short_description'))); ?>
42
- <a href="<?php echo 'http://www.facebook.com/sharer.php?s=100&' . $_u; ?>" target="_blank" title="<?php echo $this->__('Share on Facebook') ?>" class="link-facebook">
43
  <?php echo $this->__('Share Facebook') ?>
44
  </a>
45
  </li>
46
  <li>
47
- <a href="<?php echo 'http://twitter.com/home?status=' . $_productName . '+' . $_productUrl; ?>" target="_blank" title="<?php echo $this->__('Share on Twitter') ?>" class="link-twitter"><?php echo $this->__('Share on Twitter') ?></a>
48
  </li>
49
  </ul>
50
 
30
 
31
  <ul class="sharing-links">
32
  <?php if ($this->canEmailToFriend()): ?>
33
+ <li><a href="<?php echo $this->helper('catalog/product')->getEmailToFriendUrl($_product) ?>" class="link-email-friend" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email to a Friend')) ?>"><?php echo $this->__('Email to a Friend') ?></a></li>
34
  <?php endif; ?>
35
 
36
  <?php $_helper = $this->helper('catalog/output'); ?>
39
  <?php $_productUrl = urlencode(trim($_product->getProductUrl()))?>
40
  <li>
41
  <?php $_u = 'p[url]=' . $_productUrl . '&p[images][0]=' . $_productImageUrl . '&p[title]=' . $_productName . '&p[summary]=' . urlencode(trim($_helper->productAttribute($_product, nl2br($_product->getShortDescription()), 'short_description'))); ?>
42
+ <a href="<?php echo 'http://www.facebook.com/sharer.php?s=100&' . $_u; ?>" target="_blank" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Share on Facebook')) ?>" class="link-facebook">
43
  <?php echo $this->__('Share Facebook') ?>
44
  </a>
45
  </li>
46
  <li>
47
+ <a href="<?php echo 'http://twitter.com/home?status=' . $_productName . '+' . $_productUrl; ?>" target="_blank" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Share on Twitter')) ?>" class="link-twitter"><?php echo $this->__('Share on Twitter') ?></a>
48
  </li>
49
  </ul>
50
 
app/design/frontend/rwd/default/template/catalog/product/view/type/grouped.phtml CHANGED
@@ -59,7 +59,7 @@
59
  <?php if ($_product->isSaleable()): ?>
60
  <div class="qty-wrapper">
61
  <?php if ($_item->isSaleable()) : ?>
62
- <input id="super_group_<?php echo $_item->getId(); ?>" type="text" pattern="\d*" name="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo $this->__('Qty') ?>" class="input-text qty" />
63
  <label for="super_group_<?php echo $_item->getId(); ?>" class="qty-label">
64
  <?php echo $this->__('Quantity'); ?>
65
  </label>
59
  <?php if ($_product->isSaleable()): ?>
60
  <div class="qty-wrapper">
61
  <?php if ($_item->isSaleable()) : ?>
62
+ <input id="super_group_<?php echo $_item->getId(); ?>" type="text" pattern="\d*" name="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" />
63
  <label for="super_group_<?php echo $_item->getId(); ?>" class="qty-label">
64
  <?php echo $this->__('Quantity'); ?>
65
  </label>
app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml CHANGED
@@ -42,12 +42,12 @@
42
  <img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(210) ?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" />
43
  </a>
44
  <div class="product-info">
45
- <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('catalog/output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
46
  <?php echo $this->getPriceHtml($_product, true, '-widget-new-grid') ?>
47
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
48
  <div class="actions">
49
  <?php if ($_product->isSaleable()): ?>
50
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
51
  <?php else: ?>
52
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
53
  <?php endif; ?>
42
  <img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(210) ?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" />
43
  </a>
44
  <div class="product-info">
45
+ <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('catalog/output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
46
  <?php echo $this->getPriceHtml($_product, true, '-widget-new-grid') ?>
47
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
48
  <div class="actions">
49
  <?php if ($_product->isSaleable()): ?>
50
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
51
  <?php else: ?>
52
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
53
  <?php endif; ?>
app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml CHANGED
@@ -42,7 +42,7 @@
42
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
43
  <?php echo $this->getPriceHtml($_product, true, '-widget-new-list') ?>
44
  <?php if ($_product->isSaleable()): ?>
45
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
46
  <?php else: ?>
47
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
48
  <?php endif; ?>
42
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
43
  <?php echo $this->getPriceHtml($_product, true, '-widget-new-list') ?>
44
  <?php if ($_product->isSaleable()): ?>
45
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
46
  <?php else: ?>
47
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
48
  <?php endif; ?>
app/design/frontend/rwd/default/template/cataloginventory/stockqty/composite.phtml CHANGED
@@ -30,7 +30,7 @@
30
  ?>
31
  <?php if($this->isMsgVisible()): ?>
32
  <p class="availability-only">
33
- <a href="#" id="<?php echo $this->getPlaceholderId() ?>" title="<?php echo $this->__('Only %s left', ($this->getStockQty())) ?>"><?php echo $this->__('Only %s left', "<strong>{$this->getStockQty()}</strong>") ?></a>
34
  </p>
35
  <table id="<?php echo $this->getDetailsPlaceholderId() ?>" class="availability-only-details no-display data-table">
36
  <col />
30
  ?>
31
  <?php if($this->isMsgVisible()): ?>
32
  <p class="availability-only">
33
+ <a href="#" id="<?php echo $this->getPlaceholderId() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Only %s left', ($this->getStockQty()))) ?>"><?php echo $this->__('Only %s left', "<strong>{$this->getStockQty()}</strong>") ?></a>
34
  </p>
35
  <table id="<?php echo $this->getDetailsPlaceholderId() ?>" class="availability-only-details no-display data-table">
36
  <col />
app/design/frontend/rwd/default/template/catalogsearch/advanced/form.phtml CHANGED
@@ -86,7 +86,7 @@
86
  <script type="text/javascript">decorateList('advanced-search-list')</script>
87
  </div>
88
  <div class="buttons-set">
89
- <button type="submit" title="<?php echo $this->__('Search') ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
90
  </div>
91
  </form>
92
  <script type="text/javascript">
86
  <script type="text/javascript">decorateList('advanced-search-list')</script>
87
  </div>
88
  <div class="buttons-set">
89
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
90
  </div>
91
  </form>
92
  <script type="text/javascript">
app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml CHANGED
@@ -31,8 +31,8 @@ $catalogSearchHelper = $this->helper('catalogsearch');
31
  <form id="search_mini_form" action="<?php echo $catalogSearchHelper->getResultUrl() ?>" method="get">
32
  <div class="input-box">
33
  <label for="search"><?php echo $this->__('Search:') ?></label>
34
- <input id="search" type="search" name="<?php echo $catalogSearchHelper->getQueryParamName() ?>" value="<?php echo $catalogSearchHelper->getEscapedQueryText() ?>" class="input-text required-entry" maxlength="<?php echo $catalogSearchHelper->getMaxQueryLength();?>" placeholder="<?php echo $this->__('Search entire store here...') ?>" />
35
- <button type="submit" title="<?php echo $this->__('Search') ?>" class="button search-button"><span><span><?php echo $this->__('Search') ?></span></span></button>
36
  </div>
37
 
38
  <div id="search_autocomplete" class="search-autocomplete"></div>
31
  <form id="search_mini_form" action="<?php echo $catalogSearchHelper->getResultUrl() ?>" method="get">
32
  <div class="input-box">
33
  <label for="search"><?php echo $this->__('Search:') ?></label>
34
+ <input id="search" type="search" name="<?php echo $catalogSearchHelper->getQueryParamName() ?>" value="<?php echo $catalogSearchHelper->getEscapedQueryText() ?>" class="input-text required-entry" maxlength="<?php echo $catalogSearchHelper->getMaxQueryLength();?>" placeholder="<?php echo $this->quoteEscape($this->__('Search entire store here...')) ?>" />
35
+ <button type="submit" title="<?php echo $this->quoteEscape($this->__('Search')) ?>" class="button search-button"><span><span><?php echo $this->__('Search') ?></span></span></button>
36
  </div>
37
 
38
  <div id="search_autocomplete" class="search-autocomplete"></div>
app/design/frontend/rwd/default/template/checkout/cart.phtml CHANGED
@@ -47,7 +47,7 @@
47
  </div>
48
  <?php echo $this->getMessagesBlock()->toHtml() ?>
49
  <?php echo $this->getChildHtml('form_before') ?>
50
- <form action="<?php echo $this->getUrl('checkout/cart/updatePost') ?>" method="post">
51
  <?php echo $this->getBlockHtml('formkey'); ?>
52
  <table id="shopping-cart-table" class="cart-table data-table">
53
  <col width="1" />
@@ -106,19 +106,19 @@
106
  <td colspan="50" class="a-right cart-footer-actions">
107
 
108
  <!-- Make this button the first responder rather than empty cart -->
109
- <button type="submit" style="visibility:hidden;" name="update_cart_action" value="update_qty" title="<?php echo $this->__('Update Shopping Cart'); ?>" class="button2 btn-update"><span><span><?php echo $this->__('Update Shopping Cart'); ?></span></span></button>
110
 
111
- <button type="submit" name="update_cart_action" value="empty_cart" title="<?php echo $this->__('Empty Cart'); ?>" class="button2 btn-empty" id="empty_cart_button"><span><span><?php echo $this->__('Empty Cart'); ?></span></span></button>
112
 
113
- <button type="submit" name="update_cart_action" value="update_qty" title="<?php echo $this->__('Update Shopping Cart'); ?>" class="button2 btn-update"><span><span><?php echo $this->__('Update Shopping Cart'); ?></span></span></button>
114
 
115
  <span class="or">-<?php echo $this->__('or'); ?>-</span>
116
 
117
  <?php if($this->getContinueShoppingUrl()): ?>
118
- <button type="button" title="<?php echo $this->__('Continue Shopping') ?>" class="button2 btn-continue" onclick="setLocation('<?php echo $this->getContinueShoppingUrl() ?>')"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
119
  <?php endif; ?>
120
  <!--[if lt IE 8]>
121
- <input type="hidden" id="update_cart_action_container" />
122
  <script type="text/javascript">
123
  //<![CDATA[
124
  Event.observe(window, 'load', function()
47
  </div>
48
  <?php echo $this->getMessagesBlock()->toHtml() ?>
49
  <?php echo $this->getChildHtml('form_before') ?>
50
+ <form action="<?php echo $this->getFormActionUrl() ?>" method="post">
51
  <?php echo $this->getBlockHtml('formkey'); ?>
52
  <table id="shopping-cart-table" class="cart-table data-table">
53
  <col width="1" />
106
  <td colspan="50" class="a-right cart-footer-actions">
107
 
108
  <!-- Make this button the first responder rather than empty cart -->
109
+ <button type="submit" style="visibility:hidden;" data-cart-item-update name="update_cart_action" value="update_qty" title="<?php echo $this->quoteEscape($this->__('Update Shopping Cart')); ?>" class="button2 btn-update"><span><span><?php echo $this->__('Update Shopping Cart'); ?></span></span></button>
110
 
111
+ <button type="submit" name="update_cart_action" data-cart-empty value="empty_cart" title="<?php echo $this->quoteEscape($this->__('Empty Cart')); ?>" class="button2 btn-empty" id="empty_cart_button"><span><span><?php echo $this->__('Empty Cart'); ?></span></span></button>
112
 
113
+ <button type="submit" name="update_cart_action" data-cart-item-update value="update_qty" title="<?php echo $this->quoteEscape($this->__('Update Shopping Cart')); ?>" class="button2 btn-update"><span><span><?php echo $this->__('Update Shopping Cart'); ?></span></span></button>
114
 
115
  <span class="or">-<?php echo $this->__('or'); ?>-</span>
116
 
117
  <?php if($this->getContinueShoppingUrl()): ?>
118
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Continue Shopping')) ?>" class="button2 btn-continue" onclick="setLocation('<?php echo Mage::helper('core')->quoteEscape($this->getContinueShoppingUrl()) ?>')"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
119
  <?php endif; ?>
120
  <!--[if lt IE 8]>
121
+ <input type="hidden" id="update_cart_action_container" data-cart-item-update />
122
  <script type="text/javascript">
123
  //<![CDATA[
124
  Event.observe(window, 'load', function()
app/design/frontend/rwd/default/template/checkout/cart/coupon.phtml CHANGED
@@ -24,7 +24,7 @@
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
- <form id="discount-coupon-form" action="<?php echo $this->getUrl('checkout/cart/couponPost') ?>" method="post">
28
  <div class="discount">
29
  <h2><?php echo $this->__('Discount Codes') ?></h2>
30
  <div class="discount-form">
@@ -33,9 +33,9 @@
33
  <div class="field-wrapper">
34
  <input class="input-text" type="text" id="coupon_code" name="coupon_code" value="<?php echo $this->escapeHtml($this->getCouponCode()) ?>" />
35
  <div class="button-wrapper">
36
- <button type="button" title="<?php echo $this->__('Apply') ?>" class="button2" onclick="discountForm.submit(false)" value="<?php echo $this->__('Apply') ?>"><span><span><?php echo $this->__('Apply') ?></span></span></button>
37
  <?php if(strlen($this->getCouponCode())): ?>
38
- <button type="button" title="<?php echo $this->__('Cancel') ?>" class="button2 cancel-coupon" onclick="discountForm.submit(true)" value="<?php echo $this->__('Cancel') ?>"><span><span><?php echo $this->__('Cancel') ?></span></span>
39
  </button>
40
  <?php endif;?>
41
  </div>
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
+ <form id="discount-coupon-form" action="<?php echo $this->getFormActionUrl() ?>" method="post">
28
  <div class="discount">
29
  <h2><?php echo $this->__('Discount Codes') ?></h2>
30
  <div class="discount-form">
33
  <div class="field-wrapper">
34
  <input class="input-text" type="text" id="coupon_code" name="coupon_code" value="<?php echo $this->escapeHtml($this->getCouponCode()) ?>" />
35
  <div class="button-wrapper">
36
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Apply')) ?>" class="button2" onclick="discountForm.submit(false)" value="<?php echo $this->__('Apply') ?>"><span><span><?php echo $this->__('Apply') ?></span></span></button>
37
  <?php if(strlen($this->getCouponCode())): ?>
38
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel')) ?>" class="button2 cancel-coupon" onclick="discountForm.submit(true)" value="<?php echo $this->__('Cancel') ?>"><span><span><?php echo $this->__('Cancel') ?></span></span>
39
  </button>
40
  <?php endif;?>
41
  </div>
app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml CHANGED
@@ -37,14 +37,14 @@
37
  <ul id="crosssell-products-list" class="products-grid products-grid--max-3-col">
38
  <?php foreach ($this->getItems() as $_item): ?>
39
  <li class="item">
40
- <a class="product-image" href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>">
41
- <img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(210); ?>" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" />
42
- </a>
43
  <div class="product-info">
 
 
 
44
  <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></h3>
45
  <?php echo $this->getPriceHtml($_item, true) ?>
46
  <div class="actions">
47
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_item) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
48
  <ul class="add-to-links">
49
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
50
  <li><a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
37
  <ul id="crosssell-products-list" class="products-grid products-grid--max-3-col">
38
  <?php foreach ($this->getItems() as $_item): ?>
39
  <li class="item">
 
 
 
40
  <div class="product-info">
41
+ <a class="product-image" href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>">
42
+ <img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(210); ?>" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" />
43
+ </a>
44
  <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></h3>
45
  <?php echo $this->getPriceHtml($_item, true) ?>
46
  <div class="actions">
47
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_item) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
48
  <ul class="add-to-links">
49
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
50
  <li><a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
app/design/frontend/rwd/default/template/checkout/cart/item/configure/updatecart.phtml CHANGED
@@ -32,11 +32,11 @@
32
  <?php if (!$_product->isGrouped()): ?>
33
  <div class="qty-wrapper">
34
  <label for="qty"><?php echo $this->__('Qty:') ?></label>
35
- <input type="text" pattern="\d*" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo $this->__('Qty') ?>" class="input-text qty" />
36
  </div>
37
  <?php endif; ?>
38
  <div class="add-to-cart-buttons">
39
- <button type="button" title="<?php echo $buttonTitle ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?php echo $buttonTitle ?></span></span></button>
40
  <?php echo $this->getChildHtml('', true, true) ?>
41
  </div>
42
  </div>
32
  <?php if (!$_product->isGrouped()): ?>
33
  <div class="qty-wrapper">
34
  <label for="qty"><?php echo $this->__('Qty:') ?></label>
35
+ <input type="text" pattern="\d*" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" />
36
  </div>
37
  <?php endif; ?>
38
  <div class="add-to-cart-buttons">
39
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($buttonTitle) ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?php echo $buttonTitle ?></span></span></button>
40
  <?php echo $this->getChildHtml('', true, true) ?>
41
  </div>
42
  </div>
app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml CHANGED
@@ -42,7 +42,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
42
  <ul class="cart-links">
43
  <?php if ($isVisibleProduct): ?>
44
  <li>
45
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item parameters') ?>"><?php echo $this->__('Edit') ?></a>
46
  </li>
47
  <?php endif ?>
48
 
@@ -56,7 +56,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
56
 
57
  <td class="product-cart-info">
58
 
59
- <a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo $this->__('Remove Item') ?>" class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a>
60
 
61
  <h2 class="product-name">
62
  <?php if ($this->hasProductUrl()):?>
@@ -205,15 +205,17 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
205
  <?php endif; ?>
206
  <?php endif; ?>
207
  <td class="product-cart-actions" data-rwd-label="<?php echo $this->__('Qty'); ?>">
208
- <input type="text" pattern="\d*" name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo $this->__('Qty') ?>" class="input-text qty" maxlength="12" />
 
 
209
 
210
- <button type="submit" name="update_cart_action" value="update_qty" title="<?php echo $this->__('Update'); ?>" class="button btn-update"><span><span><?php echo $this->__('Update'); ?></span></span>
211
  </button>
212
 
213
  <ul class="cart-links">
214
  <?php if ($isVisibleProduct): ?>
215
  <li>
216
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item parameters') ?>"><?php echo $this->__('Edit') ?></a>
217
  </li>
218
  <?php endif ?>
219
 
@@ -323,7 +325,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
323
  </td>
324
  <?php endif; ?>
325
  <td class="a-center product-cart-remove">
326
- <a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo $this->__('Remove Item') ?>" class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a>
327
  </td>
328
  </tr>
329
 
42
  <ul class="cart-links">
43
  <?php if ($isVisibleProduct): ?>
44
  <li>
45
+ <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Edit item parameters')) ?>"><?php echo $this->__('Edit') ?></a>
46
  </li>
47
  <?php endif ?>
48
 
56
 
57
  <td class="product-cart-info">
58
 
59
+ <a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove Item')) ?>" class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a>
60
 
61
  <h2 class="product-name">
62
  <?php if ($this->hasProductUrl()):?>
205
  <?php endif; ?>
206
  <?php endif; ?>
207
  <td class="product-cart-actions" data-rwd-label="<?php echo $this->__('Qty'); ?>">
208
+ <input type="text" pattern="\d*" name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4"
209
+ data-cart-item-id="<?php echo $this->jsQuoteEscape($_item->getSku()) ?>"
210
+ title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" maxlength="12" />
211
 
212
+ <button type="submit" name="update_cart_action" data-cart-item-update value="update_qty" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update')); ?>" class="button btn-update"><span><span><?php echo $this->__('Update'); ?></span></span>
213
  </button>
214
 
215
  <ul class="cart-links">
216
  <?php if ($isVisibleProduct): ?>
217
  <li>
218
+ <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Edit item parameters')) ?>"><?php echo $this->__('Edit') ?></a>
219
  </li>
220
  <?php endif ?>
221
 
325
  </td>
326
  <?php endif; ?>
327
  <td class="a-center product-cart-remove">
328
+ <a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove Item')) ?>" class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a>
329
  </td>
330
  </tr>
331
 
app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml CHANGED
@@ -130,6 +130,7 @@
130
  id="qinput-<?php echo $_item->getId(); ?>"
131
  data-link="<?php echo $this->getAjaxUpdateUrl() ?>"
132
  data-item-id="<?php echo $_item->getId(); ?>"
 
133
  class="qty cart-item-quantity input-text" name=""
134
  value="<?php echo $this->getQty()?>"
135
  <?php if ($this->isOnCheckoutPage()) echo 'disabled'; ?>
@@ -139,6 +140,7 @@
139
  data-item-id="<?php echo $_item->getId(); ?>"
140
  disabled="disabled"
141
  data-update
 
142
  class="button quantity-button">
143
  <?php echo $this->__('ok'); ?>
144
  </button>
@@ -148,12 +150,12 @@
148
  </table>
149
 
150
  <?php if ($isVisibleProduct): ?>
151
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item') ?>" class="btn-edit">
152
  <?php echo $this->__('Edit item')?>
153
  </a>
154
  |
155
  <?php if (!$this->isOnCheckoutPage()): ?>
156
- <a href="<?php echo $this->getAjaxDeleteUrl() ?>" title="<?php echo $this->__('Remove This Item') ?>"
157
  data-confirm="<?php echo $this->__('Are you sure you would like to remove this item from the shopping cart?') ?>"
158
  class="remove">
159
  <?php echo $this->__('Remove Item') ?>
130
  id="qinput-<?php echo $_item->getId(); ?>"
131
  data-link="<?php echo $this->getAjaxUpdateUrl() ?>"
132
  data-item-id="<?php echo $_item->getId(); ?>"
133
+ data-cart-item-id="<?php echo $_item->getSku(); ?>"
134
  class="qty cart-item-quantity input-text" name=""
135
  value="<?php echo $this->getQty()?>"
136
  <?php if ($this->isOnCheckoutPage()) echo 'disabled'; ?>
140
  data-item-id="<?php echo $_item->getId(); ?>"
141
  disabled="disabled"
142
  data-update
143
+ data-cart-item-update
144
  class="button quantity-button">
145
  <?php echo $this->__('ok'); ?>
146
  </button>
150
  </table>
151
 
152
  <?php if ($isVisibleProduct): ?>
153
+ <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Edit item')) ?>" class="btn-edit">
154
  <?php echo $this->__('Edit item')?>
155
  </a>
156
  |
157
  <?php if (!$this->isOnCheckoutPage()): ?>
158
+ <a href="<?php echo $this->getAjaxDeleteUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove This Item')) ?>"
159
  data-confirm="<?php echo $this->__('Are you sure you would like to remove this item from the shopping cart?') ?>"
160
  class="remove">
161
  <?php echo $this->__('Remove Item') ?>
app/design/frontend/rwd/default/template/checkout/cart/minicart/items.phtml CHANGED
@@ -44,7 +44,7 @@ if(empty($_cartQty)) {
44
 
45
  <p class="block-subtitle">
46
  <?php echo $this->__('Recently added item(s)') ?>
47
- <a class="close skip-link-close" href="#" title="<?php echo $this->__('Close'); ?>">&times;</a>
48
  </p>
49
 
50
  <?php $_items = $this->getRecentItems() ?>
@@ -91,7 +91,7 @@ if(empty($_cartQty)) {
91
  <ul class="checkout-types minicart">
92
  <?php echo $this->getChildHtml('extra_actions') ?>
93
  <li>
94
- <a title="<?php echo $this->__('Checkout') ?>" class="button checkout-button" href="<?php echo $this->getCheckoutUrl() ?>">
95
  <?php echo $this->__('Checkout') ?>
96
  </a>
97
  </li>
44
 
45
  <p class="block-subtitle">
46
  <?php echo $this->__('Recently added item(s)') ?>
47
+ <a class="close skip-link-close" href="#" title="<?php echo $this->quoteEscape($this->__('Close')); ?>">&times;</a>
48
  </p>
49
 
50
  <?php $_items = $this->getRecentItems() ?>
91
  <ul class="checkout-types minicart">
92
  <?php echo $this->getChildHtml('extra_actions') ?>
93
  <li>
94
+ <a title="<?php echo $this->quoteEscape($this->__('Checkout')) ?>" class="button checkout-button" href="<?php echo $this->getCheckoutUrl() ?>">
95
  <?php echo $this->__('Checkout') ?>
96
  </a>
97
  </li>
app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml CHANGED
@@ -30,7 +30,7 @@
30
  ?>
31
  <?php $_item = $this->getItem() ?>
32
  <tr>
33
- <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item')?>" class="btn-remove2"><?php echo $this->__('Remove Item')?></a></td>
34
  <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" /></a></td>
35
  <td>
36
  <h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
@@ -55,7 +55,9 @@
55
  </td>
56
  <?php endif; ?>
57
  <td class="a-center">
58
- <input type="text" pattern="\d*" name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getItemQty($_item) ?>" size="4" class="input-text qty" maxlength="12" />
 
 
59
  </td>
60
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
61
  <td class="a-right">
30
  ?>
31
  <?php $_item = $this->getItem() ?>
32
  <tr>
33
+ <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove Item')) ?>" class="btn-remove2"><?php echo $this->__('Remove Item')?></a></td>
34
  <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" /></a></td>
35
  <td>
36
  <h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
55
  </td>
56
  <?php endif; ?>
57
  <td class="a-center">
58
+ <input type="text" pattern="\d*" name="cart[<?php echo $_item->getId() ?>][qty]"
59
+ data-cart-item-id="<?php echo $this->jsQuoteEscape($_item->getSku()) ?>"
60
+ value="<?php echo $this->getItemQty($_item) ?>" size="4" class="input-text qty" maxlength="12" />
61
  </td>
62
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
63
  <td class="a-right">
app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml CHANGED
@@ -30,7 +30,7 @@
30
  ?>
31
  <?php $_item = $this->getItem() ?>
32
  <tr>
33
- <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item')?>" class="btn-remove2"><?php echo $this->__('Remove Item')?></a></td>
34
  <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" /></a></td>
35
  <td>
36
  <h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
@@ -55,7 +55,9 @@
55
  </td>
56
  <?php endif; ?>
57
  <td class="a-center">
58
- <input type="text" pattern="\d*" name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getItemQty($_item) ?>" size="4" class="input-text qty" maxlength="12" />
 
 
59
  </td>
60
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
61
  <td class="a-right">
30
  ?>
31
  <?php $_item = $this->getItem() ?>
32
  <tr>
33
+ <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove Item')) ?>" class="btn-remove2"><?php echo $this->__('Remove Item')?></a></td>
34
  <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" /></a></td>
35
  <td>
36
  <h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
55
  </td>
56
  <?php endif; ?>
57
  <td class="a-center">
58
+ <input type="text" pattern="\d*" name="cart[<?php echo $_item->getId() ?>][qty]"
59
+ data-cart-item-id="<?php echo $this->jsQuoteEscape($_item->getSku()) ?>"
60
+ value="<?php echo $this->getItemQty($_item) ?>" size="4" class="input-text qty" maxlength="12" />
61
  </td>
62
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
63
  <td class="a-right">
app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml CHANGED
@@ -28,7 +28,7 @@
28
  <div class="shipping">
29
  <h2><?php echo $this->__('Estimate Shipping and Tax') ?></h2>
30
  <div class="shipping-form">
31
- <form action="<?php echo $this->getUrl('checkout/cart/estimatePost') ?>" method="post" id="shipping-zip-form">
32
  <p class="shipping-desc"><?php echo $this->__('Enter your destination to get a shipping estimate.') ?></p>
33
  <ul class="form-list">
34
  <li class="shipping-country">
@@ -44,7 +44,7 @@
44
  */ ?>
45
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
46
  <div class="input-box">
47
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" style="display:none;"<?php echo ($this->isStateProvinceRequired() ? ' class="validate-select"' : '') ?>>
48
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
49
  </select>
50
  <script type="text/javascript">
@@ -52,7 +52,7 @@
52
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getEstimateRegionId() ?>");
53
  //]]>
54
  </script>
55
- <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getEstimateRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none;" />
56
  </div>
57
  </li>
58
  <?php // endif; ?>
@@ -75,7 +75,7 @@
75
  </li>
76
  </ul>
77
  <div class="buttons-set">
78
- <button type="button" title="<?php echo $this->__('Estimate') ?>" onclick="coShippingMethodForm.submit()" class="button2">
79
  <span><span><?php echo $this->__('Estimate') ?></span></span>
80
  </button>
81
  </div>
@@ -87,7 +87,7 @@
87
  </script>
88
 
89
  <?php if (($_shippingRateGroups = $this->getEstimateRates())): ?>
90
- <form id="co-shipping-method-form" action="<?php echo $this->getUrl('checkout/cart/estimateUpdatePost') ?>">
91
  <dl class="sp-methods">
92
  <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
93
  <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
@@ -116,7 +116,7 @@
116
  <?php endforeach; ?>
117
  </dl>
118
  <div class="buttons-set">
119
- <button type="submit" title="<?php echo $this->__('Update Total') ?>" class="button" name="do" value="<?php echo $this->__('Update Total') ?>">
120
  <span><span><?php echo $this->__('Update Total') ?></span></span>
121
  </button>
122
  </div>
28
  <div class="shipping">
29
  <h2><?php echo $this->__('Estimate Shipping and Tax') ?></h2>
30
  <div class="shipping-form">
31
+ <form action="<?php echo $this->getFormActionUrl() ?>" method="post" id="shipping-zip-form">
32
  <p class="shipping-desc"><?php echo $this->__('Enter your destination to get a shipping estimate.') ?></p>
33
  <ul class="form-list">
34
  <li class="shipping-country">
44
  */ ?>
45
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
46
  <div class="input-box">
47
+ <select id="region_id" name="region_id" title="<?php echo $this->quoteEscape($this->__('State/Province')) ?>" style="display:none;"<?php echo ($this->isStateProvinceRequired() ? ' class="validate-select"' : '') ?>>
48
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
49
  </select>
50
  <script type="text/javascript">
52
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getEstimateRegionId() ?>");
53
  //]]>
54
  </script>
55
+ <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getEstimateRegion()) ?>" title="<?php echo $this->quoteEscape($this->__('State/Province')) ?>" class="input-text" style="display:none;" />
56
  </div>
57
  </li>
58
  <?php // endif; ?>
75
  </li>
76
  </ul>
77
  <div class="buttons-set">
78
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Estimate')) ?>" onclick="coShippingMethodForm.submit()" class="button2">
79
  <span><span><?php echo $this->__('Estimate') ?></span></span>
80
  </button>
81
  </div>
87
  </script>
88
 
89
  <?php if (($_shippingRateGroups = $this->getEstimateRates())): ?>
90
+ <form id="co-shipping-method-form" action="<?php echo $this->getUpdateFormActionUrl() ?>">
91
  <dl class="sp-methods">
92
  <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
93
  <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
116
  <?php endforeach; ?>
117
  </dl>
118
  <div class="buttons-set">
119
+ <button type="submit" title="<?php echo $this->quoteEscape($this->__('Update Total')) ?>" class="button" name="do" value="<?php echo $this->__('Update Total') ?>">
120
  <span><span><?php echo $this->__('Update Total') ?></span></span>
121
  </button>
122
  </div>
app/design/frontend/rwd/default/template/checkout/cart/sidebar.phtml CHANGED
@@ -72,7 +72,7 @@
72
  <?php if($_cartQty && $this->isPossibleOnepageCheckout()): ?>
73
  <div class="actions">
74
  <?php echo $this->getChildHtml('extra_actions') ?>
75
- <button type="button" title="<?php echo $this->__('Checkout') ?>" class="button" onclick="setLocation('<?php echo $this->getCheckoutUrl() ?>')"><span><span><?php echo $this->__('Checkout') ?></span></span></button>
76
  </div>
77
  <?php endif ?>
78
  </div>
72
  <?php if($_cartQty && $this->isPossibleOnepageCheckout()): ?>
73
  <div class="actions">
74
  <?php echo $this->getChildHtml('extra_actions') ?>
75
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Checkout')) ?>" class="button" onclick="setLocation('<?php echo $this->getCheckoutUrl() ?>')"><span><span><?php echo $this->__('Checkout') ?></span></span></button>
76
  </div>
77
  <?php endif ?>
78
  </div>
app/design/frontend/rwd/default/template/checkout/cart/sidebar/default.phtml CHANGED
@@ -36,10 +36,10 @@
36
  <span class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></span>
37
  <?php endif; ?>
38
  <div class="product-details">
39
- <a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo $this->__('Remove This Item') ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove this item from the shopping cart?') ?>');" class="btn-remove"><?php echo $this->__('Remove This Item') ?></a>
40
  <p class="product-name"><?php if ($this->hasProductUrl()): ?><a href="<?php echo $this->getProductUrl() ?>"><?php endif; ?><?php echo $this->escapeHtml($this->getProductName()) ?><?php if ($this->hasProductUrl()): ?></a><?php endif; ?></p>
41
  <?php if ($isVisibleProduct): ?>
42
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item') ?>" class="btn-edit"><?php echo $this->__('Edit item')?></a>
43
  <?php endif ?>
44
  <strong><?php echo $this->getQty() ?></strong> x
45
 
36
  <span class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></span>
37
  <?php endif; ?>
38
  <div class="product-details">
39
+ <a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove This Item')) ?>" onclick="return confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure you would like to remove this item from the shopping cart?')) ?>');" class="btn-remove"><?php echo $this->__('Remove This Item') ?></a>
40
  <p class="product-name"><?php if ($this->hasProductUrl()): ?><a href="<?php echo $this->getProductUrl() ?>"><?php endif; ?><?php echo $this->escapeHtml($this->getProductName()) ?><?php if ($this->hasProductUrl()): ?></a><?php endif; ?></p>
41
  <?php if ($isVisibleProduct): ?>
42
+ <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Edit item')) ?>" class="btn-edit"><?php echo $this->__('Edit item')?></a>
43
  <?php endif ?>
44
  <strong><?php echo $this->getQty() ?></strong> x
45
 
app/design/frontend/rwd/default/template/checkout/multishipping/addresses.phtml CHANGED
@@ -36,7 +36,7 @@
36
  <div class="multiple-checkout">
37
  <div class="page-title title-buttons">
38
  <h1><?php echo $this->__('Ship to Multiple Addresses') ?></h1>
39
- <button data-action="add-new-customer-address" type="button" title="<?php echo $this->__('Enter a New Address') ?>" class="button" onclick="$('add_new_address_flag').value=1; $('checkout_multishipping_form').submit();"><span><span><?php echo $this->__('Enter a New Address') ?></span></span></button>
40
  </div>
41
  <input type="hidden" name="continue" value="0" id="can_continue_flag" />
42
  <input type="hidden" name="new_address" value="0" id="add_new_address_flag" />
@@ -56,7 +56,13 @@
56
  </thead>
57
  <tfoot>
58
  <tr>
59
- <td colspan="100" class="a-right"><button type="submit" title="<?php echo $this->__('Update Qty &amp; Addresses') ?>" class="button" onclick="$('can_continue_flag').value=0"><span><span><?php echo $this->__('Update Qty &amp; Addresses') ?></span></span></button></td>
 
 
 
 
 
 
60
  </tr>
61
  </tfoot>
62
  <tbody>
@@ -64,9 +70,9 @@
64
  <?php if ($_item->getQuoteItem()) :?>
65
  <tr>
66
  <td><?php echo $this->getItemHtml($_item->getQuoteItem())?></td>
67
- <td><input type="text" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" /></td>
68
  <td data-rwd-label="Send To"><?php if ($_item->getProduct()->getIsVirtual()): echo $this->__('Shipping selection is not applicable.'); else: echo $this->getAddressesHtmlSelect($_item, $_index); endif; ?></td>
69
- <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item') ?>" class="btn-remove2"><?php echo $this->__('Remove Item') ?></a></td>
70
  </tr>
71
  <?php endif; ?>
72
  <?php endforeach; ?>
@@ -75,7 +81,7 @@
75
  <script type="text/javascript">decorateTable('multiship-addresses-table')</script>
76
  <div class="buttons-set">
77
  <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Shopping Cart') ?></a></p>
78
- <button type="submit" data-action="checkout-continue-shipping" title="<?php echo $this->__('Continue to Shipping Information') ?>" class="button<?php if ($this->isContinueDisabled()):?> disabled<?php endif; ?>" onclick="$('can_continue_flag').value=1"<?php if ($this->isContinueDisabled()):?> disabled="disabled"<?php endif; ?>><span><span><?php echo $this->__('Continue to Shipping Information') ?></span></span></button>
79
  </div>
80
  </div>
81
  </form>
36
  <div class="multiple-checkout">
37
  <div class="page-title title-buttons">
38
  <h1><?php echo $this->__('Ship to Multiple Addresses') ?></h1>
39
+ <button data-action="add-new-customer-address" type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Enter a New Address')) ?>" class="button" onclick="$('add_new_address_flag').value=1; $('checkout_multishipping_form').submit();"><span><span><?php echo $this->__('Enter a New Address') ?></span></span></button>
40
  </div>
41
  <input type="hidden" name="continue" value="0" id="can_continue_flag" />
42
  <input type="hidden" name="new_address" value="0" id="add_new_address_flag" />
56
  </thead>
57
  <tfoot>
58
  <tr>
59
+ <td colspan="100" class="a-right">
60
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Qty &amp; Addresses')) ?>"
61
+ class="button" onclick="$('can_continue_flag').value=0"
62
+ data-multiship-item-update>
63
+ <span><span><?php echo $this->__('Update Qty &amp; Addresses') ?></span></span>
64
+ </button>
65
+ </td>
66
  </tr>
67
  </tfoot>
68
  <tbody>
70
  <?php if ($_item->getQuoteItem()) :?>
71
  <tr>
72
  <td><?php echo $this->getItemHtml($_item->getQuoteItem())?></td>
73
+ <td><input type="text" data-multiship-item-id="<?php echo $this->jsQuoteEscape($_item->getSku()) ?>" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" /></td>
74
  <td data-rwd-label="Send To"><?php if ($_item->getProduct()->getIsVirtual()): echo $this->__('Shipping selection is not applicable.'); else: echo $this->getAddressesHtmlSelect($_item, $_index); endif; ?></td>
75
+ <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove Item')) ?>" class="btn-remove2"><?php echo $this->__('Remove Item') ?></a></td>
76
  </tr>
77
  <?php endif; ?>
78
  <?php endforeach; ?>
81
  <script type="text/javascript">decorateTable('multiship-addresses-table')</script>
82
  <div class="buttons-set">
83
  <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Shopping Cart') ?></a></p>
84
+ <button type="submit" data-action="checkout-continue-shipping" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue to Shipping Information')) ?>" class="button<?php if ($this->isContinueDisabled()):?> disabled<?php endif; ?>" onclick="$('can_continue_flag').value=1"<?php if ($this->isContinueDisabled()):?> disabled="disabled"<?php endif; ?>><span><span><?php echo $this->__('Continue to Shipping Information') ?></span></span></button>
85
  </div>
86
  </div>
87
  </form>
app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml CHANGED
@@ -57,12 +57,12 @@
57
  </div>
58
  <div class="box-content">
59
  <div class="tool-tip" id="payment-tool-tip" style="display:none;">
60
- <div class="btn-close"><a href="#" id="payment-tool-tip-close" title="<?php echo $this->__('Close') ?>"><?php echo $this->__('Close') ?></a></div>
61
- <div class="tool-tip-content"><img src="<?php echo $this->getSkinUrl('images/cvv.gif') ?>" alt="<?php echo $this->__('Card Verification Number Visual Reference') ?>" title="<?php echo $this->__('Card Verification Number Visual Reference') ?>" /></div>
62
  </div>
63
  <?php echo $this->getChildHtml('payment_methods_before') ?>
64
  <!-- Payment methods forms list -->
65
- <dl class="sp-methods">
66
  <?php
67
  $_methods = $this->getMethods();
68
  $_methodsCount = count($_methods);
@@ -91,12 +91,13 @@
91
  </div>
92
  <div class="buttons-set">
93
  <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Shipping Information') ?></a></p>
94
- <button id="payment-continue" type="submit" title="<?php echo $this->__('Continue to Review Your Order') ?>" class="button"><span><span><?php echo $this->__('Continue to Review Your Order') ?></span></span></button>
95
  </div>
96
  </form>
97
  <script type="text/javascript">
98
  //<![CDATA[
99
  var payment = new paymentForm('multishipping-billing-form');
 
100
  function toggleToolTip(event){
101
  if($('payment-tool-tip')){
102
  /*$('payment-tool-tip').setStyle({
57
  </div>
58
  <div class="box-content">
59
  <div class="tool-tip" id="payment-tool-tip" style="display:none;">
60
+ <div class="btn-close"><a href="#" id="payment-tool-tip-close" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close')) ?>"><?php echo $this->__('Close') ?></a></div>
61
+ <div class="tool-tip-content"><img src="<?php echo $this->getSkinUrl('images/cvv.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Card Verification Number Visual Reference')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Card Verification Number Visual Reference')) ?>" /></div>
62
  </div>
63
  <?php echo $this->getChildHtml('payment_methods_before') ?>
64
  <!-- Payment methods forms list -->
65
+ <dl id="payment-methods" class="sp-methods">
66
  <?php
67
  $_methods = $this->getMethods();
68
  $_methodsCount = count($_methods);
91
  </div>
92
  <div class="buttons-set">
93
  <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Shipping Information') ?></a></p>
94
+ <button id="payment-continue" type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue to Review Your Order')) ?>" class="button"><span><span><?php echo $this->__('Continue to Review Your Order') ?></span></span></button>
95
  </div>
96
  </form>
97
  <script type="text/javascript">
98
  //<![CDATA[
99
  var payment = new paymentForm('multishipping-billing-form');
100
+ var quoteBaseGrandTotal = <?php echo (float)$this->getQuoteBaseGrandTotal(); ?>;
101
  function toggleToolTip(event){
102
  if($('payment-tool-tip')){
103
  /*$('payment-tool-tip').setStyle({
app/design/frontend/rwd/default/template/checkout/multishipping/overview.phtml CHANGED
@@ -199,12 +199,12 @@
199
  <div class="inner">
200
  <big><?php echo $this->__('Grand Total:') ?> <?php echo $this->helper('checkout')->formatPrice($this->getTotal()) ?></big>
201
  <div id="review-buttons-container">
202
- <button type="submit" title="<?php echo $this->__('Place Order') ?>" class="button btn-checkout" id="review-button"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
203
  </div>
204
  </div>
205
  </div>
206
  <span class="please-wait" id="review-please-wait" style="display:none;">
207
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Submitting order information...') ?>" title="<?php echo $this->__('Submitting order information...') ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
208
  </span>
209
  </div>
210
  </div>
@@ -225,7 +225,7 @@
225
  var checkboxes = $$('#checkout-agreements input');
226
  for (var i=0, l=checkboxes.length; i<l; i++) {
227
  if (!checkboxes[i].checked) {
228
- alert("<?php echo $this->__('Please agree to all Terms and Conditions before placing the orders.')?>");
229
  return false;
230
  }
231
  }
199
  <div class="inner">
200
  <big><?php echo $this->__('Grand Total:') ?> <?php echo $this->helper('checkout')->formatPrice($this->getTotal()) ?></big>
201
  <div id="review-buttons-container">
202
+ <button type="submit" title="<?php echo $this->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout" id="review-button"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
203
  </div>
204
  </div>
205
  </div>
206
  <span class="please-wait" id="review-please-wait" style="display:none;">
207
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->quoteEscape($this->__('Submitting order information...')) ?>" title="<?php echo $this->quoteEscape($this->__('Submitting order information...')) ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
208
  </span>
209
  </div>
210
  </div>
225
  var checkboxes = $$('#checkout-agreements input');
226
  for (var i=0, l=checkboxes.length; i<l; i++) {
227
  if (!checkboxes[i].checked) {
228
+ alert("<?php echo $this->jsQuoteEscape($this->__('Please agree to all Terms and Conditions before placing the orders.')) ?>");
229
  return false;
230
  }
231
  }
app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml CHANGED
@@ -39,8 +39,8 @@
39
  </div>
40
  </form>
41
  <div class="tool-tip" id="payment-tool-tip" style="display:none;">
42
- <div class="btn-close"><a href="#" id="payment-tool-tip-close" title="<?php echo $this->__('Close') ?>"><?php echo $this->__('Close') ?></a></div>
43
- <div class="tool-tip-content"><img src="<?php echo $this->getSkinUrl('images/cvv.gif') ?>" alt="<?php echo $this->__('Card Verification Number Visual Reference') ?>" title="<?php echo $this->__('Card Verification Number Visual Reference') ?>" /></div>
44
  </div>
45
  <?php echo $this->getChildChildHtml('additional') ?>
46
  <div class="buttons-set" id="payment-buttons-container">
@@ -49,7 +49,7 @@
49
  <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
50
  <button type="button" class="button" onclick="payment.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
51
  <span class="please-wait" id="payment-please-wait" style="display:none;">
52
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
53
  </span>
54
  </div>
55
  <script type="text/javascript">
39
  </div>
40
  </form>
41
  <div class="tool-tip" id="payment-tool-tip" style="display:none;">
42
+ <div class="btn-close"><a href="#" id="payment-tool-tip-close" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close')) ?>"><?php echo $this->__('Close') ?></a></div>
43
+ <div class="tool-tip-content"><img src="<?php echo $this->getSkinUrl('images/cvv.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Card Verification Number Visual Reference')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Card Verification Number Visual Reference')) ?>" /></div>
44
  </div>
45
  <?php echo $this->getChildChildHtml('additional') ?>
46
  <div class="buttons-set" id="payment-buttons-container">
49
  <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
50
  <button type="button" class="button" onclick="payment.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
51
  <span class="please-wait" id="payment-please-wait" style="display:none;">
52
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
53
  </span>
54
  </div>
55
  <script type="text/javascript">
app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml CHANGED
@@ -73,9 +73,9 @@
73
  <div class="buttons-set" id="review-buttons-container">
74
  <?php echo $this->getChildHtml('button') ?>
75
  <span class="please-wait" id="review-please-wait" style="display:none;">
76
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Submitting order information...') ?>" title="<?php echo $this->__('Submitting order information...') ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
77
  </span>
78
- <p class="f-left"><?php echo $this->__('Forgot an Item?') ?> <a href="<?php echo $this->getUrl('checkout/cart') ?>" onclick="return confirm('<?php echo $this->__('Are you sure you want to leave this page? You will need to go through the checkout steps again.'); ?>')"><?php echo $this->__('Edit Your Cart') ?></a></p>
79
  </div>
80
  <script type="text/javascript">
81
  //<![CDATA[
73
  <div class="buttons-set" id="review-buttons-container">
74
  <?php echo $this->getChildHtml('button') ?>
75
  <span class="please-wait" id="review-please-wait" style="display:none;">
76
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Submitting order information...')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submitting order information...')) ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
77
  </span>
78
+ <p class="f-left"><?php echo $this->__('Forgot an Item?') ?> <a href="<?php echo $this->getUrl('checkout/cart') ?>" onclick="return confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure you want to leave this page? You will need to go through the checkout steps again.')); ?>')"><?php echo $this->__('Edit Your Cart') ?></a></p>
79
  </div>
80
  <script type="text/javascript">
81
  //<![CDATA[
app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml CHANGED
@@ -44,7 +44,7 @@
44
  <div class="fields">
45
  <label for="shipping:company"><?php echo $this->__('Company') ?></label>
46
  <div class="input-box">
47
- <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" onchange="shipping.setSameAsBilling(false);" />
48
  </div>
49
  </div>
50
  </li>
@@ -52,7 +52,7 @@
52
  <li class="wide">
53
  <label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
54
  <div class="input-box">
55
- <input type="text" title="<?php echo $this->__('Street Address') ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
56
  </div>
57
  </li>
58
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
@@ -60,7 +60,7 @@
60
  <li class="wide">
61
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Address') ?> <?php echo $_i ?></label>
62
  <div class="input-box">
63
- <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
64
  </div>
65
  </li>
66
  <?php endfor; ?>
@@ -68,7 +68,7 @@
68
  <li class="wide">
69
  <label for="billing:vat_id"><?php echo $this->__('VAT Number'); ?></label>
70
  <div class="input-box">
71
- <input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()); ?>" title="<?php echo $this->__('VAT Number'); ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
72
  </div>
73
  </li>
74
  <?php endif; ?>
@@ -76,13 +76,13 @@
76
  <div class="field">
77
  <label for="shipping:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
78
  <div class="input-box">
79
- <input type="text" title="<?php echo $this->__('City') ?>" name="shipping[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="shipping:city" onchange="shipping.setSameAsBilling(false);" />
80
  </div>
81
  </div>
82
  <div class="field">
83
  <label for="shipping:region" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
84
  <div class="input-box">
85
- <select id="shipping:region_id" name="shipping[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
86
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
87
  </select>
88
  <script type="text/javascript">
@@ -90,7 +90,7 @@
90
  $('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
91
  //]]>
92
  </script>
93
- <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
94
  </div>
95
  </div>
96
  </li>
@@ -98,7 +98,7 @@
98
  <div class="field">
99
  <label for="shipping:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
100
  <div class="input-box">
101
- <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" onchange="shipping.setSameAsBilling(false);" />
102
  </div>
103
  </div>
104
  <div class="field">
@@ -112,19 +112,19 @@
112
  <div class="field">
113
  <label for="shipping:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
114
  <div class="input-box">
115
- <input type="tel" name="shipping[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="shipping:telephone" onchange="shipping.setSameAsBilling(false);" />
116
  </div>
117
  </div>
118
  <div class="field">
119
  <label for="shipping:fax"><?php echo $this->__('Fax') ?></label>
120
  <div class="input-box">
121
- <input type="tel" name="shipping[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="shipping:fax" onchange="shipping.setSameAsBilling(false);" />
122
  </div>
123
  </div>
124
  </li>
125
  <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
126
  <li class="control">
127
- <input type="checkbox" name="shipping[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="shipping:save_in_address_book" onchange="shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="shipping:save_in_address_book"><?php echo $this->__('Save in address book') ?></label></li>
128
  <?php else:?>
129
  <li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
130
  <?php endif;?>
@@ -132,14 +132,14 @@
132
  </div>
133
  </li>
134
  <li class="control">
135
- <input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if($this->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> title="<?php echo $this->__('Use Billing Address') ?>" onclick="shipping.setSameAsBilling(this.checked)" class="checkbox" /><label for="shipping:same_as_billing"><?php echo $this->__('Use Billing Address') ?></label>
136
  </li>
137
  </ul>
138
  <div class="buttons-set" id="shipping-buttons-container">
139
  <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
140
- <button type="button" class="button" title="<?php echo $this->__('Continue') ?>" onclick="shipping.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
141
  <span id="shipping-please-wait" class="please-wait" style="display:none;">
142
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
143
  </span>
144
  </div>
145
  </form>
@@ -149,7 +149,7 @@
149
  '<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
150
  var shippingForm = new VarienForm('co-shipping-form');
151
  shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
152
- //shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
153
  $('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
154
 
155
  var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'shipping:postcode');
44
  <div class="fields">
45
  <label for="shipping:company"><?php echo $this->__('Company') ?></label>
46
  <div class="input-box">
47
+ <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Company')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" onchange="shipping.setSameAsBilling(false);" />
48
  </div>
49
  </div>
50
  </li>
52
  <li class="wide">
53
  <label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
54
  <div class="input-box">
55
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address')) ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
56
  </div>
57
  </li>
58
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
60
  <li class="wide">
61
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Address') ?> <?php echo $_i ?></label>
62
  <div class="input-box">
63
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address %s', $_i)) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
64
  </div>
65
  </li>
66
  <?php endfor; ?>
68
  <li class="wide">
69
  <label for="billing:vat_id"><?php echo $this->__('VAT Number'); ?></label>
70
  <div class="input-box">
71
+ <input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()); ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('VAT Number')); ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
72
  </div>
73
  </li>
74
  <?php endif; ?>
76
  <div class="field">
77
  <label for="shipping:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
78
  <div class="input-box">
79
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('City')) ?>" name="shipping[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="shipping:city" onchange="shipping.setSameAsBilling(false);" />
80
  </div>
81
  </div>
82
  <div class="field">
83
  <label for="shipping:region" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
84
  <div class="input-box">
85
+ <select id="shipping:region_id" name="shipping[region_id]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
86
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
87
  </select>
88
  <script type="text/javascript">
90
  $('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
91
  //]]>
92
  </script>
93
+ <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
94
  </div>
95
  </div>
96
  </li>
98
  <div class="field">
99
  <label for="shipping:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
100
  <div class="input-box">
101
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Zip/Postal Code')) ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" onchange="shipping.setSameAsBilling(false);" />
102
  </div>
103
  </div>
104
  <div class="field">
112
  <div class="field">
113
  <label for="shipping:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
114
  <div class="input-box">
115
+ <input type="tel" name="shipping[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Telephone')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="shipping:telephone" onchange="shipping.setSameAsBilling(false);" />
116
  </div>
117
  </div>
118
  <div class="field">
119
  <label for="shipping:fax"><?php echo $this->__('Fax') ?></label>
120
  <div class="input-box">
121
+ <input type="tel" name="shipping[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Fax')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="shipping:fax" onchange="shipping.setSameAsBilling(false);" />
122
  </div>
123
  </div>
124
  </li>
125
  <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
126
  <li class="control">
127
+ <input type="checkbox" name="shipping[save_in_address_book]" value="1" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save in address book')) ?>" id="shipping:save_in_address_book" onchange="shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="shipping:save_in_address_book"><?php echo $this->__('Save in address book') ?></label></li>
128
  <?php else:?>
129
  <li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
130
  <?php endif;?>
132
  </div>
133
  </li>
134
  <li class="control">
135
+ <input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if($this->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> title="<?php echo Mage::helper('core')->quoteEscape($this->__('Use Billing Address')) ?>" onclick="shipping.setSameAsBilling(this.checked)" class="checkbox" /><label for="shipping:same_as_billing"><?php echo $this->__('Use Billing Address') ?></label>
136
  </li>
137
  </ul>
138
  <div class="buttons-set" id="shipping-buttons-container">
139
  <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
140
+ <button type="button" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" onclick="shipping.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
141
  <span id="shipping-please-wait" class="please-wait" style="display:none;">
142
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
143
  </span>
144
  </div>
145
  </form>
149
  '<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
150
  var shippingForm = new VarienForm('co-shipping-form');
151
  shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
152
+ //shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Select State/Province...')) ?>');
153
  $('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
154
 
155
  var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'shipping:postcode');
app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/state/swatch.phtml CHANGED
@@ -43,10 +43,10 @@ $_swatchUrl = $this->getSwatchUrl();
43
  $clearLinkUrl = $_filter->getClearLinkUrl();
44
  if ($clearLinkUrl):
45
  ?>
46
- <a class="btn-previous" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo $this->__('Previous') ?>"><?php echo $this->__('Previous') ?></a>
47
  <a class="btn-remove" title="<?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>" href="<?php echo $clearLinkUrl ?>"><?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></a>
48
  <?php else: ?>
49
- <a class="btn-remove" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo $this->__('Remove This Item') ?>"><?php echo $this->__('Remove This Item') ?></a>
50
  <?php endif; ?>
51
  <span class="label" style="line-height: <?php echo $_lineHeight; ?>px;"><?php echo $this->__($_filter->getName()) ?>:</span>
52
  <span class="value" style="line-height: <?php echo $_lineHeight; ?>px;">
43
  $clearLinkUrl = $_filter->getClearLinkUrl();
44
  if ($clearLinkUrl):
45
  ?>
46
+ <a class="btn-previous" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Previous')) ?>"><?php echo $this->__('Previous') ?></a>
47
  <a class="btn-remove" title="<?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>" href="<?php echo $clearLinkUrl ?>"><?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></a>
48
  <?php else: ?>
49
+ <a class="btn-remove" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove This Item')) ?>"><?php echo $this->__('Remove This Item') ?></a>
50
  <?php endif; ?>
51
  <span class="label" style="line-height: <?php echo $_lineHeight; ?>px;"><?php echo $this->__($_filter->getName()) ?>:</span>
52
  <span class="value" style="line-height: <?php echo $_lineHeight; ?>px;">
app/design/frontend/rwd/default/template/contacts/form.phtml CHANGED
@@ -37,33 +37,33 @@
37
  <div class="field">
38
  <label for="name" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Name') ?></label>
39
  <div class="input-box">
40
- <input name="name" id="name" title="<?php echo Mage::helper('contacts')->__('Name') ?>" value="<?php echo $this->escapeHtml($this->helper('contacts')->getUserName()) ?>" class="input-text required-entry" type="text" />
41
  </div>
42
  </div>
43
  <div class="field">
44
  <label for="email" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Email') ?></label>
45
  <div class="input-box">
46
- <input name="email" id="email" title="<?php echo Mage::helper('contacts')->__('Email') ?>" value="<?php echo $this->escapeHtml($this->helper('contacts')->getUserEmail()) ?>" class="input-text required-entry validate-email" type="email" autocapitalize="off" autocorrect="off" spellcheck="false" />
47
  </div>
48
  </div>
49
  </li>
50
  <li>
51
  <label for="telephone"><?php echo Mage::helper('contacts')->__('Telephone') ?></label>
52
  <div class="input-box">
53
- <input name="telephone" id="telephone" title="<?php echo Mage::helper('contacts')->__('Telephone') ?>" value="" class="input-text" type="tel" />
54
  </div>
55
  </li>
56
  <li class="wide">
57
  <label for="comment" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Comment') ?></label>
58
  <div class="input-box">
59
- <textarea name="comment" id="comment" title="<?php echo Mage::helper('contacts')->__('Comment') ?>" class="required-entry input-text" cols="5" rows="3"></textarea>
60
  </div>
61
  </li>
62
  </ul>
63
  </div>
64
  <div class="buttons-set">
65
  <input type="text" name="hideit" id="hideit" value="" style="display:none !important;" />
66
- <button type="submit" title="<?php echo Mage::helper('contacts')->__('Submit') ?>" class="button"><span><span><?php echo Mage::helper('contacts')->__('Submit') ?></span></span></button>
67
  </div>
68
  </form>
69
  <script type="text/javascript">
37
  <div class="field">
38
  <label for="name" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Name') ?></label>
39
  <div class="input-box">
40
+ <input name="name" id="name" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Name')) ?>" value="<?php echo $this->escapeHtml($this->helper('contacts')->getUserName()) ?>" class="input-text required-entry" type="text" />
41
  </div>
42
  </div>
43
  <div class="field">
44
  <label for="email" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Email') ?></label>
45
  <div class="input-box">
46
+ <input name="email" id="email" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Email')) ?>" value="<?php echo $this->escapeHtml($this->helper('contacts')->getUserEmail()) ?>" class="input-text required-entry validate-email" type="email" autocapitalize="off" autocorrect="off" spellcheck="false" />
47
  </div>
48
  </div>
49
  </li>
50
  <li>
51
  <label for="telephone"><?php echo Mage::helper('contacts')->__('Telephone') ?></label>
52
  <div class="input-box">
53
+ <input name="telephone" id="telephone" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Telephone')) ?>" value="" class="input-text" type="tel" />
54
  </div>
55
  </li>
56
  <li class="wide">
57
  <label for="comment" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Comment') ?></label>
58
  <div class="input-box">
59
+ <textarea name="comment" id="comment" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Comment')) ?>" class="required-entry input-text" cols="5" rows="3"></textarea>
60
  </div>
61
  </li>
62
  </ul>
63
  </div>
64
  <div class="buttons-set">
65
  <input type="text" name="hideit" id="hideit" value="" style="display:none !important;" />
66
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Submit')) ?>" class="button"><span><span><?php echo Mage::helper('contacts')->__('Submit') ?></span></span></button>
67
  </div>
68
  </form>
69
  <script type="text/javascript">
app/design/frontend/rwd/default/template/customer/address/edit.phtml CHANGED
@@ -51,20 +51,20 @@
51
  <li class="wide">
52
  <label for="company"><?php echo $this->__('Company') ?></label>
53
  <div class="input-box">
54
- <input type="text" name="company" id="company" title="<?php echo $this->__('Company') ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
55
  </div>
56
  </li>
57
  <li class="fields">
58
  <div class="field">
59
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
60
  <div class="input-box">
61
- <input type="tel" name="telephone" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="telephone" />
62
  </div>
63
  </div>
64
  <div class="field">
65
  <label for="fax"><?php echo $this->__('Fax') ?></label>
66
  <div class="input-box">
67
- <input type="tel" name="fax" id="fax" title="<?php echo $this->__('Fax') ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" />
68
  </div>
69
  </div>
70
  </li>
@@ -77,7 +77,7 @@
77
  <li class="wide">
78
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
79
  <div class="input-box">
80
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
81
  </div>
82
  </li>
83
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
@@ -85,7 +85,7 @@
85
  <li class="wide">
86
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?></label>
87
  <div class="input-box">
88
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
89
  </div>
90
  </li>
91
  <?php endfor; ?>
@@ -93,7 +93,7 @@
93
  <li class="wide">
94
  <label for="vat_id"><?php echo $this->__('VAT Number') ?></label>
95
  <div class="input-box">
96
- <input type="text" name="vat_id" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->__('VAT Number') ?>" id="vat_id" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
97
  </div>
98
  </li>
99
  <?php endif; ?>
@@ -101,13 +101,13 @@
101
  <div class="field">
102
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
103
  <div class="input-box">
104
- <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
105
  </div>
106
  </div>
107
  <div class="field">
108
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
109
  <div class="input-box">
110
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
111
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
112
  </select>
113
  <script type="text/javascript">
@@ -115,7 +115,7 @@
115
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
116
  //]]>
117
  </script>
118
- <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" />
119
  </div>
120
  </div>
121
  </li>
@@ -123,7 +123,7 @@
123
  <div class="field">
124
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
125
  <div class="input-box">
126
- <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
127
  </div>
128
  </div>
129
  <div class="field">
@@ -137,7 +137,7 @@
137
  <?php if($this->isDefaultBilling()): ?>
138
  <strong><?php echo $this->__('Default Billing Address') ?></strong>
139
  <?php elseif($this->canSetAsDefaultBilling()): ?>
140
- <input type="checkbox" id="primary_billing" name="default_billing" value="1" title="<?php echo $this->__('Use as My Default Billing Address') ?>" class="checkbox" /><label for="primary_billing"><?php echo $this->__('Use as my default billing address') ?></label>
141
  <?php else: ?>
142
  <input type="hidden" name="default_billing" value="1" />
143
  <?php endif; ?>
@@ -146,7 +146,7 @@
146
  <?php if($this->isDefaultShipping()): ?>
147
  <strong><?php echo $this->__('Default Shipping Address') ?></strong>
148
  <?php elseif($this->canSetAsDefaultShipping()): ?>
149
- <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" title="<?php echo $this->__('Use as My Default Shipping Address') ?>" class="checkbox" /><label for="primary_shipping"><?php echo $this->__('Use as my default shipping address') ?></label>
150
  <?php else: ?>
151
  <input type="hidden" name="default_shipping" value="1" />
152
  <?php endif; ?>
@@ -155,7 +155,7 @@
155
  </div>
156
  <div class="buttons-set">
157
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
158
- <button type="submit" title="<?php echo $this->__('Save Address') ?>" class="button"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
159
  </div>
160
  </form>
161
  <script type="text/javascript">
51
  <li class="wide">
52
  <label for="company"><?php echo $this->__('Company') ?></label>
53
  <div class="input-box">
54
+ <input type="text" name="company" id="company" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Company')) ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
55
  </div>
56
  </li>
57
  <li class="fields">
58
  <div class="field">
59
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
60
  <div class="input-box">
61
+ <input type="tel" name="telephone" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Telephone')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="telephone" />
62
  </div>
63
  </div>
64
  <div class="field">
65
  <label for="fax"><?php echo $this->__('Fax') ?></label>
66
  <div class="input-box">
67
+ <input type="tel" name="fax" id="fax" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Fax')) ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" />
68
  </div>
69
  </div>
70
  </li>
77
  <li class="wide">
78
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
79
  <div class="input-box">
80
+ <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address')) ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
81
  </div>
82
  </li>
83
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
85
  <li class="wide">
86
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?></label>
87
  <div class="input-box">
88
+ <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address %s', $_i)) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
89
  </div>
90
  </li>
91
  <?php endfor; ?>
93
  <li class="wide">
94
  <label for="vat_id"><?php echo $this->__('VAT Number') ?></label>
95
  <div class="input-box">
96
+ <input type="text" name="vat_id" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('VAT Number')) ?>" id="vat_id" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
97
  </div>
98
  </li>
99
  <?php endif; ?>
101
  <div class="field">
102
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
103
  <div class="input-box">
104
+ <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('City')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
105
  </div>
106
  </div>
107
  <div class="field">
108
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
109
  <div class="input-box">
110
+ <select id="region_id" name="region_id" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
111
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
112
  </select>
113
  <script type="text/javascript">
115
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
116
  //]]>
117
  </script>
118
+ <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" />
119
  </div>
120
  </div>
121
  </li>
123
  <div class="field">
124
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
125
  <div class="input-box">
126
+ <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Zip/Postal Code')) ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
127
  </div>
128
  </div>
129
  <div class="field">
137
  <?php if($this->isDefaultBilling()): ?>
138
  <strong><?php echo $this->__('Default Billing Address') ?></strong>
139
  <?php elseif($this->canSetAsDefaultBilling()): ?>
140
+ <input type="checkbox" id="primary_billing" name="default_billing" value="1" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Use as My Default Billing Address')) ?>" class="checkbox" /><label for="primary_billing"><?php echo $this->__('Use as my default billing address') ?></label>
141
  <?php else: ?>
142
  <input type="hidden" name="default_billing" value="1" />
143
  <?php endif; ?>
146
  <?php if($this->isDefaultShipping()): ?>
147
  <strong><?php echo $this->__('Default Shipping Address') ?></strong>
148
  <?php elseif($this->canSetAsDefaultShipping()): ?>
149
+ <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Use as My Default Shipping Address')) ?>" class="checkbox" /><label for="primary_shipping"><?php echo $this->__('Use as my default shipping address') ?></label>
150
  <?php else: ?>
151
  <input type="hidden" name="default_shipping" value="1" />
152
  <?php endif; ?>
155
  </div>
156
  <div class="buttons-set">
157
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
158
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>" class="button"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
159
  </div>
160
  </form>
161
  <script type="text/javascript">
app/design/frontend/rwd/default/template/customer/form/address.phtml CHANGED
@@ -43,7 +43,7 @@
43
  <li>
44
  <label for="company"><?php echo $this->__('Company') ?></label>
45
  <div class="input-box">
46
- <input type="text" name="company" id="company" title="<?php echo $this->__('Company') ?>" value="<?php echo $this->escapeHtml($data->getCompany()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
47
  </div>
48
  </li>
49
  </ul>
@@ -55,7 +55,7 @@
55
  <li class="wide">
56
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
57
  <div class="input-box">
58
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($data->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
59
  </div>
60
  </li>
61
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
@@ -63,7 +63,7 @@
63
  <li class="wide">
64
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?></label>
65
  <div class="input-box">
66
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($data->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
67
  </div>
68
  </li>
69
  <?php endfor; ?>
@@ -71,13 +71,13 @@
71
  <div class="field">
72
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
73
  <div class="input-box">
74
- <input type="text" name="city" value="<?php echo $this->escapeHtml($data->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
75
  </div>
76
  </div>
77
  <div class="field">
78
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
79
  <div class="input-box">
80
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
81
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
82
  </select>
83
  <script type="text/javascript">
@@ -85,7 +85,7 @@
85
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
86
  //]]>
87
  </script>
88
- <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
89
  </div>
90
  </div>
91
  </li>
@@ -93,13 +93,13 @@
93
  <div class="field">
94
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
95
  <div class="input-box">
96
- <input type="text" name="postcode" value="<?php echo $this->escapeHtml($data->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
97
  </div>
98
  </div>
99
  <div class="field">
100
  <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
101
  <div class="input-box">
102
- <select name="country_id" id="country" title="<?php echo $this->__('Country') ?>" class="validate-select">
103
  <?php echo $countries->toHtmlOptions($data->getCountryId()) ?>
104
  </select>
105
  </div>
@@ -109,13 +109,13 @@
109
  <div class="field">
110
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
111
  <div class="input-box">
112
- <input type="tel" name="telephone" value="<?php echo $this->escapeHtml($data->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="telephone" />
113
  </div>
114
  </div>
115
  <div class="field">
116
  <label for="fax"><?php echo $this->__('Fax') ?></label>
117
  <div class="input-box">
118
- <input type="tel" name="fax" value="<?php echo $this->escapeHtml($data->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="fax" />
119
  </div>
120
  </div>
121
  </li>
@@ -132,7 +132,7 @@
132
  </div>
133
  <div class="buttons-set">
134
  <p class="back-link"><a href="<?php echo $this->getUrl('customer/address/') ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
135
- <button type="submit" class="button" title="<?php echo $this->__('Save Address') ?>"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
136
  </div>
137
  </form>
138
  <script type="text/javascript">
43
  <li>
44
  <label for="company"><?php echo $this->__('Company') ?></label>
45
  <div class="input-box">
46
+ <input type="text" name="company" id="company" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Company')) ?>" value="<?php echo $this->escapeHtml($data->getCompany()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
47
  </div>
48
  </li>
49
  </ul>
55
  <li class="wide">
56
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
57
  <div class="input-box">
58
+ <input type="text" name="street[]" value="<?php echo $this->escapeHtml($data->getStreet(1)) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address')) ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
59
  </div>
60
  </li>
61
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
63
  <li class="wide">
64
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?></label>
65
  <div class="input-box">
66
+ <input type="text" name="street[]" value="<?php echo $this->escapeHtml($data->getStreet($_i)) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address %s', $_i)) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
67
  </div>
68
  </li>
69
  <?php endfor; ?>
71
  <div class="field">
72
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
73
  <div class="input-box">
74
+ <input type="text" name="city" value="<?php echo $this->escapeHtml($data->getCity()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('City')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
75
  </div>
76
  </div>
77
  <div class="field">
78
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
79
  <div class="input-box">
80
+ <select id="region_id" name="region_id" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
81
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
82
  </select>
83
  <script type="text/javascript">
85
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
86
  //]]>
87
  </script>
88
+ <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
89
  </div>
90
  </div>
91
  </li>
93
  <div class="field">
94
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
95
  <div class="input-box">
96
+ <input type="text" name="postcode" value="<?php echo $this->escapeHtml($data->getPostcode()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Zip/Postal Code')) ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
97
  </div>
98
  </div>
99
  <div class="field">
100
  <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
101
  <div class="input-box">
102
+ <select name="country_id" id="country" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Country')) ?>" class="validate-select">
103
  <?php echo $countries->toHtmlOptions($data->getCountryId()) ?>
104
  </select>
105
  </div>
109
  <div class="field">
110
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
111
  <div class="input-box">
112
+ <input type="tel" name="telephone" value="<?php echo $this->escapeHtml($data->getTelephone()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Telephone')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="telephone" />
113
  </div>
114
  </div>
115
  <div class="field">
116
  <label for="fax"><?php echo $this->__('Fax') ?></label>
117
  <div class="input-box">
118
+ <input type="tel" name="fax" value="<?php echo $this->escapeHtml($data->getFax()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Fax')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="fax" />
119
  </div>
120
  </div>
121
  </li>
132
  </div>
133
  <div class="buttons-set">
134
  <p class="back-link"><a href="<?php echo $this->getUrl('customer/address/') ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
135
+ <button type="submit" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
136
  </div>
137
  </form>
138
  <script type="text/javascript">
app/design/frontend/rwd/default/template/customer/form/changepassword.phtml CHANGED
@@ -36,20 +36,20 @@
36
  <li>
37
  <label for="current_password" class="required"><em>*</em><?php echo $this->__('Current Password') ?></label>
38
  <div class="input-box">
39
- <input type="password" title="<?php echo $this->__('Current Password') ?>" class="input-text required-entry" name="current_password" id="current_password" />
40
  </div>
41
  </li>
42
  <li class="fields">
43
  <div class="field">
44
  <label for="password" class="required"><em>*</em><?php echo $this->__('New Password') ?></label>
45
  <div class="input-box">
46
- <input type="password" title="<?php echo $this->__('New Password') ?>" class="input-text required-entry validate-password" name="password" id="password" />
47
  </div>
48
  </div>
49
  <div class="field">
50
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
51
  <div class="input-box">
52
- <input type="password" title="<?php echo $this->__('Confirm New Password') ?>" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" />
53
  </div>
54
  </div>
55
  </li>
@@ -57,7 +57,7 @@
57
  </div>
58
  <div class="buttons-set">
59
  <p class="back-link"><a href="<?php echo $this->getUrl('customer/account') ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
60
- <button type="submit" title="<?php echo $this->__('Save Password') ?>" class="button"><span><span><?php echo $this->__('Save Password') ?></span></span></button>
61
  </div>
62
  </form>
63
  <script type="text/javascript">
36
  <li>
37
  <label for="current_password" class="required"><em>*</em><?php echo $this->__('Current Password') ?></label>
38
  <div class="input-box">
39
+ <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text required-entry" name="current_password" id="current_password" />
40
  </div>
41
  </li>
42
  <li class="fields">
43
  <div class="field">
44
  <label for="password" class="required"><em>*</em><?php echo $this->__('New Password') ?></label>
45
  <div class="input-box">
46
+ <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('New Password')) ?>" class="input-text required-entry validate-password" name="password" id="password" />
47
  </div>
48
  </div>
49
  <div class="field">
50
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
51
  <div class="input-box">
52
+ <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm New Password')) ?>" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" />
53
  </div>
54
  </div>
55
  </li>
57
  </div>
58
  <div class="buttons-set">
59
  <p class="back-link"><a href="<?php echo $this->getUrl('customer/account') ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
60
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save Password')) ?>" class="button"><span><span><?php echo $this->__('Save Password') ?></span></span></button>
61
  </div>
62
  </form>
63
  <script type="text/javascript">
app/design/frontend/rwd/default/template/customer/form/confirmation.phtml CHANGED
@@ -36,7 +36,7 @@
36
  <li>
37
  <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
38
  <div class="input-box">
39
- <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="email" id="email_address" title="<?php echo $this->__('Email Address') ?>" class="input-text required-entry validate-email" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" />
40
  </div>
41
  </li>
42
  </ul>
@@ -44,7 +44,7 @@
44
  <div class="buttons-set">
45
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
46
  <p class="back-link"><a href="<?php echo $this->helper('customer')->getLoginUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Login') ?></a></p>
47
- <button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
48
  </div>
49
  </form>
50
  <script type="text/javascript">
36
  <li>
37
  <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
38
  <div class="input-box">
39
+ <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="email" id="email_address" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" class="input-text required-entry validate-email" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" />
40
  </div>
41
  </li>
42
  </ul>
44
  <div class="buttons-set">
45
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
46
  <p class="back-link"><a href="<?php echo $this->helper('customer')->getLoginUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Login') ?></a></p>
47
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
48
  </div>
49
  </form>
50
  <script type="text/javascript">
app/design/frontend/rwd/default/template/customer/form/edit.phtml CHANGED
@@ -40,7 +40,7 @@
40
  <li>
41
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
42
  <div class="input-box">
43
- <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="email" id="email" value="<?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text required-entry validate-email" />
44
  </div>
45
  </li>
46
  <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
@@ -56,7 +56,7 @@
56
  <li><?php echo $_gender->setGender($this->getCustomer()->getGender())->toHtml() ?></li>
57
  <?php endif ?>
58
  <li class="control">
59
- <input type="checkbox" name="change_password" id="change_password" value="1" onclick="setPasswordForm(this.checked)" title="<?php echo $this->__('Change Password') ?>"<?php if($this->getCustomer()->getChangePassword()==1): ?> checked="checked"<?php endif; ?> class="checkbox" /><label for="change_password"><?php echo $this->__('Change Password') ?></label>
60
  </li>
61
  </ul>
62
  </div>
@@ -68,20 +68,20 @@
68
  <div class="input-box">
69
  <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
70
  <input type="text" class="input-text no-display" name="dummy" id="dummy" />
71
- <input type="password" title="<?php echo $this->__('Current Password') ?>" class="input-text" name="current_password" id="current_password" />
72
  </div>
73
  </li>
74
  <li class="fields">
75
  <div class="field">
76
  <label for="password" class="required"><em>*</em><?php echo $this->__('New Password') ?></label>
77
  <div class="input-box">
78
- <input type="password" title="<?php echo $this->__('New Password') ?>" class="input-text validate-password" name="password" id="password" />
79
  </div>
80
  </div>
81
  <div class="field">
82
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
83
  <div class="input-box">
84
- <input type="password" title="<?php echo $this->__('Confirm New Password') ?>" class="input-text validate-cpassword" name="confirmation" id="confirmation" />
85
  </div>
86
  </div>
87
  </li>
@@ -89,7 +89,7 @@
89
  </div>
90
  <div class="buttons-set">
91
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
92
- <button type="submit" title="<?php echo $this->__('Save') ?>" class="button"><span><span><?php echo $this->__('Save') ?></span></span></button>
93
  </div>
94
  </form>
95
  <script type="text/javascript">
40
  <li>
41
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
42
  <div class="input-box">
43
+ <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="email" id="email" value="<?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" class="input-text required-entry validate-email" />
44
  </div>
45
  </li>
46
  <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
56
  <li><?php echo $_gender->setGender($this->getCustomer()->getGender())->toHtml() ?></li>
57
  <?php endif ?>
58
  <li class="control">
59
+ <input type="checkbox" name="change_password" id="change_password" value="1" onclick="setPasswordForm(this.checked)" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Change Password')) ?>"<?php if($this->getCustomer()->getChangePassword()==1): ?> checked="checked"<?php endif; ?> class="checkbox" /><label for="change_password"><?php echo $this->__('Change Password') ?></label>
60
  </li>
61
  </ul>
62
  </div>
68
  <div class="input-box">
69
  <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
70
  <input type="text" class="input-text no-display" name="dummy" id="dummy" />
71
+ <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text" name="current_password" id="current_password" />
72
  </div>
73
  </li>
74
  <li class="fields">
75
  <div class="field">
76
  <label for="password" class="required"><em>*</em><?php echo $this->__('New Password') ?></label>
77
  <div class="input-box">
78
+ <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('New Password')) ?>" class="input-text validate-password" name="password" id="password" />
79
  </div>
80
  </div>
81
  <div class="field">
82
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
83
  <div class="input-box">
84
+ <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm New Password')) ?>" class="input-text validate-cpassword" name="confirmation" id="confirmation" />
85
  </div>
86
  </div>
87
  </li>
89
  </div>
90
  <div class="buttons-set">
91
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
92
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save')) ?>" class="button"><span><span><?php echo $this->__('Save') ?></span></span></button>
93
  </div>
94
  </form>
95
  <script type="text/javascript">
app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml CHANGED
@@ -45,7 +45,7 @@
45
  </div>
46
  <div class="buttons-set">
47
  <p class="back-link"><a href="<?php echo $this->helper('customer')->getLoginUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Login') ?></a></p>
48
- <button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
49
  </div>
50
  </form>
51
  <script type="text/javascript">
45
  </div>
46
  <div class="buttons-set">
47
  <p class="back-link"><a href="<?php echo $this->helper('customer')->getLoginUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Login') ?></a></p>
48
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
49
  </div>
50
  </form>
51
  <script type="text/javascript">
app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml CHANGED
@@ -49,7 +49,7 @@
49
  </ul>
50
  </div>
51
  <div class="buttons-set">
52
- <button type="submit" title="<?php echo $this->__('Reset a Password'); ?>" class="button"><span><span><?php echo $this->__('Reset a Password'); ?></span></span></button>
53
  </div>
54
  </form>
55
  <script type="text/javascript">
49
  </ul>
50
  </div>
51
  <div class="buttons-set">
52
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Reset a Password')); ?>" class="button"><span><span><?php echo $this->__('Reset a Password'); ?></span></span></button>
53
  </div>
54
  </form>
55
  <script type="text/javascript">
app/design/frontend/rwd/default/template/directory/currency.phtml CHANGED
@@ -34,7 +34,7 @@
34
  <?php if($this->getCurrencyCount()>1): ?>
35
  <div class="currency-switcher">
36
  <label for="select-currency"><?php echo $this->__('Your Currency:') ?></label>
37
- <select id="select-currency" name="currency" title="<?php echo $this->__('Your Currency') ?>" onchange="setLocation(this.value)">
38
  <?php foreach ($this->getCurrencies() as $_code => $_name): ?>
39
  <option value="<?php echo $this->getSwitchCurrencyUrl($_code) ?>"<?php if($_code==$this->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?>>
40
  <?php echo $_name ?> - <?php echo $_code ?>
34
  <?php if($this->getCurrencyCount()>1): ?>
35
  <div class="currency-switcher">
36
  <label for="select-currency"><?php echo $this->__('Your Currency:') ?></label>
37
+ <select id="select-currency" name="currency" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Your Currency')) ?>" onchange="setLocation(this.value)">
38
  <?php foreach ($this->getCurrencies() as $_code => $_name): ?>
39
  <option value="<?php echo $this->getSwitchCurrencyUrl($_code) ?>"<?php if($_code==$this->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?>>
40
  <?php echo $_name ?> - <?php echo $_code ?>
app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml CHANGED
@@ -38,7 +38,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
38
  <ul class="cart-links">
39
  <?php if ($isVisibleProduct): ?>
40
  <li>
41
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item parameters') ?>"><?php echo $this->__('Edit') ?></a>
42
  </li>
43
  <?php endif ?>
44
 
@@ -50,7 +50,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
50
  </ul>
51
  </td>
52
  <td class="product-cart-info">
53
- <a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo $this->__('Remove Item') ?>" class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a>
54
  <h2 class="product-name"><a
55
  href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a>
56
  </h2>
@@ -104,7 +104,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
104
  <a id="<?php echo $helpLinkId ?>" href="#"
105
  class="map-help-link"><?php echo $this->__("What's this?"); ?></a>
106
  <script type="text/javascript">
107
- Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo $this->__("What's this?") ?>");
108
  </script>
109
  </span>
110
  </td>
@@ -212,15 +212,17 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
212
  <?php endif; ?>
213
  <?php endif; ?>
214
  <td class="product-cart-actions" data-rwd-label="<?php echo $this->__('Qty'); ?>">
215
- <input type="text" pattern="\d*" name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo $this->__('Qty') ?>" class="input-text qty" maxlength="12" />
 
 
216
 
217
- <button type="submit" name="update_cart_action" value="update_qty" title="<?php echo $this->__('Update'); ?>" class="button btn-update"><span><span><?php echo $this->__('Update'); ?></span></span>
218
  </button>
219
 
220
  <ul class="cart-links">
221
  <?php if ($isVisibleProduct): ?>
222
  <li>
223
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item parameters') ?>"><?php echo $this->__('Edit') ?></a>
224
  </li>
225
  <?php endif ?>
226
 
@@ -339,6 +341,6 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
339
  <?php endif; ?>
340
  </td>
341
  <?php endif; ?>
342
- <td class="a-center product-cart-remove"><a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo $this->__('Remove Item') ?>"
343
  class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a></td>
344
  </tr>
38
  <ul class="cart-links">
39
  <?php if ($isVisibleProduct): ?>
40
  <li>
41
+ <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Edit item parameters')) ?>"><?php echo $this->__('Edit') ?></a>
42
  </li>
43
  <?php endif ?>
44
 
50
  </ul>
51
  </td>
52
  <td class="product-cart-info">
53
+ <a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove Item')) ?>" class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a>
54
  <h2 class="product-name"><a
55
  href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a>
56
  </h2>
104
  <a id="<?php echo $helpLinkId ?>" href="#"
105
  class="map-help-link"><?php echo $this->__("What's this?"); ?></a>
106
  <script type="text/javascript">
107
+ Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo Mage::helper('core')->jsQuoteEscape($this->__("What's this?")) ?>");
108
  </script>
109
  </span>
110
  </td>
212
  <?php endif; ?>
213
  <?php endif; ?>
214
  <td class="product-cart-actions" data-rwd-label="<?php echo $this->__('Qty'); ?>">
215
+ <input type="text" pattern="\d*" name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>"
216
+ data-cart-item-id="<?php echo $this->jsQuoteEscape($_item->getSku()) ?>"
217
+ size="4" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" maxlength="12" />
218
 
219
+ <button type="submit" data-cart-item-update name="update_cart_action" value="update_qty" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update')); ?>" class="button btn-update"><span><span><?php echo $this->__('Update'); ?></span></span>
220
  </button>
221
 
222
  <ul class="cart-links">
223
  <?php if ($isVisibleProduct): ?>
224
  <li>
225
+ <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Edit item parameters')) ?>"><?php echo $this->__('Edit') ?></a>
226
  </li>
227
  <?php endif ?>
228
 
341
  <?php endif; ?>
342
  </td>
343
  <?php endif; ?>
344
+ <td class="a-center product-cart-remove"><a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove Item')) ?>"
345
  class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a></td>
346
  </tr>
app/design/frontend/rwd/default/template/downloadable/customer/products/list.phtml CHANGED
@@ -55,9 +55,9 @@
55
  <?php $_odd = ''; ?>
56
  <?php foreach ($_items as $_item): ?>
57
  <tr>
58
- <td data-rwd-label="<?php echo Mage::helper('downloadable')->__('Order #') ?>"><a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo Mage::helper('downloadable')->__('View Order') ?>"><?php echo $_item->getPurchased()->getOrderIncrementId() ?></a></td>
59
  <td data-rwd-label="<?php echo Mage::helper('downloadable')->__('Date') ?>"><span class="nobr"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></span></td>
60
- <td data-rwd-label="<?php echo Mage::helper('downloadable')->__('Title') ?>"><?php echo $this->escapeHtml($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo Mage::helper('downloadable')->__('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_item->getLinkTitle()); ?></a></td>
61
  <td data-rwd-label="<?php echo Mage::helper('downloadable')->__('Status') ?>"><em><?php echo Mage::helper('downloadable')->__(ucfirst($_item->getStatus())) ?></em></td>
62
  <td data-rwd-label="<?php echo Mage::helper('downloadable')->__('Remaining Downloads') ?>"><?php echo $this->getRemainingDownloads($_item) ?></td>
63
  </tr>
55
  <?php $_odd = ''; ?>
56
  <?php foreach ($_items as $_item): ?>
57
  <tr>
58
+ <td data-rwd-label="<?php echo Mage::helper('downloadable')->__('Order #') ?>"><a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('downloadable')->__('View Order')) ?>"><?php echo $_item->getPurchased()->getOrderIncrementId() ?></a></td>
59
  <td data-rwd-label="<?php echo Mage::helper('downloadable')->__('Date') ?>"><span class="nobr"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></span></td>
60
+ <td data-rwd-label="<?php echo Mage::helper('downloadable')->__('Title') ?>"><?php echo $this->escapeHtml($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('downloadable')->__('Start Download')) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_item->getLinkTitle()); ?></a></td>
61
  <td data-rwd-label="<?php echo Mage::helper('downloadable')->__('Status') ?>"><em><?php echo Mage::helper('downloadable')->__(ucfirst($_item->getStatus())) ?></em></td>
62
  <td data-rwd-label="<?php echo Mage::helper('downloadable')->__('Remaining Downloads') ?>"><?php echo $this->getRemainingDownloads($_item) ?></td>
63
  </tr>
app/design/frontend/rwd/default/template/email/catalog/product/list.phtml CHANGED
@@ -87,9 +87,9 @@ $_helper = $this->helper('catalog/output');
87
  </div>
88
  <div class="product-secondary">
89
  <?php if(!$_product->canConfigure() && $_product->isSaleable()): ?>
90
- <p class="action"><button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button></p>
91
  <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
92
- <p class="action"><a title="<?php echo $this->__('View Details') ?>" class="button" href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->__('View Details') ?></a></p>
93
  <?php else: ?>
94
  <p class="action availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
95
  <?php endif; ?>
@@ -150,9 +150,9 @@ $_helper = $this->helper('catalog/output');
150
  <?php endif; ?>
151
  <div class="actions">
152
  <?php if(!$_product->canConfigure() && $_product->isSaleable()): ?>
153
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
154
  <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
155
- <a title="<?php echo $this->__('View Details') ?>" class="button" href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->__('View Details') ?></a>
156
  <?php else: ?>
157
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
158
  <?php endif; ?>
87
  </div>
88
  <div class="product-secondary">
89
  <?php if(!$_product->canConfigure() && $_product->isSaleable()): ?>
90
+ <p class="action"><button type="button" title="<?php echo $this->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button></p>
91
  <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
92
+ <p class="action"><a title="<?php echo $this->quoteEscape($this->__('View Details')) ?>" class="button" href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->__('View Details') ?></a></p>
93
  <?php else: ?>
94
  <p class="action availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
95
  <?php endif; ?>
150
  <?php endif; ?>
151
  <div class="actions">
152
  <?php if(!$_product->canConfigure() && $_product->isSaleable()): ?>
153
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
154
  <?php elseif($_product->getStockItem() && $_product->getStockItem()->getIsInStock()): ?>
155
+ <a title="<?php echo $this->quoteEscape($this->__('View Details')) ?>" class="button" href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->__('View Details') ?></a>
156
  <?php else: ?>
157
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
158
  <?php endif; ?>
app/design/frontend/rwd/default/template/newsletter/subscribe.phtml CHANGED
@@ -34,10 +34,10 @@
34
  <label for="newsletter"><?php echo $this->__('Sign Up for Our Newsletter:') ?></label>
35
  </div>
36
  <div class="input-box">
37
- <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="email" id="newsletter" title="<?php echo $this->__('Sign up for our newsletter') ?>" class="input-text required-entry validate-email" />
38
  </div>
39
  <div class="actions">
40
- <button type="submit" title="<?php echo $this->__('Subscribe') ?>" class="button"><span><span><?php echo $this->__('Subscribe') ?></span></span></button>
41
  </div>
42
  </div>
43
  </form>
34
  <label for="newsletter"><?php echo $this->__('Sign Up for Our Newsletter:') ?></label>
35
  </div>
36
  <div class="input-box">
37
+ <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="email" id="newsletter" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Sign up for our newsletter')) ?>" class="input-text required-entry validate-email" />
38
  </div>
39
  <div class="actions">
40
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Subscribe')) ?>" class="button"><span><span><?php echo $this->__('Subscribe') ?></span></span></button>
41
  </div>
42
  </div>
43
  </form>
app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml CHANGED
@@ -39,6 +39,7 @@
39
  <?php echo $this->getMessagesBlock()->toHtml() ?>
40
  <?php if (!$this->getHasException()) : ?>
41
  <form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
 
42
  <div class="fieldset" class="fieldset">
43
  <h2 class="legend"><?php echo $this->getFormTitle() ?></h2>
44
  <p class="description"><?php echo $this->__('Log in to use <strong>%s</strong>', $this->getConsumer()->getName()) ?></p>
@@ -60,9 +61,9 @@
60
  <div class="clear"></div>
61
  <div class="form-buttons">
62
  <button type="submit" class="form-button"
63
- title="<?php echo $this->__('Login') ?>"/><?php echo $this->__('Login') ?></button>
64
  <button type="button" onclick="document.location.href='<?php echo $this->getRejectUrl(); ?>';"
65
- title="<?php echo $this->__('Reject') ?>"><?php echo $this->__('Reject') ?></button>
66
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
67
  </div>
68
  </div>
39
  <?php echo $this->getMessagesBlock()->toHtml() ?>
40
  <?php if (!$this->getHasException()) : ?>
41
  <form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
42
+ <?php echo $this->getBlockHtml('formkey'); ?>
43
  <div class="fieldset" class="fieldset">
44
  <h2 class="legend"><?php echo $this->getFormTitle() ?></h2>
45
  <p class="description"><?php echo $this->__('Log in to use <strong>%s</strong>', $this->getConsumer()->getName()) ?></p>
61
  <div class="clear"></div>
62
  <div class="form-buttons">
63
  <button type="submit" class="form-button"
64
+ title="<?php echo $this->quoteEscape($this->__('Login')) ?>"/><?php echo $this->__('Login') ?></button>
65
  <button type="button" onclick="document.location.href='<?php echo $this->getRejectUrl(); ?>';"
66
+ title="<?php echo $this->quoteEscape($this->__('Reject')) ?>"><?php echo $this->__('Reject') ?></button>
67
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
68
  </div>
69
  </div>
app/design/frontend/rwd/default/template/page/html/header.phtml CHANGED
@@ -36,7 +36,7 @@
36
 
37
  <?php echo $this->getChildHtml('currency_switcher') ?>
38
 
39
- <p class="welcome-msg"><?php echo $this->getChildHtml('welcome') ?> <?php echo $this->getAdditionalHtml() ?></p>
40
  </div>
41
  </div>
42
 
36
 
37
  <?php echo $this->getChildHtml('currency_switcher') ?>
38
 
39
+ <p class="welcome-msg"><?php echo $this->getChildHtml('welcome') ?> <?php echo $this->getChildHtml('accountLinks') ?></p>
40
  </div>
41
  </div>
42
 
app/design/frontend/rwd/default/template/page/html/pager.phtml CHANGED
@@ -54,7 +54,7 @@
54
  <?php if($this->getShowPerPage()): ?>
55
  <div class="limiter">
56
  <label><?php echo $this->__('Show') ?></label>
57
- <select onchange="setLocation(this.value)" title="<?php echo $this->__('Results per page'); ?>">
58
  <?php foreach ($this->getAvailableLimit() as $_key=>$_limit): ?>
59
  <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
60
  <?php echo $_limit ?>
@@ -72,7 +72,7 @@
72
  <ol>
73
  <?php if (!$this->isFirstPage()): ?>
74
  <li>
75
- <a class="previous<?php if(!$this->getAnchorTextForPrevious()): ?> i-previous<?php endif;?>" href="<?php echo $this->getPreviousPageUrl() ?>" title="<?php echo $this->__('Previous') ?>">
76
  <?php if(!$this->getAnchorTextForPrevious()): ?>
77
  <?php echo $this->__('Previous') ?>
78
  <?php else: ?>
@@ -109,7 +109,7 @@
109
 
110
  <?php if (!$this->isLastPage()): ?>
111
  <li>
112
- <a class="next<?php if(!$this->getAnchorTextForNext()): ?> i-next<?php endif; ?>" href="<?php echo $this->getNextPageUrl() ?>" title="<?php echo $this->__('Next') ?>">
113
  <?php if(!$this->getAnchorTextForNext()): ?>
114
  <?php echo $this->__('Next') ?>
115
  <?php else: ?>
54
  <?php if($this->getShowPerPage()): ?>
55
  <div class="limiter">
56
  <label><?php echo $this->__('Show') ?></label>
57
+ <select onchange="setLocation(this.value)" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Results per page')); ?>">
58
  <?php foreach ($this->getAvailableLimit() as $_key=>$_limit): ?>
59
  <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
60
  <?php echo $_limit ?>
72
  <ol>
73
  <?php if (!$this->isFirstPage()): ?>
74
  <li>
75
+ <a class="previous<?php if(!$this->getAnchorTextForPrevious()): ?> i-previous<?php endif;?>" href="<?php echo $this->getPreviousPageUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Previous')) ?>">
76
  <?php if(!$this->getAnchorTextForPrevious()): ?>
77
  <?php echo $this->__('Previous') ?>
78
  <?php else: ?>
109
 
110
  <?php if (!$this->isLastPage()): ?>
111
  <li>
112
+ <a class="next<?php if(!$this->getAnchorTextForNext()): ?> i-next<?php endif; ?>" href="<?php echo $this->getNextPageUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Next')) ?>">
113
  <?php if(!$this->getAnchorTextForNext()): ?>
114
  <?php echo $this->__('Next') ?>
115
  <?php else: ?>
app/design/frontend/rwd/default/template/page/print.phtml CHANGED
@@ -51,7 +51,7 @@
51
  </div>
52
  <?php echo $this->getChildHtml('content') ?>
53
  <div class="buttons-set">
54
- <button type="button" title="<?php echo $this->__('Close Window') ?>" class="button" onclick="window.close();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
55
  </div>
56
  <?php echo $this->getAbsoluteFooter() ?>
57
  </div>
51
  </div>
52
  <?php echo $this->getChildHtml('content') ?>
53
  <div class="buttons-set">
54
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
55
  </div>
56
  <?php echo $this->getAbsoluteFooter() ?>
57
  </div>
app/design/frontend/rwd/default/template/payment/form/cc.phtml CHANGED
@@ -38,7 +38,7 @@
38
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
39
  <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo $this->__('Credit Card Type') ?></label>
40
  <div class="input-box">
41
- <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" class="required-entry validate-cc-type-select" title="<?php echo $this->__('Credit Card Type') ?>">
42
  <option value=""><?php echo $this->__('--Please Select--')?></option>
43
  <?php $_ccType = $this->getInfoData('cc_type') ?>
44
  <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
@@ -50,7 +50,7 @@
50
  <li>
51
  <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('Credit Card Number') ?></label>
52
  <div class="input-box">
53
- <input type="text" pattern="\d*" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo $this->__('Credit Card Number') ?>" class="input-text validate-cc-number validate-cc-type" value="" />
54
  </div>
55
  </li>
56
  <li id="<?php echo $_code ?>_cc_type_exp_div">
@@ -80,7 +80,7 @@
80
  <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('Card Verification Number') ?></label>
81
  <div class="input-box">
82
  <div class="v-fix">
83
- <input type="text" pattern="\d*" title="<?php echo $this->__('Card Verification Number') ?>" class="input-text cvv required-entry validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" />
84
  </div>
85
  <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
86
  </div>
@@ -94,7 +94,7 @@
94
  <li>
95
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
96
  <span class="input-box">
97
- <input type="text" title="<?php echo $this->__('Issue Number') ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
98
  </span>
99
  </li>
100
 
38
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
39
  <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo $this->__('Credit Card Type') ?></label>
40
  <div class="input-box">
41
+ <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" class="required-entry validate-cc-type-select" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Credit Card Type')) ?>">
42
  <option value=""><?php echo $this->__('--Please Select--')?></option>
43
  <?php $_ccType = $this->getInfoData('cc_type') ?>
44
  <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
50
  <li>
51
  <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('Credit Card Number') ?></label>
52
  <div class="input-box">
53
+ <input type="text" pattern="\d*" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Credit Card Number')) ?>" class="input-text validate-cc-number validate-cc-type" value="" />
54
  </div>
55
  </li>
56
  <li id="<?php echo $_code ?>_cc_type_exp_div">
80
  <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('Card Verification Number') ?></label>
81
  <div class="input-box">
82
  <div class="v-fix">
83
+ <input type="text" pattern="\d*" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Card Verification Number')) ?>" class="input-text cvv required-entry validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" />
84
  </div>
85
  <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
86
  </div>
94
  <li>
95
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
96
  <span class="input-box">
97
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Issue Number')) ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
98
  </span>
99
  </li>
100
 
app/design/frontend/rwd/default/template/payment/form/ccsave.phtml CHANGED
@@ -30,13 +30,13 @@
30
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
31
  <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('Name on Card') ?></label>
32
  <div class="input-box">
33
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" />
34
  </div>
35
  </li>
36
  <li>
37
  <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo $this->__('Credit Card Type') ?></label>
38
  <div class="input-box">
39
- <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" title="<?php echo $this->__('Credit Card Type') ?>" class="required-entry validate-cc-type-select">
40
  <option value=""><?php echo $this->__('--Please Select--') ?></option>
41
  <?php $_ccType = $this->getInfoData('cc_type') ?>
42
  <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
@@ -48,7 +48,7 @@
48
  <li>
49
  <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('Credit Card Number') ?></label>
50
  <div class="input-box">
51
- <input type="text" pattern="\d*" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo $this->__('Credit Card Number') ?>" class="input-text validate-cc-number validate-cc-type" value="" />
52
  </div>
53
  </li>
54
  <li>
@@ -78,7 +78,7 @@
78
  <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('Card Verification Number') ?></label>
79
  <div class="input-box">
80
  <div class="v-fix">
81
- <input type="text" pattern="\d*" title="<?php echo $this->__('Card Verification Number') ?>" class="input-text cvv required-entry validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" />
82
  </div>
83
  <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
84
  </div>
@@ -91,7 +91,7 @@
91
  <li>
92
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
93
  <span class="input-box">
94
- <input type="text" title="<?php echo $this->__('Issue Number') ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
95
  </span>
96
  </li>
97
 
30
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
31
  <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('Name on Card') ?></label>
32
  <div class="input-box">
33
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Name on Card')) ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" />
34
  </div>
35
  </li>
36
  <li>
37
  <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo $this->__('Credit Card Type') ?></label>
38
  <div class="input-box">
39
+ <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Credit Card Type')) ?>" class="required-entry validate-cc-type-select">
40
  <option value=""><?php echo $this->__('--Please Select--') ?></option>
41
  <?php $_ccType = $this->getInfoData('cc_type') ?>
42
  <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
48
  <li>
49
  <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('Credit Card Number') ?></label>
50
  <div class="input-box">
51
+ <input type="text" pattern="\d*" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Credit Card Number')) ?>" class="input-text validate-cc-number validate-cc-type" value="" />
52
  </div>
53
  </li>
54
  <li>
78
  <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('Card Verification Number') ?></label>
79
  <div class="input-box">
80
  <div class="v-fix">
81
+ <input type="text" pattern="\d*" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Card Verification Number')) ?>" class="input-text cvv required-entry validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" />
82
  </div>
83
  <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
84
  </div>
91
  <li>
92
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
93
  <span class="input-box">
94
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Issue Number')) ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
95
  </span>
96
  </li>
97
 
app/design/frontend/rwd/default/template/paypal/express/minicart/shortcut.phtml CHANGED
@@ -33,7 +33,7 @@
33
  <p class="paypal-logo">
34
  <?php $shortcutHtmlId = $this->getShortcutHtmlId() ?>
35
  <?php $bmlShortcutHtmlId = $this->getBmlShortcutHtmlId() ?>
36
- <a class="paypal-button" data-action="checkout-form-submit" id="<?php echo $shortcutHtmlId ?>" href="<?php echo $this->getCheckoutUrl()?>"><img src="<?php echo $this->getImageUrl()?>" alt="<?php echo Mage::helper('paypal')->__('Checkout with PayPal');?>" title="<?php echo Mage::helper('paypal')->__('Checkout with PayPal');?>" /></a>
37
 
38
  <span class="paypal-or"><?php echo $this->__('-OR-');?></span>
39
  </p>
@@ -42,7 +42,7 @@
42
  <li class="bml-checkout-type">
43
  <p class="paypal-logo">
44
  <span class="bml_button">
45
- <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>
46
  <a href="<?php echo $this->getMarketMessageUrl()?>"><img src="<?php echo $this->getMarketMessage()?>" /></a>
47
  </span>
48
  <span class="paypal-or"><?php echo $this->__('-OR-');?></span>
33
  <p class="paypal-logo">
34
  <?php $shortcutHtmlId = $this->getShortcutHtmlId() ?>
35
  <?php $bmlShortcutHtmlId = $this->getBmlShortcutHtmlId() ?>
36
+ <a class="paypal-button" data-action="checkout-form-submit" id="<?php echo $shortcutHtmlId ?>" href="<?php echo $this->getCheckoutUrl()?>"><img src="<?php echo $this->getImageUrl()?>" alt="<?php echo $this->quoteEscape(Mage::helper('paypal')->__('Checkout with PayPal')); ?>" title="<?php echo $this->quoteEscape(Mage::helper('paypal')->__('Checkout with PayPal')); ?>" /></a>
37
 
38
  <span class="paypal-or"><?php echo $this->__('-OR-');?></span>
39
  </p>
42
  <li class="bml-checkout-type">
43
  <p class="paypal-logo">
44
  <span class="bml_button">
45
+ <a id="<?php echo $bmlShortcutHtmlId ?>" href="<?php echo $this->getBmlCheckoutUrl()?>"><img src="<?php echo $this->getBmlImageUrl()?>" alt="<?php echo $this->quoteEscape(Mage::helper('paypal')->__('Checkout with PayPal Paypal Credit')); ?>" title="<?php echo $this->quoteEscape(Mage::helper('paypal')->__('Checkout with PayPal Paypal Credit')); ?>" /></a>
46
  <a href="<?php echo $this->getMarketMessageUrl()?>"><img src="<?php echo $this->getMarketMessage()?>" /></a>
47
  </span>
48
  <span class="paypal-or"><?php echo $this->__('-OR-');?></span>
app/design/frontend/rwd/default/template/paypal/express/product/shortcut.phtml CHANGED
@@ -34,13 +34,13 @@
34
 
35
  <?php $shortcutHtmlId = $this->getShortcutHtmlId() ?>
36
  <?php $bmlShortcutHtmlId = $this->getBmlShortcutHtmlId() ?>
37
- <a class="paypal-button" data-action="checkout-form-submit" id="<?php echo $shortcutHtmlId ?>" href="<?php echo $this->getCheckoutUrl()?>"><img src="<?php echo $this->getImageUrl()?>" alt="<?php echo Mage::helper('paypal')->__('Checkout with PayPal');?>" title="<?php echo Mage::helper('paypal')->__('Checkout with PayPal');?>" /></a>
38
  </p>
39
  <?php if ($this->getIsBmlEnabled()): ?>
40
  <p class="paypal-logo">
41
  <span class="paypal-or"><?php echo $this->__('-OR-');?></span>
42
  <span class="bml_button">
43
- <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>
44
  <a href="<?php echo $this->getMarketMessageUrl()?>"><img src="<?php echo $this->getMarketMessage()?>" /></a>
45
  </span>
46
  </p>
34
 
35
  <?php $shortcutHtmlId = $this->getShortcutHtmlId() ?>
36
  <?php $bmlShortcutHtmlId = $this->getBmlShortcutHtmlId() ?>
37
+ <a class="paypal-button" data-action="checkout-form-submit" id="<?php echo $shortcutHtmlId ?>" href="<?php echo $this->getCheckoutUrl()?>"><img src="<?php echo $this->getImageUrl()?>" alt="<?php echo $this->quoteEscape(Mage::helper('paypal')->__('Checkout with PayPal')); ?>" title="<?php echo $this->quoteEscape(Mage::helper('paypal')->__('Checkout with PayPal')); ?>" /></a>
38
  </p>
39
  <?php if ($this->getIsBmlEnabled()): ?>
40
  <p class="paypal-logo">
41
  <span class="paypal-or"><?php echo $this->__('-OR-');?></span>
42
  <span class="bml_button">
43
+ <a id="<?php echo $bmlShortcutHtmlId ?>" href="<?php echo $this->getBmlCheckoutUrl()?>"><img src="<?php echo $this->getBmlImageUrl()?>" alt="<?php echo $this->quoteEscape(Mage::helper('paypal')->__('Checkout with PayPal Paypal Credit')); ?>" title="<?php echo $this->quoteEscape(Mage::helper('paypal')->__('Checkout with PayPal Paypal Credit')); ?>" /></a>
44
  <a href="<?php echo $this->getMarketMessageUrl()?>"><img src="<?php echo $this->getMarketMessage()?>" /></a>
45
  </span>
46
  </p>
app/design/frontend/rwd/default/template/paypal/express/review.phtml CHANGED
@@ -112,7 +112,7 @@
112
  <button type="button" id="review_button" value="<?php echo $this->__('Place Order') ?>" class="button btn-checkout"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
113
  <button type="button" id="review_submit" value="<?php echo $this->__('Place Order') ?>" class="button btn-checkout"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
114
  <span class="please-wait" id="review-please-wait" style="display:none;">
115
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Submitting order information...') ?>" title="<?php echo $this->__('Submitting order information...') ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
116
  </span>
117
  </div>
118
  </form>
112
  <button type="button" id="review_button" value="<?php echo $this->__('Place Order') ?>" class="button btn-checkout"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
113
  <button type="button" id="review_submit" value="<?php echo $this->__('Place Order') ?>" class="button btn-checkout"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
114
  <span class="please-wait" id="review-please-wait" style="display:none;">
115
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->quoteEscape($this->__('Submitting order information...')) ?>" title="<?php echo $this->quoteEscape($this->__('Submitting order information...')) ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
116
  </span>
117
  </div>
118
  </form>
app/design/frontend/rwd/default/template/paypal/express/review/address.phtml CHANGED
@@ -36,14 +36,14 @@
36
  <div class="field">
37
  <label for="<?php echo $prefix ?>:company"><?php echo $this->__('Company') ?></label>
38
  <div class="input-box">
39
- <input type="text" id="<?php echo $prefix ?>:company" name="<?php echo $prefix ?>[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
40
  </div>
41
  </div>
42
  <?php if(!$this->isCustomerLoggedIn() && !$this->getHideEmailAddress()): ?>
43
  <div class="field">
44
  <label for="<?php echo $prefix ?>:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
45
  <div class="input-box">
46
- <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="<?php echo $prefix ?>[email]" id="<?php echo $prefix ?>:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
47
  </div>
48
  </div>
49
  <?php endif; ?>
@@ -53,7 +53,7 @@
53
  <div class="field">
54
  <label for="<?php echo $prefix ?>:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
55
  <div class="input-box">
56
- <input type="text" title="<?php echo $this->__('Street Address') ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
57
  </div>
58
  </div>
59
  </li>
@@ -63,7 +63,7 @@
63
  <div class="field">
64
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?></label>
65
  <div class="input-box">
66
- <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street<?php echo $_i?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
67
  </div>
68
  </div>
69
  </li>
@@ -73,7 +73,7 @@
73
  <div class="field">
74
  <label for="<?php echo $prefix ?>:vat_id"><?php echo $this->__('VAT Number') ?></label>
75
  <div class="input-box">
76
- <input type="text" id="<?php echo $prefix ?>:vat_id" name="<?php echo $prefix ?>[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->__('VAT Number') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
77
  </div>
78
  </div>
79
  </li>
@@ -82,13 +82,13 @@
82
  <div class="field">
83
  <label for="<?php echo $prefix ?>:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
84
  <div class="input-box">
85
- <input type="text" title="<?php echo $this->__('City') ?>" name="<?php echo $prefix ?>[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="<?php echo $prefix ?>:city" />
86
  </div>
87
  </div>
88
  <div class="field">
89
  <label for="<?php echo $prefix ?>:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
90
  <div class="input-box">
91
- <select id="<?php echo $prefix ?>:region_id" name="<?php echo $prefix ?>[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
92
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
93
  </select>
94
  <script type="text/javascript">
@@ -96,7 +96,7 @@
96
  $('<?php echo $prefix ?>:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
97
  //]]>
98
  </script>
99
- <input type="text" id="<?php echo $prefix ?>:region" name="<?php echo $prefix ?>[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
100
  </div>
101
  </div>
102
  </li>
@@ -104,7 +104,7 @@
104
  <div class="field">
105
  <label for="<?php echo $prefix ?>:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
106
  <div class="input-box">
107
- <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="<?php echo $prefix ?>[postcode]" id="<?php echo $prefix ?>:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
108
  </div>
109
  </div>
110
  <div class="field">
@@ -118,13 +118,13 @@
118
  <div class="field">
119
  <label for="<?php echo $prefix ?>:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
120
  <div class="input-box">
121
- <input type="tel" name="<?php echo $prefix ?>[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="<?php echo $prefix ?>:telephone" />
122
  </div>
123
  </div>
124
  <div class="field">
125
  <label for="<?php echo $prefix ?>:fax"><?php echo $this->__('Fax') ?></label>
126
  <div class="input-box">
127
- <input type="tel" name="<?php echo $prefix ?>[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="<?php echo $prefix ?>:fax" />
128
  </div>
129
  </div>
130
  </li>
@@ -133,7 +133,7 @@
133
  <li class="control">
134
  <div class="field">
135
  <div class="input-box">
136
- <input type="checkbox" name="<?php echo $prefix ?>[as_shipping]" class="checkbox" value="1" title="<?php echo $this->__('Same as shipping') ?>" id="<?php echo $prefix ?>:as_shipping" <?php if ($this->getAddress()->getSameAsBilling()):?>checked="checked"<?php endif;?>/>
137
  </div>
138
  <label for="<?php echo $prefix ?>:as_shipping"><?php echo $this->__('Same as shipping') ?></label>
139
  </div>
36
  <div class="field">
37
  <label for="<?php echo $prefix ?>:company"><?php echo $this->__('Company') ?></label>
38
  <div class="input-box">
39
+ <input type="text" id="<?php echo $prefix ?>:company" name="<?php echo $prefix ?>[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Company')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
40
  </div>
41
  </div>
42
  <?php if(!$this->isCustomerLoggedIn() && !$this->getHideEmailAddress()): ?>
43
  <div class="field">
44
  <label for="<?php echo $prefix ?>:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
45
  <div class="input-box">
46
+ <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="<?php echo $prefix ?>[email]" id="<?php echo $prefix ?>:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" class="input-text validate-email required-entry" />
47
  </div>
48
  </div>
49
  <?php endif; ?>
53
  <div class="field">
54
  <label for="<?php echo $prefix ?>:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
55
  <div class="input-box">
56
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address')) ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
57
  </div>
58
  </div>
59
  </li>
63
  <div class="field">
64
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?></label>
65
  <div class="input-box">
66
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address %s', $_i)) ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street<?php echo $_i?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
67
  </div>
68
  </div>
69
  </li>
73
  <div class="field">
74
  <label for="<?php echo $prefix ?>:vat_id"><?php echo $this->__('VAT Number') ?></label>
75
  <div class="input-box">
76
+ <input type="text" id="<?php echo $prefix ?>:vat_id" name="<?php echo $prefix ?>[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('VAT Number')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
77
  </div>
78
  </div>
79
  </li>
82
  <div class="field">
83
  <label for="<?php echo $prefix ?>:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
84
  <div class="input-box">
85
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('City')) ?>" name="<?php echo $prefix ?>[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="<?php echo $prefix ?>:city" />
86
  </div>
87
  </div>
88
  <div class="field">
89
  <label for="<?php echo $prefix ?>:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
90
  <div class="input-box">
91
+ <select id="<?php echo $prefix ?>:region_id" name="<?php echo $prefix ?>[region_id]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
92
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
93
  </select>
94
  <script type="text/javascript">
96
  $('<?php echo $prefix ?>:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
97
  //]]>
98
  </script>
99
+ <input type="text" id="<?php echo $prefix ?>:region" name="<?php echo $prefix ?>[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
100
  </div>
101
  </div>
102
  </li>
104
  <div class="field">
105
  <label for="<?php echo $prefix ?>:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
106
  <div class="input-box">
107
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Zip/Postal Code')) ?>" name="<?php echo $prefix ?>[postcode]" id="<?php echo $prefix ?>:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
108
  </div>
109
  </div>
110
  <div class="field">
118
  <div class="field">
119
  <label for="<?php echo $prefix ?>:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
120
  <div class="input-box">
121
+ <input type="tel" name="<?php echo $prefix ?>[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Telephone')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="<?php echo $prefix ?>:telephone" />
122
  </div>
123
  </div>
124
  <div class="field">
125
  <label for="<?php echo $prefix ?>:fax"><?php echo $this->__('Fax') ?></label>
126
  <div class="input-box">
127
+ <input type="tel" name="<?php echo $prefix ?>[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Fax')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="<?php echo $prefix ?>:fax" />
128
  </div>
129
  </div>
130
  </li>
133
  <li class="control">
134
  <div class="field">
135
  <div class="input-box">
136
+ <input type="checkbox" name="<?php echo $prefix ?>[as_shipping]" class="checkbox" value="1" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Same as shipping')) ?>" id="<?php echo $prefix ?>:as_shipping" <?php if ($this->getAddress()->getSameAsBilling()):?>checked="checked"<?php endif;?>/>
137
  </div>
138
  <label for="<?php echo $prefix ?>:as_shipping"><?php echo $this->__('Same as shipping') ?></label>
139
  </div>
app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml CHANGED
@@ -46,14 +46,14 @@
46
  <div class="field">
47
  <label for="billing:company"><?php echo $this->__('Company') ?></label>
48
  <div class="input-box">
49
- <input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
50
  </div>
51
  </div>
52
  <?php if(!$this->isCustomerLoggedIn()): ?>
53
  <div class="field">
54
  <label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
55
  <div class="input-box">
56
- <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
57
  </div>
58
  </div>
59
  <?php endif; ?>
@@ -62,7 +62,7 @@
62
  <li class="wide">
63
  <label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
64
  <div class="input-box">
65
- <input type="text" title="<?php echo $this->__('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
66
  </div>
67
  </li>
68
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
@@ -70,7 +70,7 @@
70
  <li class="wide">
71
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?></label>
72
  <div class="input-box">
73
- <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
74
  </div>
75
  </li>
76
  <?php endfor; ?>
@@ -78,7 +78,7 @@
78
  <li class="wide">
79
  <label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
80
  <div class="input-box">
81
- <input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->__('VAT Number') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
82
  </div>
83
  </li>
84
  <?php endif; ?>
@@ -86,13 +86,13 @@
86
  <div class="field">
87
  <label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
88
  <div class="input-box">
89
- <input type="text" title="<?php echo $this->__('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="billing:city" />
90
  </div>
91
  </div>
92
  <div class="field">
93
  <label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
94
  <div class="input-box">
95
- <select id="billing:region_id" name="billing[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
96
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
97
  </select>
98
  <script type="text/javascript">
@@ -100,7 +100,7 @@
100
  $('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
101
  //]]>
102
  </script>
103
- <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
104
  </div>
105
  </div>
106
  </li>
@@ -108,7 +108,7 @@
108
  <div class="field">
109
  <label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
110
  <div class="input-box">
111
- <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
112
  </div>
113
  </div>
114
  <div class="field">
@@ -122,13 +122,13 @@
122
  <div class="field">
123
  <label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
124
  <div class="input-box">
125
- <input type="tel" name="billing[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
126
  </div>
127
  </div>
128
  <div class="field">
129
  <label for="billing:fax"><?php echo $this->__('Fax') ?></label>
130
  <div class="input-box">
131
- <input type="tel" name="billing[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="billing:fax" />
132
  </div>
133
  </div>
134
  </li>
@@ -160,13 +160,13 @@
160
  <div class="field">
161
  <label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
162
  <div class="input-box">
163
- <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
164
  </div>
165
  </div>
166
  <div class="field">
167
  <label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
168
  <div class="input-box">
169
- <input type="password" name="billing[confirm_password]" title="<?php echo $this->__('Confirm Password') ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
170
  </div>
171
  </div>
172
  </li>
@@ -174,7 +174,7 @@
174
  <?php endif; ?>
175
  <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
176
  <li class="control">
177
- <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="billing:save_in_address_book" onchange="if(window.shipping) shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label>
178
  </li>
179
  <?php else:?>
180
  <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
@@ -186,9 +186,9 @@
186
  </li>
187
  <?php if ($this->canShip()): ?>
188
  <li class="control">
189
- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo $this->__('Ship to this address') ?>" onclick="$('shipping:same_as_billing').checked = true;" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo $this->__('Ship to this address') ?></label></li>
190
  <li class="control">
191
- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo $this->__('Ship to different address') ?>" onclick="$('shipping:same_as_billing').checked = false;" class="radio" /><label for="billing:use_for_shipping_no"><?php echo $this->__('Ship to different address') ?></label>
192
  </li>
193
  <?php endif; ?>
194
  </ul>
@@ -196,9 +196,9 @@
196
  <input type="hidden" name="billing[use_for_shipping]" value="1" />
197
  <?php endif; ?>
198
  <div class="buttons-set" id="billing-buttons-container">
199
- <button type="button" title="<?php echo $this->__('Continue') ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
200
  <span class="please-wait" id="billing-please-wait" style="display:none;">
201
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
202
  </span>
203
  </div>
204
  </div>
@@ -208,7 +208,7 @@
208
  var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>');
209
  var billingForm = new VarienForm('co-billing-form');
210
 
211
- //billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
212
  $('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
213
 
214
  var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'billing:postcode');
46
  <div class="field">
47
  <label for="billing:company"><?php echo $this->__('Company') ?></label>
48
  <div class="input-box">
49
+ <input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->quoteEscape($this->__('Company')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
50
  </div>
51
  </div>
52
  <?php if(!$this->isCustomerLoggedIn()): ?>
53
  <div class="field">
54
  <label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
55
  <div class="input-box">
56
+ <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo $this->quoteEscape($this->__('Email Address')) ?>" class="input-text validate-email required-entry" />
57
  </div>
58
  </div>
59
  <?php endif; ?>
62
  <li class="wide">
63
  <label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
64
  <div class="input-box">
65
+ <input type="text" title="<?php echo $this->quoteEscape($this->__('Street Address')) ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
66
  </div>
67
  </li>
68
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
70
  <li class="wide">
71
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?></label>
72
  <div class="input-box">
73
+ <input type="text" title="<?php echo $this->quoteEscape($this->__('Street Address %s', $_i)) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
74
  </div>
75
  </li>
76
  <?php endfor; ?>
78
  <li class="wide">
79
  <label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
80
  <div class="input-box">
81
+ <input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->quoteEscape($this->__('VAT Number')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
82
  </div>
83
  </li>
84
  <?php endif; ?>
86
  <div class="field">
87
  <label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
88
  <div class="input-box">
89
+ <input type="text" title="<?php echo $this->quoteEscape($this->__('City')) ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="billing:city" />
90
  </div>
91
  </div>
92
  <div class="field">
93
  <label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
94
  <div class="input-box">
95
+ <select id="billing:region_id" name="billing[region_id]" title="<?php echo $this->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
96
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
97
  </select>
98
  <script type="text/javascript">
100
  $('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
101
  //]]>
102
  </script>
103
+ <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->quoteEscape($this->__('State/Province')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
104
  </div>
105
  </div>
106
  </li>
108
  <div class="field">
109
  <label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
110
  <div class="input-box">
111
+ <input type="text" title="<?php echo $this->quoteEscape($this->__('Zip/Postal Code')) ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
112
  </div>
113
  </div>
114
  <div class="field">
122
  <div class="field">
123
  <label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
124
  <div class="input-box">
125
+ <input type="tel" name="billing[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->quoteEscape($this->__('Telephone')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
126
  </div>
127
  </div>
128
  <div class="field">
129
  <label for="billing:fax"><?php echo $this->__('Fax') ?></label>
130
  <div class="input-box">
131
+ <input type="tel" name="billing[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->quoteEscape($this->__('Fax')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="billing:fax" />
132
  </div>
133
  </div>
134
  </li>
160
  <div class="field">
161
  <label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
162
  <div class="input-box">
163
+ <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo $this->quoteEscape($this->__('Password')) ?>" class="input-text required-entry validate-password" />
164
  </div>
165
  </div>
166
  <div class="field">
167
  <label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
168
  <div class="input-box">
169
+ <input type="password" name="billing[confirm_password]" title="<?php echo $this->quoteEscape($this->__('Confirm Password')) ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
170
  </div>
171
  </div>
172
  </li>
174
  <?php endif; ?>
175
  <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
176
  <li class="control">
177
+ <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo $this->quoteEscape($this->__('Save in address book')) ?>" id="billing:save_in_address_book" onchange="if(window.shipping) shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label>
178
  </li>
179
  <?php else:?>
180
  <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
186
  </li>
187
  <?php if ($this->canShip()): ?>
188
  <li class="control">
189
+ <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo $this->quoteEscape($this->__('Ship to this address')) ?>" onclick="$('shipping:same_as_billing').checked = true;" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo $this->__('Ship to this address') ?></label></li>
190
  <li class="control">
191
+ <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo $this->quoteEscape($this->__('Ship to different address')) ?>" onclick="$('shipping:same_as_billing').checked = false;" class="radio" /><label for="billing:use_for_shipping_no"><?php echo $this->__('Ship to different address') ?></label>
192
  </li>
193
  <?php endif; ?>
194
  </ul>
196
  <input type="hidden" name="billing[use_for_shipping]" value="1" />
197
  <?php endif; ?>
198
  <div class="buttons-set" id="billing-buttons-container">
199
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Continue')) ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
200
  <span class="please-wait" id="billing-please-wait" style="display:none;">
201
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->quoteEscape($this->__('Loading next step...')) ?>" title="<?php echo $this->quoteEscape($this->__('Loading next step...')) ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
202
  </span>
203
  </div>
204
  </div>
208
  var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>');
209
  var billingForm = new VarienForm('co-billing-form');
210
 
211
+ //billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->jsQuoteEscape($this->__('Select State/Province...')) ?>');
212
  $('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
213
 
214
  var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'billing:postcode');
app/design/frontend/rwd/default/template/persistent/customer/form/login.phtml CHANGED
@@ -56,7 +56,7 @@
56
  </ul>
57
  </div>
58
  <div class="buttons-set">
59
- <a title="<?php echo $this->__('Create an Account') ?>" class="button" href="<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>"><span><span><?php echo $this->__('Create an Account') ?></span></span></a>
60
  </div>
61
  </div>
62
  <?php endif; ?>
@@ -70,13 +70,13 @@
70
  <li>
71
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
72
  <div class="input-box">
73
- <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
74
  </div>
75
  </li>
76
  <li>
77
  <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
78
  <div class="input-box">
79
- <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
80
  </div>
81
  </li>
82
  <?php echo $this->getChildHtml('form.additional.info'); ?>
@@ -88,7 +88,7 @@
88
  <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
89
  </div>
90
  <div class="buttons-set">
91
- <button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
92
  </div>
93
  </div>
94
  </div>
56
  </ul>
57
  </div>
58
  <div class="buttons-set">
59
+ <a title="<?php echo $this->quoteEscape($this->__('Create an Account')) ?>" class="button" href="<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>"><span><span><?php echo $this->__('Create an Account') ?></span></span></a>
60
  </div>
61
  </div>
62
  <?php endif; ?>
70
  <li>
71
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
72
  <div class="input-box">
73
+ <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->quoteEscape($this->__('Email Address')) ?>" />
74
  </div>
75
  </li>
76
  <li>
77
  <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
78
  <div class="input-box">
79
+ <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->quoteEscape($this->__('Password')) ?>" />
80
  </div>
81
  </li>
82
  <?php echo $this->getChildHtml('form.additional.info'); ?>
88
  <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
89
  </div>
90
  <div class="buttons-set">
91
+ <button type="submit" class="button" title="<?php echo $this->quoteEscape($this->__('Login')) ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
92
  </div>
93
  </div>
94
  </div>
app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml CHANGED
@@ -51,7 +51,7 @@
51
  <li>
52
  <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
53
  <div class="input-box">
54
- <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
55
  </div>
56
  </li>
57
  <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
@@ -75,13 +75,13 @@
75
  <div class="field">
76
  <label for="company"><?php echo $this->__('Company') ?></label>
77
  <div class="input-box">
78
- <input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
79
  </div>
80
  </div>
81
  <div class="field">
82
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
83
  <div class="input-box">
84
- <input type="tel" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" />
85
  </div>
86
  </div>
87
  </li>
@@ -89,7 +89,7 @@
89
  <li class="wide">
90
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
91
  <div class="input-box">
92
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(0)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
93
  </div>
94
  </li>
95
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
@@ -97,7 +97,7 @@
97
  <li class="wide">
98
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?></label>
99
  <div class="input-box">
100
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i - 1)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
101
  </div>
102
  </li>
103
  <?php endfor; ?>
@@ -105,13 +105,13 @@
105
  <div class="field">
106
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
107
  <div class="input-box">
108
- <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
109
  </div>
110
  </div>
111
  <div class="field">
112
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
113
  <div class="input-box">
114
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
115
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
116
  </select>
117
  <script type="text/javascript">
@@ -119,7 +119,7 @@
119
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
120
  //]]>
121
  </script>
122
- <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
123
  </div>
124
  </div>
125
  </li>
@@ -127,7 +127,7 @@
127
  <div class="field">
128
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
129
  <div class="input-box">
130
- <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
131
  </div>
132
  </div>
133
  <div class="field">
@@ -146,13 +146,13 @@
146
  <div class="field">
147
  <label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
148
  <div class="input-box">
149
- <input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
150
  </div>
151
  </div>
152
  <div class="field">
153
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
154
  <div class="input-box">
155
- <input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
156
  </div>
157
  </div>
158
  </li>
@@ -160,7 +160,7 @@
160
  <?php if ($this->isNewsletterEnabled()): ?>
161
  <li class="control">
162
  <div class="input-box">
163
- <input type="checkbox" name="is_subscribed" title="<?php echo $this->__('Sign Up for Newsletter') ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
164
  </div>
165
  <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
166
  </li>
@@ -171,7 +171,7 @@
171
  </div>
172
  <div class="buttons-set">
173
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
174
- <button type="submit" title="<?php echo $this->__('Register') ?>" class="button"><span><span><?php echo $this->__('Register') ?></span></span></button>
175
  </div>
176
  <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
177
  <input name="context" type="hidden" value="checkout" />
51
  <li>
52
  <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
53
  <div class="input-box">
54
+ <input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo $this->quoteEscape($this->__('Email Address')) ?>" class="input-text validate-email required-entry" />
55
  </div>
56
  </li>
57
  <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
75
  <div class="field">
76
  <label for="company"><?php echo $this->__('Company') ?></label>
77
  <div class="input-box">
78
+ <input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo $this->quoteEscape($this->__('Company')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
79
  </div>
80
  </div>
81
  <div class="field">
82
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
83
  <div class="input-box">
84
+ <input type="tel" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->quoteEscape($this->__('Telephone')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" />
85
  </div>
86
  </div>
87
  </li>
89
  <li class="wide">
90
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
91
  <div class="input-box">
92
+ <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(0)) ?>" title="<?php echo $this->quoteEscape($this->__('Street Address')) ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
93
  </div>
94
  </li>
95
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
97
  <li class="wide">
98
  <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?></label>
99
  <div class="input-box">
100
+ <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i - 1)) ?>" title="<?php echo $this->quoteEscape($this->__('Street Address %s', $_i)) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
101
  </div>
102
  </li>
103
  <?php endfor; ?>
105
  <div class="field">
106
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
107
  <div class="input-box">
108
+ <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo $this->quoteEscape($this->__('City')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
109
  </div>
110
  </div>
111
  <div class="field">
112
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
113
  <div class="input-box">
114
+ <select id="region_id" name="region_id" title="<?php echo $this->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
115
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
116
  </select>
117
  <script type="text/javascript">
119
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
120
  //]]>
121
  </script>
122
+ <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getRegion()) ?>" title="<?php echo $this->quoteEscape($this->__('State/Province')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
123
  </div>
124
  </div>
125
  </li>
127
  <div class="field">
128
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
129
  <div class="input-box">
130
+ <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->quoteEscape($this->__('Zip/Postal Code')) ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
131
  </div>
132
  </div>
133
  <div class="field">
146
  <div class="field">
147
  <label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
148
  <div class="input-box">
149
+ <input type="password" name="password" id="password" title="<?php echo $this->quoteEscape($this->__('Password')) ?>" class="input-text required-entry validate-password" />
150
  </div>
151
  </div>
152
  <div class="field">
153
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
154
  <div class="input-box">
155
+ <input type="password" name="confirmation" title="<?php echo $this->quoteEscape($this->__('Confirm Password')) ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
156
  </div>
157
  </div>
158
  </li>
160
  <?php if ($this->isNewsletterEnabled()): ?>
161
  <li class="control">
162
  <div class="input-box">
163
+ <input type="checkbox" name="is_subscribed" title="<?php echo $this->quoteEscape($this->__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
164
  </div>
165
  <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
166
  </li>
171
  </div>
172
  <div class="buttons-set">
173
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
174
+ <button type="submit" title="<?php echo $this->quoteEscape($this->__('Register')) ?>" class="button"><span><span><?php echo $this->__('Register') ?></span></span></button>
175
  </div>
176
  <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
177
  <input name="context" type="hidden" value="checkout" />
app/design/frontend/rwd/default/template/persistent/header/links.phtml ADDED
@@ -0,0 +1,41 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package rwd_default
23
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <?php
28
+ /**
29
+ * @see Mage_Page_Block_Template_Links
30
+ */
31
+ ?>
32
+ <?php $_links = $this->getLinks(); ?>
33
+ <?php if(count($_links)>0): ?>
34
+ <?php foreach($_links as $_link): ?>
35
+ <?php if ($_link instanceof Mage_Core_Block_Abstract):?>
36
+ <?php echo $_link->toHtml() ?>
37
+ <?php else: ?>
38
+ <a href="<?php echo $_link->getUrl() ?>" title="<?php echo $_link->getTitle() ?>" <?php echo $_link->getAParams() ?>><?php echo $_link->getLabel() ?></a>
39
+ <?php endif;?>
40
+ <?php endforeach; ?>
41
+ <?php endif; ?>
app/design/frontend/rwd/default/template/persistent/remember_me.phtml CHANGED
@@ -34,7 +34,7 @@
34
  <li class="control remember-me-box">
35
  <?php $rememberMeId = 'remember_me' . Mage::helper('core')->getRandomString(10); ?>
36
  <div class="input-box">
37
- <input type="checkbox" name="persistent_remember_me" class="checkbox" id="<?php echo $rememberMeId; ?>"<?php if ($this->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?php echo $this->__('Remember Me') ?>" />
38
  </div>
39
  <label for="<?php echo $rememberMeId; ?>"><?php echo $this->__('Remember Me') ?></label>
40
  <a class="link-tip" href="#"><?php echo $this->__('What\'s this?') ?></a>
34
  <li class="control remember-me-box">
35
  <?php $rememberMeId = 'remember_me' . Mage::helper('core')->getRandomString(10); ?>
36
  <div class="input-box">
37
+ <input type="checkbox" name="persistent_remember_me" class="checkbox" id="<?php echo $rememberMeId; ?>"<?php if ($this->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?php echo $this->quoteEscape($this->__('Remember Me')) ?>" />
38
  </div>
39
  <label for="<?php echo $rememberMeId; ?>"><?php echo $this->__('Remember Me') ?></label>
40
  <a class="link-tip" href="#"><?php echo $this->__('What\'s this?') ?></a>
app/design/frontend/rwd/default/template/persistent/remember_me_tooltip.phtml CHANGED
@@ -34,12 +34,12 @@
34
  <div class="remember-me-popup">
35
  <div class="remember-me-popup-head">
36
  <h3><?php echo $this->__("What's this?"); ?></h3>
37
- <a href="#" class="remember-me-popup-close" title="<?php echo $this->__('Close') ?>"><?php echo $this->__('Close') ?></a>
38
  </div>
39
  <div class="remember-me-popup-body">
40
  <p><?php echo $this->__('Checking &quot;Remember Me&quot; will let you access your shopping cart on this computer when you are logged out'); ?></p>
41
  <div class="remember-me-popup-close-button a-right">
42
- <a href="#" class="remember-me-popup-close button" title="<?php echo $this->__('Close') ?>"><span><?php echo $this->__('Close') ?></span></a>
43
  </div>
44
  </div>
45
  </div>
34
  <div class="remember-me-popup">
35
  <div class="remember-me-popup-head">
36
  <h3><?php echo $this->__("What's this?"); ?></h3>
37
+ <a href="#" class="remember-me-popup-close" title="<?php echo $this->quoteEscape($this->__('Close')) ?>"><?php echo $this->__('Close') ?></a>
38
  </div>
39
  <div class="remember-me-popup-body">
40
  <p><?php echo $this->__('Checking &quot;Remember Me&quot; will let you access your shopping cart on this computer when you are logged out'); ?></p>
41
  <div class="remember-me-popup-close-button a-right">
42
+ <a href="#" class="remember-me-popup-close button" title="<?php echo $this->quoteEscape($this->__('Close')) ?>"><span><?php echo $this->__('Close') ?></span></a>
43
  </div>
44
  </div>
45
  </div>
app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml CHANGED
@@ -45,7 +45,7 @@
45
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
46
  <div class="actions">
47
  <?php if($_product->isSaleable()): ?>
48
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
49
  <?php else: ?>
50
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
51
  <?php endif; ?>
45
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
46
  <div class="actions">
47
  <?php if($_product->isSaleable()): ?>
48
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
49
  <?php else: ?>
50
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
51
  <?php endif; ?>
app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml CHANGED
@@ -41,7 +41,7 @@
41
  <?php echo $this->getPriceHtml($_product, true, '-widget-compared-list') ?>
42
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
43
  <?php if($_product->isSaleable()): ?>
44
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
45
  <?php else: ?>
46
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
47
  <?php endif; ?>
41
  <?php echo $this->getPriceHtml($_product, true, '-widget-compared-list') ?>
42
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
43
  <?php if($_product->isSaleable()): ?>
44
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
45
  <?php else: ?>
46
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
47
  <?php endif; ?>
app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml CHANGED
@@ -49,7 +49,7 @@
49
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
50
  <div class="actions">
51
  <?php if($_product->isSaleable()): ?>
52
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
53
  <?php else: ?>
54
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
55
  <?php endif; ?>
49
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
50
  <div class="actions">
51
  <?php if($_product->isSaleable()): ?>
52
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
53
  <?php else: ?>
54
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
55
  <?php endif; ?>
app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml CHANGED
@@ -46,7 +46,7 @@
46
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
47
  <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-list') ?>
48
  <?php if($_product->isSaleable()): ?>
49
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
50
  <?php else: ?>
51
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
52
  <?php endif; ?>
46
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
47
  <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-list') ?>
48
  <?php if($_product->isSaleable()): ?>
49
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
50
  <?php else: ?>
51
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
52
  <?php endif; ?>
app/design/frontend/rwd/default/template/review/form.phtml CHANGED
@@ -120,7 +120,7 @@
120
  </ul>
121
  </div>
122
  <div class="buttons-set">
123
- <button type="submit" title="<?php echo $this->__('Submit Review') ?>" class="button"><span><span><?php echo $this->__('Submit Review') ?></span></span></button>
124
  </div>
125
  </form>
126
  <script type="text/javascript">
@@ -128,7 +128,7 @@
128
  var dataForm = new VarienForm('review-form');
129
  Validation.addAllThese(
130
  [
131
- ['validate-rating', '<?php echo $this->__('Please select one of each of the ratings above') ?>', function(v) {
132
  var trs = $('product-review-table').select('tr');
133
  var inputs;
134
  var error = 1;
120
  </ul>
121
  </div>
122
  <div class="buttons-set">
123
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit Review')) ?>" class="button"><span><span><?php echo $this->__('Submit Review') ?></span></span></button>
124
  </div>
125
  </form>
126
  <script type="text/javascript">
128
  var dataForm = new VarienForm('review-form');
129
  Validation.addAllThese(
130
  [
131
+ ['validate-rating', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Please select one of each of the ratings above')) ?>', function(v) {
132
  var trs = $('product-review-table').select('tr');
133
  var inputs;
134
  var error = 1;
app/design/frontend/rwd/default/template/sales/billing/agreement/view.phtml CHANGED
@@ -28,7 +28,7 @@
28
  <div class="page-title title-buttons billing-agreement-view-header-wrapper">
29
  <h1 class="heading"><?php echo $this->__('Billing Agreement # %s', $this->escapeHtml($this->getReferenceId())) ?></h1>
30
  <?php if ($this->getCanCancel()): ?>
31
- <button type="button" title="<?php echo $this->__('Cancel') ?>" class="button" onclick="if( confirm('<?php echo $this->__('Are you sure you want to do this?') ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
32
  <?php endif; ?>
33
  </div>
34
  <?php echo $this->getMessagesBlock()->toHtml() ?>
28
  <div class="page-title title-buttons billing-agreement-view-header-wrapper">
29
  <h1 class="heading"><?php echo $this->__('Billing Agreement # %s', $this->escapeHtml($this->getReferenceId())) ?></h1>
30
  <?php if ($this->getCanCancel()): ?>
31
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?php echo $this->jsQuoteEscape($this->__('Are you sure you want to do this?')) ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
32
  <?php endif; ?>
33
  </div>
34
  <?php echo $this->getMessagesBlock()->toHtml() ?>
app/design/frontend/rwd/default/template/sales/order/items.phtml CHANGED
@@ -54,10 +54,10 @@
54
  <tr class="border<?php echo ($_index++ > $_count ?' last':'') ?>" id="order-item-gift-message-<?php echo $_item->getId() ?>" style="display:none;">
55
  <?php $_giftMessage=$this->helper('giftmessage/message')->getGiftMessageForEntity($_item); ?>
56
  <td class="gift-message-row" colspan="7">
57
- <a href="#" title="<?php echo $this->__('Close') ?>" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>');" class="btn-close"><?php echo $this->__('Close') ?></a>
58
  <dl class="gift-message">
59
- <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
60
- <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
61
  <dd><?php echo $this->helper('giftmessage/message')->getEscapedGiftMessage($_item) ?></dd>
62
  </dl>
63
  </td>
54
  <tr class="border<?php echo ($_index++ > $_count ?' last':'') ?>" id="order-item-gift-message-<?php echo $_item->getId() ?>" style="display:none;">
55
  <?php $_giftMessage=$this->helper('giftmessage/message')->getGiftMessageForEntity($_item); ?>
56
  <td class="gift-message-row" colspan="7">
57
+ <a href="#" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close')) ?>" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>');" class="btn-close"><?php echo $this->__('Close') ?></a>
58
  <dl class="gift-message">
59
+ <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
60
+ <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
61
  <dd><?php echo $this->helper('giftmessage/message')->getEscapedGiftMessage($_item) ?></dd>
62
  </dl>
63
  </td>
app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml CHANGED
@@ -27,7 +27,7 @@
27
  <?php $_order = $this->getOrder() ?>
28
  <p class="order-links">
29
  <?php if ($_order->getTracksCollection()->count()) : ?>
30
- <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','width=800,height=600,top=0,left=0,resizable=yes,scrollbars=yes'); return false;" title="<?php echo $this->__('Track all shipment(s)') ?>"><?php echo $this->__('Track all shipments') ?></a> <span class="separator">|</span>
31
  <?php endif; ?>
32
  <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo $this->__('Print All Shipments') ?></a>
33
  </p>
@@ -39,7 +39,7 @@
39
  <tbody>
40
  <tr>
41
  <td colspan="2">
42
- <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_shipment) ?>','trackshipment','width=800,height=600,top=0,left=0,resizable=yes,scrollbars=yes'); return false;" title="<?php echo $this->__('Track this shipment') ?>"><?php echo $this->__('Track this shipment') ?></a>
43
  </td>
44
  </tr>
45
  <tr>
27
  <?php $_order = $this->getOrder() ?>
28
  <p class="order-links">
29
  <?php if ($_order->getTracksCollection()->count()) : ?>
30
+ <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','width=800,height=600,top=0,left=0,resizable=yes,scrollbars=yes'); return false;" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Track all shipment(s)')) ?>"><?php echo $this->__('Track all shipments') ?></a> <span class="separator">|</span>
31
  <?php endif; ?>
32
  <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo $this->__('Print All Shipments') ?></a>
33
  </p>
39
  <tbody>
40
  <tr>
41
  <td colspan="2">
42
+ <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_shipment) ?>','trackshipment','width=800,height=600,top=0,left=0,resizable=yes,scrollbars=yes'); return false;" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Track this shipment')) ?>"><?php echo $this->__('Track this shipment') ?></a>
43
  </td>
44
  </tr>
45
  <tr>
app/design/frontend/rwd/default/template/sales/recurring/profile/view.phtml CHANGED
@@ -34,16 +34,16 @@
34
  </div>
35
  <div class="title-buttons recurring-profiles-title-buttons">
36
  <?php if ($this->getCanCancel()): ?>
37
- <button type="button" title="<?php echo $this->__('Cancel') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
38
  <?php endif; ?>
39
  <?php if ($this->getCanSuspend()): ?>
40
- <button type="button" title="<?php echo $this->__('Suspend') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getSuspendUrl() ?>'; } return false;"><span><span><?php echo $this->__('Suspend') ?></span></span></button>
41
  <?php endif; ?>
42
  <?php if ($this->getCanActivate()): ?>
43
- <button type="button" title="<?php echo $this->__('Activate') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getActivateUrl() ?>'; } return false;"><span><span><?php echo $this->__('Activate') ?></span></span></button>
44
  <?php endif; ?>
45
  <?php if ($this->getCanUpdate()):?>
46
- <button type="button" title="<?php echo $this->__('Get Update') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getUpdateUrl() ?>'; } return false;"><span><span><?php echo $this->__('Get Update') ?></span></span></button>
47
  <?php endif;?>
48
  </div>
49
 
34
  </div>
35
  <div class="title-buttons recurring-profiles-title-buttons">
36
  <?php if ($this->getCanCancel()): ?>
37
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
38
  <?php endif; ?>
39
  <?php if ($this->getCanSuspend()): ?>
40
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Suspend')) ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getSuspendUrl() ?>'; } return false;"><span><span><?php echo $this->__('Suspend') ?></span></span></button>
41
  <?php endif; ?>
42
  <?php if ($this->getCanActivate()): ?>
43
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Activate')) ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getActivateUrl() ?>'; } return false;"><span><span><?php echo $this->__('Activate') ?></span></span></button>
44
  <?php endif; ?>
45
  <?php if ($this->getCanUpdate()):?>
46
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Get Update')) ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getUpdateUrl() ?>'; } return false;"><span><span><?php echo $this->__('Get Update') ?></span></span></button>
47
  <?php endif;?>
48
  </div>
49
 
app/design/frontend/rwd/default/template/sendfriend/send.phtml CHANGED
@@ -78,13 +78,13 @@
78
  <div class="field">
79
  <label for="sender_name" class="required"><em>*</em><?php echo $this->__('Name:') ?></label>
80
  <div class="input-box">
81
- <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>" title="<?php echo $this->__('Name') ?>" id="sender_name" type="text" class="input-text required-entry" />
82
  </div>
83
  </div>
84
  <div class="field">
85
  <label for="sender_email" class="required"><em>*</em><?php echo $this->__('Email:') ?></label>
86
  <div class="input-box">
87
- <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" id="sender_email" type="email" autocapitalize="off" autocorrect="off" spellcheck="false" class="input-text required-entry validate-email" />
88
  </div>
89
  </div>
90
  </li>
@@ -109,7 +109,7 @@
109
  <div class="field">
110
  <label for="recipients_email" class="required"><em>*</em><?php echo $this->__('Email Address:') ?></label>
111
  <div class="input-box">
112
- <input name="recipients[email][]" value="" title="<?php echo $this->__('Email Address') ?>" id="recipients_email" type="email" autocapitalize="off" autocorrect="off" spellcheck="false" class="input-text required-entry validate-email" />
113
  </div>
114
  </div>
115
  </li>
78
  <div class="field">
79
  <label for="sender_name" class="required"><em>*</em><?php echo $this->__('Name:') ?></label>
80
  <div class="input-box">
81
+ <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>" title="<?php echo $this->quoteEscape($this->__('Name')) ?>" id="sender_name" type="text" class="input-text required-entry" />
82
  </div>
83
  </div>
84
  <div class="field">
85
  <label for="sender_email" class="required"><em>*</em><?php echo $this->__('Email:') ?></label>
86
  <div class="input-box">
87
+ <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" title="<?php echo $this->quoteEscape($this->__('Email Address')) ?>" id="sender_email" type="email" autocapitalize="off" autocorrect="off" spellcheck="false" class="input-text required-entry validate-email" />
88
  </div>
89
  </div>
90
  </li>
109
  <div class="field">
110
  <label for="recipients_email" class="required"><em>*</em><?php echo $this->__('Email Address:') ?></label>
111
  <div class="input-box">
112
+ <input name="recipients[email][]" value="" title="<?php echo $this->quoteEscape($this->__('Email Address')) ?>" id="recipients_email" type="email" autocapitalize="off" autocorrect="off" spellcheck="false" class="input-text required-entry validate-email" />
113
  </div>
114
  </div>
115
  </li>
app/design/frontend/rwd/default/template/wishlist/button/update.phtml CHANGED
@@ -26,5 +26,5 @@
26
  ?>
27
 
28
  <?php if($this->getWishlist()->getItemsCount()): ?>
29
- <button type="submit" name="do" title="<?php echo $this->__('Update Wishlist') ?>" class="button btn-update button-secondary"><span><span><?php echo $this->__('Update Wishlist') ?></span></span></button>
30
  <?php endif;?>
26
  ?>
27
 
28
  <?php if($this->getWishlist()->getItemsCount()): ?>
29
+ <button type="submit" name="do" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Wishlist')) ?>" class="button btn-update button-secondary"><span><span><?php echo $this->__('Update Wishlist') ?></span></span></button>
30
  <?php endif;?>
app/design/frontend/rwd/default/template/wishlist/item/column/cart.phtml CHANGED
@@ -34,7 +34,7 @@ $options = $this->getChild('customer.wishlist.item.options')
34
  ?>
35
  <div class="cart-cell">
36
  <?php if ($product->isSaleable()): ?>
37
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" onclick="addWItemToCart(<?php echo $item->getId()?>);" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
38
  <?php else: ?>
39
  <?php if ($product->getIsSalable()): ?>
40
  <p class="availability in-stock">
34
  ?>
35
  <div class="cart-cell">
36
  <?php if ($product->isSaleable()): ?>
37
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" onclick="addWItemToCart(<?php echo $item->getId()?>);" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
38
  <?php else: ?>
39
  <?php if ($product->getIsSalable()): ?>
40
  <p class="availability in-stock">
app/design/frontend/rwd/default/template/wishlist/item/column/info.phtml CHANGED
@@ -42,7 +42,7 @@ $product = $item->getProduct();
42
  <!-- </div>
43
  </div> -->
44
 
45
- <textarea name="description[<?php echo $item->getWishlistItemId() ?>]" rows="3" cols="5" title="<?php echo $this->__('Comment') ?>" placeholder="<?php echo $this->helper('wishlist')->defaultCommentString(); ?>"><?php echo ($this->escapeHtml($item->getDescription() ? $item->getDescription() : '')) ?></textarea>
46
 
47
  <?php if($this->getSortedChildren()): ?>
48
  <div class="item-manage">
42
  <!-- </div>
43
  </div> -->
44
 
45
+ <textarea name="description[<?php echo $item->getWishlistItemId() ?>]" rows="3" cols="5" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Comment')) ?>" placeholder="<?php echo $this->helper('wishlist')->defaultCommentString(); ?>"><?php echo ($this->escapeHtml($item->getDescription() ? $item->getDescription() : '')) ?></textarea>
46
 
47
  <?php if($this->getSortedChildren()): ?>
48
  <div class="item-manage">
app/design/frontend/rwd/default/template/wishlist/shared.phtml CHANGED
@@ -61,7 +61,7 @@
61
  <td class="a-center">
62
  <?php if ($product->isSaleable()): ?>
63
  <?php if ($isVisibleProduct): ?>
64
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" onclick="setLocation('<?php echo $this->getSharedItemAddToCartUrl($item) ?>')" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
65
  <?php endif ?>
66
  <?php endif; ?>
67
  <p><a href="<?php echo $this->getAddToWishlistUrl($item) ?>" onclick="setLocation(this.href); return false;" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></p>
@@ -75,7 +75,7 @@
75
  <div class="buttons-set">
76
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
77
  <?php if($this->isSaleable()):?>
78
- <button type="button" title="<?php echo $this->__('Add All to Cart') ?>" onclick="setLocation('<?php echo $this->getUrl('*/*/allcart', array('_current'=>true)) ?>')" class="button"><span><span><?php echo $this->__('Add All to Cart') ?></span></span></button>
79
  <?php endif;?>
80
  </div>
81
  </form>
61
  <td class="a-center">
62
  <?php if ($product->isSaleable()): ?>
63
  <?php if ($isVisibleProduct): ?>
64
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Add to Cart')) ?>" onclick="setLocation('<?php echo $this->getSharedItemAddToCartUrl($item) ?>')" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
65
  <?php endif ?>
66
  <?php endif; ?>
67
  <p><a href="<?php echo $this->getAddToWishlistUrl($item) ?>" onclick="setLocation(this.href); return false;" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></p>
75
  <div class="buttons-set">
76
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
77
  <?php if($this->isSaleable()):?>
78
+ <button type="button" title="<?php echo $this->quoteEscape($this->__('Add All to Cart')) ?>" onclick="setLocation('<?php echo $this->getUrl('*/*/allcart', array('_current'=>true)) ?>')" class="button"><span><span><?php echo $this->__('Add All to Cart') ?></span></span></button>
79
  <?php endif;?>
80
  </div>
81
  </form>
app/design/frontend/rwd/default/template/wishlist/sidebar.phtml CHANGED
@@ -39,7 +39,7 @@
39
  <li class="item">
40
  <a href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($product, 'thumbnail')->resize(50); ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($product->getName()) ?>" /></a>
41
  <div class="product-details">
42
- <a href="<?php echo $this->getItemRemoveUrl($_item) ?>" title="<?php echo $this->__('Remove This Item') ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove this item from the wishlist?') ?>');" class="btn-remove"><?php echo $this->__('Remove This Item') ?></a>
43
  <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></p>
44
  <?php if ($product->isSaleable() && $product->isVisibleInSiteVisibility()): ?>
45
  <a href="<?php echo $this->getItemAddToCartUrl($_item) ?>" class="link-cart"><?php echo $this->__('Add to Cart') ?></a>
39
  <li class="item">
40
  <a href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($product, 'thumbnail')->resize(50); ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($product->getName()) ?>" /></a>
41
  <div class="product-details">
42
+ <a href="<?php echo $this->getItemRemoveUrl($_item) ?>" title="<?php echo $this->quoteEscape($this->__('Remove This Item')) ?>" onclick="return confirm('<?php echo $this->jsQuoteEscape($this->__('Are you sure you would like to remove this item from the wishlist?')) ?>');" class="btn-remove"><?php echo $this->__('Remove This Item') ?></a>
43
  <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></p>
44
  <?php if ($product->isSaleable() && $product->isVisibleInSiteVisibility()): ?>
45
  <a href="<?php echo $this->getItemAddToCartUrl($_item) ?>" class="link-cart"><?php echo $this->__('Add to Cart') ?></a>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Rwd_Default</name>
4
- <version>1.9.1.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>This is a RWD themes base</summary>
10
  <description>This is a RWD themes base</description>
11
- <notes>1.9.1.1</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
- <date>2015-04-29</date>
14
- <time>12:01:12</time>
15
- <contents><target name="magedesign"><dir name="frontend"><dir name="rwd"><dir name="default"><dir name="etc"><file name="theme.xml" hash="d00dd83bac2155a76a9f004ceeba2aa7"/><file name="widget.xml" hash="b26f0daa5ea35fae7def54e530e4fc6a"/></dir><dir name="layout"><file name="bundle.xml" hash="d4d6fd3d43bab191589be5dc04de3af9"/><file name="catalog.xml" hash="cf56a0853b8a4672c340074d6ce7d4ec"/><file name="catalog_msrp.xml" hash="761904c9772b9f9f87d168eaa5a3f35e"/><file name="catalogsearch.xml" hash="7577994c03f6e57aa50a2f9b9608fd06"/><file name="checkout.xml" hash="7a3227db21193c1f7abc1a293ee89637"/><file name="cms.xml" hash="ab13bce455c0ebdc6b7ac66973cca084"/><file name="configurableswatches.xml" hash="da5a91b2cd46e37c18f0ce23b5668d5d"/><file name="contacts.xml" hash="0feca543b963f4643b33ddff9d012287"/><file name="customer.xml" hash="becba768ba7cf0aa2f2133d77734c97c"/><file name="directory.xml" hash="116dba3caebbb645f4a4740d6203a809"/><file name="downloadable.xml" hash="dc03bfb05c6ad52ba2cfa26fc05ef80a"/><file name="newsletter.xml" hash="36464d3b9d5627a97d53cf9b5bb59038"/><file name="oauth.xml" hash="7ecd522b4625a53bd29c36f7b6708be2"/><file name="page.xml" hash="970456dbe2ff4ef2d351f6f1420bbd6a"/><file name="paypal.xml" hash="71611cd614aa622c50809659fc141b24"/><file name="persistent.xml" hash="ded204c122842c67b36890d2bb1a12c0"/><file name="review.xml" hash="e44ec617f8ad50a03ba61ab3a7f1a838"/><file name="rss.xml" hash="a96fc7aa525d5ee33ad417826cec2658"/><file name="sales.xml" hash="c9910bae1a47eb29eb1bbf3e0b720678"/><file name="wishlist.xml" hash="868da261c6eb64da2e3adeca3a390b28"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="c4e8edcfd601427461b15e65135718f7"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="view"><dir name="type"><dir name="bundle"><file name="availability.phtml" hash="39f9ec1e37f2d2d838596dd2892b1005"/><dir name="option"><file name="select.phtml" hash="3f51c006c554b18cc60f6229461cad5e"/></dir></dir><file name="bundle.phtml" hash="0abf2442f49382f83dd62c31073e9040"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="ab0adcbb666002cc70acdf6ac7021a12"/></dir><dir name="invoice"><file name="default.phtml" hash="d6c0ebeec5e10ffbc506763491b66845"/></dir><dir name="order"><file name="default.phtml" hash="abde26e36f098e3ce5108c5cc80bd254"/></dir><dir name="shipment"><file name="default.phtml" hash="b9c8dc719be1a634e0f448e6b4b47901"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="items"><file name="renderer.phtml" hash="a8e80c1633e3ee32a8c9168c9d9e8383"/></dir></dir></dir></dir><dir name="captcha"><file name="zend.phtml" hash="b35401dacc0670bf85101f19308d8f74"/></dir><dir name="catalog"><dir name="layer"><file name="filter.phtml" hash="a44247deec06eb5911f3df6d843d956b"/><file name="state.phtml" hash="cc07d57fec3e5b537f2108dfd33a62d0"/><file name="view.phtml" hash="2ca8dd0e3f146585d07e6b382e8a4eee"/></dir><dir name="msrp"><file name="popup.phtml" hash="bd1c15db8b0d6b59fe45ca0b8d03b656"/></dir><dir name="navigation"><file name="left.phtml" hash="bfb71cd13382c16524db2b0d0eab7185"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="5de0441d51d96820da8498449d1fed54"/><file name="sidebar.phtml" hash="f72690c16806e7fbc362d0a0d9f63d9f"/></dir><dir name="list"><file name="related.phtml" hash="19ca35f6c997b6f0e087d7f4e076b930"/><file name="toolbar.phtml" hash="56a9e8943ea159b3ea0464462a6932fd"/><file name="upsell.phtml" hash="450003d58ff096dc379ab9793b98c9dd"/></dir><file name="list.phtml" hash="c61e1473f9172344fc22e8e46616f259"/><file name="price.phtml" hash="ca4e9a03d5ecdac3d35196e4aee7380c"/><dir name="view"><file name="addto.phtml" hash="4b275d89973855e5a3a6088e276f43f8"/><file name="addtocart.phtml" hash="686fa0a77df83a2eafded75a444a8301"/><file name="media.phtml" hash="51aa2d8c08d1be4ad9f979a0730bbbb9"/><file name="sharing.phtml" hash="cbde302b91524bc9ff51c3cc7bc1e8b8"/><dir name="type"><dir name="availability"><file name="default.phtml" hash="4e0b08dad4bb489e8c124308cc56dd4e"/><file name="grouped.phtml" hash="7582181a90bdfb695d816fe895ed399b"/></dir><file name="default.phtml" hash="ca7f231b33e607ffe8f2f6dd4bd96948"/><file name="grouped.phtml" hash="e2f0930675c0c532cddaf07ff751f5b2"/><dir name="options"><file name="configurable.phtml" hash="71811dffa6131fbb179bc06ac1f6e3f6"/></dir></dir></dir><file name="view.phtml" hash="4afeb81c244d9a67543dfeaa60f92c29"/><dir name="widget"><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="8461c192eab496f4cc024946ea4a5b18"/><file name="new_images_list.phtml" hash="cbcb98d6ad1982d3fd6bb8004f0ef1c1"/><file name="new_names_list.phtml" hash="9cae45c356c126e715273b3a9dd5708c"/></dir><dir name="content"><file name="new_grid.phtml" hash="e2a9f4a56d467bddbfe7a80d5ce3f134"/><file name="new_list.phtml" hash="d8a53420ac61b6afdf042f2414bac3fe"/></dir></dir></dir></dir></dir><dir name="cataloginventory"><dir name="stockqty"><file name="composite.phtml" hash="3d5c3fe5c3b3287ca51a7da9cb446848"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="fad87e50e26063c80ba59fbc74146fa6"/></dir><file name="form.mini.phtml" hash="d3f3496f3f76fa4c23a0bd20069a915b"/><file name="result.phtml" hash="ea8f7555b6ff6c7af0bdcffec55d0027"/></dir><dir name="centinel"><dir name="authentication"><file name="start.phtml" hash="fe6c94ec3c92840a58b319d5038ca0d9"/></dir></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="37cb980aa0916dc4a13db816b881e21c"/><file name="crosssell.phtml" hash="121f7a967523a80baaed6b827e2275cb"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="1ef2fcb3b7299dd7534750b57ec355cd"/></dir><file name="default.phtml" hash="8db7c41fab3cbd582cb588720fc5076b"/></dir><dir name="minicart"><file name="default.phtml" hash="fbc359a7eb33e70af222d7ddca41447d"/><file name="items.phtml" hash="433b3015438119917325d9ebb76d2624"/></dir><file name="minicart.phtml" hash="c160af1af285428f466bdb1cd46ac13e"/><dir name="render"><file name="default.phtml" hash="c4aca5542cf0c532d0c0a4cb68480106"/><file name="simple.phtml" hash="4075794a5f90de4bd95a5f2c79a8be1b"/></dir><file name="shipping.phtml" hash="acb389626a2a8804bccdfb33cc3dd7ab"/><dir name="sidebar"><file name="default.phtml" hash="9533561cd1d5b89696326be9a6aa3323"/></dir><file name="sidebar.phtml" hash="84ea7dfde0e19b3deefc4335c7befc39"/></dir><file name="cart.phtml" hash="8501a38111c8f1f68af63c534b07a562"/><dir name="multishipping"><file name="addresses.phtml" hash="a6ba8edafc5daf19227e0066cf23cb5f"/><file name="billing.phtml" hash="0f0eb1b81d782931bc65b8a33d78a864"/><dir name="item"><file name="default.phtml" hash="243e0e6b950f06db8c9c1f7d1ef24590"/></dir><dir name="overview"><file name="item.phtml" hash="9318047ee9189440d7dc1f7a0ca2d917"/></dir><file name="overview.phtml" hash="4805c03d10937093cf609991f04b640e"/></dir><dir name="onepage"><file name="payment.phtml" hash="54753c3ecde7515d8baac891a5777956"/><file name="progress.phtml" hash="7445ce55ebe83156bfdf1180bc35fedd"/><dir name="review"><file name="info.phtml" hash="1d5ca8090e53b7664c51cc9f84743d4f"/><file name="item.phtml" hash="b88883933d696481306734390dceee02"/></dir><file name="shipping.phtml" hash="a045e4e2d08894e8908c6fb7b30bf9ee"/></dir><file name="onepage.phtml" hash="e3a4b58790c9f9802aff1f7896bd9c72"/></dir><dir name="configurableswatches"><dir name="catalog"><dir name="layer"><dir name="filter"><file name="swatches.phtml" hash="fe55df1df2f30b2e3ebac87bf8c0dbdc"/></dir><dir name="state"><file name="swatch.phtml" hash="b9a18114a066516be48669151a286dc7"/></dir></dir><dir name="media"><file name="js.phtml" hash="f7269d9211f654f608195c8f1ce891b2"/></dir><dir name="product"><dir name="list"><file name="swatches.phtml" hash="e41711ec411e3be7a29caaf62ac9129c"/></dir><dir name="view"><dir name="type"><dir name="configurable"><file name="swatch-js.phtml" hash="60914817ac4db7f54acb875efb106e4f"/></dir><dir name="options"><dir name="configurable"><file name="swatches.phtml" hash="c8d44e23f337facd225649dc17cf038a"/></dir></dir></dir></dir></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="0951a8f2d234a43eb657f6d7cf395f59"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="42c81b3a4844d65fcaf5622ce03a5109"/></dir><file name="dashboard.phtml" hash="1330c69eb0c5ba4433943a288e9407a0"/><file name="navigation.phtml" hash="dcec943b87e531c7b1a347ce9965ff45"/></dir><dir name="address"><file name="edit.phtml" hash="e03deda71ff03e7738ab9a14f39f9a1e"/></dir><dir name="form"><file name="address.phtml" hash="1b2c44901edb3ab1d5a22339c2d503e4"/><file name="changepassword.phtml" hash="4d81c493d568e48c5e1f50966850818c"/><file name="confirmation.phtml" hash="a26ac2393d68b392d748cf1352aac893"/><file name="edit.phtml" hash="bec2b5591b7c0257d9996ae1d28fee9b"/><file name="forgotpassword.phtml" hash="a438c3ca426a2af573371da3509895f9"/><file name="mini.login.phtml" hash="953db146a0c5a8f668b5b5d1be61f648"/><file name="resetforgottenpassword.phtml" hash="7ee27b06f3ac5e9a95f31beeb7e49748"/></dir></dir><dir name="directory"><file name="currency.phtml" hash="736e474a8275d2b7a49a72cdf3a1b5bd"/></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="type.phtml" hash="4f2f1cc4380dd935ef53c07ce9ebe11e"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="cb005ff7a01853acb956e4aaa29cdea2"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="12cb20296cf903662af327800da0ae24"/></dir></dir></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="aaaad41ac27071b6d088118d69af3989"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="2bb7a54f7002427442d81ed57b5ad6b1"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="8c6077b5646124943b74fa7c4ba7f848"/></dir><dir name="order"><file name="downloadable.phtml" hash="b9d771d574dfebd99a24c2336f8285d7"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="8b9ea75c91389c6cd847ab0ecf4c5bf8"/></dir></dir></dir></dir></dir><dir name="email"><dir name="catalog"><dir name="product"><file name="list.phtml" hash="1d452d2996ffe2a06b4792e8c52d5687"/><file name="new.phtml" hash="3e967ea93be598baaada7a78507b1434"/></dir></dir><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="f79cb5ed65ce3927b1d323479b879418"/></dir><dir name="invoice"><file name="items.phtml" hash="d4a446c25eda630196fa52072599722b"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="917301b99bb27e5495f436b91fc16ccc"/></dir><dir name="invoice"><file name="default.phtml" hash="917301b99bb27e5495f436b91fc16ccc"/></dir><dir name="order"><file name="default.phtml" hash="a883309f060bfdef5aa07a74a620032b"/></dir><dir name="shipment"><file name="default.phtml" hash="9ee4f1a8b3662422eb05ec592e105af2"/></dir></dir><file name="items.phtml" hash="3f43664a56eccd336ae9f93644a9d889"/><dir name="shipment"><file name="items.phtml" hash="fda23599e3bcf1f3538cb74e7acfa1c4"/><file name="track.phtml" hash="3d06d28e690ad0997090b2a422080a8c"/></dir><dir name="totals"><file name="wrapper.phtml" hash="0559a432acd7beda44e5b227bff41211"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="007c4d6639335482e7082da23a527cb5"/><file name="stock.phtml" hash="1d5a4e6e3c2cbbdd4f54512c85547db5"/></dir></dir><dir name="newsletter"><file name="subscribe.phtml" hash="d8b9345bd874594e43f76c66b59ac0f0"/></dir><dir name="oauth"><dir name="authorize"><dir name="form"><file name="login-simple.phtml" hash="87a48f0bc1d0037f6b25a395de889723"/></dir></dir></dir><dir name="page"><file name="1column.phtml" hash="0217d29c5ce30c4241b956f4bfcfe089"/><file name="2columns-left.phtml" hash="bebed06fd537e396f05ebbc0e4291d36"/><file name="2columns-right.phtml" hash="a1c08bc7d7fbb9d00988bb9ecdaa85e1"/><file name="3columns.phtml" hash="6f971e2518978701bdf7ad1bb799ace3"/><file name="empty.phtml" hash="f420bff4c02fa84f98d2c1ce09dce4ff"/><dir name="html"><file name="footer.phtml" hash="4a3efd641403e108261b3b6b81cd71fc"/><file name="header.phtml" hash="a4d221c57972ec860ced42bc25117bfc"/><file name="pager.phtml" hash="438916b6296454956b3e0806b0667529"/><dir name="topmenu"><file name="renderer.phtml" hash="7cee75df8e011107ff49117324a2e833"/></dir><file name="topmenu.phtml" hash="5a3237e12cb48e9b77206485f9e46499"/></dir><file name="popup.phtml" hash="807903de3c55861253a6e7a941c246eb"/><file name="print.phtml" hash="8b7b693bb44c8db080c087afcbb89a84"/><dir name="template"><file name="links.phtml" hash="1f8ed0b51c26baf0cc51f864283816c5"/></dir></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="a2cf61bd1826cf5857ddbb0e0fe2a9bf"/><file name="ccsave.phtml" hash="fe211681d7f22b54bdca1ee1752692c3"/></dir><dir name="info"><file name="default.phtml" hash="182a8a5c7ae90f701da3d26959ae88a5"/></dir></dir><dir name="paypal"><file name="bml.phtml" hash="d4bd3e63c77ebec817c9958a7b66c143"/><dir name="express"><dir name="minicart"><file name="shortcut.phtml" hash="d5025339e84609e89039b4b33703f096"/></dir><dir name="product"><file name="shortcut.phtml" hash="77ff955f0879ed0c4346ed87319514c3"/></dir><dir name="review"><file name="address.phtml" hash="d96f232efcf512442d45615489023a3c"/><file name="details.phtml" hash="559a732d462bfb741d03ec05c043d50e"/><dir name="shipping"><file name="method.phtml" hash="a1a0836340cae4530e9d035dfec315da"/></dir></dir><file name="review.phtml" hash="231fd64e2e5974fb4a62c190647b8f77"/></dir><dir name="partner"><file name="us_logo.phtml" hash="2c3eccffd8d1d79f40679cbf4efd85ed"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="240117312a5cf04f6f56e9128ba95cd0"/><file name="login.phtml" hash="634989681520d255b70f738acca3546a"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="da39a8a94b5d56344ff46da0a45d1a59"/><file name="register.phtml" hash="680208907424e0a1951848fa83e8aa27"/></dir></dir><file name="remember_me.phtml" hash="4c1c9efbca5f5c5b17e9c16a3b6b3102"/><file name="remember_me_tooltip.phtml" hash="f252f9ad1d3592eb48a026b3c6c78619"/></dir><dir name="rating"><file name="detailed.phtml" hash="ac029753c6ad21473faa8f7f1e6464e7"/></dir><dir name="reports"><file name="product_viewed.phtml" hash="868f17fe24d87fce8fc6281c65fa6825"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="98b5a02b4d0e9f24e2128199b7ff8ac9"/><file name="compared_images_list.phtml" hash="b8018d02e1c808983b9da2fcedbf380b"/><file name="compared_names_list.phtml" hash="4b3cc7169338ceb224b3bf134767d506"/></dir><dir name="content"><file name="compared_grid.phtml" hash="be04453a0f58dee5a820bfd2349d9143"/><file name="compared_list.phtml" hash="329d73ef59ca99bfa896d0c934131bc7"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="211165fdd25df6912981d4b9abef97d2"/><file name="viewed_images_list.phtml" hash="48fdb9f1cb78cd28f30815abd9e8901a"/><file name="viewed_names_list.phtml" hash="5337debf0ddc6b5fec96cdfa543f1747"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="46acd7d075d642934195e4b859558786"/><file name="viewed_list.phtml" hash="2894a7a168c52d4eb8c41257e031cb2a"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="view.phtml" hash="f05a86c29f6b998382d09f152632fc2b"/></dir><file name="form.phtml" hash="fd1f64309265f142371dcf103f3784a1"/><dir name="product"><dir name="view"><file name="list.phtml" hash="34948e48ae602004e2869de139a22a2a"/></dir></dir><file name="view.phtml" hash="ec56bfd82035e90ce84f5de9b647cca3"/></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="5dc175d7af1f3a269cfb213ed5da4850"/></dir><file name="agreements.phtml" hash="9dff256daa8f0ba30e609c2eebe06efd"/></dir><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="56630660fd5dfcad091a1e3bf7f34b36"/></dir></dir><file name="items.phtml" hash="a89d7a81766c904c8068e82969f3aa34"/></dir><file name="history.phtml" hash="84ac8f3748940b8efaae73fade8dd243"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="a96b98f4bac113c8d974e91d8a68f161"/></dir></dir><file name="items.phtml" hash="33f6ad17b6418fc29ad8b45b7f8254f1"/></dir><dir name="items"><dir name="renderer"><file name="default.phtml" hash="cdc2fa9fa75773fc214a1cf1b523a973"/></dir></dir><file name="items.phtml" hash="1a439cd72cd7528a587b54b979b215e0"/><file name="recent.phtml" hash="f17054de57e8c74cffbec8a7381fe004"/><dir name="shipment"><file name="items.phtml" hash="a82e2df9ca67eaf8b176a26e60b62f12"/></dir></dir><dir name="recurring"><file name="grid.phtml" hash="ac0d5f5d757ed8abbfe94e9fc2f18124"/><dir name="profile"><file name="view.phtml" hash="f0b5890fb687c622213bc995a923d657"/></dir></dir><dir name="widget"><dir name="guest"><file name="form.phtml" hash="d08e046a18b17a628f46551053ced887"/></dir></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="ca2dc223ec08286ee660bd9cea2b9220"/></dir><dir name="wishlist"><dir name="button"><file name="update.phtml" hash="2895c05d48ebc2d39ff3911ae8faddab"/></dir><dir name="item"><dir name="column"><file name="cart.phtml" hash="848ce51d587bbaff493d116e621d8502"/><file name="info.phtml" hash="dd17a65400412efd9973956d7bbe3e36"/><file name="price.phtml" hash="1c1645d8ad629b068294d905dcaee448"/><file name="quantity.phtml" hash="906589e5f6d83daf6b7ab60633d980e2"/></dir><file name="list.phtml" hash="face9e02ba146978704797f270d4c836"/></dir><file name="shared.phtml" hash="13398e27a5456bb5b902ab5ad591b888"/><file name="sidebar.phtml" hash="dca9a260cd471b394cf7374ddf0f2a99"/><file name="view.phtml" hash="d2306e1331e6adc8cf54969e54f28fef"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="rwd"><dir name="default"><dir name="css"><file name="madisonisland-ie8.css" hash="d5f47a4cd003ceceb5371e3837a50212"/><file name="madisonisland.css" hash="6edb2c3d3ef856ec1362d176410ec37b"/><file name="scaffold-forms.css" hash="b6e3ea01988f54815d2275047b5d29d5"/><file name="styles-ie8.css" hash="5694f9525cb155389fe91691560548e4"/><file name="styles.css" hash="1db58a79d30498256a8f1801c889cbfc"/></dir><dir name="images"><file name="ajax-loader.gif" hash="f48ee069890b16455c3ddcacee9b5f75"/><file name="bg_x.png" hash="c321c67f6929326129426c9e83207ea3"/><file name="demo-logo.png" hash="c6f4b110e5379547e71d367479f0f945"/><file name="demo_logo.png" hash="7694461c41abb69ca60c086c69e312cc"/><file name="icon_sprite.png" hash="e15f0103ef5ebe3baf48960bb9ccfaab"/><file name="icon_sprite@2x.png" hash="2e9c31d760a33d9f27951210f8311341"/><file name="logo.gif" hash="5e0912a388db8cd83c062766ac3a5d89"/><file name="logo_email.gif" hash="773ca21465d08684ea7db8bf49d30a36"/><file name="logo_print.gif" hash="5e0912a388db8cd83c062766ac3a5d89"/><dir name="media"><file name="col_left_callout.jpg" hash="5f762006021e046f9bd536f37ea7c463"/><file name="col_right_callout.jpg" hash="dae22f37a542da272a35195ec286ec25"/><file name="homepage_banner_1.jpg" hash="267b2827f3db118d99f7a623ee02ad8f"/><file name="homepage_banner_1@2x.jpg" hash="3baa6702111d6f5f5dd40d96f148fc60"/><file name="homepage_banner_2.jpg" hash="67f70cfb1690b5de6e185769fb55cd28"/><file name="homepage_callout_1.jpg" hash="4b8451e4e99e87b6c60a015f659d32b6"/><file name="homepage_callout_1@2x.jpg" hash="fb5e215f6cb623abf6f0365b5de1541d"/><file name="homepage_callout_2.jpg" hash="057ab6200f6ea05d4a6793969c5edac3"/><file name="homepage_callout_2@2x.jpg" hash="e923c6323d22235876fe61a9c5588c85"/><file name="homepage_callout_3.jpg" hash="b2cf1e73e87b3330df17425044d22f52"/><file name="homepage_callout_3@2x.jpg" hash="8b98dee63a61608b09c26bd60acea65e"/></dir><file name="opc-ajax-loader.gif" hash="f48ee069890b16455c3ddcacee9b5f75"/><file name="social_icons.png" hash="a6d0bdaea0ca0f507bd36628a6ad31a2"/><file name="social_icons@2x.png" hash="531cc696a7b949dbc8121809c1bb4d46"/></dir><dir name="js"><file name="app.js" hash="80cb5f281145387569182e9c8c0148e2"/><dir name="configurableswatches"><file name="product-media.js" hash="c1e0ccd3d16e6008f808b27b83de5fed"/><file name="swatches-list.js" hash="b37c9bad3124b287f7ee1655c1cdaabc"/><file name="swatches-product.js" hash="43564b12f299c45f99e5878a29015d46"/></dir><dir name="lib"><dir name="elevatezoom"><file name="jquery.elevateZoom-3.0.8.min.js" hash="b8c320b245bda0ee6d6a05b1c5551a58"/><file name="jquery.elevatezoom.js" hash="85bed439e504fad4c0e631146d7a75ba"/></dir><file name="enquire.js" hash="17df503d3abac5be0bec038e4b133de1"/><file name="fastclick.js" hash="8613ebaa39dc59362c2a4b69b8669d05"/><file name="imagesloaded.js" hash="82bdcdaa438659d4cb966ab112b162f4"/><file name="jquery.cycle2.min.js" hash="eb609c79b0c3f4d32ee1ba625e4fb52e"/><file name="jquery.cycle2.swipe.min.js" hash="a1310de18f5cbbf2c91cfd2fad7e19a0"/><file name="matchMedia.addListener.js" hash="6f47448212550bd3157c4265e3ebf085"/><file name="matchMedia.js" hash="89f369588d629240d6a8d4f8788490c8"/><file name="modernizr.custom.min.js" hash="6b30635dd7d7297419bce69b3a0808e7"/><file name="selectivizr.js" hash="76618ffd6e448c796f0d2422c57a6658"/></dir><file name="minicart.js" hash="5ca5b959c6166171c0a7e047dad51c25"/><file name="msrp_rwd.js" hash="522d9833cd59b12761f9b4bfebd8ffd8"/><file name="opcheckout_rwd.js" hash="ee9f07a500f77534151ed1fcdf22600a"/><file name="slideshow.js" hash="07c6e1868c032f619ea606238bc7be7b"/></dir><dir name="scss"><file name="_core.scss" hash="33d1ddbb0668de9f7b9bf2eb1cd6ecbe"/><file name="_framework.scss" hash="93384e56ec50458f4f923ce7470cd6da"/><file name="_var.scss" hash="4d628304b30a3bd438bed96c31423c84"/><file name="config.rb" hash="5f50b4dc5eefbab9e22abdfb80f4d689"/><dir name="content"><file name="_category.scss" hash="f0edffea71dd3847b7b94ceab445a419"/><file name="_home.scss" hash="cb069d92990f68195496e2196f40d7c6"/></dir><dir name="core"><file name="_common.scss" hash="0a283f726c2a82c23163b6db42c958f5"/><file name="_form.scss" hash="e6c3eb23683b0a737c2513dc8790c263"/><file name="_reset.scss" hash="b2b82e7607eeb6e4c2761af26998f70f"/><file name="_table.scss" hash="12af297e33bc3943ebd57cb5acccb769"/></dir><file name="email-inline.scss" hash="55b21d3b6b30e90f6148b667336efc97"/><file name="email-non-inline.scss" hash="0278ac71fa72897b2434dfe387346c7d"/><dir name="function"><file name="_black.scss" hash="1c76b0960588dda7082bf8e90c5ae946"/><file name="_white.scss" hash="cd297ba874f0efb0e776a2cdaba27213"/></dir><dir name="layout"><file name="_footer.scss" hash="b16e711775d33e1c753f470f74dc2495"/><file name="_global.scss" hash="ab3ad4b705a8f8fb2d37c75d0129de8e"/><file name="_header-account.scss" hash="7e6c4f5a3848f93d9f733699ad2aa0a5"/><file name="_header-cart.scss" hash="40dcd13de05a03f2af1cc054f0dc198a"/><file name="_header-nav.scss" hash="a3767ac5021509e9c2abad16728f7c7d"/><file name="_header-search.scss" hash="dee0e05bd8eeccccb82cb260395557b1"/><file name="_header.scss" hash="a9871115e90dd882e840143087cfbf90"/></dir><file name="madisonisland-ie8.scss" hash="f592668f4e5d0b7817927dbce29f59d0"/><file name="madisonisland.scss" hash="fff1e636e9aa537e38ee89f3aecf29ba"/><dir name="mixin"><file name="_breakpoint.scss" hash="fdafdfed66af713c891f4c63a19eb703"/><file name="_clearfix.scss" hash="e2ddff1360f86e7dea20567d2b7eabff"/><file name="_if-resolution.scss" hash="327ba5d3214615af09323f59a82309c1"/><file name="_image-replacement.scss" hash="030cc950644942af58d69f05a32f6010"/><file name="_loading-overlay.scss" hash="37a9fe433f024aa5cd540ab756255c48"/><file name="_menu.scss" hash="6bd0c90f14454c4868aadb3cf99119f3"/><file name="_not-selectable.scss" hash="4fc9a1f911fbbc32f5391b61d1b8894d"/><file name="_toggle-content.scss" hash="7ffb3f9e8536fc247be883ad25a08424"/><file name="_triangle.scss" hash="c09dc7c6deaa960a812d8604378035ad"/><file name="_typography.scss" hash="988e2bca5e21b62286cf1c1de667a69e"/></dir><dir name="module"><file name="_account-orders.scss" hash="6bd66d03a0c9055473d01db7a9ec523c"/><file name="_account-reviews.scss" hash="22c3cc8b756a2a9c77814019b528287b"/><file name="_billing-agreements.scss" hash="8d50942ef9e35fc8b8cb7b9f90dfc38f"/><file name="_captcha.scss" hash="28afb6c895324ddd5305e18a2a21245e"/><file name="_catalog-compare.scss" hash="b41c9204621990bc713dbb3f0b1c7e22"/><file name="_catalog-msrp.scss" hash="672b862d5e7ac9f5a38452996b3814d6"/><file name="_catalog-product.scss" hash="32acd412e3d128ef2016e0d3f1fc6ab4"/><file name="_checkout-cart-minicart.scss" hash="975b06d25307f2aa098800dbb5e496c0"/><file name="_checkout-cart.scss" hash="90fab2862180b230593e9d0913a6e76b"/><file name="_checkout-multi-address.scss" hash="5c92ba1a98308bd1519fda64d41f5f96"/><file name="_checkout-onepage.scss" hash="4006706f090fba1be2860c7ba1240c0b"/><file name="_checkout-success.scss" hash="e655584eccd68b5c89709c11a3b2a8cc"/><file name="_cms.scss" hash="067fe620286a462b2aab846f558bf851"/><file name="_configurableswatches.scss" hash="c91fe98658d9f561cfac111bd0b1d683"/><file name="_contacts.scss" hash="75b142892e52957d9d4842316e858fdc"/><file name="_cookies.scss" hash="40e322d8f98c68b44e85cfffad1d0845"/><file name="_customer.scss" hash="be23803496f69f089ac4e7defd2eeb9f"/><file name="_paypal.scss" hash="c41daf0e6277ea9fa8e55c08e2734a9c"/><file name="_popular-terms.scss" hash="c70880f760a46f4252fa2e05488669df"/><file name="_pricing_conditions.scss" hash="2fa2251c64c4de02436204e62a74b40b"/><file name="_product-list.scss" hash="07444dc99f8a40cec83f85c0412da2a5"/><file name="_recurring-profiles.scss" hash="ccefe9fa4101415eefa0c322a4751b8c"/><file name="_review.scss" hash="b921881b074f3e9f7c81e13c9268bdc1"/><file name="_search.scss" hash="f97c0831c06a72bbeaecf81e9f6428c1"/><file name="_slideshow.scss" hash="d14c8fdd53240ea4a4a89ba110942e84"/><file name="_tags.scss" hash="7ab90ca04dbb470d088fc13863bd6853"/><file name="_widget.scss" hash="6b598b6b1c95b7a3683afa5a52b339a0"/><file name="_wishlist.scss" hash="b2f2e9590bfe87777249ff70dba29dd6"/></dir><dir name="override"><file name="_plugin.scss" hash="5f8731aac694962ee07241bd70919966"/></dir><file name="scaffold-forms.scss" hash="06a7f258ffcb44f8799525400e42418e"/><file name="styles-ie8.scss" hash="2a64adffc8750b813caf25277bca2100"/><file name="styles.scss" hash="ceb1092bb069ed28d4fcd40a6cb7f4be"/><dir name="vendor"><file name="_normalize.scss" hash="f09b3df11470f1261a26bfe1b5a830ff"/></dir><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.9.1.1</min><max>1.9.1.1</max></package></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Rwd_Default</name>
4
+ <version>1.9.2.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>This is a RWD themes base</summary>
10
  <description>This is a RWD themes base</description>
11
+ <notes>1.9.2.0</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
+ <date>2015-07-08</date>
14
+ <time>12:05:58</time>
15
+ <contents><target name="magedesign"><dir name="frontend"><dir name="rwd"><dir name="default"><dir name="etc"><file name="theme.xml" hash="d00dd83bac2155a76a9f004ceeba2aa7"/><file name="widget.xml" hash="b26f0daa5ea35fae7def54e530e4fc6a"/></dir><dir name="layout"><file name="bundle.xml" hash="d4d6fd3d43bab191589be5dc04de3af9"/><file name="catalog.xml" hash="cf56a0853b8a4672c340074d6ce7d4ec"/><file name="catalog_msrp.xml" hash="761904c9772b9f9f87d168eaa5a3f35e"/><file name="catalogsearch.xml" hash="7577994c03f6e57aa50a2f9b9608fd06"/><file name="checkout.xml" hash="7a3227db21193c1f7abc1a293ee89637"/><file name="cms.xml" hash="ab13bce455c0ebdc6b7ac66973cca084"/><file name="configurableswatches.xml" hash="da5a91b2cd46e37c18f0ce23b5668d5d"/><file name="contacts.xml" hash="0feca543b963f4643b33ddff9d012287"/><file name="customer.xml" hash="becba768ba7cf0aa2f2133d77734c97c"/><file name="directory.xml" hash="116dba3caebbb645f4a4740d6203a809"/><file name="downloadable.xml" hash="dc03bfb05c6ad52ba2cfa26fc05ef80a"/><file name="newsletter.xml" hash="36464d3b9d5627a97d53cf9b5bb59038"/><file name="oauth.xml" hash="7ecd522b4625a53bd29c36f7b6708be2"/><file name="page.xml" hash="970456dbe2ff4ef2d351f6f1420bbd6a"/><file name="paypal.xml" hash="71611cd614aa622c50809659fc141b24"/><file name="persistent.xml" hash="668e57da0f663acb02b36605aecde881"/><file name="review.xml" hash="e44ec617f8ad50a03ba61ab3a7f1a838"/><file name="rss.xml" hash="a96fc7aa525d5ee33ad417826cec2658"/><file name="sales.xml" hash="c9910bae1a47eb29eb1bbf3e0b720678"/><file name="wishlist.xml" hash="868da261c6eb64da2e3adeca3a390b28"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="50ae88ef4535a9ca0e8e46799288f413"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="view"><dir name="type"><dir name="bundle"><file name="availability.phtml" hash="39f9ec1e37f2d2d838596dd2892b1005"/><dir name="option"><file name="select.phtml" hash="3f51c006c554b18cc60f6229461cad5e"/></dir></dir><file name="bundle.phtml" hash="0abf2442f49382f83dd62c31073e9040"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="ab0adcbb666002cc70acdf6ac7021a12"/></dir><dir name="invoice"><file name="default.phtml" hash="d6c0ebeec5e10ffbc506763491b66845"/></dir><dir name="order"><file name="default.phtml" hash="abde26e36f098e3ce5108c5cc80bd254"/></dir><dir name="shipment"><file name="default.phtml" hash="b9c8dc719be1a634e0f448e6b4b47901"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="items"><file name="renderer.phtml" hash="a8e80c1633e3ee32a8c9168c9d9e8383"/></dir></dir></dir></dir><dir name="captcha"><file name="zend.phtml" hash="872875bf33960b1a1e9ba6859f46600f"/></dir><dir name="catalog"><dir name="layer"><file name="filter.phtml" hash="a44247deec06eb5911f3df6d843d956b"/><file name="state.phtml" hash="eda8e9eb4f713c9da03ba0a54a25212a"/><file name="view.phtml" hash="2ca8dd0e3f146585d07e6b382e8a4eee"/></dir><dir name="msrp"><file name="popup.phtml" hash="31f2008ce2ea58e81e8414645f0ede64"/></dir><dir name="navigation"><file name="left.phtml" hash="bfb71cd13382c16524db2b0d0eab7185"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="5b808fbf9a8bddb979febcfe2609da94"/><file name="sidebar.phtml" hash="62145a39f96743f5785b3627547dc9f7"/></dir><dir name="list"><file name="related.phtml" hash="0d70beffbe11222b2c1c2183ba56b63c"/><file name="toolbar.phtml" hash="c6a3942f398c592827bbbdbb0690a01b"/><file name="upsell.phtml" hash="450003d58ff096dc379ab9793b98c9dd"/></dir><file name="list.phtml" hash="634564c3159f865577a09d34ee0ca5e3"/><file name="price.phtml" hash="ca4e9a03d5ecdac3d35196e4aee7380c"/><dir name="view"><file name="addto.phtml" hash="4b275d89973855e5a3a6088e276f43f8"/><file name="addtocart.phtml" hash="6fa2ea19134bd838dd5bd7c6de9e6843"/><file name="media.phtml" hash="51aa2d8c08d1be4ad9f979a0730bbbb9"/><file name="sharing.phtml" hash="7b9fb533933a5de636bbfa625e25369a"/><dir name="type"><dir name="availability"><file name="default.phtml" hash="4e0b08dad4bb489e8c124308cc56dd4e"/><file name="grouped.phtml" hash="7582181a90bdfb695d816fe895ed399b"/></dir><file name="default.phtml" hash="ca7f231b33e607ffe8f2f6dd4bd96948"/><file name="grouped.phtml" hash="36501822168e99019f702312a293d7ee"/><dir name="options"><file name="configurable.phtml" hash="71811dffa6131fbb179bc06ac1f6e3f6"/></dir></dir></dir><file name="view.phtml" hash="a7f35b24e370ab77185164cdde16c259"/><dir name="widget"><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="8461c192eab496f4cc024946ea4a5b18"/><file name="new_images_list.phtml" hash="cbcb98d6ad1982d3fd6bb8004f0ef1c1"/><file name="new_names_list.phtml" hash="9cae45c356c126e715273b3a9dd5708c"/></dir><dir name="content"><file name="new_grid.phtml" hash="1215c91de68cb635ee0228e2be9160da"/><file name="new_list.phtml" hash="7317df9d1635324f4aa66bf390524ed6"/></dir></dir></dir></dir></dir><dir name="cataloginventory"><dir name="stockqty"><file name="composite.phtml" hash="778855bedbe85cc965ce4a025ced04ea"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="49a326d7a04cd24f76c089a571f227f7"/></dir><file name="form.mini.phtml" hash="936f335929a1c1f3bb8d20ea274cf9be"/><file name="result.phtml" hash="ea8f7555b6ff6c7af0bdcffec55d0027"/></dir><dir name="centinel"><dir name="authentication"><file name="start.phtml" hash="fe6c94ec3c92840a58b319d5038ca0d9"/></dir></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="8893925e57b7d01c0c3b1cbe46965f2f"/><file name="crosssell.phtml" hash="b9253440450cdb8609871a0d23bf3074"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="00a773bf6b7d550cecbcb4afd5f84b7c"/></dir><file name="default.phtml" hash="581d3d31fef83f660942431922293aff"/></dir><dir name="minicart"><file name="default.phtml" hash="4892d89135eda067ecd9d0a6efdcf89f"/><file name="items.phtml" hash="1547e9d22a2f871b28f265d0a3305876"/></dir><file name="minicart.phtml" hash="c160af1af285428f466bdb1cd46ac13e"/><dir name="render"><file name="default.phtml" hash="5c1c460c6c632c5c351e7901427fffe4"/><file name="simple.phtml" hash="025e6bbb36e41df2128c1c95b36ba231"/></dir><file name="shipping.phtml" hash="3080bd1504cae62262062058863e1838"/><dir name="sidebar"><file name="default.phtml" hash="7cda83cea687b899318a3b4133c62408"/></dir><file name="sidebar.phtml" hash="390436e51cacfa0ccce28544765f0962"/></dir><file name="cart.phtml" hash="c625c2d94711e014615486b7607b6e45"/><dir name="multishipping"><file name="addresses.phtml" hash="be9c2953dbab472373de481c8e8b65d4"/><file name="billing.phtml" hash="aa92a53b4c541317b9e6815f5b8a1f28"/><dir name="item"><file name="default.phtml" hash="243e0e6b950f06db8c9c1f7d1ef24590"/></dir><dir name="overview"><file name="item.phtml" hash="9318047ee9189440d7dc1f7a0ca2d917"/></dir><file name="overview.phtml" hash="eaa4630ae9f0bafe9f102e6b1d19eb95"/></dir><dir name="onepage"><file name="payment.phtml" hash="96265c46bb4a202561fbd269636a663c"/><file name="progress.phtml" hash="7445ce55ebe83156bfdf1180bc35fedd"/><dir name="review"><file name="info.phtml" hash="a515a973ebc0181a14d45a3cbe2c2fc9"/><file name="item.phtml" hash="b88883933d696481306734390dceee02"/></dir><file name="shipping.phtml" hash="d4136b9aa6094edd4bac70fbaac89f25"/></dir><file name="onepage.phtml" hash="e3a4b58790c9f9802aff1f7896bd9c72"/></dir><dir name="configurableswatches"><dir name="catalog"><dir name="layer"><dir name="filter"><file name="swatches.phtml" hash="fe55df1df2f30b2e3ebac87bf8c0dbdc"/></dir><dir name="state"><file name="swatch.phtml" hash="fb11cbae1f603017c4e85a8692ec9752"/></dir></dir><dir name="media"><file name="js.phtml" hash="f7269d9211f654f608195c8f1ce891b2"/></dir><dir name="product"><dir name="list"><file name="swatches.phtml" hash="e41711ec411e3be7a29caaf62ac9129c"/></dir><dir name="view"><dir name="type"><dir name="configurable"><file name="swatch-js.phtml" hash="60914817ac4db7f54acb875efb106e4f"/></dir><dir name="options"><dir name="configurable"><file name="swatches.phtml" hash="c8d44e23f337facd225649dc17cf038a"/></dir></dir></dir></dir></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="2c42bb9ff229dfbd556f5e333982e825"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="42c81b3a4844d65fcaf5622ce03a5109"/></dir><file name="dashboard.phtml" hash="1330c69eb0c5ba4433943a288e9407a0"/><file name="navigation.phtml" hash="dcec943b87e531c7b1a347ce9965ff45"/></dir><dir name="address"><file name="edit.phtml" hash="ecd1ccd67442bf76df64952d8f8c93ee"/></dir><dir name="form"><file name="address.phtml" hash="3346cebdea9573ce3a5f500e8b6004a5"/><file name="changepassword.phtml" hash="8175021062d265051b59bf5622aba31f"/><file name="confirmation.phtml" hash="6cca7f19f7001e20a1128c633cfa1105"/><file name="edit.phtml" hash="34c2e0a0992d4353fb513b573e97dd4e"/><file name="forgotpassword.phtml" hash="adab27b320754d03d6db2517db9e3c86"/><file name="mini.login.phtml" hash="953db146a0c5a8f668b5b5d1be61f648"/><file name="resetforgottenpassword.phtml" hash="88b81a7972ae049b3fddd990507c6cb6"/></dir></dir><dir name="directory"><file name="currency.phtml" hash="39bcea13a67e2503b89cf8605c5f9383"/></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="type.phtml" hash="4f2f1cc4380dd935ef53c07ce9ebe11e"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="235ba1ef53629e6e0c860c822f009d73"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="12cb20296cf903662af327800da0ae24"/></dir></dir></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="4e4c835a56504ad68b8591ef61797744"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="2bb7a54f7002427442d81ed57b5ad6b1"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="8c6077b5646124943b74fa7c4ba7f848"/></dir><dir name="order"><file name="downloadable.phtml" hash="b9d771d574dfebd99a24c2336f8285d7"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="8b9ea75c91389c6cd847ab0ecf4c5bf8"/></dir></dir></dir></dir></dir><dir name="email"><dir name="catalog"><dir name="product"><file name="list.phtml" hash="5f80ecea7ccdcf068e45303a6dcebf72"/><file name="new.phtml" hash="3e967ea93be598baaada7a78507b1434"/></dir></dir><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="f79cb5ed65ce3927b1d323479b879418"/></dir><dir name="invoice"><file name="items.phtml" hash="d4a446c25eda630196fa52072599722b"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="917301b99bb27e5495f436b91fc16ccc"/></dir><dir name="invoice"><file name="default.phtml" hash="917301b99bb27e5495f436b91fc16ccc"/></dir><dir name="order"><file name="default.phtml" hash="a883309f060bfdef5aa07a74a620032b"/></dir><dir name="shipment"><file name="default.phtml" hash="9ee4f1a8b3662422eb05ec592e105af2"/></dir></dir><file name="items.phtml" hash="3f43664a56eccd336ae9f93644a9d889"/><dir name="shipment"><file name="items.phtml" hash="fda23599e3bcf1f3538cb74e7acfa1c4"/><file name="track.phtml" hash="3d06d28e690ad0997090b2a422080a8c"/></dir><dir name="totals"><file name="wrapper.phtml" hash="0559a432acd7beda44e5b227bff41211"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="007c4d6639335482e7082da23a527cb5"/><file name="stock.phtml" hash="1d5a4e6e3c2cbbdd4f54512c85547db5"/></dir></dir><dir name="newsletter"><file name="subscribe.phtml" hash="3a993dd52f34d23aa9e58d360971a309"/></dir><dir name="oauth"><dir name="authorize"><dir name="form"><file name="login-simple.phtml" hash="f9c0fb94aba9700cb862f0248baec9a1"/></dir></dir></dir><dir name="page"><file name="1column.phtml" hash="0217d29c5ce30c4241b956f4bfcfe089"/><file name="2columns-left.phtml" hash="bebed06fd537e396f05ebbc0e4291d36"/><file name="2columns-right.phtml" hash="a1c08bc7d7fbb9d00988bb9ecdaa85e1"/><file name="3columns.phtml" hash="6f971e2518978701bdf7ad1bb799ace3"/><file name="empty.phtml" hash="f420bff4c02fa84f98d2c1ce09dce4ff"/><dir name="html"><file name="footer.phtml" hash="4a3efd641403e108261b3b6b81cd71fc"/><file name="header.phtml" hash="115ecf5a9042ffcce1536fb10df32914"/><file name="pager.phtml" hash="e16cd50199a2d91c48fbf72ae22600cc"/><dir name="topmenu"><file name="renderer.phtml" hash="7cee75df8e011107ff49117324a2e833"/></dir><file name="topmenu.phtml" hash="5a3237e12cb48e9b77206485f9e46499"/></dir><file name="popup.phtml" hash="807903de3c55861253a6e7a941c246eb"/><file name="print.phtml" hash="f292ecc352173d579d449794a379dc5d"/><dir name="template"><file name="links.phtml" hash="1f8ed0b51c26baf0cc51f864283816c5"/></dir></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="a80f418e2c5fce9cc6b758d9d03c195f"/><file name="ccsave.phtml" hash="d7b2ee5a098f61419e8ab7b423d07be7"/></dir><dir name="info"><file name="default.phtml" hash="182a8a5c7ae90f701da3d26959ae88a5"/></dir></dir><dir name="paypal"><file name="bml.phtml" hash="d4bd3e63c77ebec817c9958a7b66c143"/><dir name="express"><dir name="minicart"><file name="shortcut.phtml" hash="821f849045dbd9158c117fd69b9295bd"/></dir><dir name="product"><file name="shortcut.phtml" hash="3cdd24f3af46ef4760ca20885f077d0a"/></dir><dir name="review"><file name="address.phtml" hash="4f2f7b2cdfeb4e3e8f4c9de45e10c03d"/><file name="details.phtml" hash="559a732d462bfb741d03ec05c043d50e"/><dir name="shipping"><file name="method.phtml" hash="a1a0836340cae4530e9d035dfec315da"/></dir></dir><file name="review.phtml" hash="abbb96284c22d9c451500333bc9abc98"/></dir><dir name="partner"><file name="us_logo.phtml" hash="2c3eccffd8d1d79f40679cbf4efd85ed"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="85aa6cfa48f500ff3e54beaf27c2fadf"/><file name="login.phtml" hash="634989681520d255b70f738acca3546a"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="44f01752af72cceb3bf5fff3a5a23cba"/><file name="register.phtml" hash="d4b2d37e7672f7f7d31271fa36c9be85"/></dir></dir><dir name="header"><file name="links.phtml" hash="eb1a3675863fd60601a83ba37aba1a94"/></dir><file name="remember_me.phtml" hash="ecb29a132a145258c5ccf8303fbf7825"/><file name="remember_me_tooltip.phtml" hash="c410dcf15883faca8c1fda017586378e"/></dir><dir name="rating"><file name="detailed.phtml" hash="ac029753c6ad21473faa8f7f1e6464e7"/></dir><dir name="reports"><file name="product_viewed.phtml" hash="868f17fe24d87fce8fc6281c65fa6825"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="98b5a02b4d0e9f24e2128199b7ff8ac9"/><file name="compared_images_list.phtml" hash="b8018d02e1c808983b9da2fcedbf380b"/><file name="compared_names_list.phtml" hash="4b3cc7169338ceb224b3bf134767d506"/></dir><dir name="content"><file name="compared_grid.phtml" hash="bcad46bcab98be82e219362621e37491"/><file name="compared_list.phtml" hash="6d748da0752c62ccbda731d294ce5065"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="211165fdd25df6912981d4b9abef97d2"/><file name="viewed_images_list.phtml" hash="48fdb9f1cb78cd28f30815abd9e8901a"/><file name="viewed_names_list.phtml" hash="5337debf0ddc6b5fec96cdfa543f1747"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="e8e30d08f535a1d630a10c2f3d348108"/><file name="viewed_list.phtml" hash="446121c899bfd198eebc4c65f978ddbd"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="view.phtml" hash="f05a86c29f6b998382d09f152632fc2b"/></dir><file name="form.phtml" hash="bc2a3a251a83fe521e7706dc2bcf32b5"/><dir name="product"><dir name="view"><file name="list.phtml" hash="34948e48ae602004e2869de139a22a2a"/></dir></dir><file name="view.phtml" hash="ec56bfd82035e90ce84f5de9b647cca3"/></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="1b92ce064e12147b17080fc5c2db3ae1"/></dir><file name="agreements.phtml" hash="9dff256daa8f0ba30e609c2eebe06efd"/></dir><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="56630660fd5dfcad091a1e3bf7f34b36"/></dir></dir><file name="items.phtml" hash="a89d7a81766c904c8068e82969f3aa34"/></dir><file name="history.phtml" hash="84ac8f3748940b8efaae73fade8dd243"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="a96b98f4bac113c8d974e91d8a68f161"/></dir></dir><file name="items.phtml" hash="33f6ad17b6418fc29ad8b45b7f8254f1"/></dir><dir name="items"><dir name="renderer"><file name="default.phtml" hash="cdc2fa9fa75773fc214a1cf1b523a973"/></dir></dir><file name="items.phtml" hash="c8beda8f74c01263549ea2706934f8bb"/><file name="recent.phtml" hash="f17054de57e8c74cffbec8a7381fe004"/><dir name="shipment"><file name="items.phtml" hash="cf419a6963ec9e9c92bcc1f04011457c"/></dir></dir><dir name="recurring"><file name="grid.phtml" hash="ac0d5f5d757ed8abbfe94e9fc2f18124"/><dir name="profile"><file name="view.phtml" hash="ae06af716d2c48860db09000224e8f71"/></dir></dir><dir name="widget"><dir name="guest"><file name="form.phtml" hash="d08e046a18b17a628f46551053ced887"/></dir></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="2849cb83f45985ff5e7564fa591c501a"/></dir><dir name="wishlist"><dir name="button"><file name="update.phtml" hash="6e887fadfcecb6f5a3f4a8c999bc3634"/></dir><dir name="item"><dir name="column"><file name="cart.phtml" hash="1715f0d797d0d5d3d26198dd347e302d"/><file name="info.phtml" hash="e48e55fa0fbced5b309f7f5f5b3f221b"/><file name="price.phtml" hash="1c1645d8ad629b068294d905dcaee448"/><file name="quantity.phtml" hash="906589e5f6d83daf6b7ab60633d980e2"/></dir><file name="list.phtml" hash="face9e02ba146978704797f270d4c836"/></dir><file name="shared.phtml" hash="5144c2fa4d5dc1a9df7f15513d4a461b"/><file name="sidebar.phtml" hash="f0f180ae9f831b0f47a9478ac2c41c3b"/><file name="view.phtml" hash="d2306e1331e6adc8cf54969e54f28fef"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="rwd"><dir name="default"><dir name="css"><file name="madisonisland-ie8.css" hash="d5f47a4cd003ceceb5371e3837a50212"/><file name="madisonisland.css" hash="6edb2c3d3ef856ec1362d176410ec37b"/><file name="scaffold-forms.css" hash="b6e3ea01988f54815d2275047b5d29d5"/><file name="styles-ie8.css" hash="5694f9525cb155389fe91691560548e4"/><file name="styles.css" hash="8990fb84b805d342d8a139ac92d25eb4"/></dir><dir name="images"><file name="ajax-loader.gif" hash="f48ee069890b16455c3ddcacee9b5f75"/><file name="bg_x.png" hash="c321c67f6929326129426c9e83207ea3"/><file name="demo-logo.png" hash="c6f4b110e5379547e71d367479f0f945"/><file name="demo_logo.png" hash="7694461c41abb69ca60c086c69e312cc"/><file name="icon_sprite.png" hash="e15f0103ef5ebe3baf48960bb9ccfaab"/><file name="icon_sprite@2x.png" hash="2e9c31d760a33d9f27951210f8311341"/><file name="logo.gif" hash="5e0912a388db8cd83c062766ac3a5d89"/><file name="logo_email.gif" hash="773ca21465d08684ea7db8bf49d30a36"/><file name="logo_print.gif" hash="5e0912a388db8cd83c062766ac3a5d89"/><dir name="media"><file name="col_left_callout.jpg" hash="5f762006021e046f9bd536f37ea7c463"/><file name="col_right_callout.jpg" hash="dae22f37a542da272a35195ec286ec25"/><file name="homepage_banner_1.jpg" hash="267b2827f3db118d99f7a623ee02ad8f"/><file name="homepage_banner_1@2x.jpg" hash="3baa6702111d6f5f5dd40d96f148fc60"/><file name="homepage_banner_2.jpg" hash="67f70cfb1690b5de6e185769fb55cd28"/><file name="homepage_callout_1.jpg" hash="4b8451e4e99e87b6c60a015f659d32b6"/><file name="homepage_callout_1@2x.jpg" hash="fb5e215f6cb623abf6f0365b5de1541d"/><file name="homepage_callout_2.jpg" hash="057ab6200f6ea05d4a6793969c5edac3"/><file name="homepage_callout_2@2x.jpg" hash="e923c6323d22235876fe61a9c5588c85"/><file name="homepage_callout_3.jpg" hash="b2cf1e73e87b3330df17425044d22f52"/><file name="homepage_callout_3@2x.jpg" hash="8b98dee63a61608b09c26bd60acea65e"/></dir><file name="opc-ajax-loader.gif" hash="f48ee069890b16455c3ddcacee9b5f75"/><file name="social_icons.png" hash="a6d0bdaea0ca0f507bd36628a6ad31a2"/><file name="social_icons@2x.png" hash="531cc696a7b949dbc8121809c1bb4d46"/></dir><dir name="js"><file name="app.js" hash="80cb5f281145387569182e9c8c0148e2"/><dir name="configurableswatches"><file name="product-media.js" hash="c1e0ccd3d16e6008f808b27b83de5fed"/><file name="swatches-list.js" hash="b37c9bad3124b287f7ee1655c1cdaabc"/><file name="swatches-product.js" hash="43564b12f299c45f99e5878a29015d46"/></dir><dir name="lib"><dir name="elevatezoom"><file name="jquery.elevateZoom-3.0.8.min.js" hash="b8c320b245bda0ee6d6a05b1c5551a58"/><file name="jquery.elevatezoom.js" hash="85bed439e504fad4c0e631146d7a75ba"/></dir><file name="enquire.js" hash="17df503d3abac5be0bec038e4b133de1"/><file name="fastclick.js" hash="8613ebaa39dc59362c2a4b69b8669d05"/><file name="imagesloaded.js" hash="82bdcdaa438659d4cb966ab112b162f4"/><file name="jquery.cycle2.min.js" hash="eb609c79b0c3f4d32ee1ba625e4fb52e"/><file name="jquery.cycle2.swipe.min.js" hash="a1310de18f5cbbf2c91cfd2fad7e19a0"/><file name="matchMedia.addListener.js" hash="6f47448212550bd3157c4265e3ebf085"/><file name="matchMedia.js" hash="89f369588d629240d6a8d4f8788490c8"/><file name="modernizr.custom.min.js" hash="6b30635dd7d7297419bce69b3a0808e7"/><file name="selectivizr.js" hash="76618ffd6e448c796f0d2422c57a6658"/></dir><file name="minicart.js" hash="729f136fe0cc8b3f1f174ee8fe968ffc"/><file name="msrp_rwd.js" hash="522d9833cd59b12761f9b4bfebd8ffd8"/><file name="opcheckout_rwd.js" hash="ee9f07a500f77534151ed1fcdf22600a"/><file name="slideshow.js" hash="07c6e1868c032f619ea606238bc7be7b"/></dir><dir name="scss"><file name="_core.scss" hash="33d1ddbb0668de9f7b9bf2eb1cd6ecbe"/><file name="_framework.scss" hash="93384e56ec50458f4f923ce7470cd6da"/><file name="_var.scss" hash="4d628304b30a3bd438bed96c31423c84"/><file name="config.rb" hash="5f50b4dc5eefbab9e22abdfb80f4d689"/><dir name="content"><file name="_category.scss" hash="f0edffea71dd3847b7b94ceab445a419"/><file name="_home.scss" hash="cb069d92990f68195496e2196f40d7c6"/></dir><dir name="core"><file name="_common.scss" hash="0a283f726c2a82c23163b6db42c958f5"/><file name="_form.scss" hash="e6c3eb23683b0a737c2513dc8790c263"/><file name="_reset.scss" hash="b2b82e7607eeb6e4c2761af26998f70f"/><file name="_table.scss" hash="12af297e33bc3943ebd57cb5acccb769"/></dir><file name="email-inline.scss" hash="55b21d3b6b30e90f6148b667336efc97"/><file name="email-non-inline.scss" hash="0278ac71fa72897b2434dfe387346c7d"/><dir name="function"><file name="_black.scss" hash="1c76b0960588dda7082bf8e90c5ae946"/><file name="_white.scss" hash="cd297ba874f0efb0e776a2cdaba27213"/></dir><dir name="layout"><file name="_footer.scss" hash="b16e711775d33e1c753f470f74dc2495"/><file name="_global.scss" hash="ab3ad4b705a8f8fb2d37c75d0129de8e"/><file name="_header-account.scss" hash="7e6c4f5a3848f93d9f733699ad2aa0a5"/><file name="_header-cart.scss" hash="40dcd13de05a03f2af1cc054f0dc198a"/><file name="_header-nav.scss" hash="a3767ac5021509e9c2abad16728f7c7d"/><file name="_header-search.scss" hash="dee0e05bd8eeccccb82cb260395557b1"/><file name="_header.scss" hash="a9871115e90dd882e840143087cfbf90"/></dir><file name="madisonisland-ie8.scss" hash="f592668f4e5d0b7817927dbce29f59d0"/><file name="madisonisland.scss" hash="fff1e636e9aa537e38ee89f3aecf29ba"/><dir name="mixin"><file name="_breakpoint.scss" hash="fdafdfed66af713c891f4c63a19eb703"/><file name="_clearfix.scss" hash="e2ddff1360f86e7dea20567d2b7eabff"/><file name="_if-resolution.scss" hash="327ba5d3214615af09323f59a82309c1"/><file name="_image-replacement.scss" hash="030cc950644942af58d69f05a32f6010"/><file name="_loading-overlay.scss" hash="37a9fe433f024aa5cd540ab756255c48"/><file name="_menu.scss" hash="6bd0c90f14454c4868aadb3cf99119f3"/><file name="_not-selectable.scss" hash="4fc9a1f911fbbc32f5391b61d1b8894d"/><file name="_toggle-content.scss" hash="7ffb3f9e8536fc247be883ad25a08424"/><file name="_triangle.scss" hash="c09dc7c6deaa960a812d8604378035ad"/><file name="_typography.scss" hash="988e2bca5e21b62286cf1c1de667a69e"/></dir><dir name="module"><file name="_account-orders.scss" hash="6bd66d03a0c9055473d01db7a9ec523c"/><file name="_account-reviews.scss" hash="22c3cc8b756a2a9c77814019b528287b"/><file name="_billing-agreements.scss" hash="8d50942ef9e35fc8b8cb7b9f90dfc38f"/><file name="_captcha.scss" hash="28afb6c895324ddd5305e18a2a21245e"/><file name="_catalog-compare.scss" hash="b41c9204621990bc713dbb3f0b1c7e22"/><file name="_catalog-msrp.scss" hash="672b862d5e7ac9f5a38452996b3814d6"/><file name="_catalog-product.scss" hash="32acd412e3d128ef2016e0d3f1fc6ab4"/><file name="_checkout-cart-minicart.scss" hash="975b06d25307f2aa098800dbb5e496c0"/><file name="_checkout-cart.scss" hash="90fab2862180b230593e9d0913a6e76b"/><file name="_checkout-multi-address.scss" hash="5c92ba1a98308bd1519fda64d41f5f96"/><file name="_checkout-onepage.scss" hash="4006706f090fba1be2860c7ba1240c0b"/><file name="_checkout-success.scss" hash="e655584eccd68b5c89709c11a3b2a8cc"/><file name="_cms.scss" hash="067fe620286a462b2aab846f558bf851"/><file name="_configurableswatches.scss" hash="c91fe98658d9f561cfac111bd0b1d683"/><file name="_contacts.scss" hash="75b142892e52957d9d4842316e858fdc"/><file name="_cookies.scss" hash="40e322d8f98c68b44e85cfffad1d0845"/><file name="_customer.scss" hash="be23803496f69f089ac4e7defd2eeb9f"/><file name="_paypal.scss" hash="c41daf0e6277ea9fa8e55c08e2734a9c"/><file name="_popular-terms.scss" hash="c70880f760a46f4252fa2e05488669df"/><file name="_pricing_conditions.scss" hash="2fa2251c64c4de02436204e62a74b40b"/><file name="_product-list.scss" hash="07444dc99f8a40cec83f85c0412da2a5"/><file name="_recurring-profiles.scss" hash="ccefe9fa4101415eefa0c322a4751b8c"/><file name="_review.scss" hash="b921881b074f3e9f7c81e13c9268bdc1"/><file name="_search.scss" hash="f97c0831c06a72bbeaecf81e9f6428c1"/><file name="_slideshow.scss" hash="d14c8fdd53240ea4a4a89ba110942e84"/><file name="_tags.scss" hash="7ab90ca04dbb470d088fc13863bd6853"/><file name="_widget.scss" hash="6b598b6b1c95b7a3683afa5a52b339a0"/><file name="_wishlist.scss" hash="b2f2e9590bfe87777249ff70dba29dd6"/></dir><dir name="override"><file name="_plugin.scss" hash="5f8731aac694962ee07241bd70919966"/></dir><file name="scaffold-forms.scss" hash="06a7f258ffcb44f8799525400e42418e"/><file name="styles-ie8.scss" hash="2a64adffc8750b813caf25277bca2100"/><file name="styles.scss" hash="ceb1092bb069ed28d4fcd40a6cb7f4be"/><dir name="vendor"><file name="_normalize.scss" hash="f09b3df11470f1261a26bfe1b5a830ff"/></dir><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.9.2.0</min><max>1.9.2.0</max></package></required></dependencies>
18
  </package>
skin/frontend/rwd/default/css/styles.css CHANGED
@@ -22,7 +22,6 @@
22
  * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
- /*! normalize.css v2.0.1 | MIT License | git.io/normalize */
26
  /* ==========================================================================
27
  HTML5 display definitions
28
  ========================================================================== */
@@ -10515,6 +10514,10 @@ body[class*="checkout-multishipping-"] #review-buttons-container {
10515
  width: 100%;
10516
  }
10517
 
 
 
 
 
10518
  #multiship-addresses-table > tbody > tr > td.a-center.last > a {
10519
  background-image: none;
10520
  }
22
  * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
 
25
  /* ==========================================================================
26
  HTML5 display definitions
27
  ========================================================================== */
10514
  width: 100%;
10515
  }
10516
 
10517
+ .checkout-multishipping-payment-customerbalance input.checkbox {
10518
+ margin-left: 15px;
10519
+ }
10520
+
10521
  #multiship-addresses-table > tbody > tr > td.a-center.last > a {
10522
  background-image: none;
10523
  }
skin/frontend/rwd/default/js/minicart.js CHANGED
@@ -47,7 +47,8 @@ function Minicart(options) {
47
  }
48
 
49
  Minicart.prototype = {
50
-
 
51
  init: function() {
52
  var cart = this;
53
 
@@ -74,6 +75,13 @@ Minicart.prototype = {
74
  .bind('click.quantity', function() {
75
  cart.processUpdateQuantity(this);
76
  });
 
 
 
 
 
 
 
77
  },
78
 
79
  removeItem: function(el) {
@@ -99,6 +107,11 @@ Minicart.prototype = {
99
  cart.showError(cart.defaultErrorMessage);
100
  });
101
  }
 
 
 
 
 
102
  },
103
 
104
  revertInvalidValue: function(el) {
47
  }
48
 
49
  Minicart.prototype = {
50
+ initAfterEvents : {},
51
+ removeItemAfterEvents : {},
52
  init: function() {
53
  var cart = this;
54
 
75
  .bind('click.quantity', function() {
76
  cart.processUpdateQuantity(this);
77
  });
78
+
79
+ for (var i in this.initAfterEvents) {
80
+ if (this.initAfterEvents.hasOwnProperty(i) && typeof(this.initAfterEvents[i]) === "function") {
81
+ this.initAfterEvents[i]();
82
+ }
83
+ }
84
+
85
  },
86
 
87
  removeItem: function(el) {
107
  cart.showError(cart.defaultErrorMessage);
108
  });
109
  }
110
+ for (var i in this.removeItemAfterEvents) {
111
+ if (this.removeItemAfterEvents.hasOwnProperty(i) && typeof(this.removeItemAfterEvents[i]) === "function") {
112
+ this.removeItemAfterEvents[i]();
113
+ }
114
+ }
115
  },
116
 
117
  revertInvalidValue: function(el) {