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">
45
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
46
  <p class="back-link"><a href="<?php echo $this->helper('customer')->getLoginUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Login') ?></a></p>
47
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
48
  </div>
49
  </form>
50
  <script type="text/javascript">
app/design/frontend/base/default/template/customer/form/edit.phtml CHANGED
@@ -39,7 +39,7 @@
39
  <li>
40
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
41
  <div class="input-box">
42
- <input type="text" name="email" id="email" value="<?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text required-entry validate-email" />
43
  </div>
44
  </li>
45
  <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
@@ -55,7 +55,7 @@
55
  <li><?php echo $_gender->setGender($this->getCustomer()->getGender())->toHtml() ?></li>
56
  <?php endif ?>
57
  <li class="control">
58
- <input type="checkbox" name="change_password" id="change_password" value="1" onclick="setPasswordForm(this.checked)" title="<?php echo $this->__('Change Password') ?>"<?php if($this->getCustomer()->getChangePassword()==1): ?> checked="checked"<?php endif; ?> class="checkbox" /><label for="change_password"><?php echo $this->__('Change Password') ?></label>
59
  </li>
60
  </ul>
61
  </div>
@@ -67,20 +67,20 @@
67
  <div class="input-box">
68
  <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
69
  <input type="text" class="input-text no-display" name="dummy" id="dummy" />
70
- <input type="password" title="<?php echo $this->__('Current Password') ?>" class="input-text" name="current_password" id="current_password" />
71
  </div>
72
  </li>
73
  <li class="fields">
74
  <div class="field">
75
  <label for="password" class="required"><em>*</em><?php echo $this->__('New Password') ?></label>
76
  <div class="input-box">
77
- <input type="password" title="<?php echo $this->__('New Password') ?>" class="input-text validate-password" name="password" id="password" />
78
  </div>
79
  </div>
80
  <div class="field">
81
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
82
  <div class="input-box">
83
- <input type="password" title="<?php echo $this->__('Confirm New Password') ?>" class="input-text validate-cpassword" name="confirmation" id="confirmation" />
84
  </div>
85
  </div>
86
  </li>
@@ -89,7 +89,7 @@
89
  <div class="buttons-set">
90
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
91
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
92
- <button type="submit" title="<?php echo $this->__('Save') ?>" class="button"><span><span><?php echo $this->__('Save') ?></span></span></button>
93
  </div>
94
  </form>
95
  <script type="text/javascript">
39
  <li>
40
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
41
  <div class="input-box">
42
+ <input type="text" name="email" id="email" value="<?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" class="input-text required-entry validate-email" />
43
  </div>
44
  </li>
45
  <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
55
  <li><?php echo $_gender->setGender($this->getCustomer()->getGender())->toHtml() ?></li>
56
  <?php endif ?>
57
  <li class="control">
58
+ <input type="checkbox" name="change_password" id="change_password" value="1" onclick="setPasswordForm(this.checked)" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Change Password')) ?>"<?php if($this->getCustomer()->getChangePassword()==1): ?> checked="checked"<?php endif; ?> class="checkbox" /><label for="change_password"><?php echo $this->__('Change Password') ?></label>
59
  </li>
60
  </ul>
61
  </div>
67
  <div class="input-box">
68
  <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
69
  <input type="text" class="input-text no-display" name="dummy" id="dummy" />
70
+ <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text" name="current_password" id="current_password" />
71
  </div>
72
  </li>
73
  <li class="fields">
74
  <div class="field">
75
  <label for="password" class="required"><em>*</em><?php echo $this->__('New Password') ?></label>
76
  <div class="input-box">
77
+ <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('New Password')) ?>" class="input-text validate-password" name="password" id="password" />
78
  </div>
79
  </div>
80
  <div class="field">
81
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
82
  <div class="input-box">
83
+ <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm New Password')) ?>" class="input-text validate-cpassword" name="confirmation" id="confirmation" />
84
  </div>
85
  </div>
86
  </li>
89
  <div class="buttons-set">
90
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
91
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
92
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save')) ?>" class="button"><span><span><?php echo $this->__('Save') ?></span></span></button>
93
  </div>
94
  </form>
95
  <script type="text/javascript">
app/design/frontend/base/default/template/customer/form/forgotpassword.phtml CHANGED
@@ -45,7 +45,7 @@
45
  <div class="buttons-set">
46
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
47
  <p class="back-link"><a href="<?php echo $this->helper('customer')->getLoginUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Login') ?></a></p>
48
- <button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
49
  </div>
50
  </form>
51
  <script type="text/javascript">
45
  <div class="buttons-set">
46
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
47
  <p class="back-link"><a href="<?php echo $this->helper('customer')->getLoginUrl() ?>"><small>&laquo; </small><?php echo $this->__('Back to Login') ?></a></p>
48
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
49
  </div>
50
  </form>
51
  <script type="text/javascript">
app/design/frontend/base/default/template/customer/form/login.phtml CHANGED
@@ -55,13 +55,13 @@
55
  <li>
56
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
57
  <div class="input-box">
58
- <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
59
  </div>
60
  </li>
61
  <li>
62
  <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
63
  <div class="input-box">
64
- <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
65
  </div>
66
  </li>
67
  <?php echo $this->getChildHtml('form.additional.info'); ?>
@@ -73,13 +73,13 @@
73
  <div class="col2-set">
74
  <div class="col-1 new-users">
75
  <div class="buttons-set">
76
- <button type="button" title="<?php echo $this->__('Create an Account') ?>" class="button" onclick="window.location='<?php echo $this->getCreateAccountUrl() ?>';"><span><span><?php echo $this->__('Create an Account') ?></span></span></button>
77
  </div>
78
  </div>
79
  <div class="col-2 registered-users">
80
  <div class="buttons-set">
81
  <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo $this->__('Forgot Your Password?') ?></a>
82
- <button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
83
  </div>
84
  </div>
85
  </div>
55
  <li>
56
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
57
  <div class="input-box">
58
+ <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" />
59
  </div>
60
  </li>
61
  <li>
62
  <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
63
  <div class="input-box">
64
+ <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>" />
65
  </div>
66
  </li>
67
  <?php echo $this->getChildHtml('form.additional.info'); ?>
73
  <div class="col2-set">
74
  <div class="col-1 new-users">
75
  <div class="buttons-set">
76
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Create an Account')) ?>" class="button" onclick="window.location='<?php echo $this->getCreateAccountUrl() ?>';"><span><span><?php echo $this->__('Create an Account') ?></span></span></button>
77
  </div>
78
  </div>
79
  <div class="col-2 registered-users">
80
  <div class="buttons-set">
81
  <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo $this->__('Forgot Your Password?') ?></a>
82
+ <button type="submit" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Login')) ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
83
  </div>
84
  </div>
85
  </div>
app/design/frontend/base/default/template/customer/form/newsletter.phtml CHANGED
@@ -34,14 +34,14 @@
34
  <?php echo $this->getBlockHtml('formkey')?>
35
  <h2 class="legend"><?php echo $this->__('Newsletter Subscription') ?></h2>
36
  <ul class="form-list">
37
- <li class="control"><input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?php echo $this->__('General Subscription') ?>"<?php if($this->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" /><label for="subscription"><?php echo $this->__('General Subscription') ?></label></li>
38
  <?php /* Extensions placeholder */ ?>
39
  <?php echo $this->getChildHtml('customer.form.newsletter.extra')?>
40
  </ul>
41
  </div>
42
  <div class="buttons-set">
43
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
44
- <button type="submit" title="<?php echo $this->__('Save') ?>" class="button"><span><span><?php echo $this->__('Save') ?></span></span></button>
45
  </div>
46
  </form>
47
  <?php /* Extensions placeholder */ ?>
34
  <?php echo $this->getBlockHtml('formkey')?>
35
  <h2 class="legend"><?php echo $this->__('Newsletter Subscription') ?></h2>
36
  <ul class="form-list">
37
+ <li class="control"><input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?php echo Mage::helper('core')->quoteEscape($this->__('General Subscription')) ?>"<?php if($this->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" /><label for="subscription"><?php echo $this->__('General Subscription') ?></label></li>
38
  <?php /* Extensions placeholder */ ?>
39
  <?php echo $this->getChildHtml('customer.form.newsletter.extra')?>
40
  </ul>
41
  </div>
42
  <div class="buttons-set">
43
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
44
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Save')) ?>" class="button"><span><span><?php echo $this->__('Save') ?></span></span></button>
45
  </div>
46
  </form>
47
  <?php /* Extensions placeholder */ ?>
app/design/frontend/base/default/template/customer/form/register.phtml CHANGED
@@ -51,13 +51,13 @@
51
  <li>
52
  <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
53
  <div class="input-box">
54
- <input type="text" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
55
  </div>
56
  </li>
57
  <?php if ($this->isNewsletterEnabled()): ?>
58
  <li class="control">
59
  <div class="input-box">
60
- <input type="checkbox" name="is_subscribed" title="<?php echo $this->__('Sign Up for Newsletter') ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
61
  </div>
62
  <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
63
  <?php /* Extensions placeholder */ ?>
@@ -87,13 +87,13 @@
87
  <div class="field">
88
  <label for="company"><?php echo $this->__('Company') ?></label>
89
  <div class="input-box">
90
- <input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
91
  </div>
92
  </div>
93
  <div class="field">
94
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
95
  <div class="input-box">
96
- <input type="text" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" />
97
  </div>
98
  </div>
99
  </li>
@@ -101,14 +101,14 @@
101
  <li class="wide">
102
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
103
  <div class="input-box">
104
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
105
  </div>
106
  </li>
107
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
108
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
109
  <li class="wide">
110
  <div class="input-box">
111
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
112
  </div>
113
  </li>
114
  <?php endfor; ?>
@@ -116,13 +116,13 @@
116
  <div class="field">
117
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
118
  <div class="input-box">
119
- <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
120
  </div>
121
  </div>
122
  <div class="field">
123
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
124
  <div class="input-box">
125
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
126
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
127
  </select>
128
  <script type="text/javascript">
@@ -130,7 +130,7 @@
130
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
131
  //]]>
132
  </script>
133
- <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
134
  </div>
135
  </div>
136
  </li>
@@ -138,7 +138,7 @@
138
  <div class="field">
139
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
140
  <div class="input-box">
141
- <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
142
  </div>
143
  </div>
144
  <div class="field">
@@ -160,13 +160,13 @@
160
  <div class="field">
161
  <label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
162
  <div class="input-box">
163
- <input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
164
  </div>
165
  </div>
166
  <div class="field">
167
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
168
  <div class="input-box">
169
- <input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
170
  </div>
171
  </div>
172
  </li>
@@ -176,7 +176,7 @@
176
  <div class="buttons-set">
177
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
178
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
179
- <button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
180
  </div>
181
  </form>
182
  <script type="text/javascript">
51
  <li>
52
  <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
53
  <div class="input-box">
54
+ <input type="text" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" class="input-text validate-email required-entry" />
55
  </div>
56
  </li>
57
  <?php if ($this->isNewsletterEnabled()): ?>
58
  <li class="control">
59
  <div class="input-box">
60
+ <input type="checkbox" name="is_subscribed" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
61
  </div>
62
  <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
63
  <?php /* Extensions placeholder */ ?>
87
  <div class="field">
88
  <label for="company"><?php echo $this->__('Company') ?></label>
89
  <div class="input-box">
90
+ <input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Company')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
91
  </div>
92
  </div>
93
  <div class="field">
94
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
95
  <div class="input-box">
96
+ <input type="text" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Telephone')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" />
97
  </div>
98
  </div>
99
  </li>
101
  <li class="wide">
102
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
103
  <div class="input-box">
104
+ <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address')) ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
105
  </div>
106
  </li>
107
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
108
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
109
  <li class="wide">
110
  <div class="input-box">
111
+ <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->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 ?>" />
112
  </div>
113
  </li>
114
  <?php endfor; ?>
116
  <div class="field">
117
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
118
  <div class="input-box">
119
+ <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('City')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
120
  </div>
121
  </div>
122
  <div class="field">
123
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
124
  <div class="input-box">
125
+ <select id="region_id" name="region_id" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
126
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
127
  </select>
128
  <script type="text/javascript">
130
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
131
  //]]>
132
  </script>
133
+ <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->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;" />
134
  </div>
135
  </div>
136
  </li>
138
  <div class="field">
139
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
140
  <div class="input-box">
141
+ <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->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') ?>" />
142
  </div>
143
  </div>
144
  <div class="field">
160
  <div class="field">
161
  <label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
162
  <div class="input-box">
163
+ <input type="password" name="password" id="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>" class="input-text required-entry validate-password" />
164
  </div>
165
  </div>
166
  <div class="field">
167
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
168
  <div class="input-box">
169
+ <input type="password" name="confirmation" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
170
  </div>
171
  </div>
172
  </li>
176
  <div class="buttons-set">
177
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
178
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
179
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
180
  </div>
181
  </form>
182
  <script type="text/javascript">
app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml CHANGED
@@ -49,7 +49,7 @@
49
  </div>
50
  <div class="buttons-set">
51
  <p class="required"><?php echo $this->__('* Required Fields'); ?></p>
52
- <button type="submit" title="<?php echo $this->__('Reset a Password'); ?>" class="button"><span><span><?php echo $this->__('Reset a Password'); ?></span></span></button>
53
  </div>
54
  </form>
55
  <script type="text/javascript">
49
  </div>
50
  <div class="buttons-set">
51
  <p class="required"><?php echo $this->__('* Required Fields'); ?></p>
52
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Reset a Password')); ?>" class="button"><span><span><?php echo $this->__('Reset a Password'); ?></span></span></button>
53
  </div>
54
  </form>
55
  <script type="text/javascript">
app/design/frontend/base/default/template/customer/widget/gender.phtml CHANGED
@@ -26,7 +26,7 @@
26
  ?>
27
  <label for="<?php echo $this->getFieldId('gender')?>"<?php if ($this->isRequired()) echo ' class="required"' ?>><?php if ($this->isRequired()) echo '<em>*</em>' ?><?php echo $this->__('Gender') ?></label>
28
  <div class="input-box">
29
- <select id="<?php echo $this->getFieldId('gender')?>" name="<?php echo $this->getFieldName('gender')?>" title="<?php echo $this->__('Gender') ?>"<?php if ($this->isRequired()):?> class="validate-select"<?php endif; ?> <?php echo $this->getFieldParams() ?>>
30
  <?php $options = Mage::getResourceSingleton('customer/customer')->getAttribute('gender')->getSource()->getAllOptions();?>
31
  <?php $value = $this->getGender();?>
32
  <?php foreach ($options as $option):?>
26
  ?>
27
  <label for="<?php echo $this->getFieldId('gender')?>"<?php if ($this->isRequired()) echo ' class="required"' ?>><?php if ($this->isRequired()) echo '<em>*</em>' ?><?php echo $this->__('Gender') ?></label>
28
  <div class="input-box">
29
+ <select id="<?php echo $this->getFieldId('gender')?>" name="<?php echo $this->getFieldName('gender')?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Gender')) ?>"<?php if ($this->isRequired()):?> class="validate-select"<?php endif; ?> <?php echo $this->getFieldParams() ?>>
30
  <?php $options = Mage::getResourceSingleton('customer/customer')->getAttribute('gender')->getSource()->getAllOptions();?>
31
  <?php $value = $this->getGender();?>
32
  <?php foreach ($options as $option):?>
app/design/frontend/base/default/template/customer/widget/name.phtml CHANGED
@@ -50,9 +50,9 @@ For checkout/onepage/shipping.phtml:
50
  <label for="<?php echo $this->getFieldId('prefix')?>"<?php if ($this->isPrefixRequired()) echo ' class="required"' ?>><?php if ($this->isPrefixRequired()) echo '<em>*</em>' ?><?php echo $this->getStoreLabel('prefix') ?></label>
51
  <div class="input-box">
52
  <?php if ($this->getPrefixOptions() === false): ?>
53
- <input type="text" id="<?php echo $this->getFieldId('prefix')?>" name="<?php echo $this->getFieldName('prefix')?>" value="<?php echo $this->escapeHtml($this->getObject()->getPrefix()) ?>" title="<?php echo $this->getStoreLabel('prefix') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('prefix') ?>" <?php echo $this->getFieldParams() ?> />
54
  <?php else: ?>
55
- <select id="<?php echo $this->getFieldId('prefix')?>" name="<?php echo $this->getFieldName('prefix')?>" title="<?php echo $this->getStoreLabel('prefix') ?>" class="<?php echo $this->helper('customer/address')->getAttributeValidationClass('prefix') ?>" <?php echo $this->getFieldParams() ?>>
56
  <?php foreach ($this->getPrefixOptions() as $_option): ?>
57
  <option value="<?php echo $_option?>"<?php if ($this->getObject()->getPrefix()==$_option):?> selected="selected"<?php endif; ?>><?php echo $this->__($_option)?></option>
58
  <?php endforeach; ?>
@@ -64,7 +64,7 @@ For checkout/onepage/shipping.phtml:
64
  <div class="field name-firstname">
65
  <label for="<?php echo $this->getFieldId('firstname')?>" class="required"><em>*</em><?php echo $this->getStoreLabel('firstname') ?></label>
66
  <div class="input-box">
67
- <input type="text" id="<?php echo $this->getFieldId('firstname')?>" name="<?php echo $this->getFieldName('firstname')?>" value="<?php echo $this->escapeHtml($this->getObject()->getFirstname()) ?>" title="<?php echo $this->getStoreLabel('firstname') ?>" maxlength="255" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('firstname') ?>" <?php echo $this->getFieldParams() ?> />
68
  </div>
69
  </div>
70
  <?php if ($this->showMiddlename()): ?>
@@ -72,14 +72,14 @@ For checkout/onepage/shipping.phtml:
72
  <div class="field name-middlename">
73
  <label for="<?php echo $this->getFieldId('middlename')?>"<?php echo $isMiddlenameRequired ? ' class="required"' : '' ?>><?php echo $isMiddlenameRequired ? '<em>*</em>' : '' ?><?php echo $this->getStoreLabel('middlename') ?></label>
74
  <div class="input-box">
75
- <input type="text" id="<?php echo $this->getFieldId('middlename')?>" name="<?php echo $this->getFieldName('middlename')?>" value="<?php echo $this->escapeHtml($this->getObject()->getMiddlename()) ?>" title="<?php echo $this->getStoreLabel('middlename') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('middlename') ?>" <?php echo $this->getFieldParams() ?> />
76
  </div>
77
  </div>
78
  <?php endif; ?>
79
  <div class="field name-lastname">
80
  <label for="<?php echo $this->getFieldId('lastname')?>" class="required"><em>*</em><?php echo $this->getStoreLabel('lastname') ?></label>
81
  <div class="input-box">
82
- <input type="text" id="<?php echo $this->getFieldId('lastname')?>" name="<?php echo $this->getFieldName('lastname')?>" value="<?php echo $this->escapeHtml($this->getObject()->getLastname()) ?>" title="<?php echo $this->getStoreLabel('lastname') ?>" maxlength="255" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('lastname') ?>" <?php echo $this->getFieldParams() ?> />
83
  </div>
84
  </div>
85
  <?php if ($this->showSuffix()): ?>
@@ -87,9 +87,9 @@ For checkout/onepage/shipping.phtml:
87
  <label for="<?php echo $this->getFieldId('suffix')?>"<?php if ($this->isSuffixRequired()) echo ' class="required"' ?>><?php if ($this->isSuffixRequired()) echo '<em>*</em>' ?><?php echo $this->getStoreLabel('suffix') ?></label>
88
  <div class="input-box">
89
  <?php if ($this->getSuffixOptions() === false): ?>
90
- <input type="text" id="<?php echo $this->getFieldId('suffix')?>" name="<?php echo $this->getFieldName('suffix')?>" value="<?php echo $this->escapeHtml($this->getObject()->getSuffix()) ?>" title="<?php echo $this->getStoreLabel('suffix') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('suffix') ?>" <?php echo $this->getFieldParams() ?> />
91
  <?php else: ?>
92
- <select id="<?php echo $this->getFieldId('suffix')?>" name="<?php echo $this->getFieldName('suffix')?>" title="<?php echo $this->getStoreLabel('suffix') ?>" class="<?php echo $this->helper('customer/address')->getAttributeValidationClass('suffix') ?>" <?php echo $this->getFieldParams() ?>>
93
  <?php foreach ($this->getSuffixOptions() as $_option): ?>
94
  <option value="<?php echo $_option?>"<?php if ($this->getObject()->getSuffix()==$_option):?> selected="selected"<?php endif; ?>><?php echo $this->__($_option)?></option>
95
  <?php endforeach; ?>
50
  <label for="<?php echo $this->getFieldId('prefix')?>"<?php if ($this->isPrefixRequired()) echo ' class="required"' ?>><?php if ($this->isPrefixRequired()) echo '<em>*</em>' ?><?php echo $this->getStoreLabel('prefix') ?></label>
51
  <div class="input-box">
52
  <?php if ($this->getPrefixOptions() === false): ?>
53
+ <input type="text" id="<?php echo $this->getFieldId('prefix')?>" name="<?php echo $this->getFieldName('prefix')?>" value="<?php echo $this->escapeHtml($this->getObject()->getPrefix()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->getStoreLabel('prefix')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('prefix') ?>" <?php echo $this->getFieldParams() ?> />
54
  <?php else: ?>
55
+ <select id="<?php echo $this->getFieldId('prefix')?>" name="<?php echo $this->getFieldName('prefix')?>" title="<?php echo Mage::helper('core')->quoteEscape($this->getStoreLabel('prefix')) ?>" class="<?php echo $this->helper('customer/address')->getAttributeValidationClass('prefix') ?>" <?php echo $this->getFieldParams() ?>>
56
  <?php foreach ($this->getPrefixOptions() as $_option): ?>
57
  <option value="<?php echo $_option?>"<?php if ($this->getObject()->getPrefix()==$_option):?> selected="selected"<?php endif; ?>><?php echo $this->__($_option)?></option>
58
  <?php endforeach; ?>
64
  <div class="field name-firstname">
65
  <label for="<?php echo $this->getFieldId('firstname')?>" class="required"><em>*</em><?php echo $this->getStoreLabel('firstname') ?></label>
66
  <div class="input-box">
67
+ <input type="text" id="<?php echo $this->getFieldId('firstname')?>" name="<?php echo $this->getFieldName('firstname')?>" value="<?php echo $this->escapeHtml($this->getObject()->getFirstname()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->getStoreLabel('firstname')) ?>" maxlength="255" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('firstname') ?>" <?php echo $this->getFieldParams() ?> />
68
  </div>
69
  </div>
70
  <?php if ($this->showMiddlename()): ?>
72
  <div class="field name-middlename">
73
  <label for="<?php echo $this->getFieldId('middlename')?>"<?php echo $isMiddlenameRequired ? ' class="required"' : '' ?>><?php echo $isMiddlenameRequired ? '<em>*</em>' : '' ?><?php echo $this->getStoreLabel('middlename') ?></label>
74
  <div class="input-box">
75
+ <input type="text" id="<?php echo $this->getFieldId('middlename')?>" name="<?php echo $this->getFieldName('middlename')?>" value="<?php echo $this->escapeHtml($this->getObject()->getMiddlename()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->getStoreLabel('middlename')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('middlename') ?>" <?php echo $this->getFieldParams() ?> />
76
  </div>
77
  </div>
78
  <?php endif; ?>
79
  <div class="field name-lastname">
80
  <label for="<?php echo $this->getFieldId('lastname')?>" class="required"><em>*</em><?php echo $this->getStoreLabel('lastname') ?></label>
81
  <div class="input-box">
82
+ <input type="text" id="<?php echo $this->getFieldId('lastname')?>" name="<?php echo $this->getFieldName('lastname')?>" value="<?php echo $this->escapeHtml($this->getObject()->getLastname()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->getStoreLabel('lastname')) ?>" maxlength="255" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('lastname') ?>" <?php echo $this->getFieldParams() ?> />
83
  </div>
84
  </div>
85
  <?php if ($this->showSuffix()): ?>
87
  <label for="<?php echo $this->getFieldId('suffix')?>"<?php if ($this->isSuffixRequired()) echo ' class="required"' ?>><?php if ($this->isSuffixRequired()) echo '<em>*</em>' ?><?php echo $this->getStoreLabel('suffix') ?></label>
88
  <div class="input-box">
89
  <?php if ($this->getSuffixOptions() === false): ?>
90
+ <input type="text" id="<?php echo $this->getFieldId('suffix')?>" name="<?php echo $this->getFieldName('suffix')?>" value="<?php echo $this->escapeHtml($this->getObject()->getSuffix()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->getStoreLabel('suffix')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('suffix') ?>" <?php echo $this->getFieldParams() ?> />
91
  <?php else: ?>
92
+ <select id="<?php echo $this->getFieldId('suffix')?>" name="<?php echo $this->getFieldName('suffix')?>" title="<?php echo Mage::helper('core')->quoteEscape($this->getStoreLabel('suffix')) ?>" class="<?php echo $this->helper('customer/address')->getAttributeValidationClass('suffix') ?>" <?php echo $this->getFieldParams() ?>>
93
  <?php foreach ($this->getSuffixOptions() as $_option): ?>
94
  <option value="<?php echo $_option?>"<?php if ($this->getObject()->getSuffix()==$_option):?> selected="selected"<?php endif; ?>><?php echo $this->__($_option)?></option>
95
  <?php endforeach; ?>
app/design/frontend/base/default/template/customer/widget/taxvat.phtml CHANGED
@@ -26,5 +26,5 @@
26
  ?>
27
  <label for="<?php echo $this->getFieldId('taxvat')?>"<?php if ($this->isRequired()) echo ' class="required"' ?>><?php if ($this->isRequired()) echo '<em>*</em>' ?><?php echo $this->__('Tax/VAT number') ?></label>
28
  <div class="input-box">
29
- <input type="text" id="<?php echo $this->getFieldId('taxvat')?>" name="<?php echo $this->getFieldName('taxvat')?>" value="<?php echo $this->escapeHtml($this->getTaxvat()) ?>" title="<?php echo $this->__('Tax/VAT number') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('taxvat') ?>" <?php echo $this->getFieldParams() ?> />
30
  </div>
26
  ?>
27
  <label for="<?php echo $this->getFieldId('taxvat')?>"<?php if ($this->isRequired()) echo ' class="required"' ?>><?php if ($this->isRequired()) echo '<em>*</em>' ?><?php echo $this->__('Tax/VAT number') ?></label>
28
  <div class="input-box">
29
+ <input type="text" id="<?php echo $this->getFieldId('taxvat')?>" name="<?php echo $this->getFieldName('taxvat')?>" value="<?php echo $this->escapeHtml($this->getTaxvat()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Tax/VAT number')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('taxvat') ?>" <?php echo $this->getFieldParams() ?> />
30
  </div>
app/design/frontend/base/default/template/customer/wishlist.phtml CHANGED
@@ -62,7 +62,7 @@
62
  </table>
63
  <div class="buttons-set">
64
  <a href="<?php echo Mage::getBaseUrl() ?>">&laquo; <?php echo $this->__('Continue Shopping') ?></a>
65
- <input type="submit" value="<?php echo $this->__('Update') ?>" class="input-button" name="do" />
66
  </div>
67
  </form>
68
  <?php else: ?>
62
  </table>
63
  <div class="buttons-set">
64
  <a href="<?php echo Mage::getBaseUrl() ?>">&laquo; <?php echo $this->__('Continue Shopping') ?></a>
65
+ <input type="submit" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Update')) ?>" class="input-button" name="do" />
66
  </div>
67
  </form>
68
  <?php else: ?>
app/design/frontend/base/default/template/directory/currency.phtml CHANGED
@@ -37,7 +37,7 @@
37
  <strong><span><?php echo $this->__('Select Your Currency') ?></span></strong>
38
  </div>
39
  <div class="block-content">
40
- <select name="currency" title="<?php echo $this->__('Select Your Currency') ?>" onchange="setLocation(this.value)">
41
  <?php foreach ($this->getCurrencies() as $_code => $_name): ?>
42
  <option value="<?php echo $this->getSwitchCurrencyUrl($_code) ?>"<?php if($_code==$this->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?>>
43
  <?php echo $_name ?> - <?php echo $_code ?>
37
  <strong><span><?php echo $this->__('Select Your Currency') ?></span></strong>
38
  </div>
39
  <div class="block-content">
40
+ <select name="currency" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Select Your Currency')) ?>" onchange="setLocation(this.value)">
41
  <?php foreach ($this->getCurrencies() as $_code => $_name): ?>
42
  <option value="<?php echo $this->getSwitchCurrencyUrl($_code) ?>"<?php if($_code==$this->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?>>
43
  <?php echo $_name ?> - <?php echo $_code ?>
app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml CHANGED
@@ -76,7 +76,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
76
  </td>
77
  <td class="a-center">
78
  <a href="<?php echo $this->getConfigureUrl() ?>"
79
- title="<?php echo $this->__('Edit item parameters') ?>"><?php echo $this->__('Edit') ?></a>
80
  </td>
81
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
82
  <td class="a-center">
@@ -92,7 +92,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
92
  <a id="<?php echo $helpLinkId ?>" href="#"
93
  class="map-help-link"><?php echo $this->__("What's this?"); ?></a>
94
  <script type="text/javascript">
95
- Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo $this->__("What's this?") ?>");
96
  </script>
97
  </span>
98
  </td>
@@ -201,7 +201,8 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
201
  <?php endif; ?>
202
  <td class="a-center">
203
  <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4"
204
- title="<?php echo $this->__('Qty') ?>" class="input-text qty" maxlength="12"/>
 
205
  </td>
206
  <?php if (($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
207
  <td class="a-right">
@@ -310,6 +311,6 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
310
  <?php endif; ?>
311
  </td>
312
  <?php endif; ?>
313
- <td class="a-center"><a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo $this->__('Remove Item') ?>"
314
  class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a></td>
315
  </tr>
76
  </td>
77
  <td class="a-center">
78
  <a href="<?php echo $this->getConfigureUrl() ?>"
79
+ title="<?php echo Mage::helper('core')->quoteEscape($this->__('Edit item parameters')) ?>"><?php echo $this->__('Edit') ?></a>
80
  </td>
81
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
82
  <td class="a-center">
92
  <a id="<?php echo $helpLinkId ?>" href="#"
93
  class="map-help-link"><?php echo $this->__("What's this?"); ?></a>
94
  <script type="text/javascript">
95
+ Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo Mage::helper('core')->jsQuoteEscape($this->__("What's this?")) ?>");
96
  </script>
97
  </span>
98
  </td>
201
  <?php endif; ?>
202
  <td class="a-center">
203
  <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4"
204
+ title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty"
205
+ data-cart-item-id="<?php echo $this->jsQuoteEscape($_item->getSku()) ?>" maxlength="12"/>
206
  </td>
207
  <?php if (($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
208
  <td class="a-right">
311
  <?php endif; ?>
312
  </td>
313
  <?php endif; ?>
314
+ <td class="a-center"><a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove Item')) ?>"
315
  class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a></td>
316
  </tr>
app/design/frontend/base/default/template/downloadable/customer/products/list.phtml CHANGED
@@ -55,9 +55,9 @@
55
  <?php $_odd = ''; ?>
56
  <?php foreach ($_items as $_item): ?>
57
  <tr>
58
- <td><a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo Mage::helper('downloadable')->__('View Order') ?>"><?php echo $_item->getPurchased()->getOrderIncrementId() ?></a></td>
59
  <td><span class="nobr"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></span></td>
60
- <td><?php echo $this->escapeHtml($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo Mage::helper('downloadable')->__('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_item->getLinkTitle()); ?></a></td>
61
  <td><em><?php echo Mage::helper('downloadable')->__(ucfirst($_item->getStatus())) ?></em></td>
62
  <td><?php echo $this->getRemainingDownloads($_item) ?></td>
63
  </tr>
55
  <?php $_odd = ''; ?>
56
  <?php foreach ($_items as $_item): ?>
57
  <tr>
58
+ <td><a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('downloadable')->__('View Order')) ?>"><?php echo $_item->getPurchased()->getOrderIncrementId() ?></a></td>
59
  <td><span class="nobr"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></span></td>
60
+ <td><?php echo $this->escapeHtml($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('downloadable'))->__('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_item->getLinkTitle()); ?></a></td>
61
  <td><em><?php echo Mage::helper('downloadable')->__(ucfirst($_item->getStatus())) ?></em></td>
62
  <td><?php echo $this->getRemainingDownloads($_item) ?></td>
63
  </tr>
app/design/frontend/base/default/template/giftmessage/inline.phtml CHANGED
@@ -123,20 +123,20 @@ billing.onSave = function(evt){
123
  <div class="field">
124
  <label for="gift-message-whole-from"><?php echo $this->__('From') ?></label>
125
  <div class="input-box">
126
- <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?php echo $this->__('From') ?>" value="<?php echo $this->getEscaped($this->getMessage()->getSender(), $this->getDefaultFrom()) ?>" class="input-text validation-passed" />
127
  </div>
128
  </div>
129
  <div class="field">
130
  <label for="gift-message-whole-to"><?php echo $this->__('To') ?></label>
131
  <div class="input-box">
132
- <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?php echo $this->__('To') ?>" value="<?php echo $this->getEscaped($this->getMessage()->getRecipient(), $this->getDefaultTo()) ?>" class="input-text validation-passed" />
133
  </div>
134
  </div>
135
  </li>
136
  <li class="wide">
137
  <label for="gift-message-whole-message"><?php echo $this->__('Message') ?></label>
138
  <div class="input-box">
139
- <textarea id="gift-message-whole-message" onchange="toogleRequired('gift-message-whole-message', ['gift-message-whole-from','gift-message-whole-to'])" class="input-text validation-passed giftmessage-area" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][message]" title="<?php echo $this->__('Message') ?>" rows="5" cols="10"><?php echo $this->getEscaped($this->getMessage()->getMessage()) ?></textarea>
140
  </div>
141
  </li>
142
  </ul>
@@ -174,20 +174,20 @@ billing.onSave = function(evt){
174
  <div class="field">
175
  <label for="gift-message-<?php echo $_item->getId() ?>-from"><?php echo $this->__('From') ?></label>
176
  <div class="input-box">
177
- <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][from]" id="gift-message-<?php echo $_item->getId() ?>-from" title="<?php echo $this->__('From') ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getSender(), $this->getDefaultFrom()) ?>" class="input-text validation-passed" />
178
  </div>
179
  </div>
180
  <div class="field">
181
  <label for="gift-message-<?php echo $_item->getId() ?>-to"><?php echo $this->__('To') ?></label>
182
  <div class="input-box">
183
- <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][to]" id="gift-message-<?php echo $_item->getId() ?>-to" title="<?php echo $this->__('To') ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getRecipient(), $this->getDefaultTo()) ?>" class="input-text validation-passed" />
184
  </div>
185
  </div>
186
  </li>
187
  <li class="wide">
188
  <label for="gift-message-<?php echo $_item->getId() ?>-message"><?php echo $this->__('Message') ?></label>
189
  <div class="input-box">
190
- <textarea id="gift-message-<?php echo $_item->getId() ?>-message" onchange="toogleRequired('gift-message-<?php echo $_item->getId() ?>-message', ['gift-message-<?php echo $_item->getId() ?>-from','gift-message-<?php echo $_item->getId() ?>-to'])" class="input-text validation-passed giftmessage-area" name="giftmessage[<?php echo $_item->getId() ?>][message]" title="<?php echo $this->__('Message') ?>" rows="5" cols="40"><?php echo $this->getEscaped($this->getMessage($_item)->getMessage()) ?></textarea>
191
  </div>
192
  </li>
193
  </ul>
@@ -240,20 +240,20 @@ billing.onSave = function(evt){
240
  <div class="field">
241
  <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-from"><?php echo $this->__('From') ?></label>
242
  <div class="input-box">
243
- <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][from]" id="gift-message-<?php echo $this->getEntity()->getId() ?>-from" title="<?php echo $this->__('From') ?>" value="<?php echo $this->getEscaped($this->getMessage()->getSender(), $this->getDefaultFrom()) ?>" class="input-text validation-passed" />
244
  </div>
245
  </div>
246
  <div class="field">
247
  <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-to"><?php echo $this->__('To') ?></label>
248
  <div class="input-box">
249
- <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][to]" id="gift-message-<?php echo $this->getEntity()->getId() ?>-to" title="<?php echo $this->__('To') ?>" value="<?php echo $this->getEscaped($this->getMessage()->getRecipient(), $this->getDefaultTo()) ?>" class="input-text validation-passed" />
250
  </div>
251
  </div>
252
  </li>
253
  <li class="wide">
254
  <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-message"><?php echo $this->__('Message') ?></label>
255
  <div class="input-box">
256
- <textarea id="gift-message-<?php echo $this->getEntity()->getId() ?>-message" onchange="toogleRequired('gift-message-<?php echo $this->getEntity()->getId() ?>-message', ['gift-message-<?php echo $this->getEntity()->getId() ?>-from','gift-message-<?php echo $this->getEntity()->getId() ?>-to'])" class="input-text validation-passed giftmessage-area" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][message]" title="<?php echo $this->__('Message') ?>" rows="5" cols="40"><?php echo $this->getEscaped($this->getMessage()->getMessage()) ?></textarea>
257
  </div>
258
  </li>
259
  </ul>
@@ -291,20 +291,20 @@ billing.onSave = function(evt){
291
  <div class="field">
292
  <label for="gift-message-<?php echo $_item->getId() ?>-from"><?php echo $this->__('From') ?></label>
293
  <div class="input-box">
294
- <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][from]" id="gift-message-<?php echo $_item->getId() ?>-from" title="<?php echo $this->__('From') ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getSender(), $this->getDefaultFrom()) ?>" class="input-text validation-passed" />
295
  </div>
296
  </div>
297
  <div class="field">
298
  <label for="gift-message-<?php echo $_item->getId() ?>-to"><?php echo $this->__('To') ?></label>
299
  <div class="input-box">
300
- <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][to]" id="gift-message-<?php echo $_item->getId() ?>-to" title="<?php echo $this->__('To') ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getRecipient(), $this->getDefaultTo()) ?>" class="input-text validation-passed" />
301
  </div>
302
  </div>
303
  </li>
304
  <li class="wide">
305
  <label for="gift-message-<?php echo $_item->getId() ?>-message"><?php echo $this->__('Message') ?></label>
306
  <div class="input-box">
307
- <textarea id="gift-message-<?php echo $_item->getId() ?>-message" onchange="toogleRequired('gift-message-<?php echo $_item->getId() ?>-message', ['gift-message-<?php echo $_item->getId() ?>-from','gift-message-<?php echo $_item->getId() ?>-to'])" class="input-text validation-passed giftmessage-area" name="giftmessage[<?php echo $_item->getId() ?>][message]" title="<?php echo $this->__('Message') ?>" rows="5" cols="10"><?php echo $this->getEscaped($this->getMessage($_item)->getMessage()) ?></textarea>
308
  </div>
309
  </li>
310
  </ul>
123
  <div class="field">
124
  <label for="gift-message-whole-from"><?php echo $this->__('From') ?></label>
125
  <div class="input-box">
126
+ <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?php echo Mage::helper('core')->quoteEscape($this->__('From')) ?>" value="<?php echo $this->getEscaped($this->getMessage()->getSender(), $this->getDefaultFrom()) ?>" class="input-text validation-passed" />
127
  </div>
128
  </div>
129
  <div class="field">
130
  <label for="gift-message-whole-to"><?php echo $this->__('To') ?></label>
131
  <div class="input-box">
132
+ <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?php echo Mage::helper('core')->quoteEscape($this->__('To')) ?>" value="<?php echo $this->getEscaped($this->getMessage()->getRecipient(), $this->getDefaultTo()) ?>" class="input-text validation-passed" />
133
  </div>
134
  </div>
135
  </li>
136
  <li class="wide">
137
  <label for="gift-message-whole-message"><?php echo $this->__('Message') ?></label>
138
  <div class="input-box">
139
+ <textarea id="gift-message-whole-message" onchange="toogleRequired('gift-message-whole-message', ['gift-message-whole-from','gift-message-whole-to'])" class="input-text validation-passed giftmessage-area" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][message]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Message')) ?>" rows="5" cols="10"><?php echo $this->getEscaped($this->getMessage()->getMessage()) ?></textarea>
140
  </div>
141
  </li>
142
  </ul>
174
  <div class="field">
175
  <label for="gift-message-<?php echo $_item->getId() ?>-from"><?php echo $this->__('From') ?></label>
176
  <div class="input-box">
177
+ <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][from]" id="gift-message-<?php echo $_item->getId() ?>-from" title="<?php echo Mage::helper('core')->quoteEscape($this->__('From')) ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getSender(), $this->getDefaultFrom()) ?>" class="input-text validation-passed" />
178
  </div>
179
  </div>
180
  <div class="field">
181
  <label for="gift-message-<?php echo $_item->getId() ?>-to"><?php echo $this->__('To') ?></label>
182
  <div class="input-box">
183
+ <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][to]" id="gift-message-<?php echo $_item->getId() ?>-to" title="<?php echo Mage::helper('core')->quoteEscape($this->__('To')) ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getRecipient(), $this->getDefaultTo()) ?>" class="input-text validation-passed" />
184
  </div>
185
  </div>
186
  </li>
187
  <li class="wide">
188
  <label for="gift-message-<?php echo $_item->getId() ?>-message"><?php echo $this->__('Message') ?></label>
189
  <div class="input-box">
190
+ <textarea id="gift-message-<?php echo $_item->getId() ?>-message" onchange="toogleRequired('gift-message-<?php echo $_item->getId() ?>-message', ['gift-message-<?php echo $_item->getId() ?>-from','gift-message-<?php echo $_item->getId() ?>-to'])" class="input-text validation-passed giftmessage-area" name="giftmessage[<?php echo $_item->getId() ?>][message]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Message')) ?>" rows="5" cols="40"><?php echo $this->getEscaped($this->getMessage($_item)->getMessage()) ?></textarea>
191
  </div>
192
  </li>
193
  </ul>
240
  <div class="field">
241
  <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-from"><?php echo $this->__('From') ?></label>
242
  <div class="input-box">
243
+ <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][from]" id="gift-message-<?php echo $this->getEntity()->getId() ?>-from" title="<?php echo Mage::helper('core')->quoteEscape($this->__('From')) ?>" value="<?php echo $this->getEscaped($this->getMessage()->getSender(), $this->getDefaultFrom()) ?>" class="input-text validation-passed" />
244
  </div>
245
  </div>
246
  <div class="field">
247
  <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-to"><?php echo $this->__('To') ?></label>
248
  <div class="input-box">
249
+ <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][to]" id="gift-message-<?php echo $this->getEntity()->getId() ?>-to" title="<?php echo Mage::helper('core')->quoteEscape($this->__('To')) ?>" value="<?php echo $this->getEscaped($this->getMessage()->getRecipient(), $this->getDefaultTo()) ?>" class="input-text validation-passed" />
250
  </div>
251
  </div>
252
  </li>
253
  <li class="wide">
254
  <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-message"><?php echo $this->__('Message') ?></label>
255
  <div class="input-box">
256
+ <textarea id="gift-message-<?php echo $this->getEntity()->getId() ?>-message" onchange="toogleRequired('gift-message-<?php echo $this->getEntity()->getId() ?>-message', ['gift-message-<?php echo $this->getEntity()->getId() ?>-from','gift-message-<?php echo $this->getEntity()->getId() ?>-to'])" class="input-text validation-passed giftmessage-area" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][message]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Message')) ?>" rows="5" cols="40"><?php echo $this->getEscaped($this->getMessage()->getMessage()) ?></textarea>
257
  </div>
258
  </li>
259
  </ul>
291
  <div class="field">
292
  <label for="gift-message-<?php echo $_item->getId() ?>-from"><?php echo $this->__('From') ?></label>
293
  <div class="input-box">
294
+ <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][from]" id="gift-message-<?php echo $_item->getId() ?>-from" title="<?php echo Mage::helper('core')->quoteEscape($this->__('From')) ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getSender(), $this->getDefaultFrom()) ?>" class="input-text validation-passed" />
295
  </div>
296
  </div>
297
  <div class="field">
298
  <label for="gift-message-<?php echo $_item->getId() ?>-to"><?php echo $this->__('To') ?></label>
299
  <div class="input-box">
300
+ <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][to]" id="gift-message-<?php echo $_item->getId() ?>-to" title="<?php echo Mage::helper('core')->quoteEscape($this->__('To')) ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getRecipient(), $this->getDefaultTo()) ?>" class="input-text validation-passed" />
301
  </div>
302
  </div>
303
  </li>
304
  <li class="wide">
305
  <label for="gift-message-<?php echo $_item->getId() ?>-message"><?php echo $this->__('Message') ?></label>
306
  <div class="input-box">
307
+ <textarea id="gift-message-<?php echo $_item->getId() ?>-message" onchange="toogleRequired('gift-message-<?php echo $_item->getId() ?>-message', ['gift-message-<?php echo $_item->getId() ?>-from','gift-message-<?php echo $_item->getId() ?>-to'])" class="input-text validation-passed giftmessage-area" name="giftmessage[<?php echo $_item->getId() ?>][message]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Message')) ?>" rows="5" cols="10"><?php echo $this->getEscaped($this->getMessage($_item)->getMessage()) ?></textarea>
308
  </div>
309
  </li>
310
  </ul>
app/design/frontend/base/default/template/newsletter/subscribe.phtml CHANGED
@@ -34,10 +34,10 @@
34
  <label for="newsletter"><?php echo $this->__('Sign Up for Our Newsletter:') ?></label>
35
  </div>
36
  <div class="input-box">
37
- <input type="text" name="email" id="newsletter" title="<?php echo $this->__('Sign up for our newsletter') ?>" class="input-text required-entry validate-email" />
38
  </div>
39
  <div class="actions">
40
- <button type="submit" title="<?php echo $this->__('Subscribe') ?>" class="button"><span><span><?php echo $this->__('Subscribe') ?></span></span></button>
41
  </div>
42
  </div>
43
  </form>
34
  <label for="newsletter"><?php echo $this->__('Sign Up for Our Newsletter:') ?></label>
35
  </div>
36
  <div class="input-box">
37
+ <input type="text" name="email" id="newsletter" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Sign up for our newsletter')) ?>" class="input-text required-entry validate-email" />
38
  </div>
39
  <div class="actions">
40
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Subscribe')) ?>" class="button"><span><span><?php echo $this->__('Subscribe') ?></span></span></button>
41
  </div>
42
  </div>
43
  </form>
app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml CHANGED
@@ -39,6 +39,7 @@
39
  <?php echo $this->getMessagesBlock()->toHtml() ?>
40
  <?php if (!$this->getHasException()) : ?>
41
  <form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
 
42
  <fieldset class="fieldset">
43
  <h2 class="legend"><?php echo $this->getFormTitle() ?></h2>
44
  <p class="description"><?php echo $this->__('Log in to use <strong>%s</strong>', $this->getConsumer()->getName()) ?></p>
39
  <?php echo $this->getMessagesBlock()->toHtml() ?>
40
  <?php if (!$this->getHasException()) : ?>
41
  <form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
42
+ <?php echo $this->getBlockHtml('formkey'); ?>
43
  <fieldset class="fieldset">
44
  <h2 class="legend"><?php echo $this->getFormTitle() ?></h2>
45
  <p class="description"><?php echo $this->__('Log in to use <strong>%s</strong>', $this->getConsumer()->getName()) ?></p>
app/design/frontend/base/default/template/oauth/authorize/form/login.phtml CHANGED
@@ -36,6 +36,7 @@ $rejectJs = "document.location.href='{$this->getRejectUrl()}';";
36
  <?php echo $this->getMessagesBlock()->toHtml() ?>
37
  <?php if (!$this->getHasException()): ?>
38
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
 
39
  <div class="col1-set">
40
  <div class="col-1 registered-users">
41
  <div class="content" style="margin: 0 auto; padding-bottom: 13px;">
36
  <?php echo $this->getMessagesBlock()->toHtml() ?>
37
  <?php if (!$this->getHasException()): ?>
38
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
39
+ <?php echo $this->getBlockHtml('formkey'); ?>
40
  <div class="col1-set">
41
  <div class="col-1 registered-users">
42
  <div class="content" style="margin: 0 auto; padding-bottom: 13px;">
app/design/frontend/base/default/template/page/html/pager.phtml CHANGED
@@ -66,9 +66,9 @@
66
  <ol>
67
  <?php if (!$this->isFirstPage()): ?>
68
  <li>
69
- <a class="previous<?php if(!$this->getAnchorTextForPrevious()): ?> i-previous<?php endif;?>" href="<?php echo $this->getPreviousPageUrl() ?>" title="<?php echo $this->__('Previous') ?>">
70
  <?php if(!$this->getAnchorTextForPrevious()): ?>
71
- <img src="<?php echo $this->getSkinUrl('images/pager_arrow_left.gif') ?>" alt="<?php echo $this->__('Previous') ?>" class="v-middle" />
72
  <?php else: ?>
73
  <?php echo $this->getAnchorTextForPrevious() ?>
74
  <?php endif;?>
@@ -103,9 +103,9 @@
103
 
104
  <?php if (!$this->isLastPage()): ?>
105
  <li>
106
- <a class="next<?php if(!$this->getAnchorTextForNext()): ?> i-next<?php endif; ?>" href="<?php echo $this->getNextPageUrl() ?>" title="<?php echo $this->__('Next') ?>">
107
  <?php if(!$this->getAnchorTextForNext()): ?>
108
- <img src="<?php echo $this->getSkinUrl('images/pager_arrow_right.gif') ?>" alt="<?php echo $this->__('Next') ?>" class="v-middle" />
109
  <?php else: ?>
110
  <?php echo $this->getAnchorTextForNext() ?>
111
  <?php endif;?>
66
  <ol>
67
  <?php if (!$this->isFirstPage()): ?>
68
  <li>
69
+ <a class="previous<?php if(!$this->getAnchorTextForPrevious()): ?> i-previous<?php endif;?>" href="<?php echo $this->getPreviousPageUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Previous')) ?>">
70
  <?php if(!$this->getAnchorTextForPrevious()): ?>
71
+ <img src="<?php echo $this->getSkinUrl('images/pager_arrow_left.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Previous')) ?>" class="v-middle" />
72
  <?php else: ?>
73
  <?php echo $this->getAnchorTextForPrevious() ?>
74
  <?php endif;?>
103
 
104
  <?php if (!$this->isLastPage()): ?>
105
  <li>
106
+ <a class="next<?php if(!$this->getAnchorTextForNext()): ?> i-next<?php endif; ?>" href="<?php echo $this->getNextPageUrl() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Next')) ?>">
107
  <?php if(!$this->getAnchorTextForNext()): ?>
108
+ <img src="<?php echo $this->getSkinUrl('images/pager_arrow_right.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Next')) ?>" class="v-middle" />
109
  <?php else: ?>
110
  <?php echo $this->getAnchorTextForNext() ?>
111
  <?php endif;?>
app/design/frontend/base/default/template/page/js/calendar.phtml CHANGED
@@ -35,60 +35,60 @@
35
  <script type="text/javascript">
36
  //<![CDATA[
37
  enUS = <?php echo $enUS?>; // en_US locale reference
38
- Calendar._DN = <?php echo $days['wide']?>; // full day names
39
- Calendar._SDN = <?php echo $days['abbreviated']?>; // short day names
40
- Calendar._FD = <?php echo $firstDay?>; // First day of the week. "0" means display Sunday first, "1" means display Monday first, etc.
41
- Calendar._MN = <?php echo $months['wide']?>; // full month names
42
- Calendar._SMN = <?php echo $months['abbreviated']?>; // short month names
43
  Calendar._am = <?php echo $am ?>; // am/pm
44
  Calendar._pm = <?php echo $pm ?>;
45
 
46
  // tooltips
47
  Calendar._TT = {};
48
- Calendar._TT["INFO"] = "<?php echo $this->jsQuoteEscape( $this->__('About the calendar') );?>";
49
 
50
  Calendar._TT["ABOUT"] =
51
- "<?php echo $this->jsQuoteEscape( $this->__('DHTML Date/Time Selector') )?>\n" +
52
  "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" +
53
- "<?php echo $this->jsQuoteEscape( $this->__('For latest version visit: %s', 'http://www.dynarch.com/projects/calendar/') )?>\n" +
54
- "<?php echo $this->jsQuoteEscape( $this->__('Distributed under GNU LGPL. See %s for details.', 'http://gnu.org/licenses/lgpl.html') )?>" +
55
- "\n\n" +
56
- "<?php echo $this->jsQuoteEscape( $this->__('Date selection:') )?>\n" +
57
- "<?php echo $this->jsQuoteEscape( $this->__('- Use the %s, %s buttons to select year', '\\xab', '\xbb') )?>\n" +
58
- "<?php echo $this->jsQuoteEscape( $this->__('- Use the %s buttons to select month', '" + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + "') )?>\n" +
59
- "<?php echo $this->jsQuoteEscape( $this->__('- Hold mouse button on any of the above buttons for faster selection.') )?>";
60
- Calendar._TT["ABOUT_TIME"] = "\n\n" +
61
- "<?php echo $this->jsQuoteEscape( $this->__('Time selection:') )?>\n" +
62
- "<?php echo $this->jsQuoteEscape( $this->__('- Click on any of the time parts to increase it') )?>\n" +
63
- "<?php echo $this->jsQuoteEscape( $this->__('- or Shift-click to decrease it') )?>\n" +
64
- "<?php echo $this->jsQuoteEscape( $this->__('- or click and drag for faster selection.') )?>";
65
 
66
- Calendar._TT["PREV_YEAR"] = "<?php echo $this->jsQuoteEscape( $this->__('Prev. year (hold for menu)') );?>";
67
- Calendar._TT["PREV_MONTH"] = "<?php echo $this->jsQuoteEscape( $this->__('Prev. month (hold for menu)') );?>";
68
- Calendar._TT["GO_TODAY"] = "<?php echo $this->jsQuoteEscape( $this->__('Go Today') );?>";
69
- Calendar._TT["NEXT_MONTH"] = "<?php echo $this->jsQuoteEscape( $this->__('Next month (hold for menu)') );?>";
70
- Calendar._TT["NEXT_YEAR"] = "<?php echo $this->jsQuoteEscape( $this->__('Next year (hold for menu)') );?>";
71
- Calendar._TT["SEL_DATE"] = "<?php echo $this->jsQuoteEscape( $this->__('Select date') );?>";
72
- Calendar._TT["DRAG_TO_MOVE"] = "<?php echo $this->jsQuoteEscape( $this->__('Drag to move') );?>";
73
  Calendar._TT["PART_TODAY"] = ' (' + <?php echo $today ?> + ')';
74
 
75
  // the following is to inform that "%s" is to be the first day of week
76
- Calendar._TT["DAY_FIRST"] = "<?php echo $this->jsQuoteEscape( $this->__('Display %s first', '%s') );?>";
77
 
78
  // This may be locale-dependent. It specifies the week-end days, as an array
79
  // of comma-separated numbers. The numbers are from 0 to 6: 0 means Sunday, 1
80
  // means Monday, etc.
81
- Calendar._TT["WEEKEND"] = <?php echo $weekendDays?>;
82
 
83
- Calendar._TT["CLOSE"] = "<?php echo $this->jsQuoteEscape( $this->__('Close') );?>";
84
  Calendar._TT["TODAY"] = <?php echo $today ?>;
85
- Calendar._TT["TIME_PART"] = "<?php echo $this->jsQuoteEscape( $this->__('(Shift-)Click or drag to change value') );?>";
86
 
87
  // date formats
88
- Calendar._TT["DEF_DATE_FORMAT"] = <?php echo $defaultFormat?>;
89
- Calendar._TT["TT_DATE_FORMAT"] = <?php echo $toolTipFormat?>;
90
 
91
  Calendar._TT["WK"] = <?php echo $week ?>;
92
- Calendar._TT["TIME"] = "<?php echo $this->jsQuoteEscape( $this->__('Time:') );?>";
93
  //]]>
94
  </script>
35
  <script type="text/javascript">
36
  //<![CDATA[
37
  enUS = <?php echo $enUS?>; // en_US locale reference
38
+ Calendar._DN = <?php echo $days['wide'] ?>; // full day names
39
+ Calendar._SDN = <?php echo $days['abbreviated'] ?>; // short day names
40
+ Calendar._FD = <?php echo $firstDay ?>; // First day of the week. "0" means display Sunday first, "1" means display Monday first, etc.
41
+ Calendar._MN = <?php echo $months['wide'] ?>; // full month names
42
+ Calendar._SMN = <?php echo $months['abbreviated'] ?>; // short month names
43
  Calendar._am = <?php echo $am ?>; // am/pm
44
  Calendar._pm = <?php echo $pm ?>;
45
 
46
  // tooltips
47
  Calendar._TT = {};
48
+ Calendar._TT["INFO"] = '<?php echo $this->jsQuoteEscape($this->__('About the calendar')); ?>';
49
 
50
  Calendar._TT["ABOUT"] =
51
+ '<?php echo $this->jsQuoteEscape($this->__('DHTML Date/Time Selector')) ?>\n' +
52
  "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" +
53
+ '<?php echo $this->jsQuoteEscape($this->__('For latest version visit: %s', 'http://www.dynarch.com/projects/calendar/')) ?>\n' +
54
+ '<?php echo $this->jsQuoteEscape($this->__('Distributed under GNU LGPL. See %s for details.', 'http://gnu.org/licenses/lgpl.html')) ?>' +
55
+ '\n\n' +
56
+ '<?php echo $this->jsQuoteEscape($this->__('Date selection:')) ?>\n' +
57
+ '<?php echo $this->jsQuoteEscape($this->__('- Use the %s, %s buttons to select year', '\\xab', '\xbb')) ?>\n' +
58
+ '<?php echo $this->jsQuoteEscape($this->__('- Use the %s buttons to select month', '\u2039', '\u203a')) ?>\n' +
59
+ '<?php echo $this->jsQuoteEscape($this->__('- Hold mouse button on any of the above buttons for faster selection.')) ?>';
60
+ Calendar._TT["ABOUT_TIME"] = '\n\n' +
61
+ '<?php echo $this->jsQuoteEscape($this->__('Time selection:')) ?>\n' +
62
+ '<?php echo $this->jsQuoteEscape($this->__('- Click on any of the time parts to increase it')) ?>\n' +
63
+ '<?php echo $this->jsQuoteEscape($this->__('- or Shift-click to decrease it') ) ?>\n' +
64
+ '<?php echo $this->jsQuoteEscape($this->__('- or click and drag for faster selection.')) ?>';
65
 
66
+ Calendar._TT["PREV_YEAR"] = '<?php echo $this->jsQuoteEscape($this->__('Prev. year (hold for menu)')); ?>';
67
+ Calendar._TT["PREV_MONTH"] = '<?php echo $this->jsQuoteEscape($this->__('Prev. month (hold for menu)')); ?>';
68
+ Calendar._TT["GO_TODAY"] = '<?php echo $this->jsQuoteEscape($this->__('Go Today')); ?>';
69
+ Calendar._TT["NEXT_MONTH"] = '<?php echo $this->jsQuoteEscape($this->__('Next month (hold for menu)')); ?>';
70
+ Calendar._TT["NEXT_YEAR"] = '<?php echo $this->jsQuoteEscape($this->__('Next year (hold for menu)')); ?>';
71
+ Calendar._TT["SEL_DATE"] = '<?php echo $this->jsQuoteEscape($this->__('Select date')); ?>';
72
+ Calendar._TT["DRAG_TO_MOVE"] = '<?php echo $this->jsQuoteEscape($this->__('Drag to move')); ?>';
73
  Calendar._TT["PART_TODAY"] = ' (' + <?php echo $today ?> + ')';
74
 
75
  // the following is to inform that "%s" is to be the first day of week
76
+ Calendar._TT["DAY_FIRST"] = '<?php echo $this->jsQuoteEscape($this->__('Display %s first', '%s')); ?>';
77
 
78
  // This may be locale-dependent. It specifies the week-end days, as an array
79
  // of comma-separated numbers. The numbers are from 0 to 6: 0 means Sunday, 1
80
  // means Monday, etc.
81
+ Calendar._TT["WEEKEND"] = <?php echo $weekendDays ?>;
82
 
83
+ Calendar._TT["CLOSE"] = '<?php echo $this->jsQuoteEscape($this->__('Close')); ?>';
84
  Calendar._TT["TODAY"] = <?php echo $today ?>;
85
+ Calendar._TT["TIME_PART"] = '<?php echo $this->jsQuoteEscape($this->__('(Shift-)Click or drag to change value')); ?>';
86
 
87
  // date formats
88
+ Calendar._TT["DEF_DATE_FORMAT"] = <?php echo $defaultFormat ?>;
89
+ Calendar._TT["TT_DATE_FORMAT"] = <?php echo $toolTipFormat ?>;
90
 
91
  Calendar._TT["WK"] = <?php echo $week ?>;
92
+ Calendar._TT["TIME"] = '<?php echo $this->jsQuoteEscape($this->__('Time:')); ?>';
93
  //]]>
94
  </script>
app/design/frontend/base/default/template/page/print.phtml CHANGED
@@ -44,7 +44,7 @@
44
  </div>
45
  <?php echo $this->getChildHtml('content') ?>
46
  <div class="buttons-set">
47
- <button type="button" title="<?php echo $this->__('Close Window') ?>" class="button" onclick="window.close();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
48
  </div>
49
  <?php echo $this->getAbsoluteFooter() ?>
50
  </div>
44
  </div>
45
  <?php echo $this->getChildHtml('content') ?>
46
  <div class="buttons-set">
47
+ <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>
48
  </div>
49
  <?php echo $this->getAbsoluteFooter() ?>
50
  </div>
app/design/frontend/base/default/template/paygate/form/cc.phtml CHANGED
@@ -48,7 +48,7 @@
48
  Event.observe(cancelButton, 'click', cancelPaymentAuthorizations);
49
 
50
  function cancelPaymentAuthorizations(event, hideConfirm){
51
- if (!hideConfirm && !confirm('<?php echo $this->getCancelConfirmationMessage() ?>')) {
52
  return;
53
  }
54
  $('cancel-please-wait').show();
@@ -77,7 +77,7 @@
77
  }
78
 
79
  <?php if ($_message=$this->getPartialAuthorizationConfirmationMessage()): ?>
80
- if (!confirm('<?php echo $_message ?>')) {
81
  cancelPaymentAuthorizations(true, true);
82
  }
83
  <?php endif;?>
48
  Event.observe(cancelButton, 'click', cancelPaymentAuthorizations);
49
 
50
  function cancelPaymentAuthorizations(event, hideConfirm){
51
+ if (!hideConfirm && !confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->getCancelConfirmationMessage()) ?>')) {
52
  return;
53
  }
54
  $('cancel-please-wait').show();
77
  }
78
 
79
  <?php if ($_message=$this->getPartialAuthorizationConfirmationMessage()): ?>
80
+ if (!confirm('<?php echo Mage::helper('core')->jsQuoteEscape($_message) ?>')) {
81
  cancelPaymentAuthorizations(true, true);
82
  }
83
  <?php endif;?>
app/design/frontend/base/default/template/payment/form/cc.phtml CHANGED
@@ -49,7 +49,7 @@
49
  <li>
50
  <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('Credit Card Number') ?></label>
51
  <div class="input-box">
52
- <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="" />
53
  </div>
54
  </li>
55
  <li id="<?php echo $_code ?>_cc_type_exp_div">
@@ -79,7 +79,7 @@
79
  <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('Card Verification Number') ?></label>
80
  <div class="input-box">
81
  <div class="v-fix">
82
- <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="" />
83
  </div>
84
  <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
85
  </div>
@@ -93,7 +93,7 @@
93
  <li>
94
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
95
  <span class="input-box">
96
- <input type="text" title="<?php echo $this->__('Issue Number') ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
97
  </span>
98
  </li>
99
 
49
  <li>
50
  <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('Credit Card Number') ?></label>
51
  <div class="input-box">
52
+ <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Credit Card Number')) ?>" class="input-text validate-cc-number validate-cc-type" value="" />
53
  </div>
54
  </li>
55
  <li id="<?php echo $_code ?>_cc_type_exp_div">
79
  <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('Card Verification Number') ?></label>
80
  <div class="input-box">
81
  <div class="v-fix">
82
+ <input type="text" title="<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Card Verification Number')) ?>" class="input-text cvv required-entry validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" />
83
  </div>
84
  <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
85
  </div>
93
  <li>
94
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
95
  <span class="input-box">
96
+ <input type="text" title="<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Issue Number')) ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
97
  </span>
98
  </li>
99
 
app/design/frontend/base/default/template/payment/form/ccsave.phtml CHANGED
@@ -29,13 +29,13 @@
29
  <li>
30
  <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('Name on Card') ?></label>
31
  <div class="input-box">
32
- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" />
33
  </div>
34
  </li>
35
  <li>
36
  <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo $this->__('Credit Card Type') ?></label>
37
  <div class="input-box">
38
- <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" title="<?php echo $this->__('Credit Card Type') ?>" class="required-entry validate-cc-type-select">
39
  <option value=""><?php echo $this->__('--Please Select--') ?></option>
40
  <?php $_ccType = $this->getInfoData('cc_type') ?>
41
  <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
@@ -47,7 +47,7 @@
47
  <li>
48
  <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('Credit Card Number') ?></label>
49
  <div class="input-box">
50
- <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="" />
51
  </div>
52
  </li>
53
  <li>
@@ -77,7 +77,7 @@
77
  <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('Card Verification Number') ?></label>
78
  <div class="input-box">
79
  <div class="v-fix">
80
- <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="" />
81
  </div>
82
  <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
83
  </div>
@@ -90,7 +90,7 @@
90
  <li>
91
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
92
  <span class="input-box">
93
- <input type="text" title="<?php echo $this->__('Issue Number') ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
94
  </span>
95
  </li>
96
 
29
  <li>
30
  <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('Name on Card') ?></label>
31
  <div class="input-box">
32
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Name on Card')) ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" />
33
  </div>
34
  </li>
35
  <li>
36
  <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo $this->__('Credit Card Type') ?></label>
37
  <div class="input-box">
38
+ <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Credit Card Type')) ?>" class="required-entry validate-cc-type-select">
39
  <option value=""><?php echo $this->__('--Please Select--') ?></option>
40
  <?php $_ccType = $this->getInfoData('cc_type') ?>
41
  <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
47
  <li>
48
  <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo $this->__('Credit Card Number') ?></label>
49
  <div class="input-box">
50
+ <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="" />
51
  </div>
52
  </li>
53
  <li>
77
  <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo $this->__('Card Verification Number') ?></label>
78
  <div class="input-box">
79
  <div class="v-fix">
80
+ <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="" />
81
  </div>
82
  <a href="#" class="cvv-what-is-this"><?php echo $this->__('What is this?') ?></a>
83
  </div>
90
  <li>
91
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
92
  <span class="input-box">
93
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Issue Number')) ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
94
  </span>
95
  </li>
96
 
app/design/frontend/base/default/template/payment/form/purchaseorder.phtml CHANGED
@@ -28,7 +28,7 @@
28
  <li>
29
  <label for="po_number" class="required"><em>*</em><?php echo $this->__('Purchase Order Number') ?></label>
30
  <div class="input-box">
31
- <input type="text" id="po_number" name="payment[po_number]" title="<?php echo $this->__('Purchase Order Number') ?>" class="input-text required-entry" value="<?php echo $this->escapeHtml($this->getInfoData('po_number')) ?>" />
32
  </div>
33
  </li>
34
  </ul>
28
  <li>
29
  <label for="po_number" class="required"><em>*</em><?php echo $this->__('Purchase Order Number') ?></label>
30
  <div class="input-box">
31
+ <input type="text" id="po_number" name="payment[po_number]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Purchase Order Number')) ?>" class="input-text required-entry" value="<?php echo $this->escapeHtml($this->getInfoData('po_number')) ?>" />
32
  </div>
33
  </li>
34
  </ul>
app/design/frontend/base/default/template/paypal/express/review.phtml CHANGED
@@ -109,10 +109,10 @@
109
  <form method="post" id="order_review_form" action="<?php echo $this->getPlaceOrderUrl() ?>">
110
  <?php echo $this->getChildHtml('agreements'); ?>
111
  <div class="buttons-set buttons-set-order" id="review-buttons-container">
112
- <button type="button" id="review_button" value="<?php echo $this->__('Place Order') ?>" class="button btn-checkout"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
113
- <button type="button" id="review_submit" value="<?php echo $this->__('Place Order') ?>" class="button btn-checkout"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
114
  <span class="please-wait" id="review-please-wait" style="display:none;">
115
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Submitting order information...') ?>" title="<?php echo $this->__('Submitting order information...') ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
116
  </span>
117
  </div>
118
  </form>
109
  <form method="post" id="order_review_form" action="<?php echo $this->getPlaceOrderUrl() ?>">
110
  <?php echo $this->getChildHtml('agreements'); ?>
111
  <div class="buttons-set buttons-set-order" id="review-buttons-container">
112
+ <button type="button" id="review_button" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
113
+ <button type="button" id="review_submit" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
114
  <span class="please-wait" id="review-please-wait" style="display:none;">
115
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo 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...') ?>
116
  </span>
117
  </div>
118
  </form>
app/design/frontend/base/default/template/paypal/express/shortcut.phtml CHANGED
@@ -33,27 +33,27 @@
33
  <?php $shortcutHtmlId = $this->getShortcutHtmlId() ?>
34
  <?php $bmlShortcutHtmlId = $this->getBmlShortcutHtmlId() ?>
35
  <?php if ($this->isOrPositionBefore()): ?>
36
- <span class="paypal-or"><?php echo $this->__('-OR-');?></span>
37
  <?php endif; ?>
38
- <a data-action="checkout-form-submit" id="<?php echo $shortcutHtmlId ?>" href="<?php echo $this->getCheckoutUrl()?>"><img src="<?php echo $this->getImageUrl()?>" alt="<?php echo Mage::helper('paypal')->__('Checkout with PayPal');?>" title="<?php echo Mage::helper('paypal')->__('Checkout with PayPal');?>" /></a>
39
  <?php if ($this->getIsBmlEnabled()): ?>
40
- <span class="paypal-or"><?php echo $this->__('-OR-');?></span>
41
  </p>
42
  <li class="bml-checkout-type">
43
  <p class="paypal-logo">
44
  <span class="bml_button">
45
- <a id="<?php echo $bmlShortcutHtmlId ?>" href="<?php echo $this->getBmlCheckoutUrl()?>"><img src="<?php echo $this->getBmlImageUrl()?>" alt="<?php echo Mage::helper('paypal')->__('Checkout with PayPal Paypal Credit');?>" title="<?php echo Mage::helper('paypal')->__('Checkout with PayPal Paypal Credit');?>" /></a>
46
- <a href="<?php echo $this->getMarketMessageUrl()?>"><img src="<?php echo $this->getMarketMessage()?>" /></a>
47
  </span>
48
  </p>
49
  </li>
50
  <?php else: ?>
51
  </p>
52
- <?php endif;?>
53
  <?php if ($this->isOrPositionAfter()): ?>
54
  <li>
55
  <p class="paypal-logo">
56
- <span class="paypal-or"><?php echo $this->__('-OR-');?></span>
57
  </p>
58
  </li>
59
  <?php endif; ?>
@@ -65,7 +65,7 @@
65
  //<![CDATA[
66
  $$('#<?php echo $shortcutHtmlId ?>','#<?php echo $bmlShortcutHtmlId ?>').invoke('observe', 'click', function(event) {
67
  <?php if ($this->getConfirmationUrl()): ?>
68
- if (confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->getConfirmationMessage())?>')) {
69
  this.href = '<?php echo $this->getConfirmationUrl() ?>';
70
  }
71
  <?php endif; ?>
33
  <?php $shortcutHtmlId = $this->getShortcutHtmlId() ?>
34
  <?php $bmlShortcutHtmlId = $this->getBmlShortcutHtmlId() ?>
35
  <?php if ($this->isOrPositionBefore()): ?>
36
+ <span class="paypal-or"><?php echo $this->__('-OR-'); ?></span>
37
  <?php endif; ?>
38
+ <a data-action="checkout-form-submit" id="<?php echo $shortcutHtmlId ?>" href="<?php echo $this->getCheckoutUrl() ?>"><img src="<?php echo $this->getImageUrl() ?>" alt="<?php echo Mage::helper('paypal')->__('Checkout with PayPal'); ?>" title="<?php echo Mage::helper('paypal')->__('Checkout with PayPal'); ?>" /></a>
39
  <?php if ($this->getIsBmlEnabled()): ?>
40
+ <span class="paypal-or"><?php echo $this->__('-OR-'); ?></span>
41
  </p>
42
  <li class="bml-checkout-type">
43
  <p class="paypal-logo">
44
  <span class="bml_button">
45
+ <a id="<?php echo $bmlShortcutHtmlId ?>" href="<?php echo $this->getBmlCheckoutUrl() ?>"><img src="<?php echo $this->getBmlImageUrl() ?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('paypal')->__('Checkout with PayPal Paypal Credit')); ?>" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('paypal')->__('Checkout with PayPal Paypal Credit')); ?>" /></a>
46
+ <a href="<?php echo $this->getMarketMessageUrl() ?>"><img src="<?php echo $this->getMarketMessage() ?>" /></a>
47
  </span>
48
  </p>
49
  </li>
50
  <?php else: ?>
51
  </p>
52
+ <?php endif; ?>
53
  <?php if ($this->isOrPositionAfter()): ?>
54
  <li>
55
  <p class="paypal-logo">
56
+ <span class="paypal-or"><?php echo $this->__('-OR-'); ?></span>
57
  </p>
58
  </li>
59
  <?php endif; ?>
65
  //<![CDATA[
66
  $$('#<?php echo $shortcutHtmlId ?>','#<?php echo $bmlShortcutHtmlId ?>').invoke('observe', 'click', function(event) {
67
  <?php if ($this->getConfirmationUrl()): ?>
68
+ if (confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->getConfirmationMessage()) ?>')) {
69
  this.href = '<?php echo $this->getConfirmationUrl() ?>';
70
  }
71
  <?php endif; ?>
app/design/frontend/base/default/template/paypal/hss/redirect.phtml CHANGED
@@ -48,7 +48,7 @@ if (window.top == window.self) {
48
  window.top.document.getElementById('checkout-review-submit').show();
49
  window.top.document.getElementById('iframe-warning').hide();
50
  <?php if ($this->getErrorMsg()): ?>
51
- alert('<?php echo $this->getErrorMsg() ?>');
52
  <?php endif; ?>
53
  <?php elseif ($this->getGotoSuccessPage()) : ?>
54
  window.top.location="<?php echo $this->getUrl('checkout/onepage/success') ?>";
48
  window.top.document.getElementById('checkout-review-submit').show();
49
  window.top.document.getElementById('iframe-warning').hide();
50
  <?php if ($this->getErrorMsg()): ?>
51
+ alert('<?php echo Mage::helper('core')->jsQuoteEscape($this->getErrorMsg()) ?>');
52
  <?php endif; ?>
53
  <?php elseif ($this->getGotoSuccessPage()) : ?>
54
  window.top.location="<?php echo $this->getUrl('checkout/onepage/success') ?>";
app/design/frontend/base/default/template/paypal/hss/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->__('Continue') ?>" class="button btn-checkout" onclick="review.save();"><span><span><?php echo $this->__('Continue') ?></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->__('Continue')) ?>" class="button btn-checkout" onclick="review.save();"><span><span><?php echo $this->__('Continue') ?></span></span></button>
app/design/frontend/base/default/template/paypal/partner/logo.phtml CHANGED
@@ -30,5 +30,5 @@
30
  */
31
  ?>
32
  <div class="paypal-logo">
33
- <a href="#" title="<?php echo Mage::helper('paypal')->__('Additional Options') ?>" onclick="javascript:window.open('<?php echo $this->getAboutPaypalPageUrl() ?>','paypal','width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;"><img src="<?php echo $this->escapeHtml($this->getLogoImageUrl()) ?>" alt="<?php echo Mage::helper('paypal')->__('Additional Options') ?>" title="<?php echo Mage::helper('paypal')->__('Additional Options') ?>" /></a>
34
  </div>
30
  */
31
  ?>
32
  <div class="paypal-logo">
33
+ <a href="#" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('paypal')->__('Additional Options')) ?>" onclick="javascript:window.open('<?php echo $this->getAboutPaypalPageUrl() ?>','paypal','width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;"><img src="<?php echo $this->escapeHtml($this->getLogoImageUrl()) ?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('paypal')->__('Additional Options')) ?>" title="<?php echo Mage::helper('paypal')->__('Additional Options') ?>" /></a>
34
  </div>
app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml CHANGED
@@ -57,7 +57,7 @@
57
  window_top.document.getElementById('checkout-review-submit').show();
58
  window_top.document.getElementById('iframe-warning').hide();
59
  <?php if ($this->getErrorMsg()): ?>
60
- alert('<?php echo $this->getErrorMsg() ?>');
61
  <?php endif; ?>
62
  <?php elseif ($this->getGotoSuccessPage()) : ?>
63
  window_top.location="<?php echo $this->getUrl('checkout/onepage/success') ?>";
57
  window_top.document.getElementById('checkout-review-submit').show();
58
  window_top.document.getElementById('iframe-warning').hide();
59
  <?php if ($this->getErrorMsg()): ?>
60
+ alert('<?php echo $this->jsQuoteEscape($this->getErrorMsg()) ?>');
61
  <?php endif; ?>
62
  <?php elseif ($this->getGotoSuccessPage()) : ?>
63
  window_top.location="<?php echo $this->getUrl('checkout/onepage/success') ?>";
app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml CHANGED
@@ -57,7 +57,7 @@
57
  window_top.document.getElementById('checkout-review-submit').show();
58
  window_top.document.getElementById('iframe-warning').hide();
59
  <?php if ($this->getErrorMsg()): ?>
60
- alert('<?php echo $this->getErrorMsg() ?>');
61
  <?php endif; ?>
62
  <?php elseif ($this->getGotoSuccessPage()) : ?>
63
  window_top.location="<?php echo $this->getUrl('checkout/onepage/success') ?>";
57
  window_top.document.getElementById('checkout-review-submit').show();
58
  window_top.document.getElementById('iframe-warning').hide();
59
  <?php if ($this->getErrorMsg()): ?>
60
+ alert('<?php echo $this->jsQuoteEscape($this->getErrorMsg()) ?>');
61
  <?php endif; ?>
62
  <?php elseif ($this->getGotoSuccessPage()) : ?>
63
  window_top.location="<?php echo $this->getUrl('checkout/onepage/success') ?>";
app/design/frontend/base/default/template/paypal/payment/mark.phtml CHANGED
@@ -31,7 +31,7 @@
31
  */
32
  ?>
33
  <!-- PayPal Logo -->
34
- <img src="<?php echo $this->escapeHtml($this->getPaymentAcceptanceMarkSrc())?>" alt="<?php echo Mage::helper('paypal')->__('Acceptance Mark') ?>" class="v-middle" />&nbsp;
35
  <a href="<?php echo $this->getPaymentAcceptanceMarkHref()?>" onclick="javascript:window.open('<?php echo $this->getPaymentAcceptanceMarkHref()?>','olcwhatispaypal','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=0, top=0, width=400, height=350'); return false;">
36
  <?php if($this->getPaymentWhatIs()) {echo Mage::helper('paypal')->__($this->getPaymentWhatIs());} else {echo Mage::helper('paypal')->__('What is PayPal?');} ?>
37
  </a>
31
  */
32
  ?>
33
  <!-- PayPal Logo -->
34
+ <img src="<?php echo $this->escapeHtml($this->getPaymentAcceptanceMarkSrc())?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('paypal')->__('Acceptance Mark')) ?>" class="v-middle" />&nbsp;
35
  <a href="<?php echo $this->getPaymentAcceptanceMarkHref()?>" onclick="javascript:window.open('<?php echo $this->getPaymentAcceptanceMarkHref()?>','olcwhatispaypal','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=0, top=0, width=400, height=350'); return false;">
36
  <?php if($this->getPaymentWhatIs()) {echo Mage::helper('paypal')->__($this->getPaymentWhatIs());} else {echo Mage::helper('paypal')->__('What is PayPal?');} ?>
37
  </a>
app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml CHANGED
@@ -45,14 +45,14 @@
45
  <div class="field">
46
  <label for="billing:company"><?php echo $this->__('Company') ?></label>
47
  <div class="input-box">
48
- <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') ?>" />
49
  </div>
50
  </div>
51
  <?php if(!$this->isCustomerLoggedIn()): ?>
52
  <div class="field">
53
  <label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
54
  <div class="input-box">
55
- <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" />
56
  </div>
57
  </div>
58
  <?php endif; ?>
@@ -61,14 +61,14 @@
61
  <li class="wide">
62
  <label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
63
  <div class="input-box">
64
- <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 ?>" />
65
  </div>
66
  </li>
67
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
68
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
69
  <li class="wide">
70
  <div class="input-box">
71
- <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 ?>" />
72
  </div>
73
  </li>
74
  <?php endfor; ?>
@@ -76,7 +76,7 @@
76
  <li class="wide">
77
  <label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
78
  <div class="input-box">
79
- <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') ?>" />
80
  </div>
81
  </li>
82
  <?php endif; ?>
@@ -84,13 +84,13 @@
84
  <div class="field">
85
  <label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
86
  <div class="input-box">
87
- <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" />
88
  </div>
89
  </div>
90
  <div class="field">
91
  <label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
92
  <div class="input-box">
93
- <select id="billing:region_id" name="billing[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
94
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
95
  </select>
96
  <script type="text/javascript">
@@ -98,7 +98,7 @@
98
  $('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
99
  //]]>
100
  </script>
101
- <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;" />
102
  </div>
103
  </div>
104
  </li>
@@ -106,7 +106,7 @@
106
  <div class="field">
107
  <label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
108
  <div class="input-box">
109
- <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') ?>" />
110
  </div>
111
  </div>
112
  <div class="field">
@@ -120,13 +120,13 @@
120
  <div class="field">
121
  <label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
122
  <div class="input-box">
123
- <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" />
124
  </div>
125
  </div>
126
  <div class="field">
127
  <label for="billing:fax"><?php echo $this->__('Fax') ?></label>
128
  <div class="input-box">
129
- <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" />
130
  </div>
131
  </div>
132
  </li>
@@ -157,13 +157,13 @@
157
  <div class="field">
158
  <label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
159
  <div class="input-box">
160
- <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
161
  </div>
162
  </div>
163
  <div class="field">
164
  <label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
165
  <div class="input-box">
166
- <input type="password" name="billing[confirm_password]" title="<?php echo $this->__('Confirm Password') ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
167
  </div>
168
  </div>
169
  </li>
@@ -171,7 +171,7 @@
171
  <?php endif; ?>
172
  <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
173
  <li class="control">
174
- <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>
175
  </li>
176
  <?php else:?>
177
  <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
@@ -183,9 +183,9 @@
183
  </li>
184
  <?php if ($this->canShip()): ?>
185
  <li class="control">
186
- <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>
187
  <li class="control">
188
- <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>
189
  </li>
190
  <?php endif; ?>
191
  </ul>
@@ -194,9 +194,9 @@
194
  <?php endif; ?>
195
  <div class="buttons-set" id="billing-buttons-container">
196
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
197
- <button type="button" title="<?php echo $this->__('Continue') ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
198
  <span class="please-wait" id="billing-please-wait" style="display:none;">
199
- <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...') ?>
200
  </span>
201
  </div>
202
  </fieldset>
@@ -206,7 +206,7 @@
206
  var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>');
207
  var billingForm = new VarienForm('co-billing-form');
208
 
209
- //billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
210
  $('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
211
 
212
  var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'billing:postcode');
45
  <div class="field">
46
  <label for="billing:company"><?php echo $this->__('Company') ?></label>
47
  <div class="input-box">
48
+ <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') ?>" />
49
  </div>
50
  </div>
51
  <?php if(!$this->isCustomerLoggedIn()): ?>
52
  <div class="field">
53
  <label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
54
  <div class="input-box">
55
+ <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" />
56
  </div>
57
  </div>
58
  <?php endif; ?>
61
  <li class="wide">
62
  <label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
63
  <div class="input-box">
64
+ <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 ?>" />
65
  </div>
66
  </li>
67
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
68
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
69
  <li class="wide">
70
  <div class="input-box">
71
+ <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 ?>" />
72
  </div>
73
  </li>
74
  <?php endfor; ?>
76
  <li class="wide">
77
  <label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
78
  <div class="input-box">
79
+ <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') ?>" />
80
  </div>
81
  </li>
82
  <?php endif; ?>
84
  <div class="field">
85
  <label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
86
  <div class="input-box">
87
+ <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" />
88
  </div>
89
  </div>
90
  <div class="field">
91
  <label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
92
  <div class="input-box">
93
+ <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;">
94
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
95
  </select>
96
  <script type="text/javascript">
98
  $('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
99
  //]]>
100
  </script>
101
+ <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;" />
102
  </div>
103
  </div>
104
  </li>
106
  <div class="field">
107
  <label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
108
  <div class="input-box">
109
+ <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') ?>" />
110
  </div>
111
  </div>
112
  <div class="field">
120
  <div class="field">
121
  <label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
122
  <div class="input-box">
123
+ <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" />
124
  </div>
125
  </div>
126
  <div class="field">
127
  <label for="billing:fax"><?php echo $this->__('Fax') ?></label>
128
  <div class="input-box">
129
+ <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" />
130
  </div>
131
  </div>
132
  </li>
157
  <div class="field">
158
  <label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
159
  <div class="input-box">
160
+ <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" />
161
  </div>
162
  </div>
163
  <div class="field">
164
  <label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
165
  <div class="input-box">
166
+ <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" />
167
  </div>
168
  </div>
169
  </li>
171
  <?php endif; ?>
172
  <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
173
  <li class="control">
174
+ <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>
175
  </li>
176
  <?php else:?>
177
  <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
183
  </li>
184
  <?php if ($this->canShip()): ?>
185
  <li class="control">
186
+ <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>
187
  <li class="control">
188
+ <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>
189
  </li>
190
  <?php endif; ?>
191
  </ul>
194
  <?php endif; ?>
195
  <div class="buttons-set" id="billing-buttons-container">
196
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
197
+ <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>
198
  <span class="please-wait" id="billing-please-wait" style="display:none;">
199
+ <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...') ?>
200
  </span>
201
  </div>
202
  </fieldset>
206
  var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>');
207
  var billingForm = new VarienForm('co-billing-form');
208
 
209
+ //billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Select State/Province...')) ?>');
210
  $('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
211
 
212
  var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'billing:postcode');
app/design/frontend/base/default/template/persistent/customer/form/login.phtml CHANGED
@@ -54,13 +54,13 @@
54
  <li>
55
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
56
  <div class="input-box">
57
- <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
58
  </div>
59
  </li>
60
  <li>
61
  <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
62
  <div class="input-box">
63
- <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
64
  </div>
65
  </li>
66
  <?php echo $this->getChildHtml('form.additional.info'); ?>
@@ -74,13 +74,13 @@
74
  <div class="col2-set">
75
  <div class="col-1 new-users">
76
  <div class="buttons-set">
77
- <button type="button" title="<?php echo $this->__('Create an Account') ?>" class="button" onclick="window.location='<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>';"><span><span><?php echo $this->__('Create an Account') ?></span></span></button>
78
  </div>
79
  </div>
80
  <div class="col-2 registered-users">
81
  <div class="buttons-set">
82
  <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo $this->__('Forgot Your Password?') ?></a>
83
- <button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
84
  </div>
85
  </div>
86
  </div>
54
  <li>
55
  <label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
56
  <div class="input-box">
57
+ <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" />
58
  </div>
59
  </li>
60
  <li>
61
  <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
62
  <div class="input-box">
63
+ <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>" />
64
  </div>
65
  </li>
66
  <?php echo $this->getChildHtml('form.additional.info'); ?>
74
  <div class="col2-set">
75
  <div class="col-1 new-users">
76
  <div class="buttons-set">
77
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Create an Account')) ?>" class="button" onclick="window.location='<?php echo Mage::helper('persistent')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>';"><span><span><?php echo $this->__('Create an Account') ?></span></span></button>
78
  </div>
79
  </div>
80
  <div class="col-2 registered-users">
81
  <div class="buttons-set">
82
  <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo $this->__('Forgot Your Password?') ?></a>
83
+ <button type="submit" class="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Login')) ?>" name="send" id="send2"><span><span><?php echo $this->__('Login') ?></span></span></button>
84
  </div>
85
  </div>
86
  </div>
app/design/frontend/base/default/template/persistent/customer/form/register.phtml CHANGED
@@ -50,13 +50,13 @@
50
  <li>
51
  <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
52
  <div class="input-box">
53
- <input type="text" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
54
  </div>
55
  </li>
56
  <?php if ($this->isNewsletterEnabled()): ?>
57
  <li class="control">
58
  <div class="input-box">
59
- <input type="checkbox" name="is_subscribed" title="<?php echo $this->__('Sign Up for Newsletter') ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
60
  </div>
61
  <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
62
  </li>
@@ -84,13 +84,13 @@
84
  <div class="field">
85
  <label for="company"><?php echo $this->__('Company') ?></label>
86
  <div class="input-box">
87
- <input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
88
  </div>
89
  </div>
90
  <div class="field">
91
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
92
  <div class="input-box">
93
- <input type="text" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" />
94
  </div>
95
  </div>
96
  </li>
@@ -98,14 +98,14 @@
98
  <li class="wide">
99
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
100
  <div class="input-box">
101
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
102
  </div>
103
  </li>
104
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
105
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
106
  <li class="wide">
107
  <div class="input-box">
108
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
109
  </div>
110
  </li>
111
  <?php endfor; ?>
@@ -113,13 +113,13 @@
113
  <div class="field">
114
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
115
  <div class="input-box">
116
- <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
117
  </div>
118
  </div>
119
  <div class="field">
120
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
121
  <div class="input-box">
122
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
123
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
124
  </select>
125
  <script type="text/javascript">
@@ -127,7 +127,7 @@
127
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
128
  //]]>
129
  </script>
130
- <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
131
  </div>
132
  </div>
133
  </li>
@@ -135,7 +135,7 @@
135
  <div class="field">
136
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
137
  <div class="input-box">
138
- <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
139
  </div>
140
  </div>
141
  <div class="field">
@@ -157,13 +157,13 @@
157
  <div class="field">
158
  <label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
159
  <div class="input-box">
160
- <input type="password" name="password" id="password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
161
  </div>
162
  </div>
163
  <div class="field">
164
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
165
  <div class="input-box">
166
- <input type="password" name="confirmation" title="<?php echo $this->__('Confirm Password') ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
167
  </div>
168
  </div>
169
  </li>
@@ -175,7 +175,7 @@
175
  <div class="buttons-set">
176
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
177
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
178
- <button type="submit" title="<?php echo $this->__('Submit') ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
179
  </div>
180
  <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
181
  <input name="context" type="hidden" value="checkout" />
50
  <li>
51
  <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
52
  <div class="input-box">
53
+ <input type="text" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" class="input-text validate-email required-entry" />
54
  </div>
55
  </li>
56
  <?php if ($this->isNewsletterEnabled()): ?>
57
  <li class="control">
58
  <div class="input-box">
59
+ <input type="checkbox" name="is_subscribed" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
60
  </div>
61
  <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
62
  </li>
84
  <div class="field">
85
  <label for="company"><?php echo $this->__('Company') ?></label>
86
  <div class="input-box">
87
+ <input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Company')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
88
  </div>
89
  </div>
90
  <div class="field">
91
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
92
  <div class="input-box">
93
+ <input type="text" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Telephone')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" />
94
  </div>
95
  </div>
96
  </li>
98
  <li class="wide">
99
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
100
  <div class="input-box">
101
+ <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address')) ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
102
  </div>
103
  </li>
104
  <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
105
  <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
106
  <li class="wide">
107
  <div class="input-box">
108
+ <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->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 ?>" />
109
  </div>
110
  </li>
111
  <?php endfor; ?>
113
  <div class="field">
114
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
115
  <div class="input-box">
116
+ <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('City')) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
117
  </div>
118
  </div>
119
  <div class="field">
120
  <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
121
  <div class="input-box">
122
+ <select id="region_id" name="region_id" title="<?php echo Mage::helper('core')->quoteEscape($this->__('State/Province')) ?>" class="validate-select" style="display:none;">
123
  <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
124
  </select>
125
  <script type="text/javascript">
127
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
128
  //]]>
129
  </script>
130
+ <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->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;" />
131
  </div>
132
  </div>
133
  </li>
135
  <div class="field">
136
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
137
  <div class="input-box">
138
+ <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->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') ?>" />
139
  </div>
140
  </div>
141
  <div class="field">
157
  <div class="field">
158
  <label for="password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
159
  <div class="input-box">
160
+ <input type="password" name="password" id="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>" class="input-text required-entry validate-password" />
161
  </div>
162
  </div>
163
  <div class="field">
164
  <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
165
  <div class="input-box">
166
+ <input type="password" name="confirmation" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
167
  </div>
168
  </div>
169
  </li>
175
  <div class="buttons-set">
176
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
177
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
178
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Submit')) ?>" class="button"><span><span><?php echo $this->__('Submit') ?></span></span></button>
179
  </div>
180
  <?php if (Mage::helper('checkout')->isContextCheckout()): ?>
181
  <input name="context" type="hidden" value="checkout" />
app/design/frontend/base/default/template/persistent/remember_me.phtml CHANGED
@@ -34,7 +34,7 @@
34
  <li id="remember-me-box" class="control">
35
  <?php $rememberMeId = 'remember_me' . Mage::helper('core')->getRandomString(10); ?>
36
  <div class="input-box">
37
- <input type="checkbox" name="persistent_remember_me" class="checkbox" id="<?php echo $rememberMeId; ?>"<?php if ($this->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?php echo $this->__('Remember Me') ?>" />
38
  </div>
39
  <label for="<?php echo $rememberMeId; ?>"><?php echo $this->__('Remember Me') ?></label>
40
  <a class="link-tip" href="#"><?php echo $this->__('What\'s this?') ?></a>
34
  <li id="remember-me-box" class="control">
35
  <?php $rememberMeId = 'remember_me' . Mage::helper('core')->getRandomString(10); ?>
36
  <div class="input-box">
37
+ <input type="checkbox" name="persistent_remember_me" class="checkbox" id="<?php echo $rememberMeId; ?>"<?php if ($this->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remember Me')) ?>" />
38
  </div>
39
  <label for="<?php echo $rememberMeId; ?>"><?php echo $this->__('Remember Me') ?></label>
40
  <a class="link-tip" href="#"><?php echo $this->__('What\'s this?') ?></a>
app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml CHANGED
@@ -35,12 +35,12 @@
35
  <div id="remember-me-popup" class="remember-me-popup" style="display:none;">
36
  <div class="remember-me-popup-head">
37
  <h3>What's this?</h3>
38
- <a href="#" class="remember-me-popup-close" title="<?php echo $this->__('Close') ?>"><?php echo $this->__('Close') ?></a>
39
  </div>
40
  <div class="remember-me-popup-body">
41
  <p>Checking &quot;Remember Me&quot; will let you access your shopping cart on this computer when you are logged out</p>
42
  <div class="remember-me-popup-close-button a-right">
43
- <a href="#" class="remember-me-popup-close button" title="<?php echo $this->__('Close') ?>"><span><?php echo $this->__('Close') ?></span></a>
44
  </div>
45
  </div>
46
  </div>
35
  <div id="remember-me-popup" class="remember-me-popup" style="display:none;">
36
  <div class="remember-me-popup-head">
37
  <h3>What's this?</h3>
38
+ <a href="#" class="remember-me-popup-close" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close')) ?>"><?php echo $this->__('Close') ?></a>
39
  </div>
40
  <div class="remember-me-popup-body">
41
  <p>Checking &quot;Remember Me&quot; will let you access your shopping cart on this computer when you are logged out</p>
42
  <div class="remember-me-popup-close-button a-right">
43
+ <a href="#" class="remember-me-popup-close button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close')) ?>"><span><?php echo $this->__('Close') ?></span></a>
44
  </div>
45
  </div>
46
  </div>
app/design/frontend/base/default/template/poll/active.phtml CHANGED
@@ -58,7 +58,7 @@
58
  <script type="text/javascript">decorateList('poll-answers');</script>
59
  <?php endif; ?>
60
  <div class="actions">
61
- <button type="submit" title="<?php echo $this->__('Vote') ?>" class="button"><span><span><?php echo $this->__('Vote') ?></span></span></button>
62
  </div>
63
  </div>
64
  </form>
58
  <script type="text/javascript">decorateList('poll-answers');</script>
59
  <?php endif; ?>
60
  <div class="actions">
61
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Vote')) ?>" class="button"><span><span><?php echo $this->__('Vote') ?></span></span></button>
62
  </div>
63
  </div>
64
  </form>
app/design/frontend/base/default/template/reports/home_product_compared.phtml CHANGED
@@ -39,7 +39,7 @@
39
  <?php echo $this->getPriceHtml($_product, true, '-home-compared') ?>
40
  <div class="actions">
41
  <?php if($_product->isSaleable()): ?>
42
- <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>
43
  <?php else: ?>
44
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
45
  <?php endif; ?>
39
  <?php echo $this->getPriceHtml($_product, true, '-home-compared') ?>
40
  <div class="actions">
41
  <?php if($_product->isSaleable()): ?>
42
+ <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>
43
  <?php else: ?>
44
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
45
  <?php endif; ?>
app/design/frontend/base/default/template/reports/home_product_viewed.phtml CHANGED
@@ -44,7 +44,7 @@
44
  <?php echo $this->getPriceHtml($_product, true, '-home-viewed') ?>
45
  <div class="actions">
46
  <?php if($_product->isSaleable()): ?>
47
- <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>
48
  <?php else: ?>
49
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
50
  <?php endif; ?>
44
  <?php echo $this->getPriceHtml($_product, true, '-home-viewed') ?>
45
  <div class="actions">
46
  <?php if($_product->isSaleable()): ?>
47
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
48
  <?php else: ?>
49
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
50
  <?php endif; ?>
app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml CHANGED
@@ -42,7 +42,7 @@
42
  <?php echo $this->getPriceHtml($_product, true, '-widget-compared-grid') ?>
43
  <div class="actions">
44
  <?php if($_product->isSaleable()): ?>
45
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
46
  <?php else: ?>
47
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
48
  <?php endif; ?>
42
  <?php echo $this->getPriceHtml($_product, true, '-widget-compared-grid') ?>
43
  <div class="actions">
44
  <?php if($_product->isSaleable()): ?>
45
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
46
  <?php else: ?>
47
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
48
  <?php endif; ?>
app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml CHANGED
@@ -40,7 +40,7 @@
40
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
41
  <?php echo $this->getPriceHtml($_product, true, '-widget-compared-list') ?>
42
  <?php if($_product->isSaleable()): ?>
43
- <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>
44
  <?php else: ?>
45
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
46
  <?php endif; ?>
40
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
41
  <?php echo $this->getPriceHtml($_product, true, '-widget-compared-list') ?>
42
  <?php if($_product->isSaleable()): ?>
43
+ <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>
44
  <?php else: ?>
45
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
46
  <?php endif; ?>
app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml CHANGED
@@ -47,7 +47,7 @@
47
  <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-grid') ?>
48
  <div class="actions">
49
  <?php if($_product->isSaleable()): ?>
50
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
51
  <?php else: ?>
52
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
53
  <?php endif; ?>
47
  <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-grid') ?>
48
  <div class="actions">
49
  <?php if($_product->isSaleable()): ?>
50
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
51
  <?php else: ?>
52
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
53
  <?php endif; ?>
app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml CHANGED
@@ -45,7 +45,7 @@
45
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
46
  <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-list') ?>
47
  <?php if($_product->isSaleable()): ?>
48
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
49
  <?php else: ?>
50
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
51
  <?php endif; ?>
45
  <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
46
  <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-list') ?>
47
  <?php if($_product->isSaleable()): ?>
48
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
49
  <?php else: ?>
50
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
51
  <?php endif; ?>
app/design/frontend/base/default/template/review/form.phtml CHANGED
@@ -96,7 +96,7 @@
96
  var dataForm = new VarienForm('review-form');
97
  Validation.addAllThese(
98
  [
99
- ['validate-rating', '<?php echo $this->__('Please select one of each of the ratings above') ?>', function(v) {
100
  var trs = $('product-review-table').select('tr');
101
  var inputs;
102
  var error = 1;
96
  var dataForm = new VarienForm('review-form');
97
  Validation.addAllThese(
98
  [
99
+ ['validate-rating', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Please select one of each of the ratings above')) ?>', function(v) {
100
  var trs = $('product-review-table').select('tr');
101
  var inputs;
102
  var error = 1;
app/design/frontend/base/default/template/rss/order/details.phtml CHANGED
@@ -31,8 +31,9 @@ store name = $_order->getStore()->getGroup()->getName()
31
  ?>
32
  <?php $_order=$this->getOrder() ?>
33
  <div>
34
- <?php echo $this->__('Customer Name: %s', $_order->getCustomerFirstname()?$_order->getCustomerName():$_order->getBillingAddress()->getName()) ?><br />
35
- <?php echo $this->__('Purchased From: %s', $_order->getStore()->getGroup()->getName()) ?><br />
 
36
  </div>
37
  <table cellspacing="0" cellpadding="0" border="0" width="100%" style="border:1px solid #bebcb7; background:#f8f7f5;">
38
  <thead>
31
  ?>
32
  <?php $_order=$this->getOrder() ?>
33
  <div>
34
+ <?php $customerName = $_order->getCustomerFirstname() ? $_order->getCustomerName() : $_order->getBillingAddress()->getName(); ?>
35
+ <?php echo $this->__('Customer Name: %s', Mage::helper('core')->quoteEscape($customerName)) ?><br />
36
+ <?php echo $this->__('Purchased From: %s', Mage::helper('core')->quoteEscape($_order->getStore()->getGroup()->getName())) ?><br />
37
  </div>
38
  <table cellspacing="0" cellpadding="0" border="0" width="100%" style="border:1px solid #bebcb7; background:#f8f7f5;">
39
  <thead>
app/design/frontend/base/default/template/sales/billing/agreement/view.phtml CHANGED
@@ -28,7 +28,7 @@
28
  <div class="page-title title-buttons">
29
  <h1><?php echo $this->__('Billing Agreement # %s', $this->escapeHtml($this->getReferenceId())) ?></h1>
30
  <?php if ($this->getCanCancel()): ?>
31
- <button type="button" title="<?php echo $this->__('Cancel') ?>" class="button" onclick="if( confirm('<?php echo $this->__('Are you sure you want to do this?') ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
32
  <?php endif; ?>
33
  </div>
34
  <?php echo $this->getMessagesBlock()->toHtml() ?>
28
  <div class="page-title title-buttons">
29
  <h1><?php echo $this->__('Billing Agreement # %s', $this->escapeHtml($this->getReferenceId())) ?></h1>
30
  <?php if ($this->getCanCancel()): ?>
31
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->__('Are you sure you want to do this?')) ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
32
  <?php endif; ?>
33
  </div>
34
  <?php echo $this->getMessagesBlock()->toHtml() ?>
app/design/frontend/base/default/template/sales/guest/form.phtml CHANGED
@@ -1,3 +1,29 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <div class="page-title">
2
  <h1><?php echo Mage::helper('sales')->__('Orders and Returns') ?></h1>
3
  </div>
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
  <div class="page-title">
28
  <h1><?php echo Mage::helper('sales')->__('Orders and Returns') ?></h1>
29
  </div>
app/design/frontend/base/default/template/sales/order/items.phtml CHANGED
@@ -25,7 +25,7 @@
25
  */
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
- <table class="data-table" id="my-orders-table" summary="<?php echo $this->__('Items Ordered') ?>">
29
  <col />
30
  <col width="1" />
31
  <col width="1" />
@@ -54,7 +54,7 @@
54
  <tr class="border<?php echo ($_index++ > $_count ?' last':'') ?>" id="order-item-gift-message-<?php echo $_item->getId() ?>" style="display:none;">
55
  <?php $_giftMessage=$this->helper('giftmessage/message')->getGiftMessageForEntity($_item); ?>
56
  <td class="gift-message-row" colspan="7">
57
- <a href="#" title="<?php echo $this->__('Close') ?>" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>');" class="btn-close"><?php echo $this->__('Close') ?></a>
58
  <dl class="gift-message">
59
  <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
60
  <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
25
  */
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
+ <table class="data-table" id="my-orders-table" summary="<?php echo Mage::helper('core')->quoteEscape($this->__('Items Ordered')) ?>">
29
  <col />
30
  <col width="1" />
31
  <col width="1" />
54
  <tr class="border<?php echo ($_index++ > $_count ?' last':'') ?>" id="order-item-gift-message-<?php echo $_item->getId() ?>" style="display:none;">
55
  <?php $_giftMessage=$this->helper('giftmessage/message')->getGiftMessageForEntity($_item); ?>
56
  <td class="gift-message-row" colspan="7">
57
+ <a href="#" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close')) ?>" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>');" class="btn-close"><?php echo $this->__('Close') ?></a>
58
  <dl class="gift-message">
59
  <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
60
  <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
app/design/frontend/base/default/template/sales/order/shipment/items.phtml CHANGED
@@ -27,7 +27,7 @@
27
  <?php $_order = $this->getOrder() ?>
28
  <p class="order-links">
29
  <?php if ($_order->getTracksCollection()->count()) : ?>
30
- <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','width=800,height=600,top=0,left=0,resizable=yes,scrollbars=yes'); return false;" title="<?php echo $this->__('Track all shipment(s)') ?>"><?php echo $this->__('Track all shipments') ?></a> <span class="separator">|</span>
31
  <?php endif; ?>
32
  <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo $this->__('Print All Shipments') ?></a>
33
  </p>
@@ -39,7 +39,7 @@
39
  <tbody>
40
  <tr>
41
  <td colspan="2">
42
- <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_shipment) ?>','trackshipment','width=800,height=600,top=0,left=0,resizable=yes,scrollbars=yes'); return false;" title="<?php echo $this->__('Track this shipment') ?>"><?php echo $this->__('Track this shipment') ?></a>
43
  </td>
44
  </tr>
45
  <tr>
27
  <?php $_order = $this->getOrder() ?>
28
  <p class="order-links">
29
  <?php if ($_order->getTracksCollection()->count()) : ?>
30
+ <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','width=800,height=600,top=0,left=0,resizable=yes,scrollbars=yes'); return false;" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Track all shipment(s)')) ?>"><?php echo $this->__('Track all shipments') ?></a> <span class="separator">|</span>
31
  <?php endif; ?>
32
  <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo $this->__('Print All Shipments') ?></a>
33
  </p>
39
  <tbody>
40
  <tr>
41
  <td colspan="2">
42
+ <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_shipment) ?>','trackshipment','width=800,height=600,top=0,left=0,resizable=yes,scrollbars=yes'); return false;" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Track this shipment')) ?>"><?php echo $this->__('Track this shipment') ?></a>
43
  </td>
44
  </tr>
45
  <tr>
app/design/frontend/base/default/template/sales/order/view.phtml CHANGED
@@ -57,7 +57,7 @@
57
  <?php $_order = $this->getOrder() ?>
58
  <h2 class="table-caption"><?php echo $this->__('Items Ordered') ?>
59
  <?php if ($_order->getTracksCollection()->count()) : ?>
60
- <span class="separator">|</span> <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','top=0,left=0,width=800,height=600,resizable=yes,scrollbars=yes'); return false;" title="<?php echo $this->__('Track your order') ?>"><?php echo $this->__('Track your order') ?></a>
61
  <?php endif; ?>
62
  </h2>
63
 
57
  <?php $_order = $this->getOrder() ?>
58
  <h2 class="table-caption"><?php echo $this->__('Items Ordered') ?>
59
  <?php if ($_order->getTracksCollection()->count()) : ?>
60
+ <span class="separator">|</span> <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','top=0,left=0,width=800,height=600,resizable=yes,scrollbars=yes'); return false;" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Track your order')) ?>"><?php echo $this->__('Track your order') ?></a>
61
  <?php endif; ?>
62
  </h2>
63
 
app/design/frontend/base/default/template/sales/recurring/profile/view.phtml CHANGED
@@ -32,16 +32,16 @@
32
  <div class="page-title title-buttons">
33
  <h1><?php echo $this->__('Recurring Profile # %s', $this->escapeHtml($this->getReferenceId())) ?></h1>
34
  <?php if ($this->getCanCancel()): ?>
35
- <button type="button" title="<?php echo $this->__('Cancel') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
36
  <?php endif; ?>
37
  <?php if ($this->getCanSuspend()): ?>
38
- <button type="button" title="<?php echo $this->__('Suspend') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getSuspendUrl() ?>'; } return false;"><span><span><?php echo $this->__('Suspend') ?></span></span></button>
39
  <?php endif; ?>
40
  <?php if ($this->getCanActivate()): ?>
41
- <button type="button" title="<?php echo $this->__('Activate') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getActivateUrl() ?>'; } return false;"><span><span><?php echo $this->__('Activate') ?></span></span></button>
42
  <?php endif; ?>
43
  <?php if ($this->getCanUpdate()):?>
44
- <button type="button" title="<?php echo $this->__('Get Update') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getUpdateUrl() ?>'; } return false;"><span><span><?php echo $this->__('Get Update') ?></span></span></button>
45
  <?php endif;?>
46
  </div>
47
 
32
  <div class="page-title title-buttons">
33
  <h1><?php echo $this->__('Recurring Profile # %s', $this->escapeHtml($this->getReferenceId())) ?></h1>
34
  <?php if ($this->getCanCancel()): ?>
35
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(),true) ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo $this->__('Cancel') ?></span></span></button>
36
  <?php endif; ?>
37
  <?php if ($this->getCanSuspend()): ?>
38
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Suspend')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(), true) ?>') ) { window.location.href = '<?php echo $this->getSuspendUrl() ?>'; } return false;"><span><span><?php echo $this->__('Suspend') ?></span></span></button>
39
  <?php endif; ?>
40
  <?php if ($this->getCanActivate()): ?>
41
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Activate')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(),true) ?>') ) { window.location.href = '<?php echo $this->getActivateUrl() ?>'; } return false;"><span><span><?php echo $this->__('Activate') ?></span></span></button>
42
  <?php endif; ?>
43
  <?php if ($this->getCanUpdate()):?>
44
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Get Update')) ?>" class="button" onclick="if( confirm('<?php echo Mage::helper('core')->quoteEscape($this->getConfirmationMessage(), true) ?>') ) { window.location.href = '<?php echo $this->getUpdateUrl() ?>'; } return false;"><span><span><?php echo $this->__('Get Update') ?></span></span></button>
45
  <?php endif;?>
46
  </div>
47
 
app/design/frontend/base/default/template/sales/reorder/sidebar.phtml CHANGED
@@ -47,7 +47,7 @@
47
  <li class="item">
48
  <?php if ($this->isItemAvailableForReorder($_item)): ?>
49
  <?php $_showAddButtonFlag = true ?>
50
- <input type="checkbox" name="order_items[]" id="reorder-item-<?php echo $_item->getId() ?>" value="<?php echo $_item->getId() ?>" title="<?php echo $this->__('Add to Cart') ?>" class="checkbox validate-one-required-by-name" />
51
  <script type="text/javascript">
52
  //<![CDATA[
53
  $('reorder-item-<?php echo $_item->getId() ?>').advaiceContainer = 'cart-sidebar-reorder-advice-container';
@@ -62,7 +62,7 @@
62
  <div id="cart-sidebar-reorder-advice-container"></div>
63
  <div class="actions">
64
  <?php if ($_showAddButtonFlag): ?>
65
- <button type="submit" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
66
  <?php endif; ?>
67
  <a href="<?php echo $this->getUrl('customer/account') ?>"><?php echo $this->__('View All'); ?></a>
68
  </div>
47
  <li class="item">
48
  <?php if ($this->isItemAvailableForReorder($_item)): ?>
49
  <?php $_showAddButtonFlag = true ?>
50
+ <input type="checkbox" name="order_items[]" id="reorder-item-<?php echo $_item->getId() ?>" value="<?php echo $_item->getId() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="checkbox validate-one-required-by-name" />
51
  <script type="text/javascript">
52
  //<![CDATA[
53
  $('reorder-item-<?php echo $_item->getId() ?>').advaiceContainer = 'cart-sidebar-reorder-advice-container';
62
  <div id="cart-sidebar-reorder-advice-container"></div>
63
  <div class="actions">
64
  <?php if ($_showAddButtonFlag): ?>
65
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
66
  <?php endif; ?>
67
  <a href="<?php echo $this->getUrl('customer/account') ?>"><?php echo $this->__('View All'); ?></a>
68
  </div>
app/design/frontend/base/default/template/sendfriend/send.phtml CHANGED
@@ -78,13 +78,13 @@
78
  <div class="field">
79
  <label for="sender_name" class="required"><em>*</em><?php echo $this->__('Name:') ?></label>
80
  <div class="input-box">
81
- <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>" title="<?php echo $this->__('Name') ?>" id="sender_name" type="text" class="input-text required-entry" />
82
  </div>
83
  </div>
84
  <div class="field">
85
  <label for="sender_email" class="required"><em>*</em><?php echo $this->__('Email:') ?></label>
86
  <div class="input-box">
87
- <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" id="sender_email" type="text" class="input-text required-entry validate-email" />
88
  </div>
89
  </div>
90
  </li>
@@ -109,7 +109,7 @@
109
  <div class="field">
110
  <label for="recipients_email" class="required"><em>*</em><?php echo $this->__('Email Address:') ?></label>
111
  <div class="input-box">
112
- <input name="recipients[email][]" value="" title="<?php echo $this->__('Email Address') ?>" id="recipients_email" type="text" class="input-text required-entry validate-email" />
113
  </div>
114
  </div>
115
  </li>
78
  <div class="field">
79
  <label for="sender_name" class="required"><em>*</em><?php echo $this->__('Name:') ?></label>
80
  <div class="input-box">
81
+ <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Name')) ?>" id="sender_name" type="text" class="input-text required-entry" />
82
  </div>
83
  </div>
84
  <div class="field">
85
  <label for="sender_email" class="required"><em>*</em><?php echo $this->__('Email:') ?></label>
86
  <div class="input-box">
87
+ <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" id="sender_email" type="text" class="input-text required-entry validate-email" />
88
  </div>
89
  </div>
90
  </li>
109
  <div class="field">
110
  <label for="recipients_email" class="required"><em>*</em><?php echo $this->__('Email Address:') ?></label>
111
  <div class="input-box">
112
+ <input name="recipients[email][]" value="" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Email Address')) ?>" id="recipients_email" type="text" class="input-text required-entry validate-email" />
113
  </div>
114
  </div>
115
  </li>
app/design/frontend/base/default/template/shipping/tracking/popup.phtml CHANGED
@@ -56,7 +56,7 @@
56
  <?php if($track->getErrorMessage()): ?>
57
  <tr>
58
  <th class="label"><?php echo $this->__('Error:'); ?></th>
59
- <td class="error"><?php echo $this->__('Tracking information is currently not available. Please '); if ($this->getContactUsEnabled()) : ?><a href="<?php echo $this->getContactUs() ?>" title="<?php echo $this->__('contact us') ?>" onclick="this.target='_blank'"><?php echo $this->__('contact us') ?></a><?php echo $this->__(' for more information or '); endif; echo $this->__('email us at '); ?><a href="mailto:<?php echo $this->getStoreSupportEmail() ?>"><?php echo $this->getStoreSupportEmail() ?></a></td>
60
  </tr>
61
  <?php elseif($track->getTrackSummary()): ?>
62
  <tr>
@@ -173,5 +173,5 @@
173
  <p><?php echo $this->__('There is no tracking available.'); ?></p>
174
  <?php endif; ?>
175
  <div class="buttons-set">
176
- <button type="button" title="<?php echo $this->__('Close Window') ?>" class="button" onclick="window.close(); window.opener.focus();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
177
  </div>
56
  <?php if($track->getErrorMessage()): ?>
57
  <tr>
58
  <th class="label"><?php echo $this->__('Error:'); ?></th>
59
+ <td class="error"><?php echo $this->__('Tracking information is currently not available. Please '); if ($this->getContactUsEnabled()) : ?><a href="<?php echo $this->getContactUs() ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('contact us')) ?>" onclick="this.target='_blank'"><?php echo $this->__('contact us') ?></a><?php echo $this->__(' for more information or '); endif; echo $this->__('email us at '); ?><a href="mailto:<?php echo $this->getStoreSupportEmail() ?>"><?php echo $this->getStoreSupportEmail() ?></a></td>
60
  </tr>
61
  <?php elseif($track->getTrackSummary()): ?>
62
  <tr>
173
  <p><?php echo $this->__('There is no tracking available.'); ?></p>
174
  <?php endif; ?>
175
  <div class="buttons-set">
176
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close(); window.opener.focus();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
177
  </div>
app/design/frontend/base/default/template/tag/customer/view.phtml CHANGED
@@ -29,7 +29,7 @@
29
  </div>
30
  <?php echo $this->getMessagesBlock()->toHtml() ?>
31
  <p class="my-tag-edit">
32
- <a href="#" title="<?php echo $this->__('Delete') ?>" onclick="if(confirm('<?php echo $this->__('Are you sure you want to delete this tag?') ?>')) window.location='<?php echo $this->getTagInfo()->getRemoveTagUrl(); ?>'; return false;" class="button btn-remove"><span><?php echo $this->__('Delete') ?></span></a>
33
  <?php echo $this->__('<strong>Tag Name:</strong> %s', $this->escapeHtml($this->getTagInfo()->getName())) ?>
34
  </p>
35
  <div class="clearer"></div>
@@ -54,7 +54,7 @@
54
  <?php if($_product->isSaleable()): ?>
55
  <?php $params[Mage_Core_Model_Url::FORM_KEY] = Mage::getSingleton('core/session')->getFormKey() ?>
56
  <?php $params['product'] = $_product->getId(); ?>
57
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getUrl('checkout/cart/add', $params) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
58
  <?php endif; ?>
59
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
60
  <ul class="add-to-links">
29
  </div>
30
  <?php echo $this->getMessagesBlock()->toHtml() ?>
31
  <p class="my-tag-edit">
32
+ <a href="#" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Delete')) ?>" onclick="if(confirm('<?php echo Mage::helper('core')->quoteEscape($this->__('Are you sure you want to delete this tag?'), true) ?>')) window.location='<?php echo $this->getTagInfo()->getRemoveTagUrl(); ?>'; return false;" class="button btn-remove"><span><?php echo $this->__('Delete') ?></span></a>
33
  <?php echo $this->__('<strong>Tag Name:</strong> %s', $this->escapeHtml($this->getTagInfo()->getName())) ?>
34
  </p>
35
  <div class="clearer"></div>
54
  <?php if($_product->isSaleable()): ?>
55
  <?php $params[Mage_Core_Model_Url::FORM_KEY] = Mage::getSingleton('core/session')->getFormKey() ?>
56
  <?php $params['product'] = $_product->getId(); ?>
57
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getUrl('checkout/cart/add', $params) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
58
  <?php endif; ?>
59
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
60
  <ul class="add-to-links">
app/design/frontend/base/default/template/tag/list.phtml CHANGED
@@ -42,7 +42,7 @@
42
  <div class="input-box">
43
  <input type="text" class="input-text required-entry" name="productTagName" id="productTagName" />
44
  </div>
45
- <button type="button" title="<?php echo $this->__('Add Tags') ?>" class="button" onclick="submitTagForm()">
46
  <span>
47
  <span><?php echo $this->__('Add Tags') ?></span>
48
  </span>
42
  <div class="input-box">
43
  <input type="text" class="input-text required-entry" name="productTagName" id="productTagName" />
44
  </div>
45
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add Tags')) ?>" class="button" onclick="submitTagForm()">
46
  <span>
47
  <span><?php echo $this->__('Add Tags') ?></span>
48
  </span>
app/design/frontend/base/default/template/wishlist/button/share.phtml CHANGED
@@ -26,5 +26,5 @@
26
  ?>
27
 
28
  <?php if($this->getWishlist()->getItemsCount()): ?>
29
- <button type="submit" name="save_and_share" title="<?php echo $this->__('Share Wishlist') ?>" class="button btn-share"><span><span><?php echo $this->__('Share Wishlist') ?></span></span></button>
30
  <?php endif;?>
26
  ?>
27
 
28
  <?php if($this->getWishlist()->getItemsCount()): ?>
29
+ <button type="submit" name="save_and_share" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Share Wishlist')) ?>" class="button btn-share"><span><span><?php echo $this->__('Share Wishlist') ?></span></span></button>
30
  <?php endif;?>
app/design/frontend/base/default/template/wishlist/button/tocart.phtml CHANGED
@@ -26,5 +26,5 @@
26
  ?>
27
 
28
  <?php if($this->getWishlist()->getItemsCount() && $this->getWishlist()->isSalable()): ?>
29
- <button type="button" title="<?php echo $this->__('Add All to Cart') ?>" onclick="addAllWItemsToCart()" class="button btn-add"><span><span><?php echo $this->__('Add All to Cart') ?></span></span></button>
30
  <?php endif;?>
26
  ?>
27
 
28
  <?php if($this->getWishlist()->getItemsCount() && $this->getWishlist()->isSalable()): ?>
29
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add All to Cart')) ?>" onclick="addAllWItemsToCart()" class="button btn-add"><span><span><?php echo $this->__('Add All to Cart') ?></span></span></button>
30
  <?php endif;?>
app/design/frontend/base/default/template/wishlist/button/update.phtml CHANGED
@@ -26,5 +26,5 @@
26
  ?>
27
 
28
  <?php if($this->getWishlist()->getItemsCount()): ?>
29
- <button type="submit" name="do" title="<?php echo $this->__('Update Wishlist') ?>" class="button btn-update"><span><span><?php echo $this->__('Update Wishlist') ?></span></span></button>
30
  <?php endif;?>
26
  ?>
27
 
28
  <?php if($this->getWishlist()->getItemsCount()): ?>
29
+ <button type="submit" name="do" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Wishlist')) ?>" class="button btn-update"><span><span><?php echo $this->__('Update Wishlist') ?></span></span></button>
30
  <?php endif;?>
app/design/frontend/base/default/template/wishlist/email/rss.phtml CHANGED
@@ -25,7 +25,7 @@
25
  */
26
  ?>
27
  <p style="font-size:12px; line-height:16px; margin:0 0 16px;">
28
- <?php echo $this->__("RSS link to %s's wishlist",$this->helper('wishlist')->getCustomerName()) ?>
29
  <br />
30
  <a href="<?php echo $this->helper('wishlist')->getRssUrl($this->getWishlistId()); ?>"><?php echo $this->helper('wishlist')->getRssUrl($this->getWishlistId()); ?></a>
31
  </p>
25
  */
26
  ?>
27
  <p style="font-size:12px; line-height:16px; margin:0 0 16px;">
28
+ <?php echo $this->__("RSS link to %s's wishlist", Mage::helper('core')->quoteEscape($this->helper('wishlist')->getCustomerName())) ?>
29
  <br />
30
  <a href="<?php echo $this->helper('wishlist')->getRssUrl($this->getWishlistId()); ?>"><?php echo $this->helper('wishlist')->getRssUrl($this->getWishlistId()); ?></a>
31
  </p>
app/design/frontend/base/default/template/wishlist/item/column/cart.phtml CHANGED
@@ -39,7 +39,7 @@ $options = $this->getChild('customer.wishlist.item.options')
39
  <input type="text" class="input-text qty validate-not-negative-number" name="qty[<?php echo $item->getId() ?>]" value="<?php echo $this->getAddToCartQty($item) * 1 ?>" />
40
  <?php endif; ?>
41
  <?php if ($product->isSaleable()): ?>
42
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" onclick="addWItemToCart(<?php echo $item->getId()?>);" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
43
  <?php else: ?>
44
  <?php if ($product->getIsSalable()): ?>
45
  <p class="availability in-stock"><span><?php echo $this->__('In stock') ?></span></p>
39
  <input type="text" class="input-text qty validate-not-negative-number" name="qty[<?php echo $item->getId() ?>]" value="<?php echo $this->getAddToCartQty($item) * 1 ?>" />
40
  <?php endif; ?>
41
  <?php if ($product->isSaleable()): ?>
42
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" onclick="addWItemToCart(<?php echo $item->getId()?>);" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
43
  <?php else: ?>
44
  <?php if ($product->getIsSalable()): ?>
45
  <p class="availability in-stock"><span><?php echo $this->__('In stock') ?></span></p>
app/design/frontend/base/default/template/wishlist/item/column/info.phtml CHANGED
@@ -30,7 +30,7 @@ $product = $item->getProduct();
30
  ?>
31
  <h3 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></h3>
32
  <div class="description std"><div class="inner"><?php echo $this->escapeHtml($this->stripTags($product->getShortDescription()));?></div></div>
33
- <textarea name="description[<?php echo $item->getWishlistItemId() ?>]" rows="3" cols="5" onfocus="focusComment(this)" onblur="focusComment(this)" title="<?php echo $this->__('Comment') ?>"><?php echo ($this->escapeHtml($item->getDescription() ? $item->getDescription() : $this->helper('wishlist')->defaultCommentString())) ?></textarea>
34
  <?php if($this->getSortedChildren()): ?>
35
  <div class="item-manage">
36
  <?php foreach($this->getSortedChildren() as $childName):?>
30
  ?>
31
  <h3 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></h3>
32
  <div class="description std"><div class="inner"><?php echo $this->escapeHtml($this->stripTags($product->getShortDescription()));?></div></div>
33
+ <textarea name="description[<?php echo $item->getWishlistItemId() ?>]" rows="3" cols="5" onfocus="focusComment(this)" onblur="focusComment(this)" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Comment')) ?>"><?php echo ($this->escapeHtml($item->getDescription() ? $item->getDescription() : $this->helper('wishlist')->defaultCommentString())) ?></textarea>
34
  <?php if($this->getSortedChildren()): ?>
35
  <div class="item-manage">
36
  <?php foreach($this->getSortedChildren() as $childName):?>
app/design/frontend/base/default/template/wishlist/item/column/remove.phtml CHANGED
@@ -25,5 +25,5 @@
25
  */
26
 
27
  ?>
28
- <a href="<?php echo $this->getItemRemoveUrl($this->getItem()); ?>" onclick="return confirmRemoveWishlistItem();" title="<?php echo $this->__('Remove Item') ?>"
29
  class="btn-remove btn-remove2"><?php echo $this->__('Remove item');?></a>
25
  */
26
 
27
  ?>
28
+ <a href="<?php echo $this->getItemRemoveUrl($this->getItem()); ?>" onclick="return confirmRemoveWishlistItem();" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Remove Item')) ?>"
29
  class="btn-remove btn-remove2"><?php echo $this->__('Remove item');?></a>
app/design/frontend/base/default/template/wishlist/render/item/price_msrp_item.phtml CHANGED
@@ -99,7 +99,7 @@
99
  <script type="text/javascript">
100
  Catalog.Map.addHelpLink(
101
  $('<?php echo $helpLinkId ?>'),
102
- "<?php echo $this->__("What's this?"); ?>"
103
  );
104
  </script>
105
  </div>
99
  <script type="text/javascript">
100
  Catalog.Map.addHelpLink(
101
  $('<?php echo $helpLinkId ?>'),
102
+ '<?php echo Mage::helper('core')->jsQuoteEscape($this->__("What's this?")); ?>'
103
  );
104
  </script>
105
  </div>
app/design/frontend/base/default/template/wishlist/shared.phtml CHANGED
@@ -61,7 +61,7 @@
61
  <td class="a-center">
62
  <?php if ($product->isSaleable()): ?>
63
  <?php if ($isVisibleProduct): ?>
64
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" onclick="setLocation('<?php echo $this->getSharedItemAddToCartUrl($item) ?>')" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
65
  <?php endif ?>
66
  <?php endif; ?>
67
  <p><a href="<?php echo $this->getAddToWishlistUrl($item) ?>" onclick="setLocation(this.href); return false;" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></p>
@@ -75,7 +75,7 @@
75
  <div class="buttons-set">
76
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
77
  <?php if($this->isSaleable()):?>
78
- <button type="button" title="<?php echo $this->__('Add All to Cart') ?>" onclick="setLocation('<?php echo $this->getUrl('*/*/allcart', array('_current'=>true)) ?>')" class="button"><span><span><?php echo $this->__('Add All to Cart') ?></span></span></button>
79
  <?php endif;?>
80
  </div>
81
  </form>
61
  <td class="a-center">
62
  <?php if ($product->isSaleable()): ?>
63
  <?php if ($isVisibleProduct): ?>
64
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" onclick="setLocation('<?php echo $this->getSharedItemAddToCartUrl($item) ?>')" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
65
  <?php endif ?>
66
  <?php endif; ?>
67
  <p><a href="<?php echo $this->getAddToWishlistUrl($item) ?>" onclick="setLocation(this.href); return false;" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></p>
75
  <div class="buttons-set">
76
  <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
77
  <?php if($this->isSaleable()):?>
78
+ <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add All to Cart')) ?>" onclick="setLocation('<?php echo $this->getUrl('*/*/allcart', array('_current'=>true)) ?>')" class="button"><span><span><?php echo $this->__('Add All to Cart') ?></span></span></button>
79
  <?php endif;?>
80
  </div>
81
  </form>
app/design/frontend/base/default/template/wishlist/sharing.phtml CHANGED
@@ -48,7 +48,7 @@
48
  <?php if($this->helper('wishlist')->isRssAllow()): ?>
49
  <li class="control">
50
  <div class="input-box">
51
- <input type="checkbox" name="rss_url" id="rss_url" value="1" title="<?php echo $this->__('Check this checkbox if you want to add a link to an rss feed to your wishlist.') ?>" class="checkbox" />
52
  </div>
53
  <label for="rss_url"><?php echo $this->__('Check this checkbox if you want to add a link to an rss feed to your wishlist.') ?></label>
54
  </li>
@@ -58,13 +58,13 @@
58
  <div class="buttons-set form-buttons">
59
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
60
  <p class="back-link"><a href="<?php echo $this->getBackUrl(); ?>"><small>&laquo; </small><?php echo $this->__('Back')?></a></p>
61
- <button type="submit" title="<?php echo $this->__('Share Wishlist') ?>" class="button"><span><span><?php echo $this->__('Share Wishlist') ?></span></span></button>
62
  </div>
63
  </form>
64
  <script type="text/javascript">
65
  //<![CDATA[
66
  Validation.addAllThese([
67
- ['validate-emails', '<?php echo $this->__('Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.') ?>', function (v) {
68
  if(Validation.get('IsEmpty').test(v)) {
69
  return true;
70
  }
48
  <?php if($this->helper('wishlist')->isRssAllow()): ?>
49
  <li class="control">
50
  <div class="input-box">
51
+ <input type="checkbox" name="rss_url" id="rss_url" value="1" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Check this checkbox if you want to add a link to an rss feed to your wishlist.')) ?>" class="checkbox" />
52
  </div>
53
  <label for="rss_url"><?php echo $this->__('Check this checkbox if you want to add a link to an rss feed to your wishlist.') ?></label>
54
  </li>
58
  <div class="buttons-set form-buttons">
59
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
60
  <p class="back-link"><a href="<?php echo $this->getBackUrl(); ?>"><small>&laquo; </small><?php echo $this->__('Back')?></a></p>
61
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Share Wishlist')) ?>" class="button"><span><span><?php echo $this->__('Share Wishlist') ?></span></span></button>
62
  </div>
63
  </form>
64
  <script type="text/javascript">
65
  //<![CDATA[
66
  Validation.addAllThese([
67
+ ['validate-emails', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.')) ?>', function (v) {
68
  if(Validation.get('IsEmpty').test(v)) {
69
  return true;
70
  }
app/design/frontend/base/default/template/wishlist/sidebar.phtml CHANGED
@@ -39,7 +39,7 @@
39
  <li class="item">
40
  <a href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($product, 'thumbnail')->resize(50); ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($product->getName()) ?>" /></a>
41
  <div class="product-details">
42
- <a href="<?php echo $this->getItemRemoveUrl($_item) ?>" title="<?php echo $this->__('Remove This Item') ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove this item from the wishlist?') ?>');" class="btn-remove"><?php echo $this->__('Remove This Item') ?></a>
43
  <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></p>
44
  <?php echo $this->getPriceHtml($product, false, '-wishlist') ?>
45
  <?php if ($product->isSaleable() && $product->isVisibleInSiteVisibility()): ?>
39
  <li class="item">
40
  <a href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($product, 'thumbnail')->resize(50); ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($product->getName()) ?>" /></a>
41
  <div class="product-details">
42
+ <a href="<?php echo $this->getItemRemoveUrl($_item) ?>" title="<?php echo 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 wishlist?'), true) ?>');" class="btn-remove"><?php echo $this->__('Remove This Item') ?></a>
43
  <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></p>
44
  <?php echo $this->getPriceHtml($product, false, '-wishlist') ?>
45
  <?php if ($product->isSaleable() && $product->isVisibleInSiteVisibility()): ?>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Base_Default</name>
4
- <version>1.9.1.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>This is a Magento themes base</summary>
10
  <description>This is a Magento themes base</description>
11
- <notes>1.9.1.1</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
- <date>2015-04-29</date>
14
- <time>12:01:09</time>
15
- <contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="etc"><file name="theme.xml" hash="cb15d7d843605505e5d58557f789b5b5"/><file name="widget.xml" hash="7c90d742393ad24b83c8984e45c9afb2"/></dir><dir name="layout"><file name="authorizenet.xml" hash="9b43ec1a3ab7e51226ec20fc9471cc0f"/><file name="bml.xml" hash="7308daeb41b482df29491a7d52fb8471"/><file name="bundle.xml" hash="4108c1c75f2eec7c53ff8a38e4f383a8"/><file name="captcha.xml" hash="18d5e650991b3f7c0822600a797a2835"/><file name="catalog.xml" hash="9c383975a47cde57dda70c55b73f16b2"/><file name="catalog_msrp.xml" hash="4aa0b4f0733b261c49a03ee86f8748b0"/><file name="cataloginventory.xml" hash="69fe52378a85805a0952a2b1908f2828"/><file name="catalogsearch.xml" hash="e34de289421b1a456b396402f704ff84"/><file name="checkout.xml" hash="1b37f8dc6e0a56f778e0414209e1f7c3"/><file name="cms.xml" hash="a5af520b4a47b8548bcf168fd09165e0"/><file name="contacts.xml" hash="4378fcbf196ab46e7446b6bc6a891dae"/><file name="core.xml" hash="74712a169176f8f505d21fae0b748afb"/><file name="customer.xml" hash="f19d26fcf54c986cfc0f74e8a9ec086a"/><file name="directory.xml" hash="55f934d2f1f17b3ddb1b3d659d391b86"/><file name="downloadable.xml" hash="d63b8d0085ea27f984615635a2eec1a2"/><file name="googleanalytics.xml" hash="6a771dc81c58491423e48c32522c32f9"/><file name="newsletter.xml" hash="8135d4342f613c00f10079abd441ff2f"/><file name="oauth.xml" hash="101bd169a40bdbbd4e86edbef3845d50"/><file name="page.xml" hash="d35964dd5907509bf614a040d28f9394"/><file name="pagecache.xml" hash="4f5af67cd7dc741262893975cdb7c975"/><file name="payment.xml" hash="6d1b1ef0e334ddd06ae081bc52d0fec6"/><file name="paypal.xml" hash="be2296e47120c1ee987d64fabc161575"/><file name="paypaluk.xml" hash="848d95046abc769a76454863bd6be355"/><file name="persistent.xml" hash="630f737bb39a9373b9d88e352edb76bc"/><file name="poll.xml" hash="fc1b9888131c2ca7fe3d979e32195ff9"/><file name="productalert.xml" hash="5f3358b7d00c9e3c16e1dab9e95c0a4e"/><file name="reports.xml" hash="e6cf7af18c38dcc5ab289b2a21697228"/><file name="review.xml" hash="6891b15e9bd9806c57bd37cf98902c75"/><file name="rss.xml" hash="ee5b7b8665b6281551180f6dae293a3e"/><dir name="sales"><file name="billing_agreement.xml" hash="3bb6b8cabd82076aa81da485354e7504"/><file name="recurring_profile.xml" hash="07c5cf1f6e252585ff148592ac64d799"/></dir><file name="sales.xml" hash="d0ce0e5135d7e5cadee565a0ea6a5791"/><file name="sendfriend.xml" hash="751c3ddfbe0d1192b534f573faaebf1d"/><file name="shipping.xml" hash="bc25e5d870c8f42fffd320d024c29cfc"/><file name="tag.xml" hash="507cf1830b70d4aa4ba548e14f50e962"/><file name="weee.xml" hash="a7a825ac307f4746a25ed3194280a191"/><file name="wishlist.xml" hash="bac8a033ab79991f97f4b12bf273dbf8"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="24fb086fa883c14cc9dfb9fd4dd78c64"/><file name="iframe.phtml" hash="cad12e7af9070ad97b7a0d3a8cb3f46e"/><file name="info.phtml" hash="3b505c2281b44a95a9416ec948d48c19"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="c312478997aa130687ba6d99cbdecd04"/></dir><file name="price.phtml" hash="536bba9dfc772347f912289891e028a5"/><dir name="view"><file name="option_tierprices.phtml" hash="e23de273f835bcdeb5106dfe912c33d0"/><dir name="options"><file name="notice.phtml" hash="3aaa7da292ce864f257bc8951d04bb1d"/></dir><file name="price.phtml" hash="1f300b0114243160082f039cc18cb831"/><file name="tierprices.phtml" hash="0d6822783c1c193155855206772a76c2"/><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="cf7c70e1c6f95266d527a75fbfb4d3d2"/><file name="multi.phtml" hash="14ae0a03d33d4cf96921f63c3b8b80ad"/><file name="radio.phtml" hash="3f6efd84f38e6daf926d38026e4c6fc8"/><file name="select.phtml" hash="75c096977c2573c8e0f7f8ffe8e3a825"/></dir><file name="options.phtml" hash="fcf0d2312cb6409c9fe87331e8ed812a"/></dir><file name="bundle.phtml" hash="699cf212a5845991d218c290605057ce"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="0ebd275d9fd1250369cb296642329aef"/></dir><dir name="invoice"><file name="default.phtml" hash="35a47799faad39f930bdcab1f7bddd20"/></dir><dir name="order"><file name="default.phtml" hash="abd062ff9789076c430c975db2c13ee5"/></dir><dir name="shipment"><file name="default.phtml" hash="91a551c533f425c37b150db126ffc3b9"/></dir></dir></dir></dir><dir name="rss"><dir name="catalog"><dir name="product"><file name="price.phtml" hash="3acc1f7d981e2d69f517577734cef48a"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="9cab5ff8ee6f397be3fea1bb8b1f6dfb"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="2667129b9522036ba54c6e679f863852"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="b2371c4f222823db77dcebde9ef3736e"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="84efc62c4e7965f45806be8095bb80e9"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="522992ffe5989e813dc736f7a7f5981e"/><file name="right_col.phtml" hash="522992ffe5989e813dc736f7a7f5981e"/></dir><dir name="captcha"><file name="zend.phtml" hash="9310fbe6eaa858ebdb5308b49f6b845e"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="bb6f57c1300ff8cce698944a20693158"/><file name="view.phtml" hash="b393612d0c0a8c91310e3e09f6f82d37"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="97f1fb1fb08eedf72bbad2cc21a4e368"/><file name="link_inline.phtml" hash="b1be1359eac9a775e241228e9edad6ff"/></dir></dir></dir><dir name="layer"><file name="filter.phtml" hash="db3ab7d6d6ff60f738f83d8e39b5e573"/><file name="state.phtml" hash="4eb32b334c59844b07c4e42effbd0e83"/><file name="view.phtml" hash="257a34a5feaa047a22a9324e1c584564"/></dir><dir name="msrp"><file name="popup.phtml" hash="4921e70c9c16156184a8df7cbb6c0fe1"/></dir><dir name="navigation"><file name="left.phtml" hash="9febc1ddff257023ef568ed3f0e76b67"/><file name="top.phtml" hash="9c866ce66ddb423ac85ddc32ae2a2c7b"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="73eae4f3f3becbc0335acd54ee07193f"/><file name="sidebar.phtml" hash="d89265105c25489892a12154f4a36f42"/></dir><file name="gallery.phtml" hash="684ddad4304e9c757992b9724ab34376"/><dir name="list"><file name="related.phtml" hash="65073d6e8f28c49d21eee613a7778805"/><file name="toolbar.phtml" hash="9df138ec8cb999e8c790c728aed6d00e"/><file name="upsell.phtml" hash="bc067353d480fa960f04e656045a06b3"/></dir><file name="list.phtml" hash="151e23cb81bc1f8a1fd84a5f0252c45d"/><file name="new.phtml" hash="51ba208b19b4f8c55467da4881ea2104"/><file name="price.phtml" hash="55795fbb6f2b62ddb4b4e4926400b3f2"/><file name="price_msrp.phtml" hash="6e5c5f54444a50c733dc880155e616b5"/><file name="price_msrp_item.phtml" hash="54ffede347325808c2086bdc1edbe348"/><file name="price_msrp_noform.phtml" hash="73c40737abcadff3d1a4abd64ef51886"/><file name="price_msrp_rss.phtml" hash="8ebdef3f6de012eb03ec92344dbe0cf8"/><dir name="view"><file name="additional.phtml" hash="527ae1a664b1906d8c01956cf640dff3"/><file name="addto.phtml" hash="f895117d77add30fe6103536da6176d2"/><file name="addtocart.phtml" hash="cf29965d39ab68cd40bac891b16e1226"/><file name="attributes.phtml" hash="58872c8a2970492dce4e17d6581efcd5"/><file name="description.phtml" hash="7f21f35fcf81ac91d99940a7062e3dcd"/><file name="media.phtml" hash="05b2337d07b883c788fc6a565eba57c8"/><dir name="options"><file name="js.phtml" hash="8b1b18f53ad027dd1c3e872ef28b18dd"/><dir name="type"><file name="date.phtml" hash="f11c4d1d7c0605cd597f43e73b511e04"/><file name="default.phtml" hash="bfda656d7ac7ab4966143d2ad25439d0"/><file name="file.phtml" hash="8f59cdb546924d4ce68baf49a622e493"/><file name="select.phtml" hash="df3d0d15468a1d13407f255fd9497891"/><file name="text.phtml" hash="12caeff494da87a6c878cc9f3c5fe60a"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="952d89bec89ed906cdbae021441560cb"/></dir><file name="wrapper.phtml" hash="b7a4a0933767d62a0fd69adc14b796ad"/></dir><file name="options.phtml" hash="d47affa574c4dcf8bc94739c85af3b96"/><file name="price.phtml" hash="d5ad760d4eb36bbfe599a7d46f2c1932"/><file name="price_clone.phtml" hash="15bb70ea6bced116ec6af906167f80b9"/><file name="tierprices.phtml" hash="88aac101bafa81fc161ed7af0af09652"/><dir name="type"><file name="configurable.phtml" hash="21c103b5067d5d689e1e3a19063b0ecb"/><file name="default.phtml" hash="919aca6f31f11d41e32eea62ea74cfaf"/><file name="grouped.phtml" hash="592bcfe36b7cd24acf46c4410a1fbb2d"/><dir name="options"><file name="configurable.phtml" hash="4667c89a042cc4821e8e205cc9abc122"/></dir><file name="simple.phtml" hash="21c103b5067d5d689e1e3a19063b0ecb"/><file name="virtual.phtml" hash="21c103b5067d5d689e1e3a19063b0ecb"/></dir></dir><file name="view.phtml" hash="62e5d09072fb6242fa7e0422c5f00a56"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="875e1b2076f72b939479e4da2a1687af"/><file name="link_inline.phtml" hash="88a34290644cd7534b88f58543f8a9c4"/></dir><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="94b34bb7203939697bc3aef1fe115556"/><file name="new_images_list.phtml" hash="c94b6517478eb33cb97b56930461d1a0"/><file name="new_names_list.phtml" hash="b79d1c340a030b2b30f722254fe1dbf8"/></dir><dir name="content"><file name="new_grid.phtml" hash="53018a8c6bf48e6364182feb8efd4b0d"/><file name="new_list.phtml" hash="e8ac576a4824e537081d3997e34eb8de"/></dir></dir></dir></dir><dir name="rss"><dir name="product"><file name="price.phtml" hash="9d5064b78181f548219e841bf8f4f735"/></dir></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="e0af060eed2cc92b8d198e2fde58d303"/></dir><file name="sitemap.phtml" hash="35948de2346cd34e99159f73e4eb802c"/><file name="tree.phtml" hash="ec525bd86bbe2770bc4f597454a98405"/></dir></dir><dir name="cataloginventory"><file name="qtyincrements.phtml" hash="893622cc441e708bb78588710d207ce1"/><dir name="stockqty"><file name="composite.phtml" hash="843dd52998d2cd8f6b5af0ab52f533d4"/><file name="default.phtml" hash="7369ccc7c5a23a9b12df16b0a002e77a"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="17735c49d7a52fd082e6ff5d88df7535"/><file name="result.phtml" hash="82a3e85fd8b51646b46f8d318d68b237"/></dir><file name="form.mini.phtml" hash="96b71b376ddea2b945d56da25628cfab"/><file name="result.phtml" hash="7a0a3527c13c08a904775c61557d4cfd"/><file name="term.phtml" hash="bbe7ccd2fe827ea0c48bc2a445b3320a"/></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="b93df0fa98cf49a5133acedb225a0273"/><file name="crosssell.phtml" hash="d1809a164dc510563670ba4c00155cbb"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="e130478c5bef49d7c3875594d2325bc0"/></dir><file name="default.phtml" hash="0d534fce84a63fcccde9622404bea933"/></dir><file name="noItems.phtml" hash="7ebca3d28d8c3cd134cc6c96063c8494"/><dir name="render"><file name="default.phtml" hash="76b206a6b3e8ff6014a173c48956b49c"/><file name="simple.phtml" hash="461952172e3e5b92f0042f68458ccbb0"/></dir><file name="shipping.phtml" hash="e92f0ed817f3e328daeb2550fd6b8130"/><dir name="sidebar"><file name="default.phtml" hash="4d3851d6e87ff614f6277e9ea8b20c5e"/></dir><file name="sidebar.phtml" hash="5c3d928d20071ece47ee74d17fff1365"/><file name="totals.phtml" hash="a9dc915f0c1a06c688a4a0e2548a359d"/></dir><file name="cart.phtml" hash="ae9e5fc80fbc1d9335226826a2b218bb"/><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="c2a6b1977668cad9d3c808253728c9c2"/></dir><file name="addresses.phtml" hash="f923d85477679057fe67721efbdc3e02"/><file name="agreements.phtml" hash="1b2de056cfca34aa9983e34eb740fe66"/><dir name="billing"><file name="items.phtml" hash="5dca82a962d278cf78c085854cebf10f"/></dir><file name="billing.phtml" hash="dbbd0bba5327c696622c007ce51122a8"/><dir name="item"><file name="default.phtml" hash="b4a553382bc807ff150b8e4481967dbd"/></dir><file name="link.phtml" hash="288337ac5888feeaafb91701e5d262f7"/><dir name="overview"><file name="item.phtml" hash="101c09142f53bb41ca582b12ae73e729"/></dir><file name="overview.phtml" hash="fef929a9b08e9002950fab41e177bef4"/><file name="shipping.phtml" hash="f5fa26bbdbe9baab8480f2da6ba18d18"/><file name="state.phtml" hash="6667bd9bb5b18ee7895c542f71324c4a"/><file name="success.phtml" hash="2c2610b459b201139b0bb983912ae54c"/></dir><dir name="onepage"><file name="agreements.phtml" hash="fd159b75e3886a8c1211dc082f6038a9"/><file name="billing.phtml" hash="5fa1764c02abb82c18214c30c6e30569"/><file name="failure.phtml" hash="2f2a6f86c41f74265169a2c10722e19b"/><file name="link.phtml" hash="37a8493caf940a65a268f6f53f6b421d"/><file name="login.phtml" hash="4df4b62a55137e6ac3a2e6bbdf02883b"/><dir name="payment"><file name="info.phtml" hash="26bb640843ee3fb6e72b4f2739f0a111"/><file name="methods.phtml" hash="ce2c7ddf4de7bad643bb095761e7faea"/></dir><file name="payment.phtml" hash="ec68c010c407778ae62ec98b8e5ab18d"/><dir name="progress"><file name="billing.phtml" hash="c06e12741addacd560a19ccd7ca905ba"/><file name="payment.phtml" hash="9721d97eeba66f9a770fef5e5611e1d3"/><file name="shipping.phtml" hash="da10e274a474b9077991ccd73b438107"/><file name="shipping_method.phtml" hash="da72538919498704eb7c843702daface"/></dir><file name="progress.phtml" hash="c94a75e0c3a07cef70f8509a8f76d230"/><dir name="review"><file name="button.phtml" hash="f98d35dd51394b72939d7ead2895aa96"/><file name="info.phtml" hash="4e85229c7e57ff23f79349f8dfce836f"/><file name="item.phtml" hash="6d3fd9e7e0fe9e83c2e9b17d683ce741"/><file name="totals.phtml" hash="eb054bae49687e421d0d7a99ad1395e1"/></dir><file name="review.phtml" hash="d2494b8faac5833e747a5d329ee4fab7"/><file name="shipping.phtml" hash="b0ab94e4b325dadc383febf69945ffd7"/><dir name="shipping_method"><file name="additional.phtml" hash="5b40c047594e6bc64493bd0c9f070606"/><file name="available.phtml" hash="38c7b5af800735a273ed4300f6259700"/></dir><file name="shipping_method.phtml" hash="3921097ed6fa6eb2371a834015b338f1"/></dir><file name="onepage.phtml" hash="2ab0d7efcfaa12666945c6fb6683634d"/><file name="success.phtml" hash="856f6dd360fba19f62029d163e611bd8"/><dir name="total"><file name="default.phtml" hash="f14f728417f7d3e4469c22ac396d2996"/><file name="nominal.phtml" hash="201f568085d2381ce24372f31d135c3c"/><file name="tax.phtml" hash="caf415127cdb983c4db20cdaaa5d62db"/></dir></dir><dir name="cms"><file name="content.phtml" hash="047502566c3fe8b4f93d043e7c6ca7b5"/><file name="content_heading.phtml" hash="038b25f957a664940b6c44053041912c"/><dir name="default"><file name="home.phtml" hash="11c840f59024821bc16d609aaf84655b"/><file name="no-route.phtml" hash="7f730281d216fb8e2b9cf1c613a58482"/></dir><file name="meta.phtml" hash="5995926c3ef19c539fdcf766ee8b125a"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="fd98755f4354dcd5caef0b6e4c2a275c"/><file name="link_inline.phtml" hash="5d1b2f86bd10253d61347ac8b70fa363"/></dir><dir name="static_block"><file name="default.phtml" hash="b1d683caf67a2fe3e3a518e540ab0f8e"/></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="e4b8f1df8c5674e215c023fb4a8f70ac"/></dir><dir name="core"><file name="formkey.phtml" hash="b483e152453aea655abd6b32e6cea51c"/><file name="link.phtml" hash="cd0b34977d0610129733714da63e5b3a"/><file name="messages.phtml" hash="a1270fef9dc17d55ef3355e53aadd49d"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="48474f750c4d06249e33a45cb3594f69"/><file name="hello.phtml" hash="75ba03f927822df90452471acfbc6d44"/><file name="info.phtml" hash="a769d17cf054553e62de61576e8fad6b"/><file name="newsletter.phtml" hash="9660207d1e1edb0a5aaf406c774c8f79"/></dir><file name="dashboard.phtml" hash="d193fd711052be429ca1399181a02b49"/><dir name="link"><file name="back.phtml" hash="1bc59121d95399210fd9605194a75504"/></dir><file name="navigation.phtml" hash="eecaabce0bad80bebb96f4328b9cadbb"/></dir><dir name="address"><file name="book.phtml" hash="e941bd825e53609dd5afc2f0ec972f6c"/><file name="edit.phtml" hash="e1cb60e8a9887e4b96dc74c21e359222"/></dir><file name="address.phtml" hash="b1108a1a1d3c425be9df4cb72e85abc0"/><file name="balance.phtml" hash="64ee629de88f7c62810811aef91ff3a3"/><dir name="form"><file name="address.phtml" hash="67438e0b68496cb31421050f4bd3c53e"/><file name="changepassword.phtml" hash="f2308d63e1592401190c2c2d8f31129d"/><file name="confirmation.phtml" hash="e5291cb5e4889487436a6b107985ac63"/><file name="edit.phtml" hash="b7d48c4768b17c273e473fbef764d416"/><file name="forgotpassword.phtml" hash="3e75c2f8874e429e4309219b7ac9c104"/><file name="login.phtml" hash="946b0e376845fbd93c1c5838d591250d"/><file name="mini.login.phtml" hash="af0ae17cb6f5cbe8f9fe4f047960ccd4"/><file name="newsletter.phtml" hash="68bb5cf290f0b9911ec829e0285247cf"/><file name="register.phtml" hash="6719dbbf6c7ba43e0d3ac92f48612699"/><file name="resetforgottenpassword.phtml" hash="32b3283866fea9126e2f306462803171"/></dir><file name="logout.phtml" hash="d722f44c13c93d5c7e7e8e661a8b25b2"/><file name="orders.phtml" hash="fee18b4c642a6872d85e230b1cf6aa2d"/><dir name="widget"><file name="dob.phtml" hash="d26bb6bdf6255a546bc0d0feadd07c5b"/><file name="gender.phtml" hash="c099e3b369d34c01f326b6a2c32434ce"/><file name="name.phtml" hash="9eb15b5c76560cbedcf7c0c2c5af1536"/><file name="taxvat.phtml" hash="bfe2c82c6f414d636d15331cc67d0b30"/></dir><file name="wishlist.phtml" hash="5fb9990a3d7c9713beb3550bb0a3b7f6"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="ad9d5270ecf99d4317c39f150cfee178"/></dir><file name="currency.phtml" hash="a347ef5a9b9c71d0c636758527a5ddcb"/><dir name="js"><file name="optional_zip_countries.phtml" hash="98beaa8fcc825322bdb658040a74c53b"/></dir></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="3cc2aa5af9a3ef0599dbdb6a432067c0"/><file name="samples.phtml" hash="f3fcb6acf13d9494f6e03fb9c43ca789"/><file name="type.phtml" hash="2cd550caa6ad4fa8ad5a85fe866c85cd"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="0347b39b92ebc5a6364b4890b3eac088"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="da30307e4094015c6bb0636743b0bef1"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="afa9337e189779fa488a16596f0613c9"/></dir></dir><file name="success.phtml" hash="8dcd2684f45ebe6a1c0c5721b4fde0d8"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="2a58af367c48d90e8b08ef8fe632aad2"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="8fcb56ba5ed072b66df774fc3ee3b3ad"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="18d8e386380612810de9b0ed58b94e55"/></dir><dir name="order"><file name="downloadable.phtml" hash="c284ffaf47aa57aa16d8c2300bcf5781"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="3919ec62cf0503ac47e29c63a50ffa43"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="c0154d4a0b457d0b0653cfad202de903"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="3fcd2acdf626890f1f3728a0302a9834"/></dir></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="6b8f9fd9d90516f905e77ae4d67079db"/></dir><dir name="invoice"><file name="items.phtml" hash="2015671f2b0783f31eb4c9cf23d298f0"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="301bb568dd49d23e64b4e27f37ed83b0"/></dir><dir name="invoice"><file name="default.phtml" hash="301bb568dd49d23e64b4e27f37ed83b0"/></dir><dir name="order"><file name="default.phtml" hash="0733cfb5bb20dab48aea5bf9d0b9d3dc"/></dir><dir name="shipment"><file name="default.phtml" hash="2a9f70fb9930544e088dd1c46fb88555"/></dir></dir><file name="items.phtml" hash="30ccc7a37a1a1785f64f1d5adc757bdc"/><dir name="shipment"><file name="items.phtml" hash="30dfb58464adf8b1375f418ca50612ba"/><file name="track.phtml" hash="c511504e3fc306b2b789b394bdbe456f"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="ab302e6de3cbbcebd15af1c4379465b8"/><file name="stock.phtml" hash="40ace473d1befa8c414eab76e528c179"/></dir></dir><dir name="giftmessage"><file name="inline.phtml" hash="62372bcf86f251e8a28a481f45375efc"/></dir><dir name="googleanalytics"><file name="ga.phtml" hash="7256ba2ae247ee4c903830be0244ca89"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="8d211ad2cb563a5d28ea61fc238f6ef0"/></dir><dir name="oauth"><dir name="authorize"><file name="button-simple.phtml" hash="c912f262fb0a5b772ea65019abfbba85"/><file name="button.phtml" hash="b4dd099c7dddb6df029dcfaf3d821e74"/><file name="confirm-simple.phtml" hash="a9d444ade84c4ca75f268b9f7a05a67e"/><file name="confirm.phtml" hash="0a08da9c67864936218aab98ddb0aabd"/><dir name="form"><file name="login-simple.phtml" hash="87cbd5feba381bd6d5ba52955b59e6d6"/><file name="login.phtml" hash="9881800ee18f8845a8ea2bca0b28589c"/></dir><file name="head-simple.phtml" hash="b190bfd39d2bb2e9b3c2c8dc0df24cfe"/><file name="reject-simple.phtml" hash="97cc65037d339995c492056c746a8018"/><file name="reject.phtml" hash="8e2cbeb15837570bfb42bbca434e6d94"/></dir><dir name="customer"><dir name="token"><file name="list.phtml" hash="d2bc0e29bdf2263728fbecf94c961449"/></dir></dir></dir><dir name="page"><file name="1column.phtml" hash="c6219fae7d5f414d9fb0a1ba856584d8"/><file name="2columns-left.phtml" hash="e22f4f8f009092ce042ba8ab752db82b"/><file name="2columns-right.phtml" hash="944445f22d58cd0689c4c2a992bb7f17"/><file name="3columns.phtml" hash="7aa8d11250007bb56d579a48858eb1b1"/><file name="empty.phtml" hash="b9e97e4579f3e212dccdd3f8f8032057"/><dir name="html"><file name="breadcrumbs.phtml" hash="abed58278fe993d00c697ce965fa79d3"/><file name="cookienotice.phtml" hash="52209b72e23b4db7b618face13b9bec6"/><file name="footer.phtml" hash="a85920178318e9d788f5802389c963e6"/><file name="head.phtml" hash="f8efa3eb87fbd40e60d758374c006368"/><file name="header.phtml" hash="084da06182c80432294fcd56228910e3"/><file name="notices.phtml" hash="98c290beab42ced33cf24b0ab060ed6d"/><file name="pager.phtml" hash="a8c650f3dc4341e9834f6df3188e69a3"/><file name="top.links.phtml" hash="1f2514e5b87c3bf6a677a5b48b37b696"/><file name="topmenu.phtml" hash="53ae5d2eaae7a7b40040e5816571dabf"/><file name="wrapper.phtml" hash="a5f22a8791fe43f4e131a77b524ec395"/></dir><dir name="js"><file name="calendar.phtml" hash="a7609e1ab0e416805e18107187b5b882"/><file name="cookie.phtml" hash="91f87c57d860b8bd81a2521d81d9df7a"/></dir><file name="popup.phtml" hash="40b0611964124786557529cf1bbdb8e8"/><file name="print.phtml" hash="344b2c7909aadc4985b8787df62200a0"/><file name="redirect.phtml" hash="d8d4c798d7c4a39b0dc791413f761a77"/><dir name="switch"><file name="flags.phtml" hash="f9772b018b3bc21ffb53fbeb482faf7c"/><file name="languages.phtml" hash="096e89825eaa3ac0ef1edd17d603fb4c"/><file name="stores.phtml" hash="84b7cb6a64c1efd3e13ef01974951fc5"/></dir><dir name="template"><file name="container.phtml" hash="57e4e285221afc02cd6262920bad8638"/><file name="links.phtml" hash="24d8014ab0335abeba6d8cdcb2e3f9c1"/><file name="linksblock.phtml" hash="f4e8028923e0b370b31cf4f4ad65ce93"/></dir></dir><dir name="pagecache"><file name="cookie.phtml" hash="faa2b8867ce2af8e652e6fc659ae9da2"/></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="08306340d3a3877d4719cae65dedcc52"/></dir><dir name="info"><file name="cc.phtml" hash="63064f2ac4d856a3926da7bcc1b66902"/></dir></dir><dir name="payment"><dir name="catalog"><dir name="product"><dir name="view"><dir name="profile"><file name="options.phtml" hash="b0567be2497e1e49202d0efe4b42c36d"/><file name="schedule.phtml" hash="e4a6dbe9361aa0d5b7c34675bd5555ec"/></dir></dir></dir></dir><dir name="form"><file name="banktransfer.phtml" hash="13dac89396ee15234944727abc54a4ca"/><file name="cashondelivery.phtml" hash="d6d9a34353c06df206f030e6f089b46c"/><file name="cc.phtml" hash="3307b1c77e0e6c664a730ee8d027d79b"/><file name="ccsave.phtml" hash="e6725705534c20056fd7eda97cad7756"/><file name="checkmo.phtml" hash="475a68d5c6bb4440f80be7d7522d452c"/><file name="purchaseorder.phtml" hash="de06becff89f0579af1bd2449eb476b8"/></dir><dir name="info"><file name="banktransfer.phtml" hash="8c023d3d83cdd246e44662db5a2a1658"/><file name="checkmo.phtml" hash="939b9abf501b5abe296e314e95ecfeba"/><file name="default.phtml" hash="b60c813ebcc41abe40fcdce2fca1ea95"/><file name="purchaseorder.phtml" hash="43e6a9a75b6c04cc1087006e330f3066"/></dir></dir><dir name="paypal"><file name="bml.phtml" hash="8cd5b2a279fa6eab4b863bcb48441df0"/><dir name="express"><dir name="review"><file name="details.phtml" hash="5bf8dfc321932ffc3a32fcbe4dea2630"/><dir name="shipping"><file name="method.phtml" hash="fe617b23edb958508076b885091429ff"/></dir></dir><file name="review.phtml" hash="ced6c3dddb238a493276fd04cb5f5297"/><file name="shortcut.phtml" hash="0d3e6f273a5c72e5cbc641440d0b947f"/></dir><dir name="hss"><file name="form.phtml" hash="4dd1c4d63c88c326464059a2ba6833b1"/><file name="iframe.phtml" hash="f80f5c97933a541f10bff51fb9a2556f"/><file name="info.phtml" hash="8ee1a1cd5be756754ff0a3919651f156"/><file name="js.phtml" hash="afb50ce2acdfd3606056b5572e8e40d7"/><file name="redirect.phtml" hash="311892a34b08a50a15945b046aa22b9f"/><dir name="review"><file name="button.phtml" hash="0195ed1aaee982b7d2a27cbfd406c7e7"/></dir></dir><dir name="partner"><file name="logo.phtml" hash="5762765306f237cc514789cee8b861a7"/><file name="us_logo.phtml" hash="a293aa285ab156e56fc40a4c6e9badec"/></dir><dir name="payflowadvanced"><file name="iframe.phtml" hash="8a0618b30b8fe145a4b70fce0862c6fe"/><file name="info.phtml" hash="bbea0b3e617bcb1f99bc52da4f48dd60"/><file name="redirect.phtml" hash="4e79f6f84b7afd9ab647ce7afb0b4ebf"/></dir><dir name="payflowlink"><file name="iframe.phtml" hash="b7334fc968ad26635c954bc4646b901a"/><file name="info.phtml" hash="9d7d65ff0f4e81ca029a297b65cf53f2"/><file name="redirect.phtml" hash="8ac0cba319e6551605bba1a700d75626"/></dir><dir name="payment"><file name="mark.phtml" hash="c986ef9af4c0c2e5c2e9a505ccf1ae0c"/><file name="redirect.phtml" hash="4439e94cd9d7f9ac7d7f260c354a6d14"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="8e2482d5e87a1227430b31b5ad9b284d"/><file name="login.phtml" hash="79b7b9f4c7ff93f3cd5dda3bb23ce162"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="7bdbcd905318b63894da652228d52c7a"/><file name="register.phtml" hash="3b7d6f2573452c02a61bab9597a7512e"/></dir></dir><file name="remember_me.phtml" hash="fd0e47fcd3aa6edeaa9626eb6d9bda1f"/><file name="remember_me_tooltip.phtml" hash="af178f9607c0b73475e27995104fa095"/></dir><dir name="poll"><file name="active.phtml" hash="9ab76cf394ab80eb17ee77fd08dfb395"/><file name="result.phtml" hash="1104118b32a68d81b124f6f6a4c00838"/></dir><dir name="productalert"><file name="price.phtml" hash="8955f01fd0d809ba3e082f5bb2148570"/><dir name="product"><file name="view.phtml" hash="dfd543b25592732312ea60a5f0981c3d"/></dir><file name="stock.phtml" hash="8955f01fd0d809ba3e082f5bb2148570"/></dir><dir name="rating"><file name="detailed.phtml" hash="0f18784e9e391ee0f6c6e46cbedb8c98"/><file name="empty.phtml" hash="af102ec561aed67b8e10af2333a9e9d6"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="605ee15fc83e4ee51c55b5d5e48e3a5d"/><file name="home_product_viewed.phtml" hash="357dce6d95400f48d23b0c94e3be5811"/><file name="product_compared.phtml" hash="6efc7c3a05b430e1267a802590313deb"/><file name="product_viewed.phtml" hash="5c2aeaf081dc207eb442cf353e7e9a3f"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="8f4dc3fb547c1ede1317e683033b5065"/><file name="compared_images_list.phtml" hash="9e4aba44ef3814842ab9909035c4e377"/><file name="compared_names_list.phtml" hash="61187b1bfa06590895e2244c5e627408"/></dir><dir name="content"><file name="compared_grid.phtml" hash="e69b3af32c3570152c259585c1e0269e"/><file name="compared_list.phtml" hash="b5aa9c63b481da4bbbda72a01bf27b6e"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="449beafa8c2b7f19c1b4a171b531b530"/><file name="viewed_images_list.phtml" hash="964e87c3b4305560cb9979e251f684b7"/><file name="viewed_names_list.phtml" hash="21fa749e379df134083d3599853fc3e6"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="ab6b350349bb06d82d6d1f8860915be3"/><file name="viewed_list.phtml" hash="ef46ecc1c8e5d8ff1ae6302e7e39c8dc"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="97b142ce5b96aff3fb0ccc7d124e51d1"/><file name="recent.phtml" hash="e191691dcd2348daf9c03b349a611704"/><file name="view.phtml" hash="3d4e3b78d4e2803d44609aaaf52427fe"/></dir><file name="form.phtml" hash="a41b850e14fb5635b51138dbfd0d69ea"/><dir name="helper"><file name="summary.phtml" hash="d252b54235705488a51deb3975c906a7"/><file name="summary_short.phtml" hash="76c530b821205c0231c90aad07f43f21"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="9dc77fc557d050415deb9a34841ed481"/><file name="list.phtml" hash="0afc05442e49bf61e546f4110cc4a3b8"/><file name="other.phtml" hash="498cf7b3ebe3e63b44423bb6ff7e5837"/></dir></dir><file name="view.phtml" hash="26584f68b240e9b4b497bc09af7704f8"/></dir><dir name="rss"><file name="list.phtml" hash="bb38db8ae793f424480552bb0062fc0f"/><file name="nofeed.phtml" hash="bcbad86e87ba8d8e383af663ab2add4a"/><dir name="order"><file name="details.phtml" hash="9195bc7e6e40daf0367385cf22b41e1a"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="b9e5aadece146e1e5753faeecca3a1c8"/></dir><file name="agreements.phtml" hash="a3d21f536d2563baa8f43dff1f2bbbdd"/></dir><dir name="guest"><file name="form.phtml" hash="96cd89fe53104f88439d6825ec8196a9"/></dir><dir name="order"><file name="comments.phtml" hash="b24e72576471b858a98954728419832d"/><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="ff678b441b3907323d6ee79f590f009b"/></dir></dir><file name="items.phtml" hash="2935ba2044b93b19ac0387aa8776c44f"/></dir><file name="creditmemo.phtml" hash="6697414464051abbba91760c76a52994"/><file name="details.phtml" hash="3634e89096b28d7da3fa7bb31c248dc3"/><file name="history.phtml" hash="04f64bbbea99bc220aa44254408199c5"/><dir name="info"><file name="buttons.phtml" hash="dc597f7c3702b49beb2f0205005edee0"/></dir><file name="info.phtml" hash="deb1f431a246fdb8f9ab59f07db85210"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="8d3f98f1b23f4d336b24b1f2082cfa11"/></dir></dir><file name="items.phtml" hash="580798867451d2be895577e9df917d4d"/></dir><file name="invoice.phtml" hash="222559585e587c3c59b390df442d17e0"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="b59f4b96d584b4998d2d56e8b0d32336"/></dir></dir><file name="items.phtml" hash="3226407d124aa94025011cd3b0562061"/><dir name="print"><file name="creditmemo.phtml" hash="0cbade8f5bb48b4cda2713a548646446"/><file name="invoice.phtml" hash="ffbff984bec0130b59f1429113b24215"/><file name="shipment.phtml" hash="281ad1f819b38b8add1963935c67e4d0"/></dir><file name="print.phtml" hash="cdcf1a2d80c0a24e77358f9e305ecb63"/><file name="recent.phtml" hash="d7e587f30151a738ad3dc45942b2753f"/><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="334c76cf6fd53e38dde3a0a1adbcb594"/></dir></dir><file name="items.phtml" hash="26cc242ac248ad02c7600f26854b18a8"/></dir><file name="shipment.phtml" hash="4e47258f03ce9b3bb23fec10142383c4"/><file name="totals.phtml" hash="b4c4b90f73a7f2e78db6596a2f130362"/><file name="trackinginfo.phtml" hash="79c0d787679d7c08afe45fe8d7bec969"/><file name="view.phtml" hash="3039ad51c2eda14d512a3122e7990d7d"/></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="dfba34995a96ad0130296e80822307f8"/></dir></dir></dir><dir name="recurring"><file name="grid.phtml" hash="a1ee0b42fdcf31a323ced56894e18c2c"/><dir name="profile"><dir name="view"><file name="info.phtml" hash="bbfb4560c0a12b7ae92bbf8a3c5ede13"/></dir><file name="view.phtml" hash="2b5d910840b691ba0221d37cb024b29f"/></dir><file name="profiles.phtml" hash="f871b656b1e3c4cd62d90ec4a82b0c4d"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="dd597ef04df930e85eb9f0625be62182"/></dir><dir name="widget"><dir name="guest"><file name="form.phtml" hash="d7737aa66069e5ba89d307ea5cbc78e7"/></dir></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="1c6ac3f6ff1c82dc678a33618bb13535"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="b3887982434363295b85ce5b6a9d5727"/><file name="popup.phtml" hash="06bd79d186f6ae5fc8802027cfafa35b"/></dir></dir><dir name="tag"><file name="cloud.phtml" hash="1064353c96441927c8cc5974fe86faad"/><dir name="customer"><file name="recent.phtml" hash="e6aa119fdced00f05c504f596ef74411"/><file name="tags.phtml" hash="31f66a60b2829a66a6b7085aa988abf9"/><file name="view.phtml" hash="68428e04f9831d1aecabea99d9c8ba85"/></dir><file name="list.phtml" hash="ed5f440d58fb7a09adde1f225bcd7856"/><file name="popular.phtml" hash="8cc87fd94313050d1f12afa5e4fa92a1"/></dir><dir name="tax"><dir name="checkout"><file name="discount.phtml" hash="9990886f9bdb861e69693dd5d5049c21"/><file name="grandtotal.phtml" hash="c9ce7e777e344a4a54dff5c223f867e6"/><file name="shipping.phtml" hash="e6939fdbb296ae139ebfe3ed9b1d8003"/><file name="subtotal.phtml" hash="eae01eae62bc88429e10f0075edc0a50"/><file name="tax.phtml" hash="bb6c5782fc36aa978c3427586cabbebb"/></dir><dir name="order"><file name="tax.phtml" hash="289b28549b5db31f4f78e2a0505ff8ee"/></dir></dir><dir name="wishlist"><dir name="button"><file name="share.phtml" hash="1379821d1f13d470880ad83fbb53fdf0"/><file name="tocart.phtml" hash="56504083edea2ebef34582bf4f7624a3"/><file name="update.phtml" hash="f7cc57b4eb157a8e6a7881236415bdb8"/></dir><dir name="email"><file name="items.phtml" hash="08d36c72bcb1431ae25ebf31c8054519"/><file name="rss.phtml" hash="41a2edd833831c532575997d616f5cda"/></dir><dir name="item"><dir name="column"><file name="cart.phtml" hash="4b1669b27ccf1e89130de277518f9ab3"/><file name="image.phtml" hash="0ccb12256a9e9c42a5459cb3d8d8f9af"/><file name="info.phtml" hash="f4ff4a7f121d9690b1d8b7b1c2ec7b06"/><file name="remove.phtml" hash="0e4aa4b0f4fad07a6a46e6040f50b084"/></dir><dir name="configure"><file name="addto.phtml" hash="593c7fa73668e0077776b905a8359cbe"/></dir><file name="list.phtml" hash="b7e65fb738d20dec68d04e96f0e12250"/></dir><file name="options_list.phtml" hash="c82d0d5305de4b555c85e5955df9c472"/><dir name="render"><dir name="item"><file name="price.phtml" hash="036c3bb4ffc21669e53a61b20c3a28ca"/><file name="price_msrp_item.phtml" hash="5331f9804f6c497705c8a7c48a627267"/><file name="price_msrp_rss.phtml" hash="5d4a5b9ab382ba0c04a616cb54721c69"/></dir></dir><file name="shared.phtml" hash="04da9402c031a883c48aec2f11b2a164"/><file name="sharing.phtml" hash="9e8ba54fce6c10401eca1673871ac212"/><file name="sidebar.phtml" hash="80f3d6a4054636e917a23dc170f590cc"/><file name="view.phtml" hash="b072b63099b8f7d583af3ee66ec355bb"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="email-inline.css" hash="ed63c4b0607b5f3f7077f70d2362cfc4"/><file name="email-non-inline.css" hash="bc5ea1e8344f0daf2dd5691a981a2e86"/><file name="widgets.css" hash="ed3ba13dd93e7695d9c8072ebfc83732"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="cookies"><file name="firefox.png" hash="425e1b2ddc38c0bba431fb54357c66a4"/><file name="ie6-1.gif" hash="5c27700e245762bc89ed8c3ee7183f21"/><file name="ie6-2.gif" hash="d8c55e15e1f711e5c259300a9c19551b"/><file name="ie7-1.gif" hash="d61edcc8a514a3c81ea116b7d38ddcb6"/><file name="ie7-2.gif" hash="0526a654e94c54866cad977c0a47d3e5"/><file name="ie7-3.gif" hash="4fb142def3f6cfd8d8d23e1315528a1e"/><file name="ie7-4.gif" hash="575c276231c6a91e28935ec98215e146"/><file name="ie7-5.gif" hash="3ae5fcc11fe89da91674d183872337c1"/><file name="ie7-6.gif" hash="95a4981a41785a8cde273c9b2edbfbc7"/><file name="opera.png" hash="34070d92180d4ee0e37b1dd8bb731cd7"/></dir><file name="cvv.gif" hash="83cdd38bf110b0f9c52fe84b56f45298"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="reload.png" hash="84cc4883f78ef850814ea9b53989b2a7"/><dir name="widgets"><file name="i_block-list.gif" hash="fe8424127ecbe4b0d893bcf6f253dc1a"/><file name="i_widget-link.gif" hash="1bf753578171f147f0203e7b13bdd0c4"/><file name="i_widget-new.gif" hash="a75377ffed51b711cbc608ffaa1a2e7d"/></dir></dir><dir name="js"><file name="bundle.js" hash="f0762fb8bf9ded546d5f2da29a3e4404"/><dir name="checkout"><file name="review.js" hash="65d792db44438e7181803c6398f492ab"/></dir><file name="giftmessage.js" hash="a5697ed33590050bb2582cec39f29df2"/><file name="ie6.js" hash="a28f2c74f4ba1b73e95200f195a69f3e"/><file name="msrp.js" hash="2077610ec1f7e9e5f38b7474540919e4"/><file name="opcheckout.js" hash="0804fedd5558bbafe4108bf1e25c644a"/></dir><dir name="lib"><dir name="prototype"><dir name="windows"><dir name="themes"><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="26094605a693e4c7e647ae2df4554048"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.9.1.1</min><max>1.9.1.1</max></package></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Base_Default</name>
4
+ <version>1.9.2.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>This is a Magento themes base</summary>
10
  <description>This is a Magento themes base</description>
11
+ <notes>1.9.2.0</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
+ <date>2015-06-26</date>
14
+ <time>13:48:51</time>
15
+ <contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="etc"><file name="theme.xml" hash="cb15d7d843605505e5d58557f789b5b5"/><file name="widget.xml" hash="7c90d742393ad24b83c8984e45c9afb2"/></dir><dir name="layout"><file name="authorizenet.xml" hash="9b43ec1a3ab7e51226ec20fc9471cc0f"/><file name="bml.xml" hash="7308daeb41b482df29491a7d52fb8471"/><file name="bundle.xml" hash="4108c1c75f2eec7c53ff8a38e4f383a8"/><file name="captcha.xml" hash="18d5e650991b3f7c0822600a797a2835"/><file name="catalog.xml" hash="9c383975a47cde57dda70c55b73f16b2"/><file name="catalog_msrp.xml" hash="4aa0b4f0733b261c49a03ee86f8748b0"/><file name="cataloginventory.xml" hash="69fe52378a85805a0952a2b1908f2828"/><file name="catalogsearch.xml" hash="e34de289421b1a456b396402f704ff84"/><file name="checkout.xml" hash="1b37f8dc6e0a56f778e0414209e1f7c3"/><file name="cms.xml" hash="a5af520b4a47b8548bcf168fd09165e0"/><file name="contacts.xml" hash="4378fcbf196ab46e7446b6bc6a891dae"/><file name="core.xml" hash="74712a169176f8f505d21fae0b748afb"/><file name="customer.xml" hash="f19d26fcf54c986cfc0f74e8a9ec086a"/><file name="directory.xml" hash="55f934d2f1f17b3ddb1b3d659d391b86"/><file name="downloadable.xml" hash="d63b8d0085ea27f984615635a2eec1a2"/><file name="googleanalytics.xml" hash="6a771dc81c58491423e48c32522c32f9"/><file name="newsletter.xml" hash="8135d4342f613c00f10079abd441ff2f"/><file name="oauth.xml" hash="101bd169a40bdbbd4e86edbef3845d50"/><file name="page.xml" hash="d35964dd5907509bf614a040d28f9394"/><file name="pagecache.xml" hash="4f5af67cd7dc741262893975cdb7c975"/><file name="payment.xml" hash="6d1b1ef0e334ddd06ae081bc52d0fec6"/><file name="paypal.xml" hash="be2296e47120c1ee987d64fabc161575"/><file name="paypaluk.xml" hash="848d95046abc769a76454863bd6be355"/><file name="persistent.xml" hash="630f737bb39a9373b9d88e352edb76bc"/><file name="poll.xml" hash="fc1b9888131c2ca7fe3d979e32195ff9"/><file name="productalert.xml" hash="5f3358b7d00c9e3c16e1dab9e95c0a4e"/><file name="reports.xml" hash="e6cf7af18c38dcc5ab289b2a21697228"/><file name="review.xml" hash="6891b15e9bd9806c57bd37cf98902c75"/><file name="rss.xml" hash="ee5b7b8665b6281551180f6dae293a3e"/><dir name="sales"><file name="billing_agreement.xml" hash="3bb6b8cabd82076aa81da485354e7504"/><file name="recurring_profile.xml" hash="07c5cf1f6e252585ff148592ac64d799"/></dir><file name="sales.xml" hash="d0ce0e5135d7e5cadee565a0ea6a5791"/><file name="sendfriend.xml" hash="751c3ddfbe0d1192b534f573faaebf1d"/><file name="shipping.xml" hash="bc25e5d870c8f42fffd320d024c29cfc"/><file name="tag.xml" hash="507cf1830b70d4aa4ba548e14f50e962"/><file name="weee.xml" hash="a7a825ac307f4746a25ed3194280a191"/><file name="wishlist.xml" hash="bac8a033ab79991f97f4b12bf273dbf8"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="675af0fc77da432302d993cba713e42c"/><file name="iframe.phtml" hash="cad12e7af9070ad97b7a0d3a8cb3f46e"/><file name="info.phtml" hash="3b505c2281b44a95a9416ec948d48c19"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="c312478997aa130687ba6d99cbdecd04"/></dir><file name="price.phtml" hash="536bba9dfc772347f912289891e028a5"/><dir name="view"><file name="option_tierprices.phtml" hash="e23de273f835bcdeb5106dfe912c33d0"/><dir name="options"><file name="notice.phtml" hash="3aaa7da292ce864f257bc8951d04bb1d"/></dir><file name="price.phtml" hash="1f300b0114243160082f039cc18cb831"/><file name="tierprices.phtml" hash="0d6822783c1c193155855206772a76c2"/><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="cf7c70e1c6f95266d527a75fbfb4d3d2"/><file name="multi.phtml" hash="14ae0a03d33d4cf96921f63c3b8b80ad"/><file name="radio.phtml" hash="3f6efd84f38e6daf926d38026e4c6fc8"/><file name="select.phtml" hash="75c096977c2573c8e0f7f8ffe8e3a825"/></dir><file name="options.phtml" hash="fcf0d2312cb6409c9fe87331e8ed812a"/></dir><file name="bundle.phtml" hash="699cf212a5845991d218c290605057ce"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="0ebd275d9fd1250369cb296642329aef"/></dir><dir name="invoice"><file name="default.phtml" hash="35a47799faad39f930bdcab1f7bddd20"/></dir><dir name="order"><file name="default.phtml" hash="abd062ff9789076c430c975db2c13ee5"/></dir><dir name="shipment"><file name="default.phtml" hash="91a551c533f425c37b150db126ffc3b9"/></dir></dir></dir></dir><dir name="rss"><dir name="catalog"><dir name="product"><file name="price.phtml" hash="3acc1f7d981e2d69f517577734cef48a"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="9cab5ff8ee6f397be3fea1bb8b1f6dfb"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="2667129b9522036ba54c6e679f863852"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="b2371c4f222823db77dcebde9ef3736e"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="84efc62c4e7965f45806be8095bb80e9"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="e42166f6dd76cc2eb76b8aef287784a2"/><file name="right_col.phtml" hash="e42166f6dd76cc2eb76b8aef287784a2"/></dir><dir name="captcha"><file name="zend.phtml" hash="9310fbe6eaa858ebdb5308b49f6b845e"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="bb6f57c1300ff8cce698944a20693158"/><file name="view.phtml" hash="b393612d0c0a8c91310e3e09f6f82d37"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="97f1fb1fb08eedf72bbad2cc21a4e368"/><file name="link_inline.phtml" hash="b1be1359eac9a775e241228e9edad6ff"/></dir></dir></dir><dir name="layer"><file name="filter.phtml" hash="db3ab7d6d6ff60f738f83d8e39b5e573"/><file name="state.phtml" hash="cb4e1a9e019ef2d20bec4692f3732109"/><file name="view.phtml" hash="257a34a5feaa047a22a9324e1c584564"/></dir><dir name="msrp"><file name="popup.phtml" hash="637ecaadbb9e758942c29a41b4a3ddc2"/></dir><dir name="navigation"><file name="left.phtml" hash="9febc1ddff257023ef568ed3f0e76b67"/><file name="top.phtml" hash="9c866ce66ddb423ac85ddc32ae2a2c7b"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="f8ef7699f3877698e860396374f29283"/><file name="sidebar.phtml" hash="96f251935c99c6ed2c2b4ad0796669b6"/></dir><file name="gallery.phtml" hash="684ddad4304e9c757992b9724ab34376"/><dir name="list"><file name="related.phtml" hash="fcb657d4a97625c324471d92f9de5f42"/><file name="toolbar.phtml" hash="49808497f7b604b2e25135bb93915b3d"/><file name="upsell.phtml" hash="bc067353d480fa960f04e656045a06b3"/></dir><file name="list.phtml" hash="607f1fdfcd12ff8da05e656a6383158c"/><file name="new.phtml" hash="819203ab84c283e542ebec79d9427dcc"/><file name="price.phtml" hash="55795fbb6f2b62ddb4b4e4926400b3f2"/><file name="price_msrp.phtml" hash="6e5c5f54444a50c733dc880155e616b5"/><file name="price_msrp_item.phtml" hash="9b458ae2ae9bd0ebdf29064047d26e7c"/><file name="price_msrp_noform.phtml" hash="73c40737abcadff3d1a4abd64ef51886"/><file name="price_msrp_rss.phtml" hash="8ebdef3f6de012eb03ec92344dbe0cf8"/><dir name="view"><file name="additional.phtml" hash="527ae1a664b1906d8c01956cf640dff3"/><file name="addto.phtml" hash="f895117d77add30fe6103536da6176d2"/><file name="addtocart.phtml" hash="ff31f4b455c68fb43f9f4294233cadad"/><file name="attributes.phtml" hash="58872c8a2970492dce4e17d6581efcd5"/><file name="description.phtml" hash="7f21f35fcf81ac91d99940a7062e3dcd"/><file name="media.phtml" hash="66ffe5b5a9c6463607297025a754f720"/><dir name="options"><file name="js.phtml" hash="8b1b18f53ad027dd1c3e872ef28b18dd"/><dir name="type"><file name="date.phtml" hash="f11c4d1d7c0605cd597f43e73b511e04"/><file name="default.phtml" hash="bfda656d7ac7ab4966143d2ad25439d0"/><file name="file.phtml" hash="8f59cdb546924d4ce68baf49a622e493"/><file name="select.phtml" hash="df3d0d15468a1d13407f255fd9497891"/><file name="text.phtml" hash="12caeff494da87a6c878cc9f3c5fe60a"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="952d89bec89ed906cdbae021441560cb"/></dir><file name="wrapper.phtml" hash="b7a4a0933767d62a0fd69adc14b796ad"/></dir><file name="options.phtml" hash="d47affa574c4dcf8bc94739c85af3b96"/><file name="price.phtml" hash="d5ad760d4eb36bbfe599a7d46f2c1932"/><file name="price_clone.phtml" hash="15bb70ea6bced116ec6af906167f80b9"/><file name="tierprices.phtml" hash="88aac101bafa81fc161ed7af0af09652"/><dir name="type"><file name="configurable.phtml" hash="21c103b5067d5d689e1e3a19063b0ecb"/><file name="default.phtml" hash="919aca6f31f11d41e32eea62ea74cfaf"/><file name="grouped.phtml" hash="51fe9e447eecca458ba1dfa28ca99e21"/><dir name="options"><file name="configurable.phtml" hash="4667c89a042cc4821e8e205cc9abc122"/></dir><file name="simple.phtml" hash="21c103b5067d5d689e1e3a19063b0ecb"/><file name="virtual.phtml" hash="21c103b5067d5d689e1e3a19063b0ecb"/></dir></dir><file name="view.phtml" hash="a54536536c9d7f28a409ac48c555daad"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="875e1b2076f72b939479e4da2a1687af"/><file name="link_inline.phtml" hash="88a34290644cd7534b88f58543f8a9c4"/></dir><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="94b34bb7203939697bc3aef1fe115556"/><file name="new_images_list.phtml" hash="c94b6517478eb33cb97b56930461d1a0"/><file name="new_names_list.phtml" hash="b79d1c340a030b2b30f722254fe1dbf8"/></dir><dir name="content"><file name="new_grid.phtml" hash="91695ccfd0e874c5a91f528c55195f8b"/><file name="new_list.phtml" hash="c3d16a1d30c1b1c7edd7290978812d93"/></dir></dir></dir></dir><dir name="rss"><dir name="product"><file name="price.phtml" hash="9d5064b78181f548219e841bf8f4f735"/></dir></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="e0af060eed2cc92b8d198e2fde58d303"/></dir><file name="sitemap.phtml" hash="35948de2346cd34e99159f73e4eb802c"/><file name="tree.phtml" hash="ec525bd86bbe2770bc4f597454a98405"/></dir></dir><dir name="cataloginventory"><file name="qtyincrements.phtml" hash="893622cc441e708bb78588710d207ce1"/><dir name="stockqty"><file name="composite.phtml" hash="6155f58739a49b624211a104f8df668b"/><file name="default.phtml" hash="7369ccc7c5a23a9b12df16b0a002e77a"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="f0a38a6783df0575fa6a32318a4f5f1a"/><file name="result.phtml" hash="82a3e85fd8b51646b46f8d318d68b237"/></dir><file name="form.mini.phtml" hash="062d1ee3f16c7ea32bffbdc221c4da42"/><file name="result.phtml" hash="7a0a3527c13c08a904775c61557d4cfd"/><file name="term.phtml" hash="bbe7ccd2fe827ea0c48bc2a445b3320a"/></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="5f57f8e204cf512f13f31a4fd7ba8746"/><file name="crosssell.phtml" hash="bcf5a9f6e03ceacdb3b8d6d32ad477e0"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="9fd551e8c1aac1cf1d16dc9e6617cead"/></dir><file name="default.phtml" hash="b1abf940587301a0fef07d2170262146"/></dir><file name="noItems.phtml" hash="a92becd716cec4ad2148bfb742855fee"/><dir name="render"><file name="default.phtml" hash="874241920aca94033deafea7c0707f24"/><file name="simple.phtml" hash="53e4229e1a7a00650d69272dd190b4e4"/></dir><file name="shipping.phtml" hash="c4fd1e94c902160d9614dabdd591adee"/><dir name="sidebar"><file name="default.phtml" hash="317f41c1259a37e576827ead92683945"/></dir><file name="sidebar.phtml" hash="1324c07adc3ceb719e910add0e613e18"/><file name="totals.phtml" hash="a9dc915f0c1a06c688a4a0e2548a359d"/></dir><file name="cart.phtml" hash="2064cbd4632d32289921b29c3e8674eb"/><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="46376246810847477fa57ff0791b4579"/></dir><file name="addresses.phtml" hash="a5d65753e641bd11f0b45c68f5f22546"/><file name="agreements.phtml" hash="1b2de056cfca34aa9983e34eb740fe66"/><dir name="billing"><file name="items.phtml" hash="5dca82a962d278cf78c085854cebf10f"/></dir><file name="billing.phtml" hash="81d255a69c01e46b968b1444253bb0ab"/><dir name="item"><file name="default.phtml" hash="b4a553382bc807ff150b8e4481967dbd"/></dir><file name="link.phtml" hash="b09d873e654563e76455def17c263cb3"/><dir name="overview"><file name="item.phtml" hash="101c09142f53bb41ca582b12ae73e729"/></dir><file name="overview.phtml" hash="e82ca51e60ef7ef8f7870495e2239d14"/><file name="shipping.phtml" hash="0d0304e6f1a83bbbc637a6e4476b6e1d"/><file name="state.phtml" hash="6667bd9bb5b18ee7895c542f71324c4a"/><file name="success.phtml" hash="198baad8d7b9a31af7f0a81fb4388c93"/></dir><dir name="onepage"><file name="agreements.phtml" hash="fd159b75e3886a8c1211dc082f6038a9"/><file name="billing.phtml" hash="5f955d2d5aa91620fe4cbac3a798575e"/><file name="failure.phtml" hash="1479ba21592e4872ebb6b84ab63e55c3"/><file name="link.phtml" hash="c8e11b2f9699d95754533144e802a1da"/><file name="login.phtml" hash="4df4b62a55137e6ac3a2e6bbdf02883b"/><dir name="payment"><file name="info.phtml" hash="26bb640843ee3fb6e72b4f2739f0a111"/><file name="methods.phtml" hash="8f877bd055dc782c60fb4972c603115d"/></dir><file name="payment.phtml" hash="1dbcbfd24e0166b212514926e1953629"/><dir name="progress"><file name="billing.phtml" hash="c06e12741addacd560a19ccd7ca905ba"/><file name="payment.phtml" hash="9721d97eeba66f9a770fef5e5611e1d3"/><file name="shipping.phtml" hash="da10e274a474b9077991ccd73b438107"/><file name="shipping_method.phtml" hash="da72538919498704eb7c843702daface"/></dir><file name="progress.phtml" hash="c94a75e0c3a07cef70f8509a8f76d230"/><dir name="review"><file name="button.phtml" hash="aa355d166b5e2ef41a530cd38ad7bfa1"/><file name="info.phtml" hash="dbd0bfb07cb05938aea57a2d81ad4d46"/><file name="item.phtml" hash="6d3fd9e7e0fe9e83c2e9b17d683ce741"/><file name="totals.phtml" hash="eb054bae49687e421d0d7a99ad1395e1"/></dir><file name="review.phtml" hash="d2494b8faac5833e747a5d329ee4fab7"/><file name="shipping.phtml" hash="b3f76dbbec793a164adbf4a8049c15b2"/><dir name="shipping_method"><file name="additional.phtml" hash="5b40c047594e6bc64493bd0c9f070606"/><file name="available.phtml" hash="38c7b5af800735a273ed4300f6259700"/></dir><file name="shipping_method.phtml" hash="f709b5ab2b82acfea0379814ef0a0f8d"/></dir><file name="onepage.phtml" hash="2ab0d7efcfaa12666945c6fb6683634d"/><file name="success.phtml" hash="7bd2f09c084aaf5940ff1473eedfe259"/><dir name="total"><file name="default.phtml" hash="f14f728417f7d3e4469c22ac396d2996"/><file name="nominal.phtml" hash="201f568085d2381ce24372f31d135c3c"/><file name="tax.phtml" hash="caf415127cdb983c4db20cdaaa5d62db"/></dir></dir><dir name="cms"><file name="content.phtml" hash="047502566c3fe8b4f93d043e7c6ca7b5"/><file name="content_heading.phtml" hash="038b25f957a664940b6c44053041912c"/><dir name="default"><file name="home.phtml" hash="11c840f59024821bc16d609aaf84655b"/><file name="no-route.phtml" hash="7f730281d216fb8e2b9cf1c613a58482"/></dir><file name="meta.phtml" hash="5995926c3ef19c539fdcf766ee8b125a"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="fd98755f4354dcd5caef0b6e4c2a275c"/><file name="link_inline.phtml" hash="5d1b2f86bd10253d61347ac8b70fa363"/></dir><dir name="static_block"><file name="default.phtml" hash="b1d683caf67a2fe3e3a518e540ab0f8e"/></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="9c26788fba79068771527a3b55d26764"/></dir><dir name="core"><file name="formkey.phtml" hash="b483e152453aea655abd6b32e6cea51c"/><file name="link.phtml" hash="cd0b34977d0610129733714da63e5b3a"/><file name="messages.phtml" hash="a1270fef9dc17d55ef3355e53aadd49d"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="48474f750c4d06249e33a45cb3594f69"/><file name="hello.phtml" hash="75ba03f927822df90452471acfbc6d44"/><file name="info.phtml" hash="a769d17cf054553e62de61576e8fad6b"/><file name="newsletter.phtml" hash="9660207d1e1edb0a5aaf406c774c8f79"/></dir><file name="dashboard.phtml" hash="d193fd711052be429ca1399181a02b49"/><dir name="link"><file name="back.phtml" hash="1bc59121d95399210fd9605194a75504"/></dir><file name="navigation.phtml" hash="eecaabce0bad80bebb96f4328b9cadbb"/></dir><dir name="address"><file name="book.phtml" hash="8e397b723e33925e84c172787f96cf7f"/><file name="edit.phtml" hash="bca8070bd437884fe5fb287f3ac0f218"/></dir><file name="address.phtml" hash="d796424be4a5f0b78aa6fbb812dc54da"/><file name="balance.phtml" hash="64ee629de88f7c62810811aef91ff3a3"/><dir name="form"><file name="address.phtml" hash="e779470b565b5672804da05ecbfd34c7"/><file name="changepassword.phtml" hash="18081c977c4b609e549e2457ea721e17"/><file name="confirmation.phtml" hash="41d6d54c2479fc05fa543d4da95f14fd"/><file name="edit.phtml" hash="1480fe9d00458c52188f59a011f08a6e"/><file name="forgotpassword.phtml" hash="a8f674ce438eca25f73212582869305b"/><file name="login.phtml" hash="089374498c798ec477d913eca5cccf09"/><file name="mini.login.phtml" hash="af0ae17cb6f5cbe8f9fe4f047960ccd4"/><file name="newsletter.phtml" hash="9609611108727eb0da3caa1fc55ebe73"/><file name="register.phtml" hash="e59b5950e1be95eead82944e0d4e7957"/><file name="resetforgottenpassword.phtml" hash="49cd1ab9da2ba7fcef3dd87a10cf5dac"/></dir><file name="logout.phtml" hash="d722f44c13c93d5c7e7e8e661a8b25b2"/><file name="orders.phtml" hash="fee18b4c642a6872d85e230b1cf6aa2d"/><dir name="widget"><file name="dob.phtml" hash="d26bb6bdf6255a546bc0d0feadd07c5b"/><file name="gender.phtml" hash="e1c1e84526e0d828138d691fea66a69f"/><file name="name.phtml" hash="cdfd22c844178bd844268bc24711fd9f"/><file name="taxvat.phtml" hash="38a30e3597d82df1312eb5d96b7f60c1"/></dir><file name="wishlist.phtml" hash="1a7b837a1e0bca3ea52f3e045cc1d4d8"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="ad9d5270ecf99d4317c39f150cfee178"/></dir><file name="currency.phtml" hash="fe855e48d16739f02a8619f2ff0e1786"/><dir name="js"><file name="optional_zip_countries.phtml" hash="98beaa8fcc825322bdb658040a74c53b"/></dir></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="3cc2aa5af9a3ef0599dbdb6a432067c0"/><file name="samples.phtml" hash="f3fcb6acf13d9494f6e03fb9c43ca789"/><file name="type.phtml" hash="2cd550caa6ad4fa8ad5a85fe866c85cd"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="df68bf59d6c309e740fc5d2c20529239"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="da30307e4094015c6bb0636743b0bef1"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="afa9337e189779fa488a16596f0613c9"/></dir></dir><file name="success.phtml" hash="8dcd2684f45ebe6a1c0c5721b4fde0d8"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="bd641989c4f15ffba6979e5543077fb6"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="8fcb56ba5ed072b66df774fc3ee3b3ad"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="18d8e386380612810de9b0ed58b94e55"/></dir><dir name="order"><file name="downloadable.phtml" hash="c284ffaf47aa57aa16d8c2300bcf5781"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="3919ec62cf0503ac47e29c63a50ffa43"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="c0154d4a0b457d0b0653cfad202de903"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="3fcd2acdf626890f1f3728a0302a9834"/></dir></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="6b8f9fd9d90516f905e77ae4d67079db"/></dir><dir name="invoice"><file name="items.phtml" hash="2015671f2b0783f31eb4c9cf23d298f0"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="301bb568dd49d23e64b4e27f37ed83b0"/></dir><dir name="invoice"><file name="default.phtml" hash="301bb568dd49d23e64b4e27f37ed83b0"/></dir><dir name="order"><file name="default.phtml" hash="0733cfb5bb20dab48aea5bf9d0b9d3dc"/></dir><dir name="shipment"><file name="default.phtml" hash="2a9f70fb9930544e088dd1c46fb88555"/></dir></dir><file name="items.phtml" hash="30ccc7a37a1a1785f64f1d5adc757bdc"/><dir name="shipment"><file name="items.phtml" hash="30dfb58464adf8b1375f418ca50612ba"/><file name="track.phtml" hash="c511504e3fc306b2b789b394bdbe456f"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="ab302e6de3cbbcebd15af1c4379465b8"/><file name="stock.phtml" hash="40ace473d1befa8c414eab76e528c179"/></dir></dir><dir name="giftmessage"><file name="inline.phtml" hash="efdd071094ec99f5eeca9937bf27b146"/></dir><dir name="googleanalytics"><file name="ga.phtml" hash="7256ba2ae247ee4c903830be0244ca89"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="a3599cb0ebdf93e01c26af390c745409"/></dir><dir name="oauth"><dir name="authorize"><file name="button-simple.phtml" hash="c912f262fb0a5b772ea65019abfbba85"/><file name="button.phtml" hash="b4dd099c7dddb6df029dcfaf3d821e74"/><file name="confirm-simple.phtml" hash="a9d444ade84c4ca75f268b9f7a05a67e"/><file name="confirm.phtml" hash="0a08da9c67864936218aab98ddb0aabd"/><dir name="form"><file name="login-simple.phtml" hash="c7423dee573dcef917c9b59a592f2dbb"/><file name="login.phtml" hash="0465f09d1089ec96a3d0175508d81105"/></dir><file name="head-simple.phtml" hash="b190bfd39d2bb2e9b3c2c8dc0df24cfe"/><file name="reject-simple.phtml" hash="97cc65037d339995c492056c746a8018"/><file name="reject.phtml" hash="8e2cbeb15837570bfb42bbca434e6d94"/></dir><dir name="customer"><dir name="token"><file name="list.phtml" hash="d2bc0e29bdf2263728fbecf94c961449"/></dir></dir></dir><dir name="page"><file name="1column.phtml" hash="c6219fae7d5f414d9fb0a1ba856584d8"/><file name="2columns-left.phtml" hash="e22f4f8f009092ce042ba8ab752db82b"/><file name="2columns-right.phtml" hash="944445f22d58cd0689c4c2a992bb7f17"/><file name="3columns.phtml" hash="7aa8d11250007bb56d579a48858eb1b1"/><file name="empty.phtml" hash="b9e97e4579f3e212dccdd3f8f8032057"/><dir name="html"><file name="breadcrumbs.phtml" hash="abed58278fe993d00c697ce965fa79d3"/><file name="cookienotice.phtml" hash="52209b72e23b4db7b618face13b9bec6"/><file name="footer.phtml" hash="a85920178318e9d788f5802389c963e6"/><file name="head.phtml" hash="f8efa3eb87fbd40e60d758374c006368"/><file name="header.phtml" hash="084da06182c80432294fcd56228910e3"/><file name="notices.phtml" hash="98c290beab42ced33cf24b0ab060ed6d"/><file name="pager.phtml" hash="3fc0b7538a2ae3a3b40c226877ea2b17"/><file name="top.links.phtml" hash="1f2514e5b87c3bf6a677a5b48b37b696"/><file name="topmenu.phtml" hash="53ae5d2eaae7a7b40040e5816571dabf"/><file name="wrapper.phtml" hash="a5f22a8791fe43f4e131a77b524ec395"/></dir><dir name="js"><file name="calendar.phtml" hash="c8758318d8db21932436ccd32559da53"/><file name="cookie.phtml" hash="91f87c57d860b8bd81a2521d81d9df7a"/></dir><file name="popup.phtml" hash="40b0611964124786557529cf1bbdb8e8"/><file name="print.phtml" hash="872e595bdb4472b8aaad0c8bd6c02b80"/><file name="redirect.phtml" hash="d8d4c798d7c4a39b0dc791413f761a77"/><dir name="switch"><file name="flags.phtml" hash="f9772b018b3bc21ffb53fbeb482faf7c"/><file name="languages.phtml" hash="096e89825eaa3ac0ef1edd17d603fb4c"/><file name="stores.phtml" hash="84b7cb6a64c1efd3e13ef01974951fc5"/></dir><dir name="template"><file name="container.phtml" hash="57e4e285221afc02cd6262920bad8638"/><file name="links.phtml" hash="24d8014ab0335abeba6d8cdcb2e3f9c1"/><file name="linksblock.phtml" hash="f4e8028923e0b370b31cf4f4ad65ce93"/></dir></dir><dir name="pagecache"><file name="cookie.phtml" hash="faa2b8867ce2af8e652e6fc659ae9da2"/></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="c5a9eddade3b3ebf82d550a291fa518e"/></dir><dir name="info"><file name="cc.phtml" hash="63064f2ac4d856a3926da7bcc1b66902"/></dir></dir><dir name="payment"><dir name="catalog"><dir name="product"><dir name="view"><dir name="profile"><file name="options.phtml" hash="b0567be2497e1e49202d0efe4b42c36d"/><file name="schedule.phtml" hash="e4a6dbe9361aa0d5b7c34675bd5555ec"/></dir></dir></dir></dir><dir name="form"><file name="banktransfer.phtml" hash="13dac89396ee15234944727abc54a4ca"/><file name="cashondelivery.phtml" hash="d6d9a34353c06df206f030e6f089b46c"/><file name="cc.phtml" hash="f912496e69f09380d69fcb415b203f6e"/><file name="ccsave.phtml" hash="3942fb97026a167b21e7781353968f06"/><file name="checkmo.phtml" hash="475a68d5c6bb4440f80be7d7522d452c"/><file name="purchaseorder.phtml" hash="d039229d0ef10e00b87ac44a8d687156"/></dir><dir name="info"><file name="banktransfer.phtml" hash="8c023d3d83cdd246e44662db5a2a1658"/><file name="checkmo.phtml" hash="939b9abf501b5abe296e314e95ecfeba"/><file name="default.phtml" hash="b60c813ebcc41abe40fcdce2fca1ea95"/><file name="purchaseorder.phtml" hash="43e6a9a75b6c04cc1087006e330f3066"/></dir></dir><dir name="paypal"><file name="bml.phtml" hash="8cd5b2a279fa6eab4b863bcb48441df0"/><dir name="express"><dir name="review"><file name="details.phtml" hash="5bf8dfc321932ffc3a32fcbe4dea2630"/><dir name="shipping"><file name="method.phtml" hash="fe617b23edb958508076b885091429ff"/></dir></dir><file name="review.phtml" hash="289493af5a2612f796b635740caea18d"/><file name="shortcut.phtml" hash="612db88906e00b82e6994b3bf11af3eb"/></dir><dir name="hss"><file name="form.phtml" hash="4dd1c4d63c88c326464059a2ba6833b1"/><file name="iframe.phtml" hash="f80f5c97933a541f10bff51fb9a2556f"/><file name="info.phtml" hash="8ee1a1cd5be756754ff0a3919651f156"/><file name="js.phtml" hash="afb50ce2acdfd3606056b5572e8e40d7"/><file name="redirect.phtml" hash="6a841311df6620bb4083a29e9799fd0e"/><dir name="review"><file name="button.phtml" hash="4ebb24ca6314327727838685de94f014"/></dir></dir><dir name="partner"><file name="logo.phtml" hash="ef1c4cd388f2d3015aa075c801f641df"/><file name="us_logo.phtml" hash="a293aa285ab156e56fc40a4c6e9badec"/></dir><dir name="payflowadvanced"><file name="iframe.phtml" hash="8a0618b30b8fe145a4b70fce0862c6fe"/><file name="info.phtml" hash="bbea0b3e617bcb1f99bc52da4f48dd60"/><file name="redirect.phtml" hash="df9a4cf4ea565409be6ce0abfa27a7ac"/></dir><dir name="payflowlink"><file name="iframe.phtml" hash="b7334fc968ad26635c954bc4646b901a"/><file name="info.phtml" hash="9d7d65ff0f4e81ca029a297b65cf53f2"/><file name="redirect.phtml" hash="255622341302357553c2d336351702c5"/></dir><dir name="payment"><file name="mark.phtml" hash="ad9e7b6aed53f70427a3b53434795dab"/><file name="redirect.phtml" hash="4439e94cd9d7f9ac7d7f260c354a6d14"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="a16823e5ae4028eda18a3d2764d7ba72"/><file name="login.phtml" hash="79b7b9f4c7ff93f3cd5dda3bb23ce162"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="64e5393b02f4ffa1a2b75e180b421a0f"/><file name="register.phtml" hash="cd1b7e688acb19d208e745ea07fe4710"/></dir></dir><file name="remember_me.phtml" hash="8c24521c0be510c1f4b00b3e2a8990d0"/><file name="remember_me_tooltip.phtml" hash="3245c94bfba248fa538aaf474139c797"/></dir><dir name="poll"><file name="active.phtml" hash="c8ae9f928f2422f713fb8ca8529d3af4"/><file name="result.phtml" hash="1104118b32a68d81b124f6f6a4c00838"/></dir><dir name="productalert"><file name="price.phtml" hash="8955f01fd0d809ba3e082f5bb2148570"/><dir name="product"><file name="view.phtml" hash="dfd543b25592732312ea60a5f0981c3d"/></dir><file name="stock.phtml" hash="8955f01fd0d809ba3e082f5bb2148570"/></dir><dir name="rating"><file name="detailed.phtml" hash="0f18784e9e391ee0f6c6e46cbedb8c98"/><file name="empty.phtml" hash="af102ec561aed67b8e10af2333a9e9d6"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="a4c113629b88a88a848c7463b11bd69d"/><file name="home_product_viewed.phtml" hash="2f6289cb5eb81d37793845cb4a671a49"/><file name="product_compared.phtml" hash="6efc7c3a05b430e1267a802590313deb"/><file name="product_viewed.phtml" hash="5c2aeaf081dc207eb442cf353e7e9a3f"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="8f4dc3fb547c1ede1317e683033b5065"/><file name="compared_images_list.phtml" hash="9e4aba44ef3814842ab9909035c4e377"/><file name="compared_names_list.phtml" hash="61187b1bfa06590895e2244c5e627408"/></dir><dir name="content"><file name="compared_grid.phtml" hash="118a2dcc14e530ca545d2ebc3572a4c6"/><file name="compared_list.phtml" hash="f6689eec42ad2ef38a1aff29a6a36013"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="449beafa8c2b7f19c1b4a171b531b530"/><file name="viewed_images_list.phtml" hash="964e87c3b4305560cb9979e251f684b7"/><file name="viewed_names_list.phtml" hash="21fa749e379df134083d3599853fc3e6"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="f5367281a3cb0a4ed0d5c4c4ba411d85"/><file name="viewed_list.phtml" hash="f50b2a2b2eef5710d129789f687b7467"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="97b142ce5b96aff3fb0ccc7d124e51d1"/><file name="recent.phtml" hash="e191691dcd2348daf9c03b349a611704"/><file name="view.phtml" hash="3d4e3b78d4e2803d44609aaaf52427fe"/></dir><file name="form.phtml" hash="9a9a10d4fada4c9dfe13cd6a67c6086a"/><dir name="helper"><file name="summary.phtml" hash="d252b54235705488a51deb3975c906a7"/><file name="summary_short.phtml" hash="76c530b821205c0231c90aad07f43f21"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="9dc77fc557d050415deb9a34841ed481"/><file name="list.phtml" hash="0afc05442e49bf61e546f4110cc4a3b8"/><file name="other.phtml" hash="498cf7b3ebe3e63b44423bb6ff7e5837"/></dir></dir><file name="view.phtml" hash="26584f68b240e9b4b497bc09af7704f8"/></dir><dir name="rss"><file name="list.phtml" hash="bb38db8ae793f424480552bb0062fc0f"/><file name="nofeed.phtml" hash="bcbad86e87ba8d8e383af663ab2add4a"/><dir name="order"><file name="details.phtml" hash="3ef080e4c4294d1c126085816be57920"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="eee0c7de5eff96204bc85ee219a38a8e"/></dir><file name="agreements.phtml" hash="a3d21f536d2563baa8f43dff1f2bbbdd"/></dir><dir name="guest"><file name="form.phtml" hash="dc9521f68dae3cc50c5bf1924db6856b"/></dir><dir name="order"><file name="comments.phtml" hash="b24e72576471b858a98954728419832d"/><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="ff678b441b3907323d6ee79f590f009b"/></dir></dir><file name="items.phtml" hash="2935ba2044b93b19ac0387aa8776c44f"/></dir><file name="creditmemo.phtml" hash="6697414464051abbba91760c76a52994"/><file name="details.phtml" hash="3634e89096b28d7da3fa7bb31c248dc3"/><file name="history.phtml" hash="04f64bbbea99bc220aa44254408199c5"/><dir name="info"><file name="buttons.phtml" hash="dc597f7c3702b49beb2f0205005edee0"/></dir><file name="info.phtml" hash="deb1f431a246fdb8f9ab59f07db85210"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="8d3f98f1b23f4d336b24b1f2082cfa11"/></dir></dir><file name="items.phtml" hash="580798867451d2be895577e9df917d4d"/></dir><file name="invoice.phtml" hash="222559585e587c3c59b390df442d17e0"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="b59f4b96d584b4998d2d56e8b0d32336"/></dir></dir><file name="items.phtml" hash="b234f18ba7cb1b809bd79c2db6318ee0"/><dir name="print"><file name="creditmemo.phtml" hash="0cbade8f5bb48b4cda2713a548646446"/><file name="invoice.phtml" hash="ffbff984bec0130b59f1429113b24215"/><file name="shipment.phtml" hash="281ad1f819b38b8add1963935c67e4d0"/></dir><file name="print.phtml" hash="cdcf1a2d80c0a24e77358f9e305ecb63"/><file name="recent.phtml" hash="d7e587f30151a738ad3dc45942b2753f"/><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="334c76cf6fd53e38dde3a0a1adbcb594"/></dir></dir><file name="items.phtml" hash="aed0e6571b805f3e506072c7e096aee6"/></dir><file name="shipment.phtml" hash="4e47258f03ce9b3bb23fec10142383c4"/><file name="totals.phtml" hash="b4c4b90f73a7f2e78db6596a2f130362"/><file name="trackinginfo.phtml" hash="79c0d787679d7c08afe45fe8d7bec969"/><file name="view.phtml" hash="42520ef5354319a0c2a870e42011c077"/></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="dfba34995a96ad0130296e80822307f8"/></dir></dir></dir><dir name="recurring"><file name="grid.phtml" hash="a1ee0b42fdcf31a323ced56894e18c2c"/><dir name="profile"><dir name="view"><file name="info.phtml" hash="bbfb4560c0a12b7ae92bbf8a3c5ede13"/></dir><file name="view.phtml" hash="3d06e65f6ef00713639ebb63a1d20f45"/></dir><file name="profiles.phtml" hash="f871b656b1e3c4cd62d90ec4a82b0c4d"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="2de6fe3f5509bb471469746121e13286"/></dir><dir name="widget"><dir name="guest"><file name="form.phtml" hash="d7737aa66069e5ba89d307ea5cbc78e7"/></dir></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="545b1b085e925534fb57b7f0d9b2e1a7"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="b3887982434363295b85ce5b6a9d5727"/><file name="popup.phtml" hash="d359f4a437ee65cbec37fe2bdf6ddee9"/></dir></dir><dir name="tag"><file name="cloud.phtml" hash="1064353c96441927c8cc5974fe86faad"/><dir name="customer"><file name="recent.phtml" hash="e6aa119fdced00f05c504f596ef74411"/><file name="tags.phtml" hash="31f66a60b2829a66a6b7085aa988abf9"/><file name="view.phtml" hash="7beeff9f94502373da1efa3c13d00792"/></dir><file name="list.phtml" hash="aad5490d857e0963b38d0597aa81b01b"/><file name="popular.phtml" hash="8cc87fd94313050d1f12afa5e4fa92a1"/></dir><dir name="tax"><dir name="checkout"><file name="discount.phtml" hash="9990886f9bdb861e69693dd5d5049c21"/><file name="grandtotal.phtml" hash="c9ce7e777e344a4a54dff5c223f867e6"/><file name="shipping.phtml" hash="e6939fdbb296ae139ebfe3ed9b1d8003"/><file name="subtotal.phtml" hash="eae01eae62bc88429e10f0075edc0a50"/><file name="tax.phtml" hash="bb6c5782fc36aa978c3427586cabbebb"/></dir><dir name="order"><file name="tax.phtml" hash="289b28549b5db31f4f78e2a0505ff8ee"/></dir></dir><dir name="wishlist"><dir name="button"><file name="share.phtml" hash="7d357329a8e63669533ffae58e2a9ea2"/><file name="tocart.phtml" hash="65e612fb7759208b448f0ec479354e4b"/><file name="update.phtml" hash="606592b211219af4629c8bdd0dab1133"/></dir><dir name="email"><file name="items.phtml" hash="08d36c72bcb1431ae25ebf31c8054519"/><file name="rss.phtml" hash="a5d26ad90a36388843107ce99ebcd57d"/></dir><dir name="item"><dir name="column"><file name="cart.phtml" hash="763a44d7d805edde0047e53c7a73fbb8"/><file name="image.phtml" hash="0ccb12256a9e9c42a5459cb3d8d8f9af"/><file name="info.phtml" hash="ce485afb798f89ad2844ef2043d84d51"/><file name="remove.phtml" hash="2bd046bdd9db0c7ae124af76c6648587"/></dir><dir name="configure"><file name="addto.phtml" hash="593c7fa73668e0077776b905a8359cbe"/></dir><file name="list.phtml" hash="b7e65fb738d20dec68d04e96f0e12250"/></dir><file name="options_list.phtml" hash="c82d0d5305de4b555c85e5955df9c472"/><dir name="render"><dir name="item"><file name="price.phtml" hash="036c3bb4ffc21669e53a61b20c3a28ca"/><file name="price_msrp_item.phtml" hash="d85dfb2ff9041f2384c302156c2a61a3"/><file name="price_msrp_rss.phtml" hash="5d4a5b9ab382ba0c04a616cb54721c69"/></dir></dir><file name="shared.phtml" hash="8024a2edfef4cdcb86f5546610093829"/><file name="sharing.phtml" hash="0ccd4b19e43b3b582fad51e299d5f245"/><file name="sidebar.phtml" hash="4f329b8e4584e88c6b789d8993715457"/><file name="view.phtml" hash="b072b63099b8f7d583af3ee66ec355bb"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="email-inline.css" hash="ed63c4b0607b5f3f7077f70d2362cfc4"/><file name="email-non-inline.css" hash="bc5ea1e8344f0daf2dd5691a981a2e86"/><file name="widgets.css" hash="ed3ba13dd93e7695d9c8072ebfc83732"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="cookies"><file name="firefox.png" hash="425e1b2ddc38c0bba431fb54357c66a4"/><file name="ie6-1.gif" hash="5c27700e245762bc89ed8c3ee7183f21"/><file name="ie6-2.gif" hash="d8c55e15e1f711e5c259300a9c19551b"/><file name="ie7-1.gif" hash="d61edcc8a514a3c81ea116b7d38ddcb6"/><file name="ie7-2.gif" hash="0526a654e94c54866cad977c0a47d3e5"/><file name="ie7-3.gif" hash="4fb142def3f6cfd8d8d23e1315528a1e"/><file name="ie7-4.gif" hash="575c276231c6a91e28935ec98215e146"/><file name="ie7-5.gif" hash="3ae5fcc11fe89da91674d183872337c1"/><file name="ie7-6.gif" hash="95a4981a41785a8cde273c9b2edbfbc7"/><file name="opera.png" hash="34070d92180d4ee0e37b1dd8bb731cd7"/></dir><file name="cvv.gif" hash="83cdd38bf110b0f9c52fe84b56f45298"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="reload.png" hash="84cc4883f78ef850814ea9b53989b2a7"/><dir name="widgets"><file name="i_block-list.gif" hash="fe8424127ecbe4b0d893bcf6f253dc1a"/><file name="i_widget-link.gif" hash="1bf753578171f147f0203e7b13bdd0c4"/><file name="i_widget-new.gif" hash="a75377ffed51b711cbc608ffaa1a2e7d"/></dir></dir><dir name="js"><file name="bundle.js" hash="f0762fb8bf9ded546d5f2da29a3e4404"/><dir name="checkout"><file name="review.js" hash="65d792db44438e7181803c6398f492ab"/></dir><file name="giftmessage.js" hash="a5697ed33590050bb2582cec39f29df2"/><file name="ie6.js" hash="a28f2c74f4ba1b73e95200f195a69f3e"/><file name="msrp.js" hash="2077610ec1f7e9e5f38b7474540919e4"/><file name="opcheckout.js" hash="d77144aa2e47850b2b59903615a894ce"/></dir><dir name="lib"><dir name="prototype"><dir name="windows"><dir name="themes"><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="26094605a693e4c7e647ae2df4554048"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.9.2.0</min><max>1.9.2.0</max></package></required></dependencies>
18
  </package>
skin/frontend/base/default/js/opcheckout.js CHANGED
@@ -746,6 +746,20 @@ Payment.prototype = {
746
  //Event fix for payment methods without form like "Check / Money order"
747
  document.body.fire('payment-method:switched', {method_code : method});
748
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
749
  if (method) {
750
  this.lastUsedMethod = method;
751
  }
@@ -871,7 +885,11 @@ Payment.prototype = {
871
  }
872
  return;
873
  }
874
- alert(response.error);
 
 
 
 
875
  return;
876
  }
877
 
746
  //Event fix for payment methods without form like "Check / Money order"
747
  document.body.fire('payment-method:switched', {method_code : method});
748
  }
749
+ if (method == 'free' && quoteBaseGrandTotal > 0.0001
750
+ && !(($('use_reward_points') && $('use_reward_points').checked) || ($('use_customer_balance') && $('use_customer_balance').checked))
751
+ ) {
752
+ if ($('p_method_' + method)) {
753
+ $('p_method_' + method).checked = false;
754
+ if ($('dt_method_' + method)) {
755
+ $('dt_method_' + method).hide();
756
+ }
757
+ if ($('dd_method_' + method)) {
758
+ $('dd_method_' + method).hide();
759
+ }
760
+ }
761
+ method == '';
762
+ }
763
  if (method) {
764
  this.lastUsedMethod = method;
765
  }
885
  }
886
  return;
887
  }
888
+ if (typeof(response.message) == 'string') {
889
+ alert(response.message);
890
+ } else {
891
+ alert(response.error);
892
+ }
893
  return;
894
  }
895