Interface_Frontend_Base_Default - Version 1.9.2.0

Version Notes

1.9.2.0

Download this release

Release Info

Developer Magento Core Team
Extension Interface_Frontend_Base_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 (126) hide show
  1. app/design/frontend/base/default/template/authorizenet/directpost/form.phtml +4 -4
  2. app/design/frontend/base/default/template/callouts/left_col.phtml +3 -3
  3. app/design/frontend/base/default/template/callouts/right_col.phtml +3 -3
  4. app/design/frontend/base/default/template/catalog/layer/state.phtml +1 -1
  5. app/design/frontend/base/default/template/catalog/msrp/popup.phtml +1 -1
  6. app/design/frontend/base/default/template/catalog/product/compare/list.phtml +5 -5
  7. app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml +7 -5
  8. app/design/frontend/base/default/template/catalog/product/list.phtml +2 -2
  9. app/design/frontend/base/default/template/catalog/product/list/related.phtml +2 -2
  10. app/design/frontend/base/default/template/catalog/product/list/toolbar.phtml +3 -3
  11. app/design/frontend/base/default/template/catalog/product/new.phtml +1 -1
  12. app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml +1 -1
  13. app/design/frontend/base/default/template/catalog/product/view.phtml +1 -1
  14. app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml +1 -1
  15. app/design/frontend/base/default/template/catalog/product/view/media.phtml +2 -2
  16. app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml +1 -1
  17. app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml +1 -1
  18. app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml +1 -1
  19. app/design/frontend/base/default/template/cataloginventory/stockqty/composite.phtml +1 -1
  20. app/design/frontend/base/default/template/catalogsearch/advanced/form.phtml +1 -1
  21. app/design/frontend/base/default/template/catalogsearch/form.mini.phtml +2 -2
  22. app/design/frontend/base/default/template/checkout/cart.phtml +4 -4
  23. app/design/frontend/base/default/template/checkout/cart/coupon.phtml +3 -3
  24. app/design/frontend/base/default/template/checkout/cart/crosssell.phtml +1 -1
  25. app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.phtml +1 -1
  26. app/design/frontend/base/default/template/checkout/cart/item/default.phtml +5 -3
  27. app/design/frontend/base/default/template/checkout/cart/noItems.phtml +1 -1
  28. app/design/frontend/base/default/template/checkout/cart/render/default.phtml +2 -2
  29. app/design/frontend/base/default/template/checkout/cart/render/simple.phtml +4 -2
  30. app/design/frontend/base/default/template/checkout/cart/shipping.phtml +6 -6
  31. app/design/frontend/base/default/template/checkout/cart/sidebar.phtml +1 -1
  32. app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml +2 -2
  33. app/design/frontend/base/default/template/checkout/multishipping/address/select.phtml +1 -1
  34. app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml +11 -5
  35. app/design/frontend/base/default/template/checkout/multishipping/billing.phtml +3 -3
  36. app/design/frontend/base/default/template/checkout/multishipping/link.phtml +1 -1
  37. app/design/frontend/base/default/template/checkout/multishipping/overview.phtml +3 -3
  38. app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml +1 -1
  39. app/design/frontend/base/default/template/checkout/multishipping/success.phtml +1 -1
  40. app/design/frontend/base/default/template/checkout/onepage/billing.phtml +18 -18
  41. app/design/frontend/base/default/template/checkout/onepage/failure.phtml +1 -1
  42. app/design/frontend/base/default/template/checkout/onepage/link.phtml +1 -1
  43. app/design/frontend/base/default/template/checkout/onepage/payment.phtml +3 -3
  44. app/design/frontend/base/default/template/checkout/onepage/payment/methods.phtml +2 -2
  45. app/design/frontend/base/default/template/checkout/onepage/review/button.phtml +1 -1
  46. app/design/frontend/base/default/template/checkout/onepage/review/info.phtml +1 -1
  47. app/design/frontend/base/default/template/checkout/onepage/shipping.phtml +14 -14
  48. app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml +1 -1
  49. app/design/frontend/base/default/template/checkout/success.phtml +1 -1
  50. app/design/frontend/base/default/template/contacts/form.phtml +5 -5
  51. app/design/frontend/base/default/template/customer/address.phtml +1 -1
  52. app/design/frontend/base/default/template/customer/address/book.phtml +2 -2
  53. app/design/frontend/base/default/template/customer/address/edit.phtml +13 -13
  54. app/design/frontend/base/default/template/customer/form/address.phtml +11 -11
  55. app/design/frontend/base/default/template/customer/form/changepassword.phtml +4 -4
  56. app/design/frontend/base/default/template/customer/form/confirmation.phtml +2 -2
  57. app/design/frontend/base/default/template/customer/form/edit.phtml +6 -6
  58. app/design/frontend/base/default/template/customer/form/forgotpassword.phtml +1 -1
  59. app/design/frontend/base/default/template/customer/form/login.phtml +4 -4
  60. app/design/frontend/base/default/template/customer/form/newsletter.phtml +2 -2
  61. app/design/frontend/base/default/template/customer/form/register.phtml +13 -13
  62. app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml +1 -1
  63. app/design/frontend/base/default/template/customer/widget/gender.phtml +1 -1
  64. app/design/frontend/base/default/template/customer/widget/name.phtml +7 -7
  65. app/design/frontend/base/default/template/customer/widget/taxvat.phtml +1 -1
  66. app/design/frontend/base/default/template/customer/wishlist.phtml +1 -1
  67. app/design/frontend/base/default/template/directory/currency.phtml +1 -1
  68. app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml +5 -4
  69. app/design/frontend/base/default/template/downloadable/customer/products/list.phtml +2 -2
  70. app/design/frontend/base/default/template/giftmessage/inline.phtml +12 -12
  71. app/design/frontend/base/default/template/newsletter/subscribe.phtml +2 -2
  72. app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml +1 -0
  73. app/design/frontend/base/default/template/oauth/authorize/form/login.phtml +1 -0
  74. app/design/frontend/base/default/template/page/html/pager.phtml +4 -4
  75. app/design/frontend/base/default/template/page/js/calendar.phtml +33 -33
  76. app/design/frontend/base/default/template/page/print.phtml +1 -1
  77. app/design/frontend/base/default/template/paygate/form/cc.phtml +2 -2
  78. app/design/frontend/base/default/template/payment/form/cc.phtml +3 -3
  79. app/design/frontend/base/default/template/payment/form/ccsave.phtml +5 -5
  80. app/design/frontend/base/default/template/payment/form/purchaseorder.phtml +1 -1
  81. app/design/frontend/base/default/template/paypal/express/review.phtml +3 -3
  82. app/design/frontend/base/default/template/paypal/express/shortcut.phtml +8 -8
  83. app/design/frontend/base/default/template/paypal/hss/redirect.phtml +1 -1
  84. app/design/frontend/base/default/template/paypal/hss/review/button.phtml +1 -1
  85. app/design/frontend/base/default/template/paypal/partner/logo.phtml +1 -1
  86. app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml +1 -1
  87. app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml +1 -1
  88. app/design/frontend/base/default/template/paypal/payment/mark.phtml +1 -1
  89. app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml +19 -19
  90. app/design/frontend/base/default/template/persistent/customer/form/login.phtml +4 -4
  91. app/design/frontend/base/default/template/persistent/customer/form/register.phtml +13 -13
  92. app/design/frontend/base/default/template/persistent/remember_me.phtml +1 -1
  93. app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml +2 -2
  94. app/design/frontend/base/default/template/poll/active.phtml +1 -1
  95. app/design/frontend/base/default/template/reports/home_product_compared.phtml +1 -1
  96. app/design/frontend/base/default/template/reports/home_product_viewed.phtml +1 -1
  97. app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml +1 -1
  98. app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml +1 -1
  99. app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml +1 -1
  100. app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml +1 -1
  101. app/design/frontend/base/default/template/review/form.phtml +1 -1
  102. app/design/frontend/base/default/template/rss/order/details.phtml +3 -2
  103. app/design/frontend/base/default/template/sales/billing/agreement/view.phtml +1 -1
  104. app/design/frontend/base/default/template/sales/guest/form.phtml +26 -0
  105. app/design/frontend/base/default/template/sales/order/items.phtml +2 -2
  106. app/design/frontend/base/default/template/sales/order/shipment/items.phtml +2 -2
  107. app/design/frontend/base/default/template/sales/order/view.phtml +1 -1
  108. app/design/frontend/base/default/template/sales/recurring/profile/view.phtml +4 -4
  109. app/design/frontend/base/default/template/sales/reorder/sidebar.phtml +2 -2
  110. app/design/frontend/base/default/template/sendfriend/send.phtml +3 -3
  111. app/design/frontend/base/default/template/shipping/tracking/popup.phtml +2 -2
  112. app/design/frontend/base/default/template/tag/customer/view.phtml +2 -2
  113. app/design/frontend/base/default/template/tag/list.phtml +1 -1
  114. app/design/frontend/base/default/template/wishlist/button/share.phtml +1 -1
  115. app/design/frontend/base/default/template/wishlist/button/tocart.phtml +1 -1
  116. app/design/frontend/base/default/template/wishlist/button/update.phtml +1 -1
  117. app/design/frontend/base/default/template/wishlist/email/rss.phtml +1 -1
  118. app/design/frontend/base/default/template/wishlist/item/column/cart.phtml +1 -1
  119. app/design/frontend/base/default/template/wishlist/item/column/info.phtml +1 -1
  120. app/design/frontend/base/default/template/wishlist/item/column/remove.phtml +1 -1
  121. app/design/frontend/base/default/template/wishlist/render/item/price_msrp_item.phtml +1 -1
  122. app/design/frontend/base/default/template/wishlist/shared.phtml +2 -2
  123. app/design/frontend/base/default/template/wishlist/sharing.phtml +3 -3
  124. app/design/frontend/base/default/template/wishlist/sidebar.phtml +1 -1
  125. package.xml +6 -6
  126. skin/frontend/base/default/js/opcheckout.js +19 -1
app/design/frontend/base/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" 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" 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" 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" 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/base/default/template/callouts/left_col.phtml CHANGED
@@ -27,11 +27,11 @@
27
  <div class="block block-banner">
28
  <div class="block-content">
29
  <?php if(strtolower(substr($this->getLinkUrl(),0,4))==='http'): ?>
30
- <a href="<?php echo $this->getLinkUrl() ?>" title="<?php echo $this->__($this->getImgAlt()) ?>">
31
  <?php elseif($this->getLinkUrl()): ?>
32
- <a href="<?php echo $this->getUrl($this->getLinkUrl()) ?>" title="<?php echo $this->__($this->getImgAlt()) ?>">
33
  <?php endif; ?>
34
- <img src="<?php echo $this->getSkinUrl($this->getImgSrc()) ?>"<?php if(!$this->getLinkUrl()): ?> title="<?php echo $this->__($this->getImgAlt()) ?>"<?php endif; ?> alt="<?php echo $this->__($this->getImgAlt()) ?>" />
35
  <?php if($this->getLinkUrl()): ?>
36
  </a>
37
  <?php endif ?>
27
  <div class="block block-banner">
28
  <div class="block-content">
29
  <?php if(strtolower(substr($this->getLinkUrl(),0,4))==='http'): ?>
30
+ <a href="<?php echo $this->getLinkUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__($this->getImgAlt())) ?>">
31
  <?php elseif($this->getLinkUrl()): ?>
32
+ <a href="<?php echo $this->getUrl($this->getLinkUrl()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__($this->getImgAlt())) ?>">
33
  <?php endif; ?>
34
+ <img src="<?php echo $this->getSkinUrl($this->getImgSrc()) ?>"<?php if(!$this->getLinkUrl()): ?> title="<?php echo Mage::helper('core')->quoteEscape($this->__($this->getImgAlt())) ?>"<?php endif; ?> alt="<?php echo Mage::helper('core')->quoteEscape($this->__($this->getImgAlt())) ?>" />
35
  <?php if($this->getLinkUrl()): ?>
36
  </a>
37
  <?php endif ?>
app/design/frontend/base/default/template/callouts/right_col.phtml CHANGED
@@ -27,11 +27,11 @@
27
  <div class="block block-banner">
28
  <div class="block-content">
29
  <?php if(strtolower(substr($this->getLinkUrl(),0,4))==='http'): ?>
30
- <a href="<?php echo $this->getLinkUrl() ?>" title="<?php echo $this->__($this->getImgAlt()) ?>">
31
  <?php elseif($this->getLinkUrl()): ?>
32
- <a href="<?php echo $this->getUrl($this->getLinkUrl()) ?>" title="<?php echo $this->__($this->getImgAlt()) ?>">
33
  <?php endif; ?>
34
- <img src="<?php echo $this->getSkinUrl($this->getImgSrc()) ?>"<?php if(!$this->getLinkUrl()): ?> title="<?php echo $this->__($this->getImgAlt()) ?>"<?php endif; ?> alt="<?php echo $this->__($this->getImgAlt()) ?>" />
35
  <?php if($this->getLinkUrl()): ?>
36
  </a>
37
  <?php endif ?>
27
  <div class="block block-banner">
28
  <div class="block-content">
29
  <?php if(strtolower(substr($this->getLinkUrl(),0,4))==='http'): ?>
30
+ <a href="<?php echo $this->getLinkUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__($this->getImgAlt())) ?>">
31
  <?php elseif($this->getLinkUrl()): ?>
32
+ <a href="<?php echo $this->getUrl($this->getLinkUrl()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__($this->getImgAlt())) ?>">
33
  <?php endif; ?>
34
+ <img src="<?php echo $this->getSkinUrl($this->getImgSrc()) ?>"<?php if(!$this->getLinkUrl()): ?> title="<?php echo Mage::helper('core')->quoteEscape($this->__($this->getImgAlt())) ?>"<?php endif; ?> alt="<?php echo Mage::helper('core')->quoteEscape($this->__($this->getImgAlt())) ?>" />
35
  <?php if($this->getLinkUrl()): ?>
36
  </a>
37
  <?php endif ?>
app/design/frontend/base/default/template/catalog/layer/state.phtml CHANGED
@@ -46,7 +46,7 @@
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
  </li>
52
  <?php endforeach; ?>
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 Mage::helper('core')->quoteEscape($this->__('Remove This Item')) ?>"><?php echo $this->__('Remove This Item') ?></a>
50
  <?php endif; ?>
51
  </li>
52
  <?php endforeach; ?>
app/design/frontend/base/default/template/catalog/msrp/popup.phtml CHANGED
@@ -42,7 +42,7 @@
42
  <div class="additional-addtocart-box">
43
  <?php echo $this->getChildHtml(); ?>
44
  </div>
45
- <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>
46
  </form>
47
  </div>
48
  <div class="map-popup-msrp" id="map-popup-msrp-box"><strong><?php echo $this->__('Price'); ?>:</strong> <span style="text-decoration:line-through;" id="map-popup-msrp"></span></div>
42
  <div class="additional-addtocart-box">
43
  <?php echo $this->getChildHtml(); ?>
44
  </div>
45
+ <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>
46
  </form>
47
  </div>
48
  <div class="map-popup-msrp" id="map-popup-msrp-box"><strong><?php echo $this->__('Price'); ?>:</strong> <span style="text-decoration:line-through;" id="map-popup-msrp"></span></div>
app/design/frontend/base/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>
@@ -65,7 +65,7 @@
65
  <?php echo $this->getReviewsSummaryHtml($_item, 'short') ?>
66
  <?php echo $this->getPriceHtml($_item, true, '-compare-list-top') ?>
67
  <?php if($_item->isSaleable()): ?>
68
- <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>
69
  <?php else: ?>
70
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
71
  <?php endif; ?>
@@ -118,7 +118,7 @@
118
  <td>
119
  <?php echo $this->getPriceHtml($_item, true, '-compare-list-bottom') ?>
120
  <?php if($_item->isSaleable()): ?>
121
- <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>
122
  <?php else: ?>
123
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
124
  <?php endif; ?>
@@ -133,9 +133,9 @@
133
  </tbody>
134
  </table>
135
  <div class="buttons-set">
136
- <button type="button" title="<?php echo $this->__('Close Window') ?>" class="button" onclick="window.close();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
137
  <span class="please-wait" id="compare-list-please-wait" style="display:none;">
138
- <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...') ?>
139
  </span>
140
  </div>
141
  <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 Mage::helper('core')->quoteEscape($this->__('Remove This Item')) ?>"><?php echo $this->__('Remove This Item') ?></a></td>
51
  <?php endforeach; ?>
52
  </tr>
53
  </thead>
65
  <?php echo $this->getReviewsSummaryHtml($_item, 'short') ?>
66
  <?php echo $this->getPriceHtml($_item, true, '-compare-list-top') ?>
67
  <?php if($_item->isSaleable()): ?>
68
+ <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>
69
  <?php else: ?>
70
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
71
  <?php endif; ?>
118
  <td>
119
  <?php echo $this->getPriceHtml($_item, true, '-compare-list-bottom') ?>
120
  <?php if($_item->isSaleable()): ?>
121
+ <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>
122
  <?php else: ?>
123
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
124
  <?php endif; ?>
133
  </tbody>
134
  </table>
135
  <div class="buttons-set">
136
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
137
  <span class="please-wait" id="compare-list-please-wait" style="display:none;">
138
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Please wait...')) ?>" title="<?php echo $this->__('Please wait...') ?>" class="v-middle" /> <?php echo $this->__('Please wait...') ?>
139
  </span>
140
  </div>
141
  <script type="text/javascript">
app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml CHANGED
@@ -25,14 +25,15 @@
25
  */
26
  /* @var $this Mage_Catalog_Block_Product_Compare_Sidebar */
27
  ?>
28
- <?php
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') ?>
35
- <?php if($_helper->getItemCount() > 0): ?>
36
  <small><?php echo $this->__('(%d)', $_helper->getItemCount()) ?></small>
37
  <?php endif; ?>
38
  </span></strong>
@@ -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
- <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>
54
- <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>
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>
 
25
  */
26
  /* @var $this Mage_Catalog_Block_Product_Compare_Sidebar */
27
  ?>
28
+ <?php
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') ?>
36
+ <?php if($_helper->getItemCount() > 0): ?>
37
  <small><?php echo $this->__('(%d)', $_helper->getItemCount()) ?></small>
38
  <?php endif; ?>
39
  </span></strong>
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 Mage::helper('core')->quoteEscape($this->__('Remove This Item')) ?>" class="btn-remove" onclick="return confirm('<?php echo Mage::helper('core')->quoteEscape($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
+ <a href="<?php echo $_helper->getClearListUrl() ?>" onclick="return confirm('<?php echo Mage::helper('core')->quoteEscape($this->__('Are you sure you would like to remove all products from your comparison?')) ?>');"><?php echo $this->__('Clear All') ?></a>
55
+ <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>
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/base/default/template/catalog/product/list.phtml CHANGED
@@ -58,7 +58,7 @@
58
  <?php endif; ?>
59
  <?php echo $this->getPriceHtml($_product, true) ?>
60
  <?php if($_product->isSaleable()): ?>
61
- <p><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>
62
  <?php else: ?>
63
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
64
  <?php endif; ?>
@@ -100,7 +100,7 @@
100
  <?php echo $this->getPriceHtml($_product, true) ?>
101
  <div class="actions">
102
  <?php if($_product->isSaleable()): ?>
103
- <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>
104
  <?php else: ?>
105
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
106
  <?php endif; ?>
58
  <?php endif; ?>
59
  <?php echo $this->getPriceHtml($_product, true) ?>
60
  <?php if($_product->isSaleable()): ?>
61
+ <p><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></p>
62
  <?php else: ?>
63
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
64
  <?php endif; ?>
100
  <?php echo $this->getPriceHtml($_product, true) ?>
101
  <div class="actions">
102
  <?php if($_product->isSaleable()): ?>
103
+ <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>
104
  <?php else: ?>
105
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
106
  <?php endif; ?>
app/design/frontend/base/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/base/default/template/catalog/product/list/toolbar.phtml CHANGED
@@ -74,7 +74,7 @@
74
  <?php endif; ?>
75
  </p>
76
  <?php endif; ?>
77
-
78
  <div class="sort-by">
79
  <label><?php echo $this->__('Sort By') ?></label>
80
  <select onchange="setLocation(this.value)">
@@ -85,9 +85,9 @@
85
  <?php endforeach; ?>
86
  </select>
87
  <?php if($this->getCurrentDirection() == 'desc'): ?>
88
- <a href="<?php echo $this->getOrderUrl(null, 'asc') ?>" title="<?php echo $this->__('Set Ascending Direction') ?>"><img src="<?php echo $this->getSkinUrl('images/i_desc_arrow.gif') ?>" alt="<?php echo $this->__('Set Ascending Direction') ?>" class="v-middle" /></a>
89
  <?php else: ?>
90
- <a href="<?php echo $this->getOrderUrl(null, 'desc') ?>" title="<?php echo $this->__('Set Descending Direction') ?>"><img src="<?php echo $this->getSkinUrl('images/i_asc_arrow.gif') ?>" alt="<?php echo $this->__('Set Descending Direction') ?>" class="v-middle" /></a>
91
  <?php endif; ?>
92
  </div>
93
  </div>
74
  <?php endif; ?>
75
  </p>
76
  <?php endif; ?>
77
+
78
  <div class="sort-by">
79
  <label><?php echo $this->__('Sort By') ?></label>
80
  <select onchange="setLocation(this.value)">
85
  <?php endforeach; ?>
86
  </select>
87
  <?php if($this->getCurrentDirection() == 'desc'): ?>
88
+ <a href="<?php echo $this->getOrderUrl(null, 'asc') ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Ascending Direction')) ?>"><img src="<?php echo $this->getSkinUrl('images/i_desc_arrow.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Ascending Direction')) ?>" class="v-middle" /></a>
89
  <?php else: ?>
90
+ <a href="<?php echo $this->getOrderUrl(null, 'desc') ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Descending Direction')) ?>"><img src="<?php echo $this->getSkinUrl('images/i_asc_arrow.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Set Descending Direction')) ?>" class="v-middle" /></a>
91
  <?php endif; ?>
92
  </div>
93
  </div>
app/design/frontend/base/default/template/catalog/product/new.phtml CHANGED
@@ -38,7 +38,7 @@
38
  <?php echo $this->getPriceHtml($_product, true, '-new') ?>
39
  <div class="actions">
40
  <?php if($_product->isSaleable()): ?>
41
- <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>
42
  <?php else: ?>
43
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
44
  <?php endif; ?>
38
  <?php echo $this->getPriceHtml($_product, true, '-new') ?>
39
  <div class="actions">
40
  <?php if($_product->isSaleable()): ?>
41
+ <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>
42
  <?php else: ?>
43
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
44
  <?php endif; ?>
app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml CHANGED
@@ -101,7 +101,7 @@
101
  <script type="text/javascript">
102
  Catalog.Map.addHelpLink(
103
  $('<?php echo $helpLinkId ?>'),
104
- "<?php echo $this->__("What's this?"); ?>"
105
  );
106
  </script>
107
  </div>
101
  <script type="text/javascript">
102
  Catalog.Map.addHelpLink(
103
  $('<?php echo $helpLinkId ?>'),
104
+ '<?php echo Mage::helper('core')->jsQuoteEscape($this->__("What's this?")); ?>'
105
  );
106
  </script>
107
  </div>
app/design/frontend/base/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/base/default/template/catalog/product/view/addtocart.phtml CHANGED
@@ -30,7 +30,7 @@
30
  <div class="add-to-cart">
31
  <?php if(!$_product->isGrouped()): ?>
32
  <label for="qty"><?php echo $this->__('Qty:') ?></label>
33
- <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo $this->__('Qty') ?>" class="input-text qty" />
34
  <?php endif; ?>
35
  <button type="button" title="<?php echo $buttonTitle ?>" id="product-addtocart-button" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?php echo $buttonTitle ?></span></span></button>
36
  <?php echo $this->getChildHtml('', true, true) ?>
30
  <div class="add-to-cart">
31
  <?php if(!$_product->isGrouped()): ?>
32
  <label for="qty"><?php echo $this->__('Qty:') ?></label>
33
+ <input type="text" 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" />
34
  <?php endif; ?>
35
  <button type="button" title="<?php echo $buttonTitle ?>" id="product-addtocart-button" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?php echo $buttonTitle ?></span></span></button>
36
  <?php echo $this->getChildHtml('', true, true) ?>
app/design/frontend/base/default/template/catalog/product/view/media.phtml CHANGED
@@ -43,11 +43,11 @@
43
  </p>
44
  <p class="zoom-notice" id="track_hint"><?php echo $this->__('Double click on above image to view full picture') ?></p>
45
  <div class="zoom">
46
- <img id="zoom_out" src="<?php echo $this->getSkinUrl('images/slider_btn_zoom_out.gif') ?>" alt="<?php echo $this->__('Zoom Out') ?>" title="<?php echo $this->__('Zoom Out') ?>" class="btn-zoom-out" />
47
  <div id="track">
48
  <div id="handle"></div>
49
  </div>
50
- <img id="zoom_in" src="<?php echo $this->getSkinUrl('images/slider_btn_zoom_in.gif') ?>" alt="<?php echo $this->__('Zoom In') ?>" title="<?php echo $this->__('Zoom In') ?>" class="btn-zoom-in" />
51
  </div>
52
  <script type="text/javascript">
53
  //<![CDATA[
43
  </p>
44
  <p class="zoom-notice" id="track_hint"><?php echo $this->__('Double click on above image to view full picture') ?></p>
45
  <div class="zoom">
46
+ <img id="zoom_out" src="<?php echo $this->getSkinUrl('images/slider_btn_zoom_out.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Zoom Out')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Zoom Out')) ?>" class="btn-zoom-out" />
47
  <div id="track">
48
  <div id="handle"></div>
49
  </div>
50
+ <img id="zoom_in" src="<?php echo $this->getSkinUrl('images/slider_btn_zoom_in.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Zoom In')) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Zoom In')) ?>" class="btn-zoom-in" />
51
  </div>
52
  <script type="text/javascript">
53
  //<![CDATA[
app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml CHANGED
@@ -75,7 +75,7 @@
75
  <?php if ($_product->isSaleable()): ?>
76
  <td class="a-center">
77
  <?php if ($_item->isSaleable()) : ?>
78
- <input type="text" name="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo $this->__('Qty') ?>" class="input-text qty" />
79
  <?php else: ?>
80
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
81
  <?php endif; ?>
75
  <?php if ($_product->isSaleable()): ?>
76
  <td class="a-center">
77
  <?php if ($_item->isSaleable()) : ?>
78
+ <input type="text" 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" />
79
  <?php else: ?>
80
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
81
  <?php endif; ?>
app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml CHANGED
@@ -43,7 +43,7 @@
43
  <?php echo $this->getPriceHtml($_product, true, '-widget-new-grid') ?>
44
  <div class="actions">
45
  <?php if ($_product->isSaleable()): ?>
46
- <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>
47
  <?php else: ?>
48
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
49
  <?php endif; ?>
43
  <?php echo $this->getPriceHtml($_product, true, '-widget-new-grid') ?>
44
  <div class="actions">
45
  <?php if ($_product->isSaleable()): ?>
46
+ <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>
47
  <?php else: ?>
48
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
49
  <?php endif; ?>
app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml CHANGED
@@ -41,7 +41,7 @@
41
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
42
  <?php echo $this->getPriceHtml($_product, true, '-widget-new-list') ?>
43
  <?php if ($_product->isSaleable()): ?>
44
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
45
  <?php else: ?>
46
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
47
  <?php endif; ?>
41
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
42
  <?php echo $this->getPriceHtml($_product, true, '-widget-new-list') ?>
43
  <?php if ($_product->isSaleable()): ?>
44
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
45
  <?php else: ?>
46
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
47
  <?php endif; ?>
app/design/frontend/base/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">
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">
36
  <col />
app/design/frontend/base/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/base/default/template/catalogsearch/form.mini.phtml CHANGED
@@ -31,11 +31,11 @@ $catalogSearchHelper = $this->helper('catalogsearch');
31
  <div class="form-search">
32
  <label for="search"><?php echo $this->__('Search:') ?></label>
33
  <input id="search" type="text" name="<?php echo $catalogSearchHelper->getQueryParamName() ?>" value="<?php echo $catalogSearchHelper->getEscapedQueryText() ?>" class="input-text" maxlength="<?php echo $catalogSearchHelper->getMaxQueryLength();?>" />
34
- <button type="submit" title="<?php echo $this->__('Search') ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
35
  <div id="search_autocomplete" class="search-autocomplete"></div>
36
  <script type="text/javascript">
37
  //<![CDATA[
38
- var searchForm = new Varien.searchForm('search_mini_form', 'search', '<?php echo $this->__('Search entire store here...') ?>');
39
  searchForm.initAutocomplete('<?php echo $catalogSearchHelper->getSuggestUrl() ?>', 'search_autocomplete');
40
  //]]>
41
  </script>
31
  <div class="form-search">
32
  <label for="search"><?php echo $this->__('Search:') ?></label>
33
  <input id="search" type="text" name="<?php echo $catalogSearchHelper->getQueryParamName() ?>" value="<?php echo $catalogSearchHelper->getEscapedQueryText() ?>" class="input-text" maxlength="<?php echo $catalogSearchHelper->getMaxQueryLength();?>" />
34
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
35
  <div id="search_autocomplete" class="search-autocomplete"></div>
36
  <script type="text/javascript">
37
  //<![CDATA[
38
+ var searchForm = new Varien.searchForm('search_mini_form', 'search', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Search entire store here...')) ?>');
39
  searchForm.initAutocomplete('<?php echo $catalogSearchHelper->getSuggestUrl() ?>', 'search_autocomplete');
40
  //]]>
41
  </script>
app/design/frontend/base/default/template/checkout/cart.phtml CHANGED
@@ -46,7 +46,7 @@
46
  </div>
47
  <?php echo $this->getMessagesBlock()->toHtml() ?>
48
  <?php echo $this->getChildHtml('form_before') ?>
49
- <form action="<?php echo $this->getUrl('checkout/cart/updatePost') ?>" method="post">
50
  <?php echo $this->getBlockHtml('formkey'); ?>
51
  <fieldset>
52
  <table id="shopping-cart-table" class="data-table cart-table">
@@ -98,10 +98,10 @@
98
  <tr>
99
  <td colspan="50" class="a-right">
100
  <?php if($this->getContinueShoppingUrl()): ?>
101
- <button type="button" title="<?php echo $this->__('Continue Shopping') ?>" class="button btn-continue" onclick="setLocation('<?php echo $this->getContinueShoppingUrl() ?>')"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
102
  <?php endif; ?>
103
- <button type="submit" name="update_cart_action" value="update_qty" title="<?php echo $this->__('Update Shopping Cart'); ?>" class="button btn-update"><span><span><?php echo $this->__('Update Shopping Cart'); ?></span></span></button>
104
- <button type="submit" name="update_cart_action" value="empty_cart" title="<?php echo $this->__('Clear Shopping Cart'); ?>" class="button btn-empty" id="empty_cart_button"><span><span><?php echo $this->__('Clear Shopping Cart'); ?></span></span></button>
105
  <!--[if lt IE 8]>
106
  <input type="hidden" id="update_cart_action_container" />
107
  <script type="text/javascript">
46
  </div>
47
  <?php echo $this->getMessagesBlock()->toHtml() ?>
48
  <?php echo $this->getChildHtml('form_before') ?>
49
+ <form action="<?php echo $this->getFormActionUrl() ?>" method="post">
50
  <?php echo $this->getBlockHtml('formkey'); ?>
51
  <fieldset>
52
  <table id="shopping-cart-table" class="data-table cart-table">
98
  <tr>
99
  <td colspan="50" class="a-right">
100
  <?php if($this->getContinueShoppingUrl()): ?>
101
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue Shopping')) ?>" class="button btn-continue" onclick="setLocation('<?php echo Mage::helper('core')->quoteEscape($this->getContinueShoppingUrl()) ?>')"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
102
  <?php endif; ?>
103
+ <button type="submit" name="update_cart_action" value="update_qty" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Shopping Cart')); ?>" class="button btn-update"><span><span><?php echo $this->__('Update Shopping Cart'); ?></span></span></button>
104
+ <button type="submit" name="update_cart_action" value="empty_cart" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Clear Shopping Cart')); ?>" class="button btn-empty" id="empty_cart_button"><span><span><?php echo $this->__('Clear Shopping Cart'); ?></span></span></button>
105
  <!--[if lt IE 8]>
106
  <input type="hidden" id="update_cart_action_container" />
107
  <script type="text/javascript">
app/design/frontend/base/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">
@@ -34,9 +34,9 @@
34
  <input class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $this->escapeHtml($this->getCouponCode()) ?>" />
35
  </div>
36
  <div class="buttons-set">
37
- <button type="button" title="<?php echo $this->__('Apply Coupon') ?>" class="button" onclick="discountForm.submit(false)" value="<?php echo $this->__('Apply Coupon') ?>"><span><span><?php echo $this->__('Apply Coupon') ?></span></span></button>
38
  <?php if(strlen($this->getCouponCode())): ?>
39
- &nbsp; <button type="button" title="<?php echo $this->__('Cancel Coupon') ?>" class="button" onclick="discountForm.submit(true)" value="<?php echo $this->__('Cancel Coupon') ?>"><span><span><?php echo $this->__('Cancel Coupon') ?></span></span></button>
40
  <?php endif;?>
41
  </div>
42
  </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">
34
  <input class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $this->escapeHtml($this->getCouponCode()) ?>" />
35
  </div>
36
  <div class="buttons-set">
37
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Apply Coupon')) ?>" class="button" onclick="discountForm.submit(false)" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Apply Coupon')) ?>"><span><span><?php echo $this->__('Apply Coupon') ?></span></span></button>
38
  <?php if(strlen($this->getCouponCode())): ?>
39
+ &nbsp; <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel Coupon')) ?>" class="button" onclick="discountForm.submit(true)" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel Coupon')) ?>"><span><span><?php echo $this->__('Cancel Coupon') ?></span></span></button>
40
  <?php endif;?>
41
  </div>
42
  </div>
app/design/frontend/base/default/template/checkout/cart/crosssell.phtml CHANGED
@@ -41,7 +41,7 @@
41
  <div class="product-details">
42
  <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></h3>
43
  <?php echo $this->getPriceHtml($_item, true) ?>
44
- <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>
45
  <ul class="add-to-links">
46
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
47
  <li><a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
41
  <div class="product-details">
42
  <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></h3>
43
  <?php echo $this->getPriceHtml($_item, true) ?>
44
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_item) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
45
  <ul class="add-to-links">
46
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
47
  <li><a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.phtml CHANGED
@@ -31,7 +31,7 @@
31
  <div class="add-to-cart">
32
  <?php if (!$_product->isGrouped()): ?>
33
  <label for="qty"><?php echo $this->__('Qty:') ?></label>
34
- <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo $this->__('Qty') ?>" class="input-text qty" />
35
  <?php endif; ?>
36
  <button type="button" title="<?php echo $buttonTitle ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?php echo $buttonTitle ?></span></span></button>
37
  <?php echo $this->getChildHtml('', true, true) ?>
31
  <div class="add-to-cart">
32
  <?php if (!$_product->isGrouped()): ?>
33
  <label for="qty"><?php echo $this->__('Qty:') ?></label>
34
+ <input type="text" 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" />
35
  <?php endif; ?>
36
  <button type="button" title="<?php echo $buttonTitle ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?php echo $buttonTitle ?></span></span></button>
37
  <?php echo $this->getChildHtml('', true, true) ?>
app/design/frontend/base/default/template/checkout/cart/item/default.phtml CHANGED
@@ -69,7 +69,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
69
  </td>
70
  <td class="a-center">
71
  <?php if ($isVisibleProduct): ?>
72
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item parameters') ?>"><?php echo $this->__('Edit') ?></a>
73
  <?php endif ?>
74
  </td>
75
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
@@ -178,7 +178,9 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
178
  <?php endif; ?>
179
  <?php endif; ?>
180
  <td class="a-center">
181
- <input 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" />
 
 
182
  </td>
183
 
184
  <!--Sub total starts here -->
@@ -275,5 +277,5 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
275
  <?php endif; ?>
276
  </td>
277
  <?php endif; ?>
278
- <td class="a-center"><a href="<?php echo $this->getDeleteUrl()?>" title="<?php echo $this->__('Remove item')?>" class="btn-remove btn-remove2"><?php echo $this->__('Remove item')?></a></td>
279
  </tr>
69
  </td>
70
  <td class="a-center">
71
  <?php if ($isVisibleProduct): ?>
72
+ <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Edit item parameters')) ?>"><?php echo $this->__('Edit') ?></a>
73
  <?php endif ?>
74
  </td>
75
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
178
  <?php endif; ?>
179
  <?php endif; ?>
180
  <td class="a-center">
181
+ <input name="cart[<?php echo $_item->getId() ?>][qty]"
182
+ data-cart-item-id="<?php echo $this->jsQuoteEscape($_item->getSku()) ?>"
183
+ value="<?php echo $this->getQty() ?>" size="4" title="<?php echo $this->__('Qty') ?>" class="input-text qty" maxlength="12" />
184
  </td>
185
 
186
  <!--Sub total starts here -->
277
  <?php endif; ?>
278
  </td>
279
  <?php endif; ?>
280
+ <td class="a-center"><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></td>
281
  </tr>
app/design/frontend/base/default/template/checkout/cart/noItems.phtml CHANGED
@@ -31,6 +31,6 @@
31
  <?php echo $this->getMessagesBlock()->toHtml() ?>
32
  <?php echo $this->getChildHtml('checkout_cart_empty_widget'); ?>
33
  <p><?php echo $this->__('You have no items in your shopping cart.') ?></p>
34
- <p><?php echo $this->__('Click <a href="%s">here</a> to continue shopping.', $this->getContinueShoppingUrl()) ?></p>
35
  <?php echo $this->getChildHtml('shopping.cart.table.after'); ?>
36
  </div>
31
  <?php echo $this->getMessagesBlock()->toHtml() ?>
32
  <?php echo $this->getChildHtml('checkout_cart_empty_widget'); ?>
33
  <p><?php echo $this->__('You have no items in your shopping cart.') ?></p>
34
+ <p><?php echo $this->__('Click <a href="%s">here</a> to continue shopping.', Mage::helper('core')->quoteEscape($this->getContinueShoppingUrl())) ?></p>
35
  <?php echo $this->getChildHtml('shopping.cart.table.after'); ?>
36
  </div>
app/design/frontend/base/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,7 @@
55
  </td>
56
  <?php endif; ?>
57
  <td class="a-center">
58
- <input 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 name="cart[<?php echo $_item->getId() ?>][qty]" data-cart-item-id="<?php echo $this->jsQuoteEscape($_item->getSku()) ?>" 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">
app/design/frontend/base/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 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 name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getItemQty($_item) ?>"
59
+ data-cart-item-id="<?php echo $this->jsQuoteEscape($_item->getSku()) ?>"
60
+ 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/base/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><?php echo $this->__('Enter your destination to get a shipping estimate.') ?></p>
33
  <ul class="form-list">
34
  <li>
@@ -41,7 +41,7 @@
41
  <li>
42
  <label for="region_id"<?php if ($this->isStateProvinceRequired()) echo ' class="required"' ?>><?php if ($this->isStateProvinceRequired()) echo '<em>*</em>' ?><?php echo $this->__('State/Province') ?></label>
43
  <div class="input-box">
44
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" style="display:none;"<?php echo ($this->isStateProvinceRequired() ? ' class="validate-select"' : '') ?>>
45
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
46
  </select>
47
  <script type="text/javascript">
@@ -49,7 +49,7 @@
49
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getEstimateRegionId() ?>");
50
  //]]>
51
  </script>
52
- <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;" />
53
  </div>
54
  </li>
55
  <?php //endif; ?>
@@ -69,7 +69,7 @@
69
  </li>
70
  </ul>
71
  <div class="buttons-set">
72
- <button type="button" title="<?php echo $this->__('Get a Quote') ?>" onclick="coShippingMethodForm.submit()" class="button"><span><span><?php echo $this->__('Get a Quote') ?></span></span></button>
73
  </div>
74
  </form>
75
  <script type="text/javascript">
@@ -79,7 +79,7 @@
79
  </script>
80
 
81
  <?php if (($_shippingRateGroups = $this->getEstimateRates())): ?>
82
- <form id="co-shipping-method-form" action="<?php echo $this->getUrl('checkout/cart/estimateUpdatePost') ?>">
83
  <dl class="sp-methods">
84
  <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
85
  <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
@@ -107,7 +107,7 @@
107
  <?php endforeach; ?>
108
  </dl>
109
  <div class="buttons-set">
110
- <button type="submit" title="<?php echo $this->__('Update Total') ?>" class="button" name="do" value="<?php echo $this->__('Update Total') ?>"><span><span><?php echo $this->__('Update Total') ?></span></span></button>
111
  </div>
112
  </form>
113
  <?php endif; ?>
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><?php echo $this->__('Enter your destination to get a shipping estimate.') ?></p>
33
  <ul class="form-list">
34
  <li>
41
  <li>
42
  <label for="region_id"<?php if ($this->isStateProvinceRequired()) echo ' class="required"' ?>><?php if ($this->isStateProvinceRequired()) echo '<em>*</em>' ?><?php echo $this->__('State/Province') ?></label>
43
  <div class="input-box">
44
+ <select id="region_id" name="region_id" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" style="display:none;"<?php echo ($this->isStateProvinceRequired() ? ' class="validate-select"' : '') ?>>
45
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
46
  </select>
47
  <script type="text/javascript">
49
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getEstimateRegionId() ?>");
50
  //]]>
51
  </script>
52
+ <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getEstimateRegion()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="input-text" style="display:none;" />
53
  </div>
54
  </li>
55
  <?php //endif; ?>
69
  </li>
70
  </ul>
71
  <div class="buttons-set">
72
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Get a Quote')) ?>" onclick="coShippingMethodForm.submit()" class="button"><span><span><?php echo $this->__('Get a Quote') ?></span></span></button>
73
  </div>
74
  </form>
75
  <script type="text/javascript">
79
  </script>
80
 
81
  <?php if (($_shippingRateGroups = $this->getEstimateRates())): ?>
82
+ <form id="co-shipping-method-form" action="<?php echo $this->getUpdateFormActionUrl() ?>">
83
  <dl class="sp-methods">
84
  <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
85
  <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
107
  <?php endforeach; ?>
108
  </dl>
109
  <div class="buttons-set">
110
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Total')) ?>" class="button" name="do" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Total')) ?>"><span><span><?php echo $this->__('Update Total') ?></span></span></button>
111
  </div>
112
  </form>
113
  <?php endif; ?>
app/design/frontend/base/default/template/checkout/cart/sidebar.phtml CHANGED
@@ -60,7 +60,7 @@
60
  <?php if($_cartQty && $this->isPossibleOnepageCheckout()): ?>
61
  <div class="actions">
62
  <?php echo $this->getChildHtml('extra_actions') ?>
63
- <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>
64
  </div>
65
  <?php endif ?>
66
  <?php $_items = $this->getRecentItems() ?>
60
  <?php if($_cartQty && $this->isPossibleOnepageCheckout()): ?>
61
  <div class="actions">
62
  <?php echo $this->getChildHtml('extra_actions') ?>
63
+ <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>
64
  </div>
65
  <?php endif ?>
66
  <?php $_items = $this->getRecentItems() ?>
app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml CHANGED
@@ -36,9 +36,9 @@
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
  <?php if ($isVisibleProduct): ?>
41
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item') ?>" class="btn-edit"><?php echo $this->__('Edit item')?></a>
42
  <?php endif ?>
43
  <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>
44
  <strong><?php echo $this->getQty() ?></strong> x
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')->quoteEscape($this->__('Are you sure you would like to remove this item from the shopping cart?'), true) ?>');" class="btn-remove"><?php echo $this->__('Remove This Item') ?></a>
40
  <?php if ($isVisibleProduct): ?>
41
+ <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>
42
  <?php endif ?>
43
  <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>
44
  <strong><?php echo $this->getQty() ?></strong> x
app/design/frontend/base/default/template/checkout/multishipping/address/select.phtml CHANGED
@@ -27,7 +27,7 @@
27
  <div class="multiple-checkout">
28
  <div class="page-title title-buttons">
29
  <h1><?php echo $this->__('Change Billing Address') ?></h1>
30
- <button type="button" title="<?php echo $this->__('Add New Address') ?>" class="button" onclick="setLocation('<?php echo $this->getAddNewUrl() ?>')"><span><span><?php echo $this->__('Add New Address') ?></span></span></button>
31
  </div>
32
  <?php echo $this->getMessagesBlock()->toHtml() ?>
33
  <?php $_index=0 ?>
27
  <div class="multiple-checkout">
28
  <div class="page-title title-buttons">
29
  <h1><?php echo $this->__('Change Billing Address') ?></h1>
30
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add New Address')) ?>" class="button" onclick="setLocation('<?php echo $this->getAddNewUrl() ?>')"><span><span><?php echo $this->__('Add New Address') ?></span></span></button>
31
  </div>
32
  <?php echo $this->getMessagesBlock()->toHtml() ?>
33
  <?php $_index=0 ?>
app/design/frontend/base/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><?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"><button type="submit"
60
+ data-multiship-item-update
61
+ title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Qty &amp; Addresses')) ?>"
62
+ class="button" onclick="$('can_continue_flag').value=0">
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><?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/base/default/template/checkout/multishipping/billing.phtml CHANGED
@@ -57,8 +57,8 @@
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
  <!-- Payment methods forms list -->
64
  <dl class="sp-methods">
@@ -89,7 +89,7 @@
89
  </div>
90
  <div class="buttons-set">
91
  <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Shipping Information') ?></a></p>
92
- <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>
93
  </div>
94
  </form>
95
  <script type="text/javascript">
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
  <!-- Payment methods forms list -->
64
  <dl class="sp-methods">
89
  </div>
90
  <div class="buttons-set">
91
  <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Shipping Information') ?></a></p>
92
+ <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>
93
  </div>
94
  </form>
95
  <script type="text/javascript">
app/design/frontend/base/default/template/checkout/multishipping/link.phtml CHANGED
@@ -24,4 +24,4 @@
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
- <a href="<?php echo $this->getCheckoutUrl()?>" title="<?php echo Mage::helper('checkout')->__('Checkout with Multiple Addresses');?>"><?php echo Mage::helper('checkout')->__('Checkout with Multiple Addresses');?></a>
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
+ <a href="<?php echo $this->getCheckoutUrl()?>" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('checkout')->__('Checkout with Multiple Addresses')); ?>"><?php echo Mage::helper('checkout')->__('Checkout with Multiple Addresses');?></a>
app/design/frontend/base/default/template/checkout/multishipping/overview.phtml CHANGED
@@ -197,12 +197,12 @@
197
  <div class="inner">
198
  <big><?php echo $this->__('Grand Total:') ?> <?php echo $this->helper('checkout')->formatPrice($this->getTotal()) ?></big>
199
  <div id="review-buttons-container">
200
- <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>
201
  </div>
202
  </div>
203
  </div>
204
  <span class="please-wait" id="review-please-wait" style="display:none;">
205
- <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...') ?>
206
  </span>
207
  </div>
208
  </div>
@@ -223,7 +223,7 @@
223
  var checkboxes = $$('#checkout-agreements input');
224
  for (var i=0, l=checkboxes.length; i<l; i++) {
225
  if (!checkboxes[i].checked) {
226
- alert("<?php echo $this->__('Please agree to all Terms and Conditions before placing the orders.')?>");
227
  return false;
228
  }
229
  }
197
  <div class="inner">
198
  <big><?php echo $this->__('Grand Total:') ?> <?php echo $this->helper('checkout')->formatPrice($this->getTotal()) ?></big>
199
  <div id="review-buttons-container">
200
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout" id="review-button"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
201
  </div>
202
  </div>
203
  </div>
204
  <span class="please-wait" id="review-please-wait" style="display:none;">
205
+ <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...') ?>
206
  </span>
207
  </div>
208
  </div>
223
  var checkboxes = $$('#checkout-agreements input');
224
  for (var i=0, l=checkboxes.length; i<l; i++) {
225
  if (!checkboxes[i].checked) {
226
+ alert("<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Please agree to all Terms and Conditions before placing the orders.')) ?>");
227
  return false;
228
  }
229
  }
app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml CHANGED
@@ -124,7 +124,7 @@
124
  <?php echo $this->getChildHtml('checkout_billing_items') ?>
125
  <div class="buttons-set">
126
  <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Select Addresses') ?></a></p>
127
- <button data-action="checkout-continue-billing" type="submit" title="<?php echo $this->__('Continue to Billing Information') ?>" class="button"><span><span><?php echo $this->__('Continue to Billing Information') ?></span></span></button>
128
  </div>
129
  </form>
130
  </div>
124
  <?php echo $this->getChildHtml('checkout_billing_items') ?>
125
  <div class="buttons-set">
126
  <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Select Addresses') ?></a></p>
127
+ <button data-action="checkout-continue-billing" type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue to Billing Information')) ?>" class="button"><span><span><?php echo $this->__('Continue to Billing Information') ?></span></span></button>
128
  </div>
129
  </form>
130
  </div>
app/design/frontend/base/default/template/checkout/multishipping/success.phtml CHANGED
@@ -45,6 +45,6 @@
45
  <?php endif; ?>
46
  <?php echo $this->getChildHtml() ?>
47
  <div class="buttons-set">
48
- <button type="button" title="<?php echo $this->__('Continue Shopping') ?>" class="button" onclick="setLocation('<?php echo $this->getContinueUrl() ?>')"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
49
  </div>
50
  </div>
45
  <?php endif; ?>
46
  <?php echo $this->getChildHtml() ?>
47
  <div class="buttons-set">
48
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue Shopping')) ?>" class="button" onclick="setLocation('<?php echo $this->getContinueUrl() ?>')"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
49
  </div>
50
  </div>
app/design/frontend/base/default/template/checkout/onepage/billing.phtml CHANGED
@@ -44,14 +44,14 @@
44
  <div class="field">
45
  <label for="billing:company"><?php echo $this->__('Company') ?></label>
46
  <div class="input-box">
47
- <input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
48
  </div>
49
  </div>
50
  <?php if(!$this->isCustomerLoggedIn()): ?>
51
  <div class="field">
52
  <label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
53
  <div class="input-box">
54
- <input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
55
  </div>
56
  </div>
57
  <?php endif; ?>
@@ -60,14 +60,14 @@
60
  <li class="wide">
61
  <label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
62
  <div class="input-box">
63
- <input type="text" title="<?php echo $this->__('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
64
  </div>
65
  </li>
66
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
67
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
68
  <li class="wide">
69
  <div class="input-box">
70
- <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
71
  </div>
72
  </li>
73
  <?php endfor; ?>
@@ -75,7 +75,7 @@
75
  <li class="wide">
76
  <label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
77
  <div class="input-box">
78
- <input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->__('VAT Number') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
79
  </div>
80
  </li>
81
  <?php endif; ?>
@@ -83,13 +83,13 @@
83
  <div class="field">
84
  <label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
85
  <div class="input-box">
86
- <input type="text" title="<?php echo $this->__('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="billing:city" />
87
  </div>
88
  </div>
89
  <div class="field">
90
  <label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
91
  <div class="input-box">
92
- <select id="billing:region_id" name="billing[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
93
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
94
  </select>
95
  <script type="text/javascript">
@@ -97,7 +97,7 @@
97
  $('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
98
  //]]>
99
  </script>
100
- <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
101
  </div>
102
  </div>
103
  </li>
@@ -105,7 +105,7 @@
105
  <div class="field">
106
  <label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
107
  <div class="input-box">
108
- <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
109
  </div>
110
  </div>
111
  <div class="field">
@@ -119,13 +119,13 @@
119
  <div class="field">
120
  <label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
121
  <div class="input-box">
122
- <input type="text" name="billing[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
123
  </div>
124
  </div>
125
  <div class="field">
126
  <label for="billing:fax"><?php echo $this->__('Fax') ?></label>
127
  <div class="input-box">
128
- <input type="text" name="billing[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="billing:fax" />
129
  </div>
130
  </div>
131
  </li>
@@ -159,20 +159,20 @@
159
  <div class="field">
160
  <label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
161
  <div class="input-box">
162
- <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
163
  </div>
164
  </div>
165
  <div class="field">
166
  <label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
167
  <div class="input-box">
168
- <input type="password" name="billing[confirm_password]" title="<?php echo $this->__('Confirm Password') ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
169
  </div>
170
  </div>
171
  </li>
172
  <?php endif; ?>
173
  <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
174
  <li class="control">
175
- <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="billing:save_in_address_book" onchange="if(window.shipping) shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label>
176
  </li>
177
  <?php else:?>
178
  <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
@@ -185,9 +185,9 @@
185
  <?php echo $this->getChildHtml('checkout.onepage.billing.extra')?>
186
  <?php if ($this->canShip()): ?>
187
  <li class="control">
188
- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo $this->__('Ship to this address') ?>" onclick="$('shipping:same_as_billing').checked = true;" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo $this->__('Ship to this address') ?></label></li>
189
  <li class="control">
190
- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo $this->__('Ship to different address') ?>" onclick="$('shipping:same_as_billing').checked = false;" class="radio" /><label for="billing:use_for_shipping_no"><?php echo $this->__('Ship to different address') ?></label>
191
  </li>
192
  <?php endif; ?>
193
  </ul>
@@ -196,9 +196,9 @@
196
  <?php endif; ?>
197
  <div class="buttons-set" id="billing-buttons-container">
198
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
199
- <button type="button" title="<?php echo $this->__('Continue') ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
200
  <span class="please-wait" id="billing-please-wait" style="display:none;">
201
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
202
  </span>
203
  </div>
204
  </fieldset>
44
  <div class="field">
45
  <label for="billing:company"><?php echo $this->__('Company') ?></label>
46
  <div class="input-box">
47
+ <input type="text" id="billing:company" name="billing[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') ?>" />
48
  </div>
49
  </div>
50
  <?php if(!$this->isCustomerLoggedIn()): ?>
51
  <div class="field">
52
  <label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
53
  <div class="input-box">
54
+ <input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" class="input-text validate-email required-entry" />
55
  </div>
56
  </div>
57
  <?php endif; ?>
60
  <li class="wide">
61
  <label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
62
  <div class="input-box">
63
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address')) ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
64
  </div>
65
  </li>
66
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
67
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
68
  <li class="wide">
69
  <div class="input-box">
70
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address %s', $_i)) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
71
  </div>
72
  </li>
73
  <?php endfor; ?>
75
  <li class="wide">
76
  <label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
77
  <div class="input-box">
78
+ <input type="text" id="billing:vat_id" name="billing[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') ?>" />
79
  </div>
80
  </li>
81
  <?php endif; ?>
83
  <div class="field">
84
  <label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
85
  <div class="input-box">
86
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('City')) ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="billing:city" />
87
  </div>
88
  </div>
89
  <div class="field">
90
  <label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
91
  <div class="input-box">
92
+ <select id="billing:region_id" name="billing[region_id]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
93
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
94
  </select>
95
  <script type="text/javascript">
97
  $('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
98
  //]]>
99
  </script>
100
+ <input type="text" id="billing:region" name="billing[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;" />
101
  </div>
102
  </div>
103
  </li>
105
  <div class="field">
106
  <label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
107
  <div class="input-box">
108
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Zip/Postal Code')) ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
109
  </div>
110
  </div>
111
  <div class="field">
119
  <div class="field">
120
  <label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
121
  <div class="input-box">
122
+ <input type="text" name="billing[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="billing:telephone" />
123
  </div>
124
  </div>
125
  <div class="field">
126
  <label for="billing:fax"><?php echo $this->__('Fax') ?></label>
127
  <div class="input-box">
128
+ <input type="text" name="billing[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="billing:fax" />
129
  </div>
130
  </div>
131
  </li>
159
  <div class="field">
160
  <label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
161
  <div class="input-box">
162
+ <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>" class="input-text required-entry validate-password" />
163
  </div>
164
  </div>
165
  <div class="field">
166
  <label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
167
  <div class="input-box">
168
+ <input type="password" name="billing[confirm_password]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
169
  </div>
170
  </div>
171
  </li>
172
  <?php endif; ?>
173
  <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
174
  <li class="control">
175
+ <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save in address book')) ?>" id="billing:save_in_address_book" onchange="if(window.shipping) shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label>
176
  </li>
177
  <?php else:?>
178
  <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
185
  <?php echo $this->getChildHtml('checkout.onepage.billing.extra')?>
186
  <?php if ($this->canShip()): ?>
187
  <li class="control">
188
+ <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo Mage::helper('core')->quoteEscape($this->__('Ship to this address')) ?>" onclick="$('shipping:same_as_billing').checked = true;" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo $this->__('Ship to this address') ?></label></li>
189
  <li class="control">
190
+ <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo Mage::helper('core')->quoteEscape($this->__('Ship to different address')) ?>" onclick="$('shipping:same_as_billing').checked = false;" class="radio" /><label for="billing:use_for_shipping_no"><?php echo $this->__('Ship to different address') ?></label>
191
  </li>
192
  <?php endif; ?>
193
  </ul>
196
  <?php endif; ?>
197
  <div class="buttons-set" id="billing-buttons-container">
198
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
199
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue')) ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
200
  <span class="please-wait" id="billing-please-wait" style="display:none;">
201
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo 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...') ?>
202
  </span>
203
  </div>
204
  </fieldset>
app/design/frontend/base/default/template/checkout/onepage/failure.phtml CHANGED
@@ -29,4 +29,4 @@
29
  </div>
30
  <?php if ($this->getRealOrderId()) : ?><p><?php echo $this->__('Order #') . $this->getRealOrderId() ?></p><?php endif ?>
31
  <?php if ($error = $this->getErrorMessage()) : ?><p><?php echo $error ?></p><?php endif ?>
32
- <p><?php echo $this->__('Click <a href="%s">here</a> to continue shopping.', $this->getContinueShoppingUrl()) ?></p>
29
  </div>
30
  <?php if ($this->getRealOrderId()) : ?><p><?php echo $this->__('Order #') . $this->getRealOrderId() ?></p><?php endif ?>
31
  <?php if ($error = $this->getErrorMessage()) : ?><p><?php echo $error ?></p><?php endif ?>
32
+ <p><?php echo $this->__('Click <a href="%s">here</a> to continue shopping.', Mage::helper('core')->quoteEscape($this->getContinueShoppingUrl())) ?></p>
app/design/frontend/base/default/template/checkout/onepage/link.phtml CHANGED
@@ -25,5 +25,5 @@
25
  */
26
  ?>
27
  <?php if ($this->isPossibleOnepageCheckout()):?>
28
- <button type="button" title="<?php echo $this->__('Proceed to Checkout') ?>" class="button btn-proceed-checkout btn-checkout<?php if ($this->isDisabled()):?> no-checkout<?php endif; ?>"<?php if ($this->isDisabled()):?> disabled="disabled"<?php endif; ?> onclick="window.location='<?php echo $this->getCheckoutUrl() ?>';"><span><span><?php echo $this->__('Proceed to Checkout') ?></span></span></button>
29
  <?php endif?>
25
  */
26
  ?>
27
  <?php if ($this->isPossibleOnepageCheckout()):?>
28
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Proceed to Checkout')) ?>" class="button btn-proceed-checkout btn-checkout<?php if ($this->isDisabled()):?> no-checkout<?php endif; ?>"<?php if ($this->isDisabled()):?> disabled="disabled"<?php endif; ?> onclick="window.location='<?php echo $this->getCheckoutUrl() ?>';"><span><span><?php echo $this->__('Proceed to Checkout') ?></span></span></button>
29
  <?php endif?>
app/design/frontend/base/default/template/checkout/onepage/payment.phtml CHANGED
@@ -38,15 +38,15 @@
38
  </fieldset>
39
  </form>
40
  <div class="tool-tip" id="payment-tool-tip" style="display:none;">
41
- <div class="btn-close"><a href="#" id="payment-tool-tip-close" title="<?php echo $this->__('Close') ?>"><?php echo $this->__('Close') ?></a></div>
42
- <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>
43
  </div>
44
  <div class="buttons-set" id="payment-buttons-container">
45
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
46
  <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
47
  <button type="button" class="button" onclick="payment.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
48
  <span class="please-wait" id="payment-please-wait" style="display:none;">
49
- <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...') ?>
50
  </span>
51
  </div>
52
  <script type="text/javascript">
38
  </fieldset>
39
  </form>
40
  <div class="tool-tip" id="payment-tool-tip" style="display:none;">
41
+ <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>
42
+ <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>
43
  </div>
44
  <div class="buttons-set" id="payment-buttons-container">
45
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
46
  <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
47
  <button type="button" class="button" onclick="payment.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
48
  <span class="please-wait" id="payment-please-wait" style="display:none;">
49
+ <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...') ?>
50
  </span>
51
  </div>
52
  <script type="text/javascript">
app/design/frontend/base/default/template/checkout/onepage/payment/methods.phtml CHANGED
@@ -44,7 +44,7 @@
44
  foreach ($methods as $_method):
45
  $_code = $_method->getCode();
46
  ?>
47
- <dt>
48
  <?php if(!$oneMethod): ?>
49
  <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
50
  <?php else: ?>
@@ -54,7 +54,7 @@
54
  <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($this->getMethodTitle($_method)) ?> <?php echo $this->getMethodLabelAfterHtml($_method) ?></label>
55
  </dt>
56
  <?php if ($html = $this->getPaymentMethodFormHtml($_method)): ?>
57
- <dd>
58
  <?php echo $html; ?>
59
  </dd>
60
  <?php endif; ?>
44
  foreach ($methods as $_method):
45
  $_code = $_method->getCode();
46
  ?>
47
+ <dt id="dt_method_<?php echo $_code ?>">
48
  <?php if(!$oneMethod): ?>
49
  <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
50
  <?php else: ?>
54
  <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($this->getMethodTitle($_method)) ?> <?php echo $this->getMethodLabelAfterHtml($_method) ?></label>
55
  </dt>
56
  <?php if ($html = $this->getPaymentMethodFormHtml($_method)): ?>
57
+ <dd id="dd_method_<?php echo $_code ?>">
58
  <?php echo $html; ?>
59
  </dd>
60
  <?php endif; ?>
app/design/frontend/base/default/template/checkout/onepage/review/button.phtml CHANGED
@@ -24,4 +24,4 @@
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
- <button type="submit" title="<?php echo $this->__('Place Order') ?>" class="button btn-checkout" onclick="review.save();"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout" onclick="review.save();"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
app/design/frontend/base/default/template/checkout/onepage/review/info.phtml CHANGED
@@ -73,7 +73,7 @@
73
  <p class="f-left"><?php echo $this->__('Forgot an Item?') ?> <a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo $this->__('Edit Your Cart') ?></a></p>
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
  </div>
79
  <script type="text/javascript">
73
  <p class="f-left"><?php echo $this->__('Forgot an Item?') ?> <a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo $this->__('Edit Your Cart') ?></a></p>
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
  </div>
79
  <script type="text/javascript">
app/design/frontend/base/default/template/checkout/onepage/shipping.phtml CHANGED
@@ -43,7 +43,7 @@
43
  <div class="fields">
44
  <label for="shipping:company"><?php echo $this->__('Company') ?></label>
45
  <div class="input-box">
46
- <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);" />
47
  </div>
48
  </div>
49
  </li>
@@ -51,14 +51,14 @@
51
  <li class="wide">
52
  <label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
53
  <div class="input-box">
54
- <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);" />
55
  </div>
56
  </li>
57
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
58
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
59
  <li class="wide">
60
  <div class="input-box">
61
- <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);" />
62
  </div>
63
  </li>
64
  <?php endfor; ?>
@@ -66,7 +66,7 @@
66
  <li class="wide">
67
  <label for="billing:vat_id"><?php echo $this->__('VAT Number'); ?></label>
68
  <div class="input-box">
69
- <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') ?>" />
70
  </div>
71
  </li>
72
  <?php endif; ?>
@@ -74,13 +74,13 @@
74
  <div class="field">
75
  <label for="shipping:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
76
  <div class="input-box">
77
- <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);" />
78
  </div>
79
  </div>
80
  <div class="field">
81
  <label for="shipping:region" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
82
  <div class="input-box">
83
- <select id="shipping:region_id" name="shipping[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
84
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
85
  </select>
86
  <script type="text/javascript">
@@ -88,7 +88,7 @@
88
  $('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
89
  //]]>
90
  </script>
91
- <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;" />
92
  </div>
93
  </div>
94
  </li>
@@ -96,7 +96,7 @@
96
  <div class="field">
97
  <label for="shipping:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
98
  <div class="input-box">
99
- <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);" />
100
  </div>
101
  </div>
102
  <div class="field">
@@ -110,19 +110,19 @@
110
  <div class="field">
111
  <label for="shipping:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
112
  <div class="input-box">
113
- <input type="text" 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);" />
114
  </div>
115
  </div>
116
  <div class="field">
117
  <label for="shipping:fax"><?php echo $this->__('Fax') ?></label>
118
  <div class="input-box">
119
- <input type="text" 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);" />
120
  </div>
121
  </div>
122
  </li>
123
  <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
124
  <li class="control">
125
- <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>
126
  <?php else:?>
127
  <li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
128
  <?php endif;?>
@@ -136,9 +136,9 @@
136
  <div class="buttons-set" id="shipping-buttons-container">
137
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
138
  <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
139
- <button type="button" class="button" title="<?php echo $this->__('Continue') ?>" onclick="shipping.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
140
  <span id="shipping-please-wait" class="please-wait" style="display:none;">
141
- <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...') ?>
142
  </span>
143
  </div>
144
  </form>
@@ -148,7 +148,7 @@
148
  '<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
149
  var shippingForm = new VarienForm('co-shipping-form');
150
  shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
151
- //shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
152
  $('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
153
 
154
  var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'shipping:postcode');
43
  <div class="fields">
44
  <label for="shipping:company"><?php echo $this->__('Company') ?></label>
45
  <div class="input-box">
46
+ <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);" />
47
  </div>
48
  </div>
49
  </li>
51
  <li class="wide">
52
  <label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
53
  <div class="input-box">
54
+ <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);" />
55
  </div>
56
  </li>
57
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
58
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
59
  <li class="wide">
60
  <div class="input-box">
61
+ <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);" />
62
  </div>
63
  </li>
64
  <?php endfor; ?>
66
  <li class="wide">
67
  <label for="billing:vat_id"><?php echo $this->__('VAT Number'); ?></label>
68
  <div class="input-box">
69
+ <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') ?>" />
70
  </div>
71
  </li>
72
  <?php endif; ?>
74
  <div class="field">
75
  <label for="shipping:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
76
  <div class="input-box">
77
+ <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);" />
78
  </div>
79
  </div>
80
  <div class="field">
81
  <label for="shipping:region" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
82
  <div class="input-box">
83
+ <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;">
84
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
85
  </select>
86
  <script type="text/javascript">
88
  $('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
89
  //]]>
90
  </script>
91
+ <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;" />
92
  </div>
93
  </div>
94
  </li>
96
  <div class="field">
97
  <label for="shipping:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
98
  <div class="input-box">
99
+ <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);" />
100
  </div>
101
  </div>
102
  <div class="field">
110
  <div class="field">
111
  <label for="shipping:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
112
  <div class="input-box">
113
+ <input type="text" 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);" />
114
  </div>
115
  </div>
116
  <div class="field">
117
  <label for="shipping:fax"><?php echo $this->__('Fax') ?></label>
118
  <div class="input-box">
119
+ <input type="text" 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);" />
120
  </div>
121
  </div>
122
  </li>
123
  <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
124
  <li class="control">
125
+ <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>
126
  <?php else:?>
127
  <li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
128
  <?php endif;?>
136
  <div class="buttons-set" id="shipping-buttons-container">
137
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
138
  <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
139
+ <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>
140
  <span id="shipping-please-wait" class="please-wait" style="display:none;">
141
+ <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...') ?>
142
  </span>
143
  </div>
144
  </form>
148
  '<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
149
  var shippingForm = new VarienForm('co-shipping-form');
150
  shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
151
+ //shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Select State/Province...')) ?>');
152
  $('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
153
 
154
  var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'shipping:postcode');
app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml CHANGED
@@ -40,7 +40,7 @@
40
  <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
41
  <button type="button" class="button" onclick="shippingMethod.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
42
  <span id="shipping-method-please-wait" class="please-wait" style="display:none;">
43
- <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...') ?>
44
  </span>
45
  </div>
46
  </form>
40
  <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
41
  <button type="button" class="button" onclick="shippingMethod.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
42
  <span id="shipping-method-please-wait" class="please-wait" style="display:none;">
43
+ <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...') ?>
44
  </span>
45
  </div>
46
  </form>
app/design/frontend/base/default/template/checkout/success.phtml CHANGED
@@ -60,5 +60,5 @@
60
  <?php endif;?>
61
 
62
  <div class="buttons-set">
63
- <button type="button" class="button" title="<?php echo $this->__('Continue Shopping') ?>" onclick="window.location='<?php echo $this->getUrl() ?>'"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
64
  </div>
60
  <?php endif;?>
61
 
62
  <div class="buttons-set">
63
+ <button type="button" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue Shopping')) ?>" onclick="window.location='<?php echo $this->getUrl() ?>'"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
64
  </div>
app/design/frontend/base/default/template/contacts/form.phtml CHANGED
@@ -36,26 +36,26 @@
36
  <div class="field">
37
  <label for="name" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Name') ?></label>
38
  <div class="input-box">
39
- <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" />
40
  </div>
41
  </div>
42
  <div class="field">
43
  <label for="email" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Email') ?></label>
44
  <div class="input-box">
45
- <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="text" />
46
  </div>
47
  </div>
48
  </li>
49
  <li>
50
  <label for="telephone"><?php echo Mage::helper('contacts')->__('Telephone') ?></label>
51
  <div class="input-box">
52
- <input name="telephone" id="telephone" title="<?php echo Mage::helper('contacts')->__('Telephone') ?>" value="" class="input-text" type="text" />
53
  </div>
54
  </li>
55
  <li class="wide">
56
  <label for="comment" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Comment') ?></label>
57
  <div class="input-box">
58
- <textarea name="comment" id="comment" title="<?php echo Mage::helper('contacts')->__('Comment') ?>" class="required-entry input-text" cols="5" rows="3"></textarea>
59
  </div>
60
  </li>
61
  </ul>
@@ -63,7 +63,7 @@
63
  <div class="buttons-set">
64
  <p class="required"><?php echo Mage::helper('contacts')->__('* Required Fields') ?></p>
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">
36
  <div class="field">
37
  <label for="name" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Name') ?></label>
38
  <div class="input-box">
39
+ <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" />
40
  </div>
41
  </div>
42
  <div class="field">
43
  <label for="email" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Email') ?></label>
44
  <div class="input-box">
45
+ <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="text" />
46
  </div>
47
  </div>
48
  </li>
49
  <li>
50
  <label for="telephone"><?php echo Mage::helper('contacts')->__('Telephone') ?></label>
51
  <div class="input-box">
52
+ <input name="telephone" id="telephone" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Telephone')) ?>" value="" class="input-text" type="text" />
53
  </div>
54
  </li>
55
  <li class="wide">
56
  <label for="comment" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Comment') ?></label>
57
  <div class="input-box">
58
+ <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>
59
  </div>
60
  </li>
61
  </ul>
63
  <div class="buttons-set">
64
  <p class="required"><?php echo Mage::helper('contacts')->__('* Required Fields') ?></p>
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/base/default/template/customer/address.phtml CHANGED
@@ -86,7 +86,7 @@
86
  </div>
87
  <script type="text/javascript">
88
  function deleteAddress(addressId) {
89
- if(confirm('<?php echo $this->__('Are you sure you want to delete this address?') ?>')) {
90
  window.location='<?php echo $this->getUrl("customer/address/delete") ?>address/'+addressId;
91
  }
92
  return false;
86
  </div>
87
  <script type="text/javascript">
88
  function deleteAddress(addressId) {
89
+ if(confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure you want to delete this address?')) ?>')) {
90
  window.location='<?php echo $this->getUrl("customer/address/delete") ?>address/'+addressId;
91
  }
92
  return false;
app/design/frontend/base/default/template/customer/address/book.phtml CHANGED
@@ -32,7 +32,7 @@
32
  ?>
33
  <div class="page-title title-buttons">
34
  <h1><?php echo $this->__('Address Book') ?></h1>
35
- <button type="button" title="<?php echo $this->__('Add New Address') ?>" class="button" onclick="window.location='<?php echo $this->getAddAddressUrl() ?>';"><span><span><?php echo $this->__('Add New Address') ?></span></span></button>
36
  </div>
37
  <?php echo $this->getMessagesBlock()->toHtml() ?>
38
  <div class="col2-set addresses-list">
@@ -96,7 +96,7 @@
96
  <script type="text/javascript">
97
  //<![CDATA[
98
  function deleteAddress(addressId) {
99
- if(confirm('<?php echo $this->__('Are you sure you want to delete this address?') ?>')) {
100
  window.location='<?php echo $this->getDeleteUrl() ?>id/'+addressId;
101
  }
102
  return false;
32
  ?>
33
  <div class="page-title title-buttons">
34
  <h1><?php echo $this->__('Address Book') ?></h1>
35
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add New Address')) ?>" class="button" onclick="window.location='<?php echo $this->getAddAddressUrl() ?>';"><span><span><?php echo $this->__('Add New Address') ?></span></span></button>
36
  </div>
37
  <?php echo $this->getMessagesBlock()->toHtml() ?>
38
  <div class="col2-set addresses-list">
96
  <script type="text/javascript">
97
  //<![CDATA[
98
  function deleteAddress(addressId) {
99
+ if(confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure you want to delete this address?')) ?>')) {
100
  window.location='<?php echo $this->getDeleteUrl() ?>id/'+addressId;
101
  }
102
  return false;
app/design/frontend/base/default/template/customer/address/edit.phtml CHANGED
@@ -50,20 +50,20 @@
50
  <li class="wide">
51
  <label for="company"><?php echo $this->__('Company') ?></label>
52
  <div class="input-box">
53
- <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') ?>" />
54
  </div>
55
  </li>
56
  <li class="fields">
57
  <div class="field">
58
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
59
  <div class="input-box">
60
- <input type="text" 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" />
61
  </div>
62
  </div>
63
  <div class="field">
64
  <label for="fax"><?php echo $this->__('Fax') ?></label>
65
  <div class="input-box">
66
- <input type="text" 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') ?>" />
67
  </div>
68
  </div>
69
  </li>
@@ -76,14 +76,14 @@
76
  <li class="wide">
77
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
78
  <div class="input-box">
79
- <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 ?>" />
80
  </div>
81
  </li>
82
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
83
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
84
  <li class="wide">
85
  <div class="input-box">
86
- <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 ?>" />
87
  </div>
88
  </li>
89
  <?php endfor; ?>
@@ -91,7 +91,7 @@
91
  <li class="wide">
92
  <label for="vat_id"><?php echo $this->__('VAT Number') ?></label>
93
  <div class="input-box">
94
- <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') ?>" />
95
  </div>
96
  </li>
97
  <?php endif; ?>
@@ -99,13 +99,13 @@
99
  <div class="field">
100
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
101
  <div class="input-box">
102
- <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" />
103
  </div>
104
  </div>
105
  <div class="field">
106
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
107
  <div class="input-box">
108
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
109
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
110
  </select>
111
  <script type="text/javascript">
@@ -113,7 +113,7 @@
113
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
114
  //]]>
115
  </script>
116
- <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') ?>" />
117
  </div>
118
  </div>
119
  </li>
@@ -121,7 +121,7 @@
121
  <div class="field">
122
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
123
  <div class="input-box">
124
- <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') ?>" />
125
  </div>
126
  </div>
127
  <div class="field">
@@ -135,7 +135,7 @@
135
  <?php if($this->isDefaultBilling()): ?>
136
  <strong><?php echo $this->__('Default Billing Address') ?></strong>
137
  <?php elseif($this->canSetAsDefaultBilling()): ?>
138
- <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>
139
  <?php else: ?>
140
  <input type="hidden" name="default_billing" value="1" />
141
  <?php endif; ?>
@@ -144,7 +144,7 @@
144
  <?php if($this->isDefaultShipping()): ?>
145
  <strong><?php echo $this->__('Default Shipping Address') ?></strong>
146
  <?php elseif($this->canSetAsDefaultShipping()): ?>
147
- <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>
148
  <?php else: ?>
149
  <input type="hidden" name="default_shipping" value="1" />
150
  <?php endif; ?>
@@ -154,7 +154,7 @@
154
  <div class="buttons-set">
155
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
156
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
157
- <button data-action="save-customer-address" type="submit" title="<?php echo $this->__('Save Address') ?>" class="button"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
158
  </div>
159
  </form>
160
  <script type="text/javascript">
50
  <li class="wide">
51
  <label for="company"><?php echo $this->__('Company') ?></label>
52
  <div class="input-box">
53
+ <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') ?>" />
54
  </div>
55
  </li>
56
  <li class="fields">
57
  <div class="field">
58
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
59
  <div class="input-box">
60
+ <input type="text" 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" />
61
  </div>
62
  </div>
63
  <div class="field">
64
  <label for="fax"><?php echo $this->__('Fax') ?></label>
65
  <div class="input-box">
66
+ <input type="text" 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') ?>" />
67
  </div>
68
  </div>
69
  </li>
76
  <li class="wide">
77
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
78
  <div class="input-box">
79
+ <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 ?>" />
80
  </div>
81
  </li>
82
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
83
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
84
  <li class="wide">
85
  <div class="input-box">
86
+ <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 ?>" />
87
  </div>
88
  </li>
89
  <?php endfor; ?>
91
  <li class="wide">
92
  <label for="vat_id"><?php echo $this->__('VAT Number') ?></label>
93
  <div class="input-box">
94
+ <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') ?>" />
95
  </div>
96
  </li>
97
  <?php endif; ?>
99
  <div class="field">
100
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
101
  <div class="input-box">
102
+ <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" />
103
  </div>
104
  </div>
105
  <div class="field">
106
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
107
  <div class="input-box">
108
+ <select id="region_id" name="region_id" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
109
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
110
  </select>
111
  <script type="text/javascript">
113
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
114
  //]]>
115
  </script>
116
+ <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') ?>" />
117
  </div>
118
  </div>
119
  </li>
121
  <div class="field">
122
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
123
  <div class="input-box">
124
+ <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') ?>" />
125
  </div>
126
  </div>
127
  <div class="field">
135
  <?php if($this->isDefaultBilling()): ?>
136
  <strong><?php echo $this->__('Default Billing Address') ?></strong>
137
  <?php elseif($this->canSetAsDefaultBilling()): ?>
138
+ <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>
139
  <?php else: ?>
140
  <input type="hidden" name="default_billing" value="1" />
141
  <?php endif; ?>
144
  <?php if($this->isDefaultShipping()): ?>
145
  <strong><?php echo $this->__('Default Shipping Address') ?></strong>
146
  <?php elseif($this->canSetAsDefaultShipping()): ?>
147
+ <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>
148
  <?php else: ?>
149
  <input type="hidden" name="default_shipping" value="1" />
150
  <?php endif; ?>
154
  <div class="buttons-set">
155
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
156
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
157
+ <button data-action="save-customer-address" type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>" class="button"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
158
  </div>
159
  </form>
160
  <script type="text/javascript">
app/design/frontend/base/default/template/customer/form/address.phtml CHANGED
@@ -42,7 +42,7 @@
42
  <li>
43
  <label for="company"><?php echo $this->__('Company') ?></label>
44
  <div class="input-box">
45
- <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') ?>" />
46
  </div>
47
  </li>
48
  </ul>
@@ -54,14 +54,14 @@
54
  <li class="wide">
55
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
56
  <div class="input-box">
57
- <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 ?>" />
58
  </div>
59
  </li>
60
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
61
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
62
  <li class="wide">
63
  <div class="input-box">
64
- <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 ?>" />
65
  </div>
66
  </li>
67
  <?php endfor; ?>
@@ -69,13 +69,13 @@
69
  <div class="field">
70
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
71
  <div class="input-box">
72
- <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" />
73
  </div>
74
  </div>
75
  <div class="field">
76
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
77
  <div class="input-box">
78
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
79
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
80
  </select>
81
  <script type="text/javascript">
@@ -83,7 +83,7 @@
83
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
84
  //]]>
85
  </script>
86
- <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;" />
87
  </div>
88
  </div>
89
  </li>
@@ -91,13 +91,13 @@
91
  <div class="field">
92
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
93
  <div class="input-box">
94
- <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') ?>" />
95
  </div>
96
  </div>
97
  <div class="field">
98
  <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
99
  <div class="input-box">
100
- <select name="country_id" id="country" title="<?php echo $this->__('Country') ?>" class="validate-select">
101
  <?php echo $countries->toHtmlOptions($data->getCountryId()) ?>
102
  </select>
103
  </div>
@@ -107,13 +107,13 @@
107
  <div class="field">
108
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
109
  <div class="input-box">
110
- <input type="text" 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" />
111
  </div>
112
  </div>
113
  <div class="field">
114
  <label for="fax"><?php echo $this->__('Fax') ?></label>
115
  <div class="input-box">
116
- <input type="text" 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" />
117
  </div>
118
  </div>
119
  </li>
@@ -131,7 +131,7 @@
131
  <div class="buttons-set">
132
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
133
  <p class="back-link"><a href="<?php echo $this->getUrl('customer/address/') ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
134
- <button data-action="save-customer-address" type="submit" class="button" title="<?php echo $this->__('Save Address') ?>"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
135
  </div>
136
  </form>
137
  <script type="text/javascript">
42
  <li>
43
  <label for="company"><?php echo $this->__('Company') ?></label>
44
  <div class="input-box">
45
+ <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') ?>" />
46
  </div>
47
  </li>
48
  </ul>
54
  <li class="wide">
55
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
56
  <div class="input-box">
57
+ <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 ?>" />
58
  </div>
59
  </li>
60
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
61
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
62
  <li class="wide">
63
  <div class="input-box">
64
+ <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 ?>" />
65
  </div>
66
  </li>
67
  <?php endfor; ?>
69
  <div class="field">
70
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
71
  <div class="input-box">
72
+ <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" />
73
  </div>
74
  </div>
75
  <div class="field">
76
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
77
  <div class="input-box">
78
+ <select id="region_id" name="region_id" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
79
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
80
  </select>
81
  <script type="text/javascript">
83
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
84
  //]]>
85
  </script>
86
+ <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;" />
87
  </div>
88
  </div>
89
  </li>
91
  <div class="field">
92
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
93
  <div class="input-box">
94
+ <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') ?>" />
95
  </div>
96
  </div>
97
  <div class="field">
98
  <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
99
  <div class="input-box">
100
+ <select name="country_id" id="country" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Country')) ?>" class="validate-select">
101
  <?php echo $countries->toHtmlOptions($data->getCountryId()) ?>
102
  </select>
103
  </div>
107
  <div class="field">
108
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
109
  <div class="input-box">
110
+ <input type="text" 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" />
111
  </div>
112
  </div>
113
  <div class="field">
114
  <label for="fax"><?php echo $this->__('Fax') ?></label>
115
  <div class="input-box">
116
+ <input type="text" 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" />
117
  </div>
118
  </div>
119
  </li>
131
  <div class="buttons-set">
132
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
133
  <p class="back-link"><a href="<?php echo $this->getUrl('customer/address/') ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
134
+ <button data-action="save-customer-address" type="submit" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save Address')) ?>"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
135
  </div>
136
  </form>
137
  <script type="text/javascript">
app/design/frontend/base/default/template/customer/form/changepassword.phtml CHANGED
@@ -35,20 +35,20 @@
35
  <li>
36
  <label for="current_password" class="required"><em>*</em><?php echo $this->__('Current Password') ?></label>
37
  <div class="input-box">
38
- <input type="password" title="<?php echo $this->__('Current Password') ?>" class="input-text required-entry" name="current_password" id="current_password" />
39
  </div>
40
  </li>
41
  <li class="fields">
42
  <div class="field">
43
  <label for="password" class="required"><em>*</em><?php echo $this->__('New Password') ?></label>
44
  <div class="input-box">
45
- <input type="password" title="<?php echo $this->__('New Password') ?>" class="input-text required-entry validate-password" name="password" id="password" />
46
  </div>
47
  </div>
48
  <div class="field">
49
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
50
  <div class="input-box">
51
- <input type="password" title="<?php echo $this->__('Confirm New Password') ?>" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" />
52
  </div>
53
  </div>
54
  </li>
@@ -57,7 +57,7 @@
57
  <div class="buttons-set">
58
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
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">
35
  <li>
36
  <label for="current_password" class="required"><em>*</em><?php echo $this->__('Current Password') ?></label>
37
  <div class="input-box">
38
+ <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text required-entry" name="current_password" id="current_password" />
39
  </div>
40
  </li>
41
  <li class="fields">
42
  <div class="field">
43
  <label for="password" class="required"><em>*</em><?php echo $this->__('New Password') ?></label>
44
  <div class="input-box">
45
+ <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('New Password')) ?>" class="input-text required-entry validate-password" name="password" id="password" />
46
  </div>
47
  </div>
48
  <div class="field">
49
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
50
  <div class="input-box">
51
+ <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" />
52
  </div>
53
  </div>
54
  </li>
57
  <div class="buttons-set">
58
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
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/base/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="text" 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="text" 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">