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->__('Subscrib