Interface_Frontend_Base_Default - Version 1.7.0.0

Version Notes

1.7.0.0

Download this release

Release Info

Developer Magento Core Team
Extension Interface_Frontend_Base_Default
Version 1.7.0.0
Comparing to
See all releases


Code changes from version 1.6.2.0 to 1.7.0.0

Files changed (445) hide show
  1. app/design/frontend/base/default/etc/widget.xml +1 -1
  2. app/design/frontend/base/default/layout/authorizenet.xml +1 -1
  3. app/design/frontend/base/default/layout/bundle.xml +2 -8
  4. app/design/frontend/base/default/layout/captcha.xml +106 -0
  5. app/design/frontend/base/default/layout/catalog.xml +1 -22
  6. app/design/frontend/base/default/layout/catalog_msrp.xml +1 -1
  7. app/design/frontend/base/default/layout/cataloginventory.xml +1 -1
  8. app/design/frontend/base/default/layout/catalogsearch.xml +1 -1
  9. app/design/frontend/base/default/layout/checkout.xml +3 -3
  10. app/design/frontend/base/default/layout/cms.xml +1 -1
  11. app/design/frontend/base/default/layout/contacts.xml +1 -1
  12. app/design/frontend/base/default/layout/core.xml +1 -1
  13. app/design/frontend/base/default/layout/customer.xml +3 -3
  14. app/design/frontend/base/default/layout/directory.xml +1 -1
  15. app/design/frontend/base/default/layout/downloadable.xml +1 -7
  16. app/design/frontend/base/default/layout/googleanalytics.xml +2 -2
  17. app/design/frontend/base/default/layout/googlecheckout.xml +1 -1
  18. app/design/frontend/base/default/layout/newsletter.xml +1 -1
  19. app/design/frontend/base/default/layout/oauth.xml +137 -0
  20. app/design/frontend/base/default/layout/page.xml +2 -1
  21. app/design/frontend/base/default/layout/pagecache.xml +1 -1
  22. app/design/frontend/base/default/layout/payment.xml +1 -1
  23. app/design/frontend/base/default/layout/paypal.xml +4 -1
  24. app/design/frontend/base/default/layout/paypaluk.xml +2 -2
  25. app/design/frontend/base/default/layout/persistent.xml +1 -1
  26. app/design/frontend/base/default/layout/poll.xml +1 -1
  27. app/design/frontend/base/default/layout/productalert.xml +1 -1
  28. app/design/frontend/base/default/layout/reports.xml +1 -1
  29. app/design/frontend/base/default/layout/review.xml +1 -1
  30. app/design/frontend/base/default/layout/rss.xml +1 -1
  31. app/design/frontend/base/default/layout/sales.xml +1 -1
  32. app/design/frontend/base/default/layout/sales/billing_agreement.xml +1 -1
  33. app/design/frontend/base/default/layout/sales/recurring_profile.xml +1 -1
  34. app/design/frontend/base/default/layout/sendfriend.xml +1 -1
  35. app/design/frontend/base/default/layout/shipping.xml +1 -1
  36. app/design/frontend/base/default/layout/tag.xml +1 -1
  37. app/design/frontend/base/default/layout/weee.xml +1 -1
  38. app/design/frontend/base/default/layout/wishlist.xml +33 -13
  39. app/design/frontend/base/default/template/authorizenet/directpost/form.phtml +1 -1
  40. app/design/frontend/base/default/template/authorizenet/directpost/iframe.phtml +1 -1
  41. app/design/frontend/base/default/template/authorizenet/directpost/info.phtml +1 -1
  42. app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml +1 -1
  43. app/design/frontend/base/default/template/bundle/catalog/product/price.phtml +10 -5
  44. app/design/frontend/base/default/template/bundle/catalog/product/view/options/notice.phtml +1 -1
  45. app/design/frontend/base/default/template/bundle/catalog/product/view/price.phtml +1 -1
  46. app/design/frontend/base/default/template/bundle/catalog/product/view/tierprices.phtml +1 -1
  47. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml +1 -1
  48. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml +1 -1
  49. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml +1 -1
  50. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml +1 -1
  51. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml +1 -1
  52. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/options.phtml +1 -1
  53. app/design/frontend/base/default/template/bundle/email/order/items/creditmemo/default.phtml +1 -1
  54. app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml +1 -1
  55. app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml +1 -1
  56. app/design/frontend/base/default/template/bundle/email/order/items/shipment/default.phtml +1 -1
  57. app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml +1 -1
  58. app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml +1 -1
  59. app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml +1 -1
  60. app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml +1 -1
  61. app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml +1 -1
  62. app/design/frontend/base/default/template/callouts/left_col.phtml +1 -1
  63. app/design/frontend/base/default/template/callouts/right_col.phtml +1 -1
  64. app/design/frontend/base/default/template/captcha/zend.phtml +51 -0
  65. app/design/frontend/base/default/template/catalog/category/page.phtml +1 -1
  66. app/design/frontend/base/default/template/catalog/category/view.phtml +1 -1
  67. app/design/frontend/base/default/template/catalog/category/widget/link/link_block.phtml +1 -1
  68. app/design/frontend/base/default/template/catalog/category/widget/link/link_inline.phtml +1 -1
  69. app/design/frontend/base/default/template/catalog/layer/filter.phtml +3 -1
  70. app/design/frontend/base/default/template/catalog/layer/state.phtml +11 -4
  71. app/design/frontend/base/default/template/catalog/layer/view.phtml +4 -1
  72. app/design/frontend/base/default/template/catalog/msrp/popup.phtml +4 -3
  73. app/design/frontend/base/default/template/catalog/navigation/left.phtml +1 -1
  74. app/design/frontend/base/default/template/catalog/navigation/top.phtml +1 -1
  75. app/design/frontend/base/default/template/catalog/product/compare/list.phtml +6 -4
  76. app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml +1 -1
  77. app/design/frontend/base/default/template/catalog/product/gallery.phtml +1 -1
  78. app/design/frontend/base/default/template/catalog/product/list.phtml +1 -1
  79. app/design/frontend/base/default/template/catalog/product/list/related.phtml +1 -1
  80. app/design/frontend/base/default/template/catalog/product/list/toolbar.phtml +1 -1
  81. app/design/frontend/base/default/template/catalog/product/list/upsell.phtml +1 -1
  82. app/design/frontend/base/default/template/catalog/product/new.phtml +1 -1
  83. app/design/frontend/base/default/template/catalog/product/price.phtml +63 -49
  84. app/design/frontend/base/default/template/catalog/product/price_msrp.phtml +2 -2
  85. app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml +2 -2
  86. app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml +2 -2
  87. app/design/frontend/base/default/template/catalog/product/price_msrp_rss.phtml +1 -1
  88. app/design/frontend/base/default/template/catalog/product/view.phtml +8 -1
  89. app/design/frontend/base/default/template/catalog/product/view/additional.phtml +1 -1
  90. app/design/frontend/base/default/template/catalog/product/view/addto.phtml +2 -2
  91. app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml +1 -1
  92. app/design/frontend/base/default/template/catalog/product/view/attributes.phtml +1 -1
  93. app/design/frontend/base/default/template/catalog/product/view/description.phtml +1 -1
  94. app/design/frontend/base/default/template/catalog/product/view/media.phtml +1 -1
  95. app/design/frontend/base/default/template/catalog/product/view/options.phtml +36 -25
  96. app/design/frontend/base/default/template/catalog/product/view/options/js.phtml +1 -1
  97. app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml +1 -1
  98. app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml +1 -1
  99. app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml +1 -1
  100. app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml +1 -1
  101. app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml +1 -1
  102. app/design/frontend/base/default/template/catalog/product/view/options/wrapper.phtml +1 -1
  103. app/design/frontend/base/default/template/catalog/product/view/options/wrapper/bottom.phtml +1 -1
  104. app/design/frontend/base/default/template/catalog/product/view/price.phtml +1 -1
  105. app/design/frontend/base/default/template/catalog/product/view/price_clone.phtml +1 -1
  106. app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml +10 -5
  107. app/design/frontend/base/default/template/catalog/product/view/type/configurable.phtml +1 -1
  108. app/design/frontend/base/default/template/catalog/product/view/type/default.phtml +1 -1
  109. app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml +1 -1
  110. app/design/frontend/base/default/template/catalog/product/view/type/options/configurable.phtml +1 -1
  111. app/design/frontend/base/default/template/catalog/product/view/type/simple.phtml +1 -1
  112. app/design/frontend/base/default/template/catalog/product/view/type/virtual.phtml +1 -1
  113. app/design/frontend/base/default/template/catalog/product/widget/link/link_block.phtml +1 -1
  114. app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml +1 -1
  115. app/design/frontend/base/default/template/catalog/product/widget/new/column/new_default_list.phtml +1 -1
  116. app/design/frontend/base/default/template/catalog/product/widget/new/column/new_images_list.phtml +1 -1
  117. app/design/frontend/base/default/template/catalog/product/widget/new/column/new_names_list.phtml +1 -1
  118. app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml +1 -1
  119. app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml +1 -1
  120. app/design/frontend/base/default/template/catalog/rss/product/price.phtml +1 -1
  121. app/design/frontend/base/default/template/catalog/seo/sitemap.phtml +3 -3
  122. app/design/frontend/base/default/template/catalog/seo/sitemap/container.phtml +1 -1
  123. app/design/frontend/base/default/template/catalog/seo/tree.phtml +1 -1
  124. app/design/frontend/base/default/template/cataloginventory/qtyincrements.phtml +1 -1
  125. app/design/frontend/base/default/template/cataloginventory/stockqty/composite.phtml +1 -1
  126. app/design/frontend/base/default/template/cataloginventory/stockqty/default.phtml +1 -1
  127. app/design/frontend/base/default/template/catalogsearch/advanced/form.phtml +7 -6
  128. app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml +1 -1
  129. app/design/frontend/base/default/template/catalogsearch/form.mini.phtml +7 -4
  130. app/design/frontend/base/default/template/catalogsearch/result.phtml +1 -1
  131. app/design/frontend/base/default/template/catalogsearch/term.phtml +1 -1
  132. app/design/frontend/base/default/template/checkout/cart.phtml +27 -2
  133. app/design/frontend/base/default/template/checkout/cart/coupon.phtml +1 -1
  134. app/design/frontend/base/default/template/checkout/cart/crosssell.phtml +1 -1
  135. app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.phtml +1 -1
  136. app/design/frontend/base/default/template/checkout/cart/item/default.phtml +8 -7
  137. app/design/frontend/base/default/template/checkout/cart/noItems.phtml +3 -1
  138. app/design/frontend/base/default/template/checkout/cart/render/default.phtml +2 -2
  139. app/design/frontend/base/default/template/checkout/cart/render/simple.phtml +3 -3
  140. app/design/frontend/base/default/template/checkout/cart/shipping.phtml +9 -13
  141. app/design/frontend/base/default/template/checkout/cart/sidebar.phtml +1 -1
  142. app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml +1 -1
  143. app/design/frontend/base/default/template/checkout/cart/totals.phtml +1 -1
  144. app/design/frontend/base/default/template/checkout/multishipping/address/select.phtml +1 -1
  145. app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml +1 -1
  146. app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml +1 -1
  147. app/design/frontend/base/default/template/checkout/multishipping/billing.phtml +1 -1
  148. app/design/frontend/base/default/template/checkout/multishipping/billing/items.phtml +1 -1
  149. app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml +1 -1
  150. app/design/frontend/base/default/template/checkout/multishipping/link.phtml +1 -1
  151. app/design/frontend/base/default/template/checkout/multishipping/overview.phtml +5 -4
  152. app/design/frontend/base/default/template/checkout/multishipping/overview/item.phtml +1 -1
  153. app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml +6 -5
  154. app/design/frontend/base/default/template/checkout/multishipping/state.phtml +1 -1
  155. app/design/frontend/base/default/template/checkout/multishipping/success.phtml +1 -1
  156. app/design/frontend/base/default/template/checkout/onepage.phtml +1 -2
  157. app/design/frontend/base/default/template/checkout/onepage/agreements.phtml +1 -1
  158. app/design/frontend/base/default/template/checkout/onepage/billing.phtml +29 -16
  159. app/design/frontend/base/default/template/checkout/onepage/failure.phtml +1 -1
  160. app/design/frontend/base/default/template/checkout/onepage/link.phtml +1 -1
  161. app/design/frontend/base/default/template/checkout/onepage/login.phtml +4 -1
  162. app/design/frontend/base/default/template/checkout/onepage/payment.phtml +1 -1
  163. app/design/frontend/base/default/template/checkout/onepage/payment/methods.phtml +2 -2
  164. app/design/frontend/base/default/template/checkout/onepage/progress.phtml +15 -10
  165. app/design/frontend/base/default/template/checkout/onepage/review.phtml +1 -1
  166. app/design/frontend/base/default/template/checkout/onepage/review/button.phtml +1 -1
  167. app/design/frontend/base/default/template/checkout/onepage/review/info.phtml +1 -1
  168. app/design/frontend/base/default/template/checkout/onepage/review/item.phtml +1 -1
  169. app/design/frontend/base/default/template/checkout/onepage/review/totals.phtml +1 -1
  170. app/design/frontend/base/default/template/checkout/onepage/shipping.phtml +23 -21
  171. app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml +1 -1
  172. app/design/frontend/base/default/template/checkout/onepage/shipping_method/additional.phtml +1 -1
  173. app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml +7 -5
  174. app/design/frontend/base/default/template/checkout/success.phtml +2 -2
  175. app/design/frontend/base/default/template/checkout/total/default.phtml +2 -2
  176. app/design/frontend/base/default/template/checkout/total/nominal.phtml +1 -1
  177. app/design/frontend/base/default/template/checkout/total/tax.phtml +2 -2
  178. app/design/frontend/base/default/template/cms/content.phtml +1 -1
  179. app/design/frontend/base/default/template/cms/content_heading.phtml +1 -1
  180. app/design/frontend/base/default/template/cms/default/home.phtml +1 -1
  181. app/design/frontend/base/default/template/cms/default/no-route.phtml +1 -1
  182. app/design/frontend/base/default/template/cms/meta.phtml +1 -1
  183. app/design/frontend/base/default/template/cms/widget/link/link_block.phtml +1 -1
  184. app/design/frontend/base/default/template/cms/widget/link/link_inline.phtml +1 -1
  185. app/design/frontend/base/default/template/cms/widget/static_block/default.phtml +1 -1
  186. app/design/frontend/base/default/template/contacts/form.phtml +1 -1
  187. app/design/frontend/base/default/template/core/formkey.phtml +1 -1
  188. app/design/frontend/base/default/template/core/link.phtml +1 -1
  189. app/design/frontend/base/default/template/core/messages.phtml +1 -1
  190. app/design/frontend/base/default/template/customer/account/dashboard.phtml +3 -1
  191. app/design/frontend/base/default/template/customer/account/dashboard/address.phtml +1 -1
  192. app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml +1 -1
  193. app/design/frontend/base/default/template/customer/account/dashboard/info.phtml +3 -1
  194. app/design/frontend/base/default/template/customer/account/dashboard/newsletter.phtml +1 -1
  195. app/design/frontend/base/default/template/customer/account/link/back.phtml +1 -1
  196. app/design/frontend/base/default/template/customer/account/navigation.phtml +1 -1
  197. app/design/frontend/base/default/template/customer/address.phtml +1 -1
  198. app/design/frontend/base/default/template/customer/address/book.phtml +1 -1
  199. app/design/frontend/base/default/template/customer/address/edit.phtml +21 -11
  200. app/design/frontend/base/default/template/customer/balance.phtml +1 -1
  201. app/design/frontend/base/default/template/customer/form/address.phtml +13 -11
  202. app/design/frontend/base/default/template/customer/form/changepassword.phtml +1 -1
  203. app/design/frontend/base/default/template/customer/form/confirmation.phtml +1 -1
  204. app/design/frontend/base/default/template/customer/form/edit.phtml +1 -1
  205. app/design/frontend/base/default/template/customer/form/forgotpassword.phtml +2 -1
  206. app/design/frontend/base/default/template/customer/form/login.phtml +4 -1
  207. app/design/frontend/base/default/template/customer/form/mini.login.phtml +1 -1
  208. app/design/frontend/base/default/template/customer/form/newsletter.phtml +5 -1
  209. app/design/frontend/base/default/template/customer/form/register.phtml +19 -12
  210. app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml +1 -1
  211. app/design/frontend/base/default/template/customer/logout.phtml +1 -1
  212. app/design/frontend/base/default/template/customer/orders.phtml +1 -1
  213. app/design/frontend/base/default/template/customer/widget/dob.phtml +1 -1
  214. app/design/frontend/base/default/template/customer/widget/gender.phtml +1 -1
  215. app/design/frontend/base/default/template/customer/widget/name.phtml +15 -16
  216. app/design/frontend/base/default/template/customer/widget/taxvat.phtml +2 -2
  217. app/design/frontend/base/default/template/customer/wishlist.phtml +1 -1
  218. app/design/frontend/base/default/template/directory/currency.phtml +1 -1
  219. app/design/frontend/base/default/template/directory/currency/switch.phtml +1 -1
  220. app/design/frontend/base/default/template/directory/js/optional_zip_countries.phtml +1 -1
  221. app/design/frontend/base/default/template/downloadable/catalog/product/links.phtml +2 -2
  222. app/design/frontend/base/default/template/downloadable/catalog/product/samples.phtml +2 -2
  223. app/design/frontend/base/default/template/downloadable/catalog/product/type.phtml +1 -1
  224. app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml +6 -6
  225. app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml +2 -2
  226. app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml +2 -2
  227. app/design/frontend/base/default/template/downloadable/checkout/success.phtml +1 -1
  228. app/design/frontend/base/default/template/downloadable/customer/products/list.phtml +2 -2
  229. app/design/frontend/base/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml +2 -2
  230. app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.phtml +2 -2
  231. app/design/frontend/base/default/template/downloadable/email/order/items/order/downloadable.phtml +2 -2
  232. app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +2 -2
  233. app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +2 -2
  234. app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml +2 -2
  235. app/design/frontend/base/default/template/email/order/creditmemo/items.phtml +1 -1
  236. app/design/frontend/base/default/template/email/order/invoice/items.phtml +1 -1
  237. app/design/frontend/base/default/template/email/order/items.phtml +3 -1
  238. app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml +1 -1
  239. app/design/frontend/base/default/template/email/order/items/invoice/default.phtml +1 -1
  240. app/design/frontend/base/default/template/email/order/items/order/default.phtml +1 -1
  241. app/design/frontend/base/default/template/email/order/items/shipment/default.phtml +1 -1
  242. app/design/frontend/base/default/template/email/order/shipment/items.phtml +1 -1
  243. app/design/frontend/base/default/template/email/order/shipment/track.phtml +1 -1
  244. app/design/frontend/base/default/template/email/productalert/price.phtml +1 -1
  245. app/design/frontend/base/default/template/email/productalert/stock.phtml +1 -1
  246. app/design/frontend/base/default/template/giftmessage/inline.phtml +2 -2
  247. app/design/frontend/base/default/template/googleanalytics/ga.phtml +45 -0
  248. app/design/frontend/base/default/template/googlecheckout/form.phtml +1 -1
  249. app/design/frontend/base/default/template/googlecheckout/link.phtml +1 -1
  250. app/design/frontend/base/default/template/newsletter/subscribe.phtml +4 -3
  251. app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml +62 -0
  252. app/design/frontend/base/default/template/oauth/authorize/button.phtml +53 -0
  253. app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml +52 -0
  254. app/design/frontend/base/default/template/oauth/authorize/confirm.phtml +42 -0
  255. app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml +75 -0
  256. app/design/frontend/base/default/template/oauth/authorize/form/login.phtml +76 -0
  257. app/design/frontend/base/default/template/oauth/authorize/head-simple.phtml +38 -0
  258. app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml +47 -0
  259. app/design/frontend/base/default/template/oauth/authorize/reject.phtml +38 -0
  260. app/design/frontend/base/default/template/oauth/customer/token/list.phtml +72 -0
  261. app/design/frontend/base/default/template/page/1column.phtml +1 -1
  262. app/design/frontend/base/default/template/page/2columns-left.phtml +1 -1
  263. app/design/frontend/base/default/template/page/2columns-right.phtml +1 -1
  264. app/design/frontend/base/default/template/page/3columns.phtml +1 -1
  265. app/design/frontend/base/default/template/page/empty.phtml +1 -1
  266. app/design/frontend/base/default/template/page/html/breadcrumbs.phtml +1 -1
  267. app/design/frontend/base/default/template/page/html/footer.phtml +1 -1
  268. app/design/frontend/base/default/template/page/html/head.phtml +1 -1
  269. app/design/frontend/base/default/template/page/html/header.phtml +1 -1
  270. app/design/frontend/base/default/template/page/html/notices.phtml +32 -7
  271. app/design/frontend/base/default/template/page/html/pager.phtml +1 -1
  272. app/design/frontend/base/default/template/page/html/top.links.phtml +1 -1
  273. app/design/frontend/base/default/template/page/html/topmenu.phtml +41 -0
  274. app/design/frontend/base/default/template/page/html/wrapper.phtml +1 -1
  275. app/design/frontend/base/default/template/page/js/calendar.phtml +1 -1
  276. app/design/frontend/base/default/template/page/js/cookie.phtml +1 -1
  277. app/design/frontend/base/default/template/page/popup.phtml +1 -1
  278. app/design/frontend/base/default/template/page/print.phtml +1 -1
  279. app/design/frontend/base/default/template/page/redirect.phtml +1 -1
  280. app/design/frontend/base/default/template/page/switch/flags.phtml +1 -1
  281. app/design/frontend/base/default/template/page/switch/languages.phtml +1 -1
  282. app/design/frontend/base/default/template/page/switch/stores.phtml +1 -1
  283. app/design/frontend/base/default/template/page/template/container.phtml +1 -1
  284. app/design/frontend/base/default/template/page/template/links.phtml +1 -1
  285. app/design/frontend/base/default/template/page/template/linksblock.phtml +1 -1
  286. app/design/frontend/base/default/template/pagecache/cookie.phtml +1 -1
  287. app/design/frontend/base/default/template/paygate/form/cc.phtml +1 -1
  288. app/design/frontend/base/default/template/paygate/info/cc.phtml +1 -1
  289. app/design/frontend/base/default/template/payment/catalog/product/view/profile/options.phtml +1 -1
  290. app/design/frontend/base/default/template/payment/catalog/product/view/profile/schedule.phtml +1 -1
  291. app/design/frontend/base/default/template/payment/form/banktransfer.phtml +35 -0
  292. app/design/frontend/base/default/template/payment/form/cashondelivery.phtml +39 -0
  293. app/design/frontend/base/default/template/payment/form/cc.phtml +1 -1
  294. app/design/frontend/base/default/template/payment/form/ccsave.phtml +1 -1
  295. app/design/frontend/base/default/template/payment/form/checkmo.phtml +1 -1
  296. app/design/frontend/base/default/template/payment/form/purchaseorder.phtml +1 -1
  297. app/design/frontend/base/default/template/payment/info/banktransfer.phtml +41 -0
  298. app/design/frontend/base/default/template/payment/info/checkmo.phtml +1 -1
  299. app/design/frontend/base/default/template/payment/info/default.phtml +1 -1
  300. app/design/frontend/base/default/template/payment/info/purchaseorder.phtml +1 -1
  301. app/design/frontend/base/default/template/paypal/express/review.phtml +74 -93
  302. app/design/frontend/base/default/template/paypal/express/review/address.phtml +145 -0
  303. app/design/frontend/base/default/template/paypal/express/review/details.phtml +1 -1
  304. app/design/frontend/base/default/template/paypal/express/review/shipping/method.phtml +53 -0
  305. app/design/frontend/base/default/template/paypal/express/shortcut.phtml +1 -1
  306. app/design/frontend/base/default/template/paypal/hss/form.phtml +1 -1
  307. app/design/frontend/base/default/template/paypal/hss/iframe.phtml +1 -1
  308. app/design/frontend/base/default/template/paypal/hss/info.phtml +1 -1
  309. app/design/frontend/base/default/template/paypal/hss/js.phtml +2 -2
  310. app/design/frontend/base/default/template/paypal/hss/redirect.phtml +4 -1
  311. app/design/frontend/base/default/template/paypal/hss/review/button.phtml +1 -1
  312. app/design/frontend/base/default/template/paypal/partner/logo.phtml +1 -1
  313. app/design/frontend/base/default/template/paypal/payflowadvanced/form.phtml +1 -1
  314. app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml +1 -1
  315. app/design/frontend/base/default/template/paypal/payflowadvanced/info.phtml +1 -1
  316. app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml +1 -1
  317. app/design/frontend/base/default/template/paypal/payflowlink/form.phtml +1 -1
  318. app/design/frontend/base/default/template/paypal/payflowlink/iframe.phtml +1 -1
  319. app/design/frontend/base/default/template/paypal/payflowlink/info.phtml +1 -1
  320. app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml +1 -1
  321. app/design/frontend/base/default/template/paypal/payment/mark.phtml +1 -1
  322. app/design/frontend/base/default/template/paypal/payment/redirect.phtml +1 -1
  323. app/design/frontend/base/default/template/paypaluk/express/review.phtml +191 -0
  324. app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml +30 -20
  325. app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml +4 -1
  326. app/design/frontend/base/default/template/persistent/customer/form/login.phtml +2 -1
  327. app/design/frontend/base/default/template/persistent/customer/form/register.phtml +14 -11
  328. app/design/frontend/base/default/template/persistent/remember_me.phtml +8 -8
  329. app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml +1 -1
  330. app/design/frontend/base/default/template/poll/active.phtml +1 -1
  331. app/design/frontend/base/default/template/poll/result.phtml +1 -1
  332. app/design/frontend/base/default/template/productalert/price.phtml +1 -1
  333. app/design/frontend/base/default/template/productalert/product/view.phtml +1 -1
  334. app/design/frontend/base/default/template/productalert/stock.phtml +1 -1
  335. app/design/frontend/base/default/template/rating/detailed.phtml +1 -1
  336. app/design/frontend/base/default/template/rating/empty.phtml +1 -1
  337. app/design/frontend/base/default/template/reports/home_product_compared.phtml +1 -1
  338. app/design/frontend/base/default/template/reports/home_product_viewed.phtml +1 -1
  339. app/design/frontend/base/default/template/reports/product_compared.phtml +1 -1
  340. app/design/frontend/base/default/template/reports/product_viewed.phtml +1 -1
  341. app/design/frontend/base/default/template/reports/widget/compared/column/compared_default_list.phtml +1 -1
  342. app/design/frontend/base/default/template/reports/widget/compared/column/compared_images_list.phtml +1 -1
  343. app/design/frontend/base/default/template/reports/widget/compared/column/compared_names_list.phtml +1 -1
  344. app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml +1 -1
  345. app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml +1 -1
  346. app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_default_list.phtml +1 -1
  347. app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_images_list.phtml +1 -1
  348. app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_names_list.phtml +1 -1
  349. app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml +1 -1
  350. app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml +1 -1
  351. app/design/frontend/base/default/template/review/customer/list.phtml +1 -1
  352. app/design/frontend/base/default/template/review/customer/recent.phtml +1 -1
  353. app/design/frontend/base/default/template/review/customer/view.phtml +1 -1
  354. app/design/frontend/base/default/template/review/form.phtml +1 -1
  355. app/design/frontend/base/default/template/review/helper/summary.phtml +1 -1
  356. app/design/frontend/base/default/template/review/helper/summary_short.phtml +1 -1
  357. app/design/frontend/base/default/template/review/product/view/count.phtml +1 -1
  358. app/design/frontend/base/default/template/review/product/view/list.phtml +1 -1
  359. app/design/frontend/base/default/template/review/product/view/other.phtml +1 -1
  360. app/design/frontend/base/default/template/review/view.phtml +1 -1
  361. app/design/frontend/base/default/template/rss/list.phtml +1 -1
  362. app/design/frontend/base/default/template/rss/nofeed.phtml +1 -1
  363. app/design/frontend/base/default/template/rss/order/details.phtml +1 -1
  364. app/design/frontend/base/default/template/sales/billing/agreement/view.phtml +1 -1
  365. app/design/frontend/base/default/template/sales/billing/agreements.phtml +1 -1
  366. app/design/frontend/base/default/template/sales/order/comments.phtml +1 -1
  367. app/design/frontend/base/default/template/sales/order/creditmemo.phtml +1 -1
  368. app/design/frontend/base/default/template/sales/order/creditmemo/items.phtml +1 -1
  369. app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml +1 -1
  370. app/design/frontend/base/default/template/sales/order/details.phtml +2 -2
  371. app/design/frontend/base/default/template/sales/order/history.phtml +1 -1
  372. app/design/frontend/base/default/template/sales/order/info.phtml +5 -4
  373. app/design/frontend/base/default/template/sales/order/info/buttons.phtml +1 -1
  374. app/design/frontend/base/default/template/sales/order/invoice.phtml +1 -1
  375. app/design/frontend/base/default/template/sales/order/invoice/items.phtml +1 -1
  376. app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml +1 -1
  377. app/design/frontend/base/default/template/sales/order/items.phtml +1 -1
  378. app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml +1 -1
  379. app/design/frontend/base/default/template/sales/order/print.phtml +2 -2
  380. app/design/frontend/base/default/template/sales/order/print/creditmemo.phtml +2 -2
  381. app/design/frontend/base/default/template/sales/order/print/invoice.phtml +2 -2
  382. app/design/frontend/base/default/template/sales/order/print/shipment.phtml +1 -1
  383. app/design/frontend/base/default/template/sales/order/recent.phtml +1 -1
  384. app/design/frontend/base/default/template/sales/order/shipment.phtml +1 -1
  385. app/design/frontend/base/default/template/sales/order/shipment/items.phtml +1 -1
  386. app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml +1 -1
  387. app/design/frontend/base/default/template/sales/order/totals.phtml +3 -3
  388. app/design/frontend/base/default/template/sales/order/trackinginfo.phtml +4 -5
  389. app/design/frontend/base/default/template/sales/order/view.phtml +1 -1
  390. app/design/frontend/base/default/template/sales/payment/form/billing/agreement.phtml +1 -1
  391. app/design/frontend/base/default/template/sales/recurring/grid.phtml +1 -1
  392. app/design/frontend/base/default/template/sales/recurring/profile/view.phtml +1 -1
  393. app/design/frontend/base/default/template/sales/recurring/profile/view/info.phtml +1 -1
  394. app/design/frontend/base/default/template/sales/recurring/profiles.phtml +1 -1
  395. app/design/frontend/base/default/template/sales/reorder/sidebar.phtml +1 -1
  396. app/design/frontend/base/default/template/sales/widget/guest/form.phtml +1 -1
  397. app/design/frontend/base/default/template/sendfriend/send.phtml +1 -1
  398. app/design/frontend/base/default/template/shipping/tracking/ajax.phtml +1 -1
  399. app/design/frontend/base/default/template/shipping/tracking/popup.phtml +6 -6
  400. app/design/frontend/base/default/template/tag/cloud.phtml +1 -1
  401. app/design/frontend/base/default/template/tag/customer/recent.phtml +1 -1
  402. app/design/frontend/base/default/template/tag/customer/tags.phtml +1 -1
  403. app/design/frontend/base/default/template/tag/customer/view.phtml +1 -1
  404. app/design/frontend/base/default/template/tag/list.phtml +1 -1
  405. app/design/frontend/base/default/template/tag/popular.phtml +1 -1
  406. app/design/frontend/base/default/template/tax/checkout/discount.phtml +1 -1
  407. app/design/frontend/base/default/template/tax/checkout/grandtotal.phtml +1 -1
  408. app/design/frontend/base/default/template/tax/checkout/shipping.phtml +2 -2
  409. app/design/frontend/base/default/template/tax/checkout/subtotal.phtml +1 -1
  410. app/design/frontend/base/default/template/tax/checkout/tax.phtml +2 -2
  411. app/design/frontend/base/default/template/tax/order/tax.phtml +2 -2
  412. app/design/frontend/base/default/template/wishlist/button/share.phtml +30 -0
  413. app/design/frontend/base/default/template/wishlist/button/tocart.phtml +30 -0
  414. app/design/frontend/base/default/template/wishlist/button/update.phtml +30 -0
  415. app/design/frontend/base/default/template/wishlist/email/items.phtml +8 -5
  416. app/design/frontend/base/default/template/wishlist/email/rss.phtml +2 -2
  417. app/design/frontend/base/default/template/wishlist/item/column/cart.phtml +54 -0
  418. app/design/frontend/base/default/template/wishlist/item/column/image.phtml +33 -0
  419. app/design/frontend/base/default/template/wishlist/item/column/info.phtml +40 -0
  420. app/design/frontend/base/default/template/wishlist/item/column/remove.phtml +29 -0
  421. app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml +2 -2
  422. app/design/frontend/base/default/template/wishlist/item/list.phtml +63 -0
  423. app/design/frontend/base/default/template/wishlist/options_list.phtml +1 -1
  424. app/design/frontend/base/default/template/wishlist/render/item/price.phtml +1 -1
  425. app/design/frontend/base/default/template/wishlist/render/item/price_msrp_item.phtml +2 -2
  426. app/design/frontend/base/default/template/wishlist/render/item/price_msrp_rss.phtml +1 -1
  427. app/design/frontend/base/default/template/wishlist/shared.phtml +4 -4
  428. app/design/frontend/base/default/template/wishlist/sharing.phtml +2 -2
  429. app/design/frontend/base/default/template/wishlist/sidebar.phtml +2 -2
  430. app/design/frontend/base/default/template/wishlist/view.phtml +45 -124
  431. package.xml +6 -6
  432. skin/frontend/base/default/css/widgets.css +1 -1
  433. skin/frontend/base/default/images/cvv.gif +0 -0
  434. skin/frontend/base/default/images/reload.png +0 -0
  435. skin/frontend/base/default/js/bundle.js +1 -1
  436. skin/frontend/base/default/js/checkout/review.js +322 -15
  437. skin/frontend/base/default/js/giftmessage.js +1 -1
  438. skin/frontend/base/default/js/ie6.js +1 -1
  439. skin/frontend/base/default/js/msrp.js +3 -1
  440. skin/frontend/base/default/js/opcheckout.js +35 -18
  441. skin/frontend/base/default/lib/prototype/windows/themes/magento.css +64 -0
  442. skin/frontend/base/default/lib/prototype/windows/themes/magento/btn_bg.gif +0 -0
  443. skin/frontend/base/default/lib/prototype/windows/themes/magento/content_bg.gif +0 -0
  444. skin/frontend/base/default/lib/prototype/windows/themes/magento/top_bg.gif +0 -0
  445. skin/frontend/base/default/lib/prototype/windows/themes/magento/window_close.png +0 -0
app/design/frontend/base/default/etc/widget.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/base/default/layout/authorizenet.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/bundle.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
@@ -92,12 +92,6 @@ Adding custom product price block
92
  </reference>
93
  </default>
94
 
95
- <wishlist_index_index>
96
- <reference name="customer.wishlist">
97
- <action method="addOptionsRenderCfg"><type>bundle</type><helper>bundle/catalog_product_configuration</helper></action>
98
- </reference>
99
- </wishlist_index_index>
100
-
101
  <catalog_product_view>
102
  <reference name="catalog.product.related">
103
  <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
@@ -227,7 +221,7 @@ Additional block for bundle product type
227
  <reference name="product.info.options.wrapper.bottom">
228
  <remove name="product.tierprices" />
229
  <block type="bundle/catalog_product_view" name="bundle.tierprices" as="tierprices" before="-" template="bundle/catalog/product/view/tierprices.phtml"/>
230
- <block type="cataloginventory/qtyincrements" name="product.info.extrahint" as="extrahint" template="cataloginventory/qtyincrements.phtml"/>
231
  </reference>
232
  <reference name="product.clone_prices">
233
  <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/view/price.phtml</template></action>
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
92
  </reference>
93
  </default>
94
 
 
 
 
 
 
 
95
  <catalog_product_view>
96
  <reference name="catalog.product.related">
97
  <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
221
  <reference name="product.info.options.wrapper.bottom">
222
  <remove name="product.tierprices" />
223
  <block type="bundle/catalog_product_view" name="bundle.tierprices" as="tierprices" before="-" template="bundle/catalog/product/view/tierprices.phtml"/>
224
+ <block type="cataloginventory/qtyincrements" name="product.info.qtyincrements" before="-" template="cataloginventory/qtyincrements.phtml"/>
225
  </reference>
226
  <reference name="product.clone_prices">
227
  <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/view/price.phtml</template></action>
app/design/frontend/base/default/layout/captcha.xml ADDED
@@ -0,0 +1,106 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0"?>
2
+ <!--
3
+ /**
4
+ * Magento
5
+ *
6
+ * NOTICE OF LICENSE
7
+ *
8
+ * This source file is subject to the Academic Free License (AFL 3.0)
9
+ * that is bundled with this package in the file LICENSE_AFL.txt.
10
+ * It is also available through the world-wide-web at this URL:
11
+ * http://opensource.org/licenses/afl-3.0.php
12
+ * If you did not receive a copy of the license and are unable to
13
+ * obtain it through the world-wide-web, please send an email
14
+ * to license@magentocommerce.com so we can send you a copy immediately.
15
+ *
16
+ * DISCLAIMER
17
+ *
18
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
19
+ * versions in the future. If you wish to customize Magento for your
20
+ * needs please refer to http://www.magentocommerce.com for more information.
21
+ *
22
+ * @category design
23
+ * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
+ */
27
+
28
+ -->
29
+ <layout version="0.1.0">
30
+ <customer_account_login>
31
+ <reference name="customer_form_login">
32
+ <block type="core/text_list" name="form.additional.info">
33
+ <block type="captcha/captcha" name="captcha">
34
+ <reference name="head">
35
+ <action method="addJs"><file>mage/captcha.js</file></action>
36
+ </reference>
37
+ <action method="setFormId"><formId>user_login</formId></action>
38
+ <action method="setImgWidth"><width>230</width></action>
39
+ <action method="setImgHeight"><width>50</width></action>
40
+ </block>
41
+ </block>
42
+ </reference>
43
+ </customer_account_login>
44
+ <customer_account_forgotpassword>
45
+ <reference name="forgotPassword">
46
+ <block type="core/text_list" name="form.additional.info">
47
+ <block type="captcha/captcha" name="captcha">
48
+ <reference name="head">
49
+ <action method="addJs"><file>mage/captcha.js</file></action>
50
+ </reference>
51
+ <action method="setFormId"><formId>user_forgotpassword</formId></action>
52
+ <action method="setImgWidth"><width>230</width></action>
53
+ <action method="setImgHeight"><width>50</width></action>
54
+ </block>
55
+ </block>
56
+ </reference>
57
+ </customer_account_forgotpassword>
58
+ <customer_account_create>
59
+ <reference name="customer_form_register">
60
+ <block type="core/text_list" name="form.additional.info">
61
+ <block type="captcha/captcha" name="captcha">
62
+ <reference name="head">
63
+ <action method="addJs"><file>mage/captcha.js</file></action>
64
+ </reference>
65
+ <action method="setFormId"><formId>user_create</formId></action>
66
+ <action method="setImgWidth"><width>230</width></action>
67
+ <action method="setImgHeight"><width>50</width></action>
68
+ </block>
69
+ </block>
70
+ </reference>
71
+ </customer_account_create>
72
+ <checkout_onepage_index>
73
+ <reference name="checkout.onepage.login">
74
+ <block type="core/text_list" name="form.additional.info">
75
+ <block type="captcha/captcha" name="captcha">
76
+ <reference name="head">
77
+ <action method="addJs"><file>mage/captcha.js</file></action>
78
+ </reference>
79
+ <action method="setFormId"><formId>user_login</formId></action>
80
+ <action method="setImgWidth"><width>230</width></action>
81
+ <action method="setImgHeight"><width>50</width></action>
82
+ </block>
83
+ </block>
84
+ </reference>
85
+ <reference name="checkout.onepage.billing">
86
+ <block type="core/text_list" name="form.additional.info">
87
+ <block type="captcha/captcha" name="captcha.guest.checkout">
88
+ <reference name="head">
89
+ <action method="addJs"><file>mage/captcha.js</file></action>
90
+ </reference>
91
+ <action method="setFormId"><formId>guest_checkout</formId></action>
92
+ <action method="setImgWidth"><width>230</width></action>
93
+ <action method="setImgHeight"><width>50</width></action>
94
+ </block>
95
+ <block type="captcha/captcha" name="captcha.register.during.checkout">
96
+ <reference name="head">
97
+ <action method="addJs"><file>mage/captcha.js</file></action>
98
+ </reference>
99
+ <action method="setFormId"><formId>register_during_checkout</formId></action>
100
+ <action method="setImgWidth"><width>230</width></action>
101
+ <action method="setImgHeight"><width>50</width></action>
102
+ </block>
103
+ </block>
104
+ </reference>
105
+ </checkout_onepage_index>
106
+ </layout>
app/design/frontend/base/default/layout/catalog.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
@@ -45,9 +45,6 @@ Default layout, loads most of the pages
45
  <default>
46
 
47
  <!-- Mage_Catalog -->
48
- <reference name="top.menu">
49
- <block type="catalog/navigation" name="catalog.topnav" template="catalog/navigation/top.phtml"/>
50
- </reference>
51
  <reference name="left">
52
  <block type="core/template" name="left.permanent.callout" template="callouts/left_col.phtml">
53
  <action method="setImgSrc"><src>images/media/col_left_callout.jpg</src></action>
@@ -418,22 +415,4 @@ SEO Site Map
418
  <action method="addLink" translate="label title" module="catalog"><label>Categories Sitemap</label><url helper="catalog/map/getCategoryUrl"/><title>Categories Sitemap</title></action>
419
  </reference>
420
  </catalog_seo_sitemap_product>
421
-
422
-
423
- <!--
424
- Catalog search terms block
425
- -->
426
-
427
- <catalog_seo_searchterm_popular translate="label">
428
- <label>Catalog Seo Popular Search Terms</label>
429
- <remove name="right"/>
430
- <remove name="left"/>
431
- <reference name="root">
432
- <action method="setTemplate"><template>page/1column.phtml</template></action>
433
- </reference>
434
- <reference name="content">
435
- <block type="catalog/seo_searchterm" name="seo.searchterm" template="catalog/seo/searchterm.phtml"/>
436
- </reference>
437
- </catalog_seo_searchterm_popular>
438
-
439
  </layout>
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
45
  <default>
46
 
47
  <!-- Mage_Catalog -->
 
 
 
48
  <reference name="left">
49
  <block type="core/template" name="left.permanent.callout" template="callouts/left_col.phtml">
50
  <action method="setImgSrc"><src>images/media/col_left_callout.jpg</src></action>
415
  <action method="addLink" translate="label title" module="catalog"><label>Categories Sitemap</label><url helper="catalog/map/getCategoryUrl"/><title>Categories Sitemap</title></action>
416
  </reference>
417
  </catalog_seo_sitemap_product>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
418
  </layout>
app/design/frontend/base/default/layout/catalog_msrp.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/cataloginventory.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/catalogsearch.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/checkout.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
@@ -96,7 +96,7 @@ Default layout, loads most of the pages
96
  <label>Additional Product Info</label>
97
  </block>
98
  </checkout_cart_index>
99
-
100
  <checkout_cart_configure translate="label">
101
  <label>Configure Cart Item</label>
102
  <update handle="catalog_product_view"/>
@@ -104,7 +104,7 @@ Default layout, loads most of the pages
104
  <block type="checkout/cart_item_configure" name="checkout.cart.item.configure.block"></block>
105
  </reference>
106
  </checkout_cart_configure>
107
-
108
  <!--
109
  Multi address shipping checkout main layout,
110
  will be rendered on all checkout pages
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
96
  <label>Additional Product Info</label>
97
  </block>
98
  </checkout_cart_index>
99
+
100
  <checkout_cart_configure translate="label">
101
  <label>Configure Cart Item</label>
102
  <update handle="catalog_product_view"/>
104
  <block type="checkout/cart_item_configure" name="checkout.cart.item.configure.block"></block>
105
  </reference>
106
  </checkout_cart_configure>
107
+
108
  <!--
109
  Multi address shipping checkout main layout,
110
  will be rendered on all checkout pages
app/design/frontend/base/default/layout/cms.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/base/default/layout/contacts.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/base/default/layout/core.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/customer.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
@@ -91,7 +91,7 @@ Layout for customer login page
91
  <action method="setTemplate"><template>page/1column.phtml</template></action>
92
  </reference>
93
  <reference name="content">
94
- <block type="customer/form_login" name="customer_form_login" template="customer/form/login.phtml"/>
95
  </reference>
96
  </customer_account_login>
97
 
@@ -149,7 +149,7 @@ New customer registration
149
  </reference>
150
  <reference name="content">
151
  <!--<block type="core/template" name="forgotPassword" template="customer/form/forgotpassword.phtml"/>-->
152
- <block type="customer/account_forgotpassword" name="forgotPassword" template="customer/form/forgotpassword.phtml"/>
153
  </reference>
154
  </customer_account_forgotpassword>
155
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
91
  <action method="setTemplate"><template>page/1column.phtml</template></action>
92
  </reference>
93
  <reference name="content">
94
+ <block type="customer/form_login" name="customer_form_login" template="customer/form/login.phtml" />
95
  </reference>
96
  </customer_account_login>
97
 
149
  </reference>
150
  <reference name="content">
151
  <!--<block type="core/template" name="forgotPassword" template="customer/form/forgotpassword.phtml"/>-->
152
+ <block type="customer/account_forgotpassword" name="forgotPassword" template="customer/form/forgotpassword.phtml" />
153
  </reference>
154
  </customer_account_forgotpassword>
155
 
app/design/frontend/base/default/layout/directory.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/downloadable.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
@@ -127,12 +127,6 @@
127
  </reference>
128
  </sales_order_creditmemo>
129
 
130
- <wishlist_index_index>
131
- <reference name="customer.wishlist">
132
- <action method="addOptionsRenderCfg"><type>downloadable</type><helper>downloadable/catalog_product_configuration</helper></action>
133
- </reference>
134
- </wishlist_index_index>
135
-
136
  <!--
137
  Print pages
138
  -->
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
127
  </reference>
128
  </sales_order_creditmemo>
129
 
 
 
 
 
 
 
130
  <!--
131
  Print pages
132
  -->
app/design/frontend/base/default/layout/googleanalytics.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
@@ -35,7 +35,7 @@ Default layout, loads most of the pages
35
  <default>
36
  <!-- Mage_GoogleAnalytics -->
37
  <reference name="after_body_start">
38
- <block type="googleanalytics/ga" name="google_analytics" as="google_analytics" />
39
  </reference>
40
  </default>
41
  </layout>
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
35
  <default>
36
  <!-- Mage_GoogleAnalytics -->
37
  <reference name="after_body_start">
38
+ <block type="googleanalytics/ga" name="google_analytics" as="google_analytics" template="googleanalytics/ga.phtml" />
39
  </reference>
40
  </default>
41
  </layout>
app/design/frontend/base/default/layout/googlecheckout.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/newsletter.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/oauth.xml ADDED
@@ -0,0 +1,137 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0"?>
2
+ <!--
3
+ /**
4
+ * Magento
5
+ *
6
+ * NOTICE OF LICENSE
7
+ *
8
+ * This source file is subject to the Academic Free License (AFL 3.0)
9
+ * that is bundled with this package in the file LICENSE_AFL.txt.
10
+ * It is also available through the world-wide-web at this URL:
11
+ * http://opensource.org/licenses/afl-3.0.php
12
+ * If you did not receive a copy of the license and are unable to
13
+ * obtain it through the world-wide-web, please send an email
14
+ * to license@magentocommerce.com so we can send you a copy immediately.
15
+ *
16
+ * DISCLAIMER
17
+ *
18
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
19
+ * versions in the future. If you wish to customize Magento for your
20
+ * needs please refer to http://www.magentocommerce.com for more information.
21
+ *
22
+ * @category design
23
+ * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
+ */
27
+ -->
28
+ <layout version="1.0.0.0">
29
+ <oauth_root_handle>
30
+ <reference name="root">
31
+ <action method="setTemplate">
32
+ <template>page/1column.phtml</template>
33
+ </action>
34
+ </reference>
35
+ <reference name="head">
36
+ <action method="removeItem"><type>js</type><name>lib/ccard.js</name></action>
37
+ <action method="removeItem"><type>js</type><name>scriptaculous/controls.js</name></action>
38
+ <action method="removeItem"><type>js</type><name>scriptaculous/builder.js</name></action>
39
+ <action method="removeItem"><type>js</type><name>scriptaculous/dragdrop.js</name></action>
40
+ <action method="removeItem"><type>js</type><name>scriptaculous/controls.js</name></action>
41
+ <action method="removeItem"><type>js</type><name>scriptaculous/slider.js</name></action>
42
+ <action method="removeItem"><type>js</type><name>varien/js.js</name></action>
43
+ <action method="removeItem"><type>js</type><name>varien/menu.js</name></action>
44
+ </reference>
45
+ <remove name="top.links"/>
46
+ <remove name="top.search"/>
47
+ <remove name="top.menu"/>
48
+ <remove name="footer"/>
49
+ </oauth_root_handle>
50
+
51
+ <oauth_root_handle_simple>
52
+ <remove name="js_cookie" />
53
+ <block type="page/html" name="root" output="toHtml" template="page/empty.phtml">
54
+ <block type="page/html_head" name="head" as="head" template="oauth/authorize/head-simple.phtml">
55
+ <action method="addCss"><stylesheet>css/oauth-simple.css</stylesheet></action>
56
+ </block>
57
+ <block type="core/text_list" name="content"/>
58
+ </block>
59
+ </oauth_root_handle_simple>
60
+
61
+ <!-- Authorization -->
62
+ <oauth_authorize_index translate="label">
63
+ <update handle="oauth_root_handle"/>
64
+ <label>OAuth authorization for customer</label>
65
+ <reference name="content">
66
+ <block type="oauth/authorize" name="oauth.authorize.form" template="oauth/authorize/form/login.phtml"/>
67
+ <block type="oauth/authorize_button" name="oauth.authorize.button" template="oauth/authorize/button.phtml" />
68
+ </reference>
69
+ </oauth_authorize_index>
70
+
71
+ <oauth_authorize_simple translate="label">
72
+ <update handle="oauth_root_handle_simple"/>
73
+ <remove name="header"/>
74
+ <label>OAuth authorization Pop Up for customer</label>
75
+ <reference name="content">
76
+ <block type="oauth/authorize" name="oauth.authorize.form" template="oauth/authorize/form/login-simple.phtml"/>
77
+ <block type="oauth/authorize_button" name="oauth.authorize.button" template="oauth/authorize/button-simple.phtml" />
78
+ </reference>
79
+ </oauth_authorize_simple>
80
+ <!-- EOF Authorization -->
81
+
82
+ <!-- Confirm Authorization -->
83
+ <oauth_authorize_confirm translate="label">
84
+ <update handle="oauth_root_handle"/>
85
+ <label>Confirm OAuth token authorization</label>
86
+ <reference name="content">
87
+ <block type="oauth/authorize_button" name="oauth.authorize.confirm" template="oauth/authorize/confirm.phtml"/>
88
+ </reference>
89
+ </oauth_authorize_confirm>
90
+
91
+ <oauth_authorize_confirmsimple translate="label">
92
+ <update handle="oauth_root_handle_simple"/>
93
+ <remove name="header"/>
94
+ <reference name="content">
95
+ <block type="oauth/authorize_button" name="oauth.authorize.confirm" template="oauth/authorize/confirm-simple.phtml"/>
96
+ </reference>
97
+ </oauth_authorize_confirmsimple>
98
+ <!-- EOF Confirm Authorization -->
99
+
100
+ <!-- Reject Authorization -->
101
+ <oauth_authorize_reject translate="label">
102
+ <update handle="oauth_root_handle"/>
103
+ <label>Reject OAuth token authorization</label>
104
+ <reference name="content">
105
+ <block type="oauth/authorize_button" name="oauth.authorize.reject" template="oauth/authorize/reject.phtml"/>
106
+ </reference>
107
+ </oauth_authorize_reject>
108
+
109
+ <oauth_authorize_rejectsimple translate="label">
110
+ <update handle="oauth_root_handle_simple"/>
111
+ <remove name="header"/>
112
+ <reference name="content">
113
+ <block type="oauth/authorize_button" name="oauth.authorize.reject" template="oauth/authorize/reject-simple.phtml"/>
114
+ </reference>
115
+ </oauth_authorize_rejectsimple>
116
+ <!-- EOF Reject Authorization -->
117
+
118
+ <!-- My Applications-->
119
+ <customer_account>
120
+ <reference name="customer_account_navigation">
121
+ <action method="addLink" translate="label" module="oauth">
122
+ <name>OAuth Customer Tokens</name>
123
+ <path>oauth/customer_token</path>
124
+ <label>My Applications</label>
125
+ </action>
126
+ </reference>
127
+ </customer_account>
128
+
129
+ <oauth_customer_token_index translate="label">
130
+ <label>Customer My Account My OAuth Applications</label>
131
+ <update handle="customer_account"/>
132
+ <reference name="my.account.wrapper">
133
+ <block type="oauth/customer_token_list" name="oauth_customer_token_list" template="oauth/customer/token/list.phtml"/>
134
+ </reference>
135
+ </oauth_customer_token_index>
136
+ <!-- EOF My Applications-->
137
+ </layout>
app/design/frontend/base/default/layout/page.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
@@ -71,6 +71,7 @@ Default layout, loads most of the pages
71
  <block type="page/switch" name="store_language" as="store_language" template="page/switch/languages.phtml"/>
72
  <block type="core/text_list" name="top.menu" as="topMenu" translate="label">
73
  <label>Navigation Bar</label>
 
74
  </block>
75
  <block type="page/html_wrapper" name="top.container" as="topContainer" translate="label">
76
  <label>Page Header</label>
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
71
  <block type="page/switch" name="store_language" as="store_language" template="page/switch/languages.phtml"/>
72
  <block type="core/text_list" name="top.menu" as="topMenu" translate="label">
73
  <label>Navigation Bar</label>
74
+ <block type="page/html_topmenu" name="catalog.topnav" template="page/html/topmenu.phtml"/>
75
  </block>
76
  <block type="page/html_wrapper" name="top.container" as="topContainer" translate="label">
77
  <label>Page Header</label>
app/design/frontend/base/default/layout/pagecache.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/payment.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/paypal.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
@@ -53,6 +53,9 @@
53
  </reference>
54
  <reference name="content">
55
  <block type="paypal/express_review" name="paypal.express.review" template="paypal/express/review.phtml">
 
 
 
56
  <block type="paypal/express_review_details" name="paypal.express.review.details" as="details" template="paypal/express/review/details.phtml">
57
  <action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
58
  <action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>checkout/onepage/review/item.phtml</template></action>
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
53
  </reference>
54
  <reference name="content">
55
  <block type="paypal/express_review" name="paypal.express.review" template="paypal/express/review.phtml">
56
+ <block type="paypal/express_review_billing" name="express.review.billing" as="billing" template="paypal/express/review/address.phtml"/>
57
+ <block type="paypal/express_review_shipping" name="express.review.shipping" as="shipping" template="paypal/express/review/address.phtml"/>
58
+ <block type="paypal/express_review" name="express.review.shipping.method" as="shipping_method" template="paypal/express/review/shipping/method.phtml"/>
59
  <block type="paypal/express_review_details" name="paypal.express.review.details" as="details" template="paypal/express/review/details.phtml">
60
  <action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
61
  <action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>checkout/onepage/review/item.phtml</template></action>
app/design/frontend/base/default/layout/paypaluk.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
@@ -51,7 +51,7 @@
51
  <action method="setTemplate"><template>page/1column.phtml</template></action>
52
  </reference>
53
  <reference name="content">
54
- <block type="paypal/express_review" name="paypal.express.review" template="paypal/express/review.phtml">
55
  <action method="setPaypalActionPrefix"><prefix>paypaluk</prefix></action>
56
  <block type="paypal/express_review_details" name="paypal.express.review.details" as="details" template="paypal/express/review/details.phtml">
57
  <action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
51
  <action method="setTemplate"><template>page/1column.phtml</template></action>
52
  </reference>
53
  <reference name="content">
54
+ <block type="paypal/express_review" name="paypal.express.review" template="paypaluk/express/review.phtml">
55
  <action method="setPaypalActionPrefix"><prefix>paypaluk</prefix></action>
56
  <block type="paypal/express_review_details" name="paypal.express.review.details" as="details" template="paypal/express/review/details.phtml">
57
  <action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
app/design/frontend/base/default/layout/persistent.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/poll.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/productalert.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/base/default/layout/reports.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/review.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/rss.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/base/default/layout/sales.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/sales/billing_agreement.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/sales/recurring_profile.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/sendfriend.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/base/default/layout/shipping.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/tag.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/weee.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/base/default/layout/wishlist.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
@@ -33,15 +33,14 @@ Default layout, loads most of the pages
33
  -->
34
 
35
  <default>
36
-
37
  <reference name="top.links">
38
- <block type="wishlist/links" name="wishlist_link"/>
39
  <action method="addLinkBlock"><blockName>wishlist_link</blockName></action>
40
  </reference>
41
 
42
  <!-- Mage_Wishlist -->
43
  <reference name="right">
44
- <block type="wishlist/customer_sidebar" name="wishlist_sidebar" as="wishlist" after="cart_sidebar" template="wishlist/sidebar.phtml"/>
45
  </reference>
46
  </default>
47
 
@@ -61,7 +60,6 @@ Customer account home dashboard layout
61
  -->
62
 
63
  <customer_account_index>
64
-
65
  <reference name="right">
66
  <action method="unsetChild"><name>wishlist</name></action>
67
  </reference>
@@ -74,10 +72,32 @@ Wishlist pages
74
  <wishlist_index_index translate="label">
75
  <label>Customer My Account My Wishlist</label>
76
  <!-- Mage_Wishlist -->
77
- <update handle="customer_account"/>
78
  <reference name="my.account.wrapper">
79
  <block type="wishlist/customer_wishlist" name="customer.wishlist" template="wishlist/view.phtml">
80
- <block type="wishlist/customer_wishlist_item_options" name="customer.wishlist.item.options" as="item_options"/>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
81
  </block>
82
  </reference>
83
  <reference name="right">
@@ -88,20 +108,20 @@ Wishlist pages
88
  <wishlist_index_share translate="label">
89
  <label>Customer My Account Wishlist Sharing Form</label>
90
  <!-- Mage_Wishlist -->
91
- <update handle="customer_account"/>
92
  <reference name="my.account.wrapper">
93
- <block type="wishlist/customer_sharing" name="wishlist.sharing" template="wishlist/sharing.phtml"/>
94
  </reference>
95
  <reference name="right">
96
  <action method="unsetChild"><name>wishlist_customer_sidebar</name></action>
97
  </reference>
98
  </wishlist_index_share>
99
-
100
  <wishlist_index_configure translate="label">
101
  <label>Configure Wishlist Item</label>
102
- <update handle="catalog_product_view"/>
103
  <reference name="product.info">
104
- <block type="wishlist/item_configure" name="product.info.addto" as="addto" template="wishlist/item/configure/addto.phtml"/>
105
  </reference>
106
  <reference name="product.info.options.wrapper.bottom">
107
  <action method="unsetChild"><name>product.info.addto</name></action>
@@ -113,7 +133,7 @@ Wishlist pages
113
  <label>Customer Shared Wishlist View</label>
114
  <!-- Mage_Wishlist -->
115
  <reference name="content">
116
- <block type="wishlist/share_wishlist" name="customer.wishlist" template="wishlist/shared.phtml"/>
117
  </reference>
118
  </wishlist_shared_index>
119
  </layout>
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
33
  -->
34
 
35
  <default>
 
36
  <reference name="top.links">
37
+ <block type="wishlist/links" name="wishlist_link" />
38
  <action method="addLinkBlock"><blockName>wishlist_link</blockName></action>
39
  </reference>
40
 
41
  <!-- Mage_Wishlist -->
42
  <reference name="right">
43
+ <block type="wishlist/customer_sidebar" name="wishlist_sidebar" as="wishlist" after="cart_sidebar" template="wishlist/sidebar.phtml" />
44
  </reference>
45
  </default>
46
 
60
  -->
61
 
62
  <customer_account_index>
 
63
  <reference name="right">
64
  <action method="unsetChild"><name>wishlist</name></action>
65
  </reference>
72
  <wishlist_index_index translate="label">
73
  <label>Customer My Account My Wishlist</label>
74
  <!-- Mage_Wishlist -->
75
+ <update handle="customer_account" />
76
  <reference name="my.account.wrapper">
77
  <block type="wishlist/customer_wishlist" name="customer.wishlist" template="wishlist/view.phtml">
78
+ <action method="setTitle" translate="title">
79
+ <title>My Wishlist</title>
80
+ </action>
81
+ <block type="wishlist/customer_wishlist_items" name="customer.wishlist.items" as="items" template="wishlist/item/list.phtml">
82
+ <block type="wishlist/customer_wishlist_item_column_image" name="customer.wishlist.item.image" template="wishlist/item/column/image.phtml" />
83
+ <block type="wishlist/customer_wishlist_item_column_comment" name="customer.wishlist.item.info" template="wishlist/item/column/info.phtml">
84
+ <action method="setTitle" translate="title">
85
+ <title>Product Details and Comment</title>
86
+ </action>
87
+ </block>
88
+ <block type="wishlist/customer_wishlist_item_column_cart" name="customer.wishlist.item.cart" template="wishlist/item/column/cart.phtml">
89
+ <action method="setTitle" translate="title">
90
+ <title>Add to Cart</title>
91
+ </action>
92
+ <block type="wishlist/customer_wishlist_item_options" name="customer.wishlist.item.options" />
93
+ </block>
94
+ <block type="wishlist/customer_wishlist_item_column_remove" name="customer.wishlist.item.remove" template="wishlist/item/column/remove.phtml" />
95
+ </block>
96
+ <block type="core/text_list" name="customer.wishlist.buttons" as="control_buttons">
97
+ <block type="wishlist/customer_wishlist_button" name="customer.wishlist.button.share" template="wishlist/button/share.phtml" />
98
+ <block type="wishlist/customer_wishlist_button" name="customer.wishlist.button.toCart" template="wishlist/button/tocart.phtml" />
99
+ <block type="wishlist/customer_wishlist_button" name="customer.wishlist.button.update" template="wishlist/button/update.phtml" />
100
+ </block>
101
  </block>
102
  </reference>
103
  <reference name="right">
108
  <wishlist_index_share translate="label">
109
  <label>Customer My Account Wishlist Sharing Form</label>
110
  <!-- Mage_Wishlist -->
111
+ <update handle="customer_account" />
112
  <reference name="my.account.wrapper">
113
+ <block type="wishlist/customer_sharing" name="wishlist.sharing" template="wishlist/sharing.phtml" />
114
  </reference>
115
  <reference name="right">
116
  <action method="unsetChild"><name>wishlist_customer_sidebar</name></action>
117
  </reference>
118
  </wishlist_index_share>
119
+
120
  <wishlist_index_configure translate="label">
121
  <label>Configure Wishlist Item</label>
122
+ <update handle="catalog_product_view" />
123
  <reference name="product.info">
124
+ <block type="wishlist/item_configure" name="product.info.addto" as="addto" template="wishlist/item/configure/addto.phtml" />
125
  </reference>
126
  <reference name="product.info.options.wrapper.bottom">
127
  <action method="unsetChild"><name>product.info.addto</name></action>
133
  <label>Customer Shared Wishlist View</label>
134
  <!-- Mage_Wishlist -->
135
  <reference name="content">
136
+ <block type="wishlist/share_wishlist" name="customer.wishlist" template="wishlist/shared.phtml" />
137
  </reference>
138
  </wishlist_shared_index>
139
  </layout>
app/design/frontend/base/default/template/authorizenet/directpost/form.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/authorizenet/directpost/iframe.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/authorizenet/directpost/info.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/catalog/product/price.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -35,12 +35,17 @@
35
  <?php
36
  if ($_product->getPriceType() == 1) {
37
  $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product);
 
 
 
 
 
38
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
39
  $_minimalPriceTax += $_weeeTaxAmount;
40
- $_minimalPriceInclTax += $_weeeTaxAmount;
41
  }
42
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
43
- $_minimalPriceInclTax += $_weeeTaxAmount;
44
  }
45
 
46
  if (Mage::helper('weee')->typeOfDisplay($_product, array(1, 2, 4))) {
@@ -153,10 +158,10 @@ if ($_product->getPriceType() == 1) {
153
  if ($_product->getPriceType() == 1) {
154
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
155
  $_maximalPriceTax += $_weeeTaxAmount;
156
- $_maximalPriceInclTax += $_weeeTaxAmount;
157
  }
158
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
159
- $_maximalPriceInclTax += $_weeeTaxAmount;
160
  }
161
  }
162
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
35
  <?php
36
  if ($_product->getPriceType() == 1) {
37
  $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product);
38
+ $_weeeTaxAmountInclTaxes = $_weeeTaxAmount;
39
+ if (Mage::helper('weee')->isTaxable()) {
40
+ $_attributes = Mage::helper('weee')->getProductWeeeAttributesForRenderer($_product, null, null, null, true);
41
+ $_weeeTaxAmountInclTaxes = Mage::helper('weee')->getAmountInclTaxes($_attributes);
42
+ }
43
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
44
  $_minimalPriceTax += $_weeeTaxAmount;
45
+ $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
46
  }
47
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
48
+ $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
49
  }
50
 
51
  if (Mage::helper('weee')->typeOfDisplay($_product, array(1, 2, 4))) {
158
  if ($_product->getPriceType() == 1) {
159
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
160
  $_maximalPriceTax += $_weeeTaxAmount;
161
+ $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
162
  }
163
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
164
+ $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
165
  }
166
  }
167
  ?>
app/design/frontend/base/default/template/bundle/catalog/product/view/options/notice.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/catalog/product/view/price.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/catalog/product/view/tierprices.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/options.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/email/order/items/creditmemo/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/email/order/items/shipment/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/callouts/left_col.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/callouts/right_col.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/captcha/zend.phtml ADDED
@@ -0,0 +1,51 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <?php /* @var $this Mage_Core_Block_Captcha_Zend */ ?>
28
+
29
+ <?php /* @var $captcha Mage_Core_Model_Captcha_Zend */ ?>
30
+ <?php $captcha = $this->getCaptchaModel() ?>
31
+ <li id="captcha-input-box-<?php echo $this->getFormId()?>">
32
+ <label for="captcha_<?php echo $this->getFormId() ?>" class="required"><em>*</em><?php echo $this->__('Please type the letters below')?></label>
33
+ <div class="input-box captcha">
34
+ <input name="<?php echo Mage_Captcha_Helper_Data::INPUT_NAME_FIELD_VALUE ?>[<?php echo $this->getFormId()?>]" type="text" class="input-text required-entry" id="captcha_<?php echo $this->getFormId() ?>" />
35
+ </div>
36
+ </li>
37
+ <li>
38
+ <div class="captcha-image" id="captcha-image-box-<?php echo $this->getFormId()?>">
39
+ <img id="captcha-reload" class="captcha-reload" src="<?php echo $this->getSkinUrl('images/reload.png') ?>" alt="<?php echo $this->__('Reload captcha') ?>" onclick="$('<?php echo $this->getFormId()?>').captcha.refresh(this)">
40
+ <img id="<?php echo $this->getFormId() ?>" class="captcha-img" height="<?php echo $this->getImgHeight() ?>" src="<?php echo $captcha->getImgSrc() ?>"/>
41
+ <?php if ($captcha->isCaseSensitive()) :?>
42
+ <div class="captcha-note">
43
+ <?php echo $this->__('<strong>Attention</strong>: Captcha is case sensitive.') ?>
44
+ </div>
45
+ <?php endif; ?>
46
+ </div>
47
+ <script type="text/javascript">//<![CDATA[
48
+ $('<?php echo $this->getFormId() ?>').captcha = new Captcha('<?php echo $this->getRefreshUrl() ?>', '<?php echo $this->getFormId() ?>');
49
+ //]]></script>
50
+ </li>
51
+
app/design/frontend/base/default/template/catalog/category/page.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/catalog/category/view.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/category/widget/link/link_block.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/category/widget/link/link_inline.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/layer/filter.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -39,7 +39,9 @@
39
  <a href="<?php echo $this->urlEscape($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?></a>
40
  <?php else: echo $_item->getLabel() ?>
41
  <?php endif; ?>
 
42
  (<?php echo $_item->getCount() ?>)
 
43
  </li>
44
  <?php endforeach ?>
45
  </ol>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
39
  <a href="<?php echo $this->urlEscape($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?></a>
40
  <?php else: echo $_item->getLabel() ?>
41
  <?php endif; ?>
42
+ <?php if ($this->shouldDisplayProductCount()): ?>
43
  (<?php echo $_item->getCount() ?>)
44
+ <?php endif; ?>
45
  </li>
46
  <?php endforeach ?>
47
  </ol>
app/design/frontend/base/default/template/catalog/layer/state.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -38,11 +38,18 @@
38
  <ol>
39
  <?php foreach ($_filters as $_filter): ?>
40
  <li>
41
- <a href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo $this->__('Remove This Item') ?>" class="btn-remove"><?php echo $this->__('Remove This Item') ?></a>
42
- <span class="label"><?php echo $this->__($_filter->getName()) ?>:</span> <?php echo $this->stripTags($_filter->getLabel()) ?>
 
 
 
 
 
 
 
 
43
  </li>
44
  <?php endforeach; ?>
45
  </ol>
46
- <div class="actions"><a href="<?php echo $this->getClearUrl() ?>"><?php echo $this->__('Clear All') ?></a></div>
47
  </div>
48
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
38
  <ol>
39
  <?php foreach ($_filters as $_filter): ?>
40
  <li>
41
+ <span class="label"><?php echo $this->__($_filter->getName()) ?>:</span> <span class="value"><?php echo $this->stripTags($_filter->getLabel()) ?></span>
42
+ <?php
43
+ $clearLinkUrl = $_filter->getClearLinkUrl();
44
+ if ($clearLinkUrl):
45
+ ?>
46
+ <a class="btn-previous" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo $this->__('Previous') ?>"><?php echo $this->__('Previous') ?></a>
47
+ <a class="btn-remove" title="<?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>" href="<?php echo $clearLinkUrl ?>"><?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></a>
48
+ <?php else: ?>
49
+ <a class="btn-remove" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo $this->__('Remove This Item') ?>"><?php echo $this->__('Remove This Item') ?></a>
50
+ <?php endif; ?>
51
  </li>
52
  <?php endforeach; ?>
53
  </ol>
 
54
  </div>
55
  <?php endif; ?>
app/design/frontend/base/default/template/catalog/layer/view.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -38,6 +38,9 @@
38
  </div>
39
  <div class="block-content">
40
  <?php echo $this->getStateHtml() ?>
 
 
 
41
  <?php if($this->canShowOptions()): ?>
42
  <p class="block-subtitle"><?php echo $this->__('Shopping Options') ?></p>
43
  <dl id="narrow-by-list">
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
38
  </div>
39
  <div class="block-content">
40
  <?php echo $this->getStateHtml() ?>
41
+ <?php if ($this->getLayer()->getState()->getFilters()): ?>
42
+ <div class="actions"><a href="<?php echo $this->getClearUrl() ?>"><?php echo $this->__('Clear All') ?></a></div>
43
+ <?php endif; ?>
44
  <?php if($this->canShowOptions()): ?>
45
  <p class="block-subtitle"><?php echo $this->__('Shopping Options') ?></p>
46
  <dl id="narrow-by-list">
app/design/frontend/base/default/template/catalog/msrp/popup.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -38,9 +38,10 @@
38
  <div class="map-popup-content" id="map-popup-content">
39
  <div class="map-popup-checkout">
40
  <form action="" method="POST" id="product_addtocart_form_from_popup">
41
- <?php echo $this->getChildHtml('product.info.addtocart.paypal.wrapper') ?>
42
- <?php echo $this->getChildHtml('product.info.addtocart.paypaluk.wrapper') ?>
43
  <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id" />
 
 
 
44
  <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>
45
  </form>
46
  </div>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
38
  <div class="map-popup-content" id="map-popup-content">
39
  <div class="map-popup-checkout">
40
  <form action="" method="POST" id="product_addtocart_form_from_popup">
 
 
41
  <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id" />
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>
app/design/frontend/base/default/template/catalog/navigation/left.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/catalog/navigation/top.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/compare/list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Catalog_Block_Product_Compare_List */
@@ -71,7 +71,7 @@
71
  <?php endif; ?>
72
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
73
  <ul class="add-to-links">
74
- <li><a href="#" class="link-wishlist" onclick="setPLocation('<?php echo $this->getAddToWishlistUrl($_item) ?>', true)"><?php echo $this->__('Add to Wishlist') ?></a></li>
75
  </ul>
76
  <?php endif; ?>
77
  </td>
@@ -98,7 +98,9 @@
98
  echo substr($this->getProductAttributeValue($_item, $_attribute),0,10);
99
  break;
100
  default: ?>
101
- <?php echo $this->helper('catalog/output')->productAttribute($_item, $this->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
 
 
102
  <?php break;
103
  } ?>
104
  </td>
@@ -122,7 +124,7 @@
122
  <?php endif; ?>
123
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
124
  <ul class="add-to-links">
125
- <li><a href="#" class="link-wishlist" onclick="setPLocation('<?php echo $this->getAddToWishlistUrl($_item) ?>', true)"><?php echo $this->__('Add to Wishlist') ?></a></li>
126
  </ul>
127
  <?php endif; ?>
128
  </td>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Catalog_Block_Product_Compare_List */
71
  <?php endif; ?>
72
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
73
  <ul class="add-to-links">
74
+ <li><a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist" onclick="setPLocation(this.href, true)"><?php echo $this->__('Add to Wishlist') ?></a></li>
75
  </ul>
76
  <?php endif; ?>
77
  </td>
98
  echo substr($this->getProductAttributeValue($_item, $_attribute),0,10);
99
  break;
100
  default: ?>
101
+ <div class="std">
102
+ <?php echo $this->helper('catalog/output')->productAttribute($_item, $this->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
103
+ </div>
104
  <?php break;
105
  } ?>
106
  </td>
124
  <?php endif; ?>
125
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
126
  <ul class="add-to-links">
127
+ <li><a href="<?php echo $this->getAddToWishlistUrl($_item);?>" class="link-wishlist" onclick="setPLocation(this.href, true)"><?php echo $this->__('Add to Wishlist') ?></a></li>
128
  </ul>
129
  <?php endif; ?>
130
  </td>
app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Catalog_Block_Product_Compare_Sidebar */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Catalog_Block_Product_Compare_Sidebar */
app/design/frontend/base/default/template/catalog/product/gallery.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/list/related.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/list/toolbar.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/list/upsell.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/new.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/price.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -41,6 +41,7 @@
41
  /* @var $_taxHelper Mage_Tax_Helper_Data */
42
 
43
  $_product = $this->getProduct();
 
44
  $_id = $_product->getId();
45
  $_weeeSeparator = '';
46
  $_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() || $_taxHelper->displayBothPrices());
@@ -50,10 +51,15 @@
50
 
51
  <?php if (!$_product->isGrouped()): ?>
52
  <?php $_weeeTaxAmount = $_weeeHelper->getAmountForDisplay($_product); ?>
53
- <?php if ($_weeeHelper->typeOfDisplay($_product, array(1,2,4))): ?>
54
  <?php $_weeeTaxAmount = $_weeeHelper->getAmount($_product); ?>
55
  <?php $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForDisplay($_product); ?>
56
  <?php endif; ?>
 
 
 
 
 
57
 
58
  <div class="price-box">
59
  <?php $_price = $_taxHelper->getPrice($_product, $_product->getPrice()) ?>
@@ -61,32 +67,32 @@
61
  <?php $_finalPrice = $_taxHelper->getPrice($_product, $_product->getFinalPrice()) ?>
62
  <?php $_finalPriceInclTax = $_taxHelper->getPrice($_product, $_product->getFinalPrice(), true) ?>
63
  <?php $_weeeDisplayType = $_weeeHelper->getPriceDisplayType(); ?>
64
- <?php if ($_finalPrice == $_price): ?>
65
  <?php if ($_taxHelper->displayBothPrices()): ?>
66
  <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
67
  <span class="price-excluding-tax">
68
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
69
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
70
- <?php echo $_coreHelper->currency($_price+$_weeeTaxAmount,true,false) ?>
71
  </span>
72
  </span>
73
  <span class="price-including-tax">
74
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
75
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
76
- <?php echo $_coreHelper->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?>
77
  </span>
78
  </span>
79
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
80
  <span class="price-excluding-tax">
81
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
82
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
83
- <?php echo $_coreHelper->currency($_price+$_weeeTaxAmount,true,false) ?>
84
  </span>
85
  </span>
86
  <span class="price-including-tax">
87
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
88
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
89
- <?php echo $_coreHelper->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?>
90
  </span>
91
  <span class="weee">(
92
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
@@ -100,18 +106,18 @@
100
  <span class="price-excluding-tax">
101
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
102
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
103
- <?php echo $_coreHelper->currency($_price+$_weeeTaxAmount,true,false) ?>
104
  </span>
105
  </span>
106
  <span class="price-including-tax">
107
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
108
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
109
- <?php echo $_coreHelper->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?>
110
  </span>
111
  <span class="weee">(
112
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
113
  <?php echo $_weeeSeparator; ?>
114
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(), true, true); ?>
115
  <?php $_weeeSeparator = ' + '; ?>
116
  <?php endforeach; ?>
117
  )</span>
@@ -120,7 +126,7 @@
120
  <span class="price-excluding-tax">
121
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
122
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
123
- <?php echo $_coreHelper->currency($_price,true,false) ?>
124
  </span>
125
  </span>
126
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
@@ -131,31 +137,35 @@
131
  <span class="price-including-tax">
132
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
133
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
134
- <?php echo $_coreHelper->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?>
135
  </span>
136
  </span>
137
  <?php else: ?>
138
  <span class="price-excluding-tax">
139
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
140
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
141
- <?php echo $_coreHelper->currency($_price,true,false) ?>
 
 
 
 
142
  </span>
143
  </span>
144
  <span class="price-including-tax">
145
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
146
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
147
- <?php echo $_coreHelper->currency($_finalPriceInclTax,true,false) ?>
148
  </span>
149
  </span>
150
  <?php endif; ?>
151
  <?php else: ?>
152
  <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
153
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
154
- <?php echo $_coreHelper->currency($_price+$_weeeTaxAmount,true,true) ?>
155
  </span>
156
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
157
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
158
- <?php echo $_coreHelper->currency($_price+$_weeeTaxAmount,true,true) ?>
159
  </span>
160
  <span class="weee">(
161
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
@@ -166,12 +176,12 @@
166
  )</span>
167
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
168
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
169
- <?php echo $_coreHelper->currency($_price+$_weeeTaxAmount,true,true) ?>
170
  </span>
171
  <span class="weee">(
172
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
173
  <?php echo $_weeeSeparator; ?>
174
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(), true, true); ?>
175
  <?php $_weeeSeparator = ' + '; ?>
176
  <?php endforeach; ?>
177
  )</span>
@@ -183,11 +193,15 @@
183
  </span>
184
  <?php endforeach; ?>
185
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
186
- <?php echo $_coreHelper->currency($_price+$_weeeTaxAmount,true,true) ?>
187
  </span>
188
  <?php else: ?>
189
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
190
- <?php echo $_coreHelper->currency($_price,true,true) ?>
 
 
 
 
191
  </span>
192
  <?php endif; ?>
193
  <?php endif; ?>
@@ -198,7 +212,7 @@
198
  <p class="old-price">
199
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
200
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
201
- <?php echo $_coreHelper->currency($_regularPrice+$_originalWeeeTaxAmount,true,false) ?>
202
  </span>
203
  </p>
204
 
@@ -206,15 +220,15 @@
206
  <p class="special-price">
207
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
208
  <span class="price-excluding-tax">
209
- <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
210
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
211
- <?php echo $_coreHelper->currency($_finalPrice+$_weeeTaxAmount,true,false) ?>
212
  </span>
213
  </span>
214
  <span class="price-including-tax">
215
- <span class="label"><?php echo $_taxHelper->__('Incl. Tax:') ?></span>
216
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
217
- <?php echo $_coreHelper->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?>
218
  </span>
219
  </span>
220
  </p>
@@ -222,7 +236,7 @@
222
  <p class="special-price">
223
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
224
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
225
- <?php echo $_coreHelper->currency($_finalPrice+$_weeeTaxAmount,true,false) ?>
226
  </span>
227
  </p>
228
  <?php endif; ?>
@@ -231,16 +245,16 @@
231
  <p class="old-price">
232
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
233
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
234
- <?php echo $_coreHelper->currency($_regularPrice+$_originalWeeeTaxAmount,true,false) ?>
235
  </span>
236
  </p>
237
 
238
  <p class="special-price">
239
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
240
  <span class="price-excluding-tax">
241
- <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
242
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
243
- <?php echo $_coreHelper->currency($_finalPrice+$_weeeTaxAmount,true,false) ?>
244
  </span>
245
  </span>
246
  <span class="weee">(
@@ -251,9 +265,9 @@
251
  <?php endforeach; ?>
252
  )</span>
253
  <span class="price-including-tax">
254
- <span class="label"><?php echo $_taxHelper->__('Incl. Tax:') ?></span>
255
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
256
- <?php echo $_coreHelper->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?>
257
  </span>
258
  </span>
259
  </p>
@@ -261,29 +275,29 @@
261
  <p class="old-price">
262
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
263
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
264
- <?php echo $_coreHelper->currency($_regularPrice+$_originalWeeeTaxAmount,true,false) ?>
265
  </span>
266
  </p>
267
 
268
  <p class="special-price">
269
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
270
  <span class="price-excluding-tax">
271
- <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
272
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
273
- <?php echo $_coreHelper->currency($_finalPrice+$_weeeTaxAmount,true,false) ?>
274
  </span>
275
  </span>
276
  <span class="weee">(
277
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
278
  <?php echo $_weeeSeparator; ?>
279
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(), true, true); ?>
280
  <?php $_weeeSeparator = ' + '; ?>
281
  <?php endforeach; ?>
282
  )</span>
283
  <span class="price-including-tax">
284
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
285
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
286
- <?php echo $_coreHelper->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?>
287
  </span>
288
  </span>
289
  </p>
@@ -291,16 +305,16 @@
291
  <p class="old-price">
292
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
293
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
294
- <?php echo $_coreHelper->currency($_regularPrice,true,false) ?>
295
  </span>
296
  </p>
297
 
298
  <p class="special-price">
299
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
300
  <span class="price-excluding-tax">
301
- <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
302
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
303
- <?php echo $_coreHelper->currency($_finalPrice,true,false) ?>
304
  </span>
305
  </span>
306
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
@@ -311,7 +325,7 @@
311
  <span class="price-including-tax">
312
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
313
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
314
- <?php echo $_coreHelper->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?>
315
  </span>
316
  </span>
317
  </p>
@@ -319,7 +333,7 @@
319
  <p class="old-price">
320
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
321
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
322
- <?php echo $_coreHelper->currency($_regularPrice,true,false) ?>
323
  </span>
324
  </p>
325
 
@@ -327,15 +341,15 @@
327
  <p class="special-price">
328
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
329
  <span class="price-excluding-tax">
330
- <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
331
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
332
- <?php echo $_coreHelper->currency($_finalPrice,true,false) ?>
333
  </span>
334
  </span>
335
  <span class="price-including-tax">
336
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
337
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
338
- <?php echo $_coreHelper->currency($_finalPriceInclTax,true,false) ?>
339
  </span>
340
  </span>
341
  </p>
@@ -343,7 +357,7 @@
343
  <p class="special-price">
344
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
345
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
346
- <?php echo $_coreHelper->currency($_finalPrice,true,false) ?>
347
  </span>
348
  </p>
349
  <?php endif; ?>
@@ -355,7 +369,7 @@
355
 
356
  <?php $_minimalPriceDisplayValue = $_minimalPrice; ?>
357
  <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))): ?>
358
- <?php $_minimalPriceDisplayValue = $_minimalPrice+$_weeeTaxAmount; ?>
359
  <?php endif; ?>
360
 
361
  <?php if ($this->getUseLinkForAsLowAs()):?>
@@ -365,7 +379,7 @@
365
  <?php endif?>
366
  <span class="label"><?php echo $this->__('As low as:') ?></span>
367
  <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
368
- <?php echo $_coreHelper->currency($_minimalPriceDisplayValue,true,false) ?>
369
  </span>
370
  <?php if ($this->getUseLinkForAsLowAs()):?>
371
  </a>
@@ -377,8 +391,8 @@
377
 
378
  <?php else: /* if (!$_product->isGrouped()): */ ?>
379
  <?php
380
- $_exclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, $includingTax = null);
381
- $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, $includingTax = true);
382
  ?>
383
  <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue): ?>
384
  <div class="price-box">
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
41
  /* @var $_taxHelper Mage_Tax_Helper_Data */
42
 
43
  $_product = $this->getProduct();
44
+ $_storeId = $_product->getStoreId();
45
  $_id = $_product->getId();
46
  $_weeeSeparator = '';
47
  $_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() || $_taxHelper->displayBothPrices());
51
 
52
  <?php if (!$_product->isGrouped()): ?>
53
  <?php $_weeeTaxAmount = $_weeeHelper->getAmountForDisplay($_product); ?>
54
+ <?php if ($_weeeHelper->typeOfDisplay($_product, array(Mage_Weee_Model_Tax::DISPLAY_INCL_DESCR, Mage_Weee_Model_Tax::DISPLAY_EXCL_DESCR_INCL, 4))): ?>
55
  <?php $_weeeTaxAmount = $_weeeHelper->getAmount($_product); ?>
56
  <?php $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForDisplay($_product); ?>
57
  <?php endif; ?>
58
+ <?php $_weeeTaxAmountInclTaxes = $_weeeTaxAmount; ?>
59
+ <?php if ($_weeeHelper->isTaxable() && !$_taxHelper->priceIncludesTax($_storeId)): ?>
60
+ <?php $_attributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true); ?>
61
+ <?php $_weeeTaxAmountInclTaxes = $_weeeHelper->getAmountInclTaxes($_attributes); ?>
62
+ <?php endif; ?>
63
 
64
  <div class="price-box">
65
  <?php $_price = $_taxHelper->getPrice($_product, $_product->getPrice()) ?>
67
  <?php $_finalPrice = $_taxHelper->getPrice($_product, $_product->getFinalPrice()) ?>
68
  <?php $_finalPriceInclTax = $_taxHelper->getPrice($_product, $_product->getFinalPrice(), true) ?>
69
  <?php $_weeeDisplayType = $_weeeHelper->getPriceDisplayType(); ?>
70
+ <?php if ($_finalPrice >= $_price): ?>
71
  <?php if ($_taxHelper->displayBothPrices()): ?>
72
  <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
73
  <span class="price-excluding-tax">
74
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
75
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
76
+ <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
77
  </span>
78
  </span>
79
  <span class="price-including-tax">
80
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
81
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
82
+ <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
83
  </span>
84
  </span>
85
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
86
  <span class="price-excluding-tax">
87
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
88
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
89
+ <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
90
  </span>
91
  </span>
92
  <span class="price-including-tax">
93
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
94
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
95
+ <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
96
  </span>
97
  <span class="weee">(
98
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
106
  <span class="price-excluding-tax">
107
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
108
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
109
+ <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
110
  </span>
111
  </span>
112
  <span class="price-including-tax">
113
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
114
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
115
+ <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
116
  </span>
117
  <span class="weee">(
118
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
119
  <?php echo $_weeeSeparator; ?>
120
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
121
  <?php $_weeeSeparator = ' + '; ?>
122
  <?php endforeach; ?>
123
  )</span>
126
  <span class="price-excluding-tax">
127
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
128
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
129
+ <?php echo $_coreHelper->currency($_price, true, false) ?>
130
  </span>
131
  </span>
132
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
137
  <span class="price-including-tax">
138
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
139
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
140
+ <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
141
  </span>
142
  </span>
143
  <?php else: ?>
144
  <span class="price-excluding-tax">
145
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
146
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
147
+ <?php if ($_finalPrice == $_price): ?>
148
+ <?php echo $_coreHelper->currency($_price, true, false) ?>
149
+ <?php else: ?>
150
+ <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
151
+ <?php endif; ?>
152
  </span>
153
  </span>
154
  <span class="price-including-tax">
155
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
156
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
157
+ <?php echo $_coreHelper->currency($_finalPriceInclTax, true, false) ?>
158
  </span>
159
  </span>
160
  <?php endif; ?>
161
  <?php else: ?>
162
  <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
163
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
164
+ <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
165
  </span>
166
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
167
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
168
+ <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
169
  </span>
170
  <span class="weee">(
171
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
176
  )</span>
177
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
178
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
179
+ <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
180
  </span>
181
  <span class="weee">(
182
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
183
  <?php echo $_weeeSeparator; ?>
184
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
185
  <?php $_weeeSeparator = ' + '; ?>
186
  <?php endforeach; ?>
187
  )</span>
193
  </span>
194
  <?php endforeach; ?>
195
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
196
+ <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
197
  </span>
198
  <?php else: ?>
199
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
200
+ <?php if ($_finalPrice == $_price): ?>
201
+ <?php echo $_coreHelper->currency($_price, true, true) ?>
202
+ <?php else: ?>
203
+ <?php echo $_coreHelper->currency($_finalPrice, true, true) ?>
204
+ <?php endif; ?>
205
  </span>
206
  <?php endif; ?>
207
  <?php endif; ?>
212
  <p class="old-price">
213
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
214
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
215
+ <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
216
  </span>
217
  </p>
218
 
220
  <p class="special-price">
221
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
222
  <span class="price-excluding-tax">
223
+ <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
224
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
225
+ <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmount, true, false) ?>
226
  </span>
227
  </span>
228
  <span class="price-including-tax">
229
+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
230
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
231
+ <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
232
  </span>
233
  </span>
234
  </p>
236
  <p class="special-price">
237
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
238
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
239
+ <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmountInclTaxes, true, false) ?>
240
  </span>
241
  </p>
242
  <?php endif; ?>
245
  <p class="old-price">
246
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
247
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
248
+ <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
249
  </span>
250
  </p>
251
 
252
  <p class="special-price">
253
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
254
  <span class="price-excluding-tax">
255
+ <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
256
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
257
+ <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmount, true, false) ?>
258
  </span>
259
  </span>
260
  <span class="weee">(
265
  <?php endforeach; ?>
266
  )</span>
267
  <span class="price-including-tax">
268
+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
269
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
270
+ <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
271
  </span>
272
  </span>
273
  </p>
275
  <p class="old-price">
276
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
277
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
278
+ <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
279
  </span>
280
  </p>
281
 
282
  <p class="special-price">
283
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
284
  <span class="price-excluding-tax">
285
+ <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
286
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
287
+ <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmount, true, false) ?>
288
  </span>
289
  </span>
290
  <span class="weee">(
291
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
292
  <?php echo $_weeeSeparator; ?>
293
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
294
  <?php $_weeeSeparator = ' + '; ?>
295
  <?php endforeach; ?>
296
  )</span>
297
  <span class="price-including-tax">
298
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
299
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
300
+ <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
301
  </span>
302
  </span>
303
  </p>
305
  <p class="old-price">
306
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
307
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
308
+ <?php echo $_coreHelper->currency($_regularPrice, true, false) ?>
309
  </span>
310
  </p>
311
 
312
  <p class="special-price">
313
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
314
  <span class="price-excluding-tax">
315
+ <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
316
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
317
+ <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
318
  </span>
319
  </span>
320
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
325
  <span class="price-including-tax">
326
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
327
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
328
+ <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
329
  </span>
330
  </span>
331
  </p>
333
  <p class="old-price">
334
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
335
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
336
+ <?php echo $_coreHelper->currency($_regularPrice, true, false) ?>
337
  </span>
338
  </p>
339
 
341
  <p class="special-price">
342
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
343
  <span class="price-excluding-tax">
344
+ <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
345
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
346
+ <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
347
  </span>
348
  </span>
349
  <span class="price-including-tax">
350
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
351
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
352
+ <?php echo $_coreHelper->currency($_finalPriceInclTax, true, false) ?>
353
  </span>
354
  </span>
355
  </p>
357
  <p class="special-price">
358
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
359
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
360
+ <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
361
  </span>
362
  </p>
363
  <?php endif; ?>
369
 
370
  <?php $_minimalPriceDisplayValue = $_minimalPrice; ?>
371
  <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))): ?>
372
+ <?php $_minimalPriceDisplayValue = $_minimalPrice + $_weeeTaxAmount; ?>
373
  <?php endif; ?>
374
 
375
  <?php if ($this->getUseLinkForAsLowAs()):?>
379
  <?php endif?>
380
  <span class="label"><?php echo $this->__('As low as:') ?></span>
381
  <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
382
+ <?php echo $_coreHelper->currency($_minimalPriceDisplayValue, true, false) ?>
383
  </span>
384
  <?php if ($this->getUseLinkForAsLowAs()):?>
385
  </a>
391
 
392
  <?php else: /* if (!$_product->isGrouped()): */ ?>
393
  <?php
394
+ $_exclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue);
395
+ $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, true);
396
  ?>
397
  <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue): ?>
398
  <div class="price-box">
app/design/frontend/base/default/template/catalog/product/price_msrp.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -52,7 +52,7 @@
52
  "<?php echo $_product->getName() ?>",
53
  <?php echo $this->getRealPriceJs($_product) ?>,
54
  '<?php echo $_msrpPrice ?>',
55
- "<?php echo $_product->getAddToCartUrl() ?>"
56
  );
57
  newLink.product_id = '<?php echo $_product->getId() ?>';
58
  <?php else: ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
52
  "<?php echo $_product->getName() ?>",
53
  <?php echo $this->getRealPriceJs($_product) ?>,
54
  '<?php echo $_msrpPrice ?>',
55
+ "<?php echo $_product->isSalable() ? $_product->getAddToCartUrl() : '' ?>"
56
  );
57
  newLink.product_id = '<?php echo $_product->getId() ?>';
58
  <?php else: ?>
app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -86,7 +86,7 @@
86
  "<?php echo $_product->getName() ?>",
87
  $("<?php echo $priceElementId ?>"),
88
  '<?php echo $_msrpPrice ?>',
89
- "<?php echo $_product->getAddToCartUrl() ?>"
90
  );
91
  </script>
92
  <?php else: ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
86
  "<?php echo $_product->getName() ?>",
87
  $("<?php echo $priceElementId ?>"),
88
  '<?php echo $_msrpPrice ?>',
89
+ "<?php echo $_product->isSalable() ? $_product->getAddToCartUrl() : '' ?>"
90
  );
91
  </script>
92
  <?php else: ?>
app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -48,7 +48,7 @@
48
  <script type="text/javascript">
49
  <?php if ($this->helper('catalog')->isShowPriceOnGesture($_product)): ?>
50
  var productLink = {
51
- url: "<?php echo $_product->getAddToCartUrl() ?>",
52
  notUseForm: true
53
  };
54
  var newLink = Catalog.Map.addHelpLink(
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
48
  <script type="text/javascript">
49
  <?php if ($this->helper('catalog')->isShowPriceOnGesture($_product)): ?>
50
  var productLink = {
51
+ url: "<?php echo $_product->isSalable() ? $_product->getAddToCartUrl() : '' ?>",
52
  notUseForm: true
53
  };
54
  var newLink = Catalog.Map.addHelpLink(
app/design/frontend/base/default/template/catalog/product/price_msrp_rss.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
@@ -134,6 +134,13 @@
134
  delete Validation.methods['required-entry'];
135
  delete Validation.methods['validate-one-required'];
136
  delete Validation.methods['validate-one-required-by-name'];
 
 
 
 
 
 
 
137
  if (this.validator.validate()) {
138
  if (url) {
139
  this.form.action = url;
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
134
  delete Validation.methods['required-entry'];
135
  delete Validation.methods['validate-one-required'];
136
  delete Validation.methods['validate-one-required-by-name'];
137
+ // Remove custom datetime validators
138
+ for (var methodName in Validation.methods) {
139
+ if (methodName.match(/^validate-datetime-.*/i)) {
140
+ delete Validation.methods[methodName];
141
+ }
142
+ }
143
+
144
  if (this.validator.validate()) {
145
  if (url) {
146
  this.form.action = url;
app/design/frontend/base/default/template/catalog/product/view/additional.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/addto.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -30,7 +30,7 @@
30
 
31
  <ul class="add-to-links">
32
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
33
- <li><a href="<?php echo $_wishlistSubmitUrl ?>" onclick="productAddToCartForm.submitLight(this, '<?php echo $_wishlistSubmitUrl ?>'); return false;" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
34
  <?php endif; ?>
35
  <?php
36
  $_compareUrl = $this->helper('catalog/product_compare')->getAddUrl($_product);
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
30
 
31
  <ul class="add-to-links">
32
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
33
+ <li><a href="<?php echo $_wishlistSubmitUrl ?>" onclick="productAddToCartForm.submitLight(this, this.href); return false;" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
34
  <?php endif; ?>
35
  <?php
36
  $_compareUrl = $this->helper('catalog/product_compare')->getAddUrl($_product);
app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/attributes.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/catalog/product/view/description.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/catalog/product/view/media.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/catalog/product/view/options.phtml CHANGED
@@ -20,9 +20,10 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
 
26
  ?>
27
 
28
  <?php $_options = Mage::helper('core')->decorateArray($this->getOptions()) ?>
@@ -103,25 +104,26 @@
103
 
104
  Product.Options = Class.create();
105
  Product.Options.prototype = {
106
- initialize : function(config){
107
  this.config = config;
108
  this.reloadPrice();
109
  document.observe("dom:loaded", this.reloadPrice.bind(this));
110
  },
111
- reloadPrice : function(){
112
- price = new Number();
113
- config = this.config;
114
- skipIds = [];
115
- $$('.product-custom-option').each(function(element){
116
  var optionId = 0;
117
  element.name.sub(/[0-9]+/, function(match){
118
- optionId = match[0];
119
  });
120
- if (this.config[optionId]) {
 
 
121
  if (element.type == 'checkbox' || element.type == 'radio') {
122
  if (element.checked) {
123
- if (config[optionId][element.getValue()]) {
124
- price += parseFloat(config[optionId][element.getValue()]);
125
  }
126
  }
127
  } else if(element.hasClassName('datetime-picker') && !skipIds.include(optionId)) {
@@ -132,36 +134,45 @@
132
  }
133
  });
134
  if (dateSelected) {
135
- price += parseFloat(this.config[optionId]);
136
  skipIds[optionId] = optionId;
137
  }
138
  } else if(element.type == 'select-one' || element.type == 'select-multiple') {
139
- if (element.options) {
140
  $A(element.options).each(function(selectOption){
141
- if (selectOption.selected) {
142
- if (this.config[optionId][selectOption.value]) {
143
- price += parseFloat(this.config[optionId][selectOption.value]);
144
  }
145
  }
146
  });
147
  }
148
  } else {
149
  if (element.getValue().strip() != '') {
150
- price += parseFloat(this.config[optionId]);
151
  }
152
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
153
  }
154
  });
155
- try {
156
- optionsPrice.changePrice('options', price);
157
- optionsPrice.changePrice('optionsPriceInclTax', price);
158
- optionsPrice.reload();
159
- } catch (e) {
160
-
161
- }
162
  }
163
  }
164
- function validateOptionsCallback(elmId, result){
165
  var container = $(elmId).up('ul.options-list');
166
  if (result == 'failed') {
167
  container.removeClassName('validation-passed');
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
+ /* @var $this Mage_Catalog_Block_Product_View_Options */
27
  ?>
28
 
29
  <?php $_options = Mage::helper('core')->decorateArray($this->getOptions()) ?>
104
 
105
  Product.Options = Class.create();
106
  Product.Options.prototype = {
107
+ initialize : function(config) {
108
  this.config = config;
109
  this.reloadPrice();
110
  document.observe("dom:loaded", this.reloadPrice.bind(this));
111
  },
112
+ reloadPrice : function() {
113
+ var config = this.config;
114
+ var skipIds = [];
115
+ $$('body .product-custom-option').each(function(element){
 
116
  var optionId = 0;
117
  element.name.sub(/[0-9]+/, function(match){
118
+ optionId = parseInt(match[0], 10);
119
  });
120
+ if (config[optionId]) {
121
+ var configOptions = config[optionId];
122
+ var curConfig = {price: 0};
123
  if (element.type == 'checkbox' || element.type == 'radio') {
124
  if (element.checked) {
125
+ if (typeof configOptions[element.getValue()] != 'undefined') {
126
+ curConfig = configOptions[element.getValue()];
127
  }
128
  }
129
  } else if(element.hasClassName('datetime-picker') && !skipIds.include(optionId)) {
134
  }
135
  });
136
  if (dateSelected) {
137
+ curConfig = configOptions;
138
  skipIds[optionId] = optionId;
139
  }
140
  } else if(element.type == 'select-one' || element.type == 'select-multiple') {
141
+ if ('options' in element) {
142
  $A(element.options).each(function(selectOption){
143
+ if ('selected' in selectOption && selectOption.selected) {
144
+ if (typeof(configOptions[selectOption.value]) != 'undefined') {
145
+ curConfig = configOptions[selectOption.value];
146
  }
147
  }
148
  });
149
  }
150
  } else {
151
  if (element.getValue().strip() != '') {
152
+ curConfig = configOptions;
153
  }
154
  }
155
+ if(element.type == 'select-multiple' && ('options' in element)) {
156
+ $A(element.options).each(function(selectOption) {
157
+ if (('selected' in selectOption) && typeof(configOptions[selectOption.value]) != 'undefined') {
158
+ if (selectOption.selected) {
159
+ curConfig = configOptions[selectOption.value];
160
+ } else {
161
+ curConfig = {price: 0};
162
+ }
163
+ optionsPrice.addCustomPrices(optionId + '-' + selectOption.value, curConfig);
164
+ optionsPrice.reload();
165
+ }
166
+ });
167
+ } else {
168
+ optionsPrice.addCustomPrices(element.id || optionId, curConfig);
169
+ optionsPrice.reload();
170
+ }
171
  }
172
  });
 
 
 
 
 
 
 
173
  }
174
  }
175
+ function validateOptionsCallback(elmId, result) {
176
  var container = $(elmId).up('ul.options-list');
177
  if (result == 'failed') {
178
  container.removeClassName('validation-passed');
app/design/frontend/base/default/template/catalog/product/view/options/js.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/options/wrapper.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/options/wrapper/bottom.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/price.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/catalog/product/view/price_clone.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -48,7 +48,7 @@ if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
48
  <?php $_tierPrices = $this->getTierPrices($_product); ?>
49
  <?php endif; ?>
50
  <?php Mage::helper('weee')->processTierPrices($_product, $_tierPrices); ?>
51
- <?php foreach ($_tierPrices as $_price): ?>
52
  <li>
53
  <?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
54
  <?php if ($this->getInGrouped()): ?>
@@ -186,7 +186,7 @@ if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
186
  <?php if (!$this->getInGrouped()): ?>
187
  <?php if(($_product->getPrice() == $_product->getFinalPrice() && $_product->getPrice() > $_price['price'])
188
  || ($_product->getPrice() != $_product->getFinalPrice() && $_product->getFinalPrice() > $_price['price'])): ?>
189
- <?php echo $this->__('and') ?>&nbsp;<strong class="benefit"><?php echo $this->__('save')?>&nbsp;<?php echo $_price['savePercent']?>%
190
  <?php endif ?></strong>
191
  <?php endif; ?>
192
 
@@ -194,14 +194,19 @@ if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
194
  <?php $popupId = 'msrp-popup-' . $_product->getId() . $this->helper('core')->getRandomString(20); ?>
195
  <a href="#" id="<?php echo($popupId);?>"><?php echo $this->__('Click for price'); ?></a>
196
  <script type="text/javascript">
 
 
 
 
 
197
  <?php if (!$this->getInGrouped()): ?>
198
  var newLink = {
199
- url: "<?php echo $this->getAddToCartUrl($_product, array('qty' => $_price['price_qty'])); ?>",
200
  qty: "<?php echo $_price['price_qty']?>"
201
  };
202
  <?php else: ?>
203
  var newLink = {
204
- url: "<?php echo $this->getAddToCartUrl($_product, array('qty' => $_price['price_qty'])); ?>",
205
  notUseForm: true
206
  };
207
  <?php endif ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
48
  <?php $_tierPrices = $this->getTierPrices($_product); ?>
49
  <?php endif; ?>
50
  <?php Mage::helper('weee')->processTierPrices($_product, $_tierPrices); ?>
51
+ <?php foreach ($_tierPrices as $_index => $_price): ?>
52
  <li>
53
  <?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
54
  <?php if ($this->getInGrouped()): ?>
186
  <?php if (!$this->getInGrouped()): ?>
187
  <?php if(($_product->getPrice() == $_product->getFinalPrice() && $_product->getPrice() > $_price['price'])
188
  || ($_product->getPrice() != $_product->getFinalPrice() && $_product->getFinalPrice() > $_price['price'])): ?>
189
+ <?php echo $this->__('and') ?>&nbsp;<strong class="benefit"><?php echo $this->__('save')?>&nbsp;<span class="percent tier-<?php echo $_index;?>"><?php echo $_price['savePercent']?></span>%
190
  <?php endif ?></strong>
191
  <?php endif; ?>
192
 
194
  <?php $popupId = 'msrp-popup-' . $_product->getId() . $this->helper('core')->getRandomString(20); ?>
195
  <a href="#" id="<?php echo($popupId);?>"><?php echo $this->__('Click for price'); ?></a>
196
  <script type="text/javascript">
197
+ <?php
198
+ $addToCartUrl = $this->getProduct()->isSalable()
199
+ ? $this->getAddToCartUrl($_product, array('qty' => $_price['price_qty']))
200
+ : '';
201
+ ?>
202
  <?php if (!$this->getInGrouped()): ?>
203
  var newLink = {
204
+ url: "<?php echo $addToCartUrl; ?>",
205
  qty: "<?php echo $_price['price_qty']?>"
206
  };
207
  <?php else: ?>
208
  var newLink = {
209
+ url: "<?php echo $addToCartUrl; ?>",
210
  notUseForm: true
211
  };
212
  <?php endif ?>
app/design/frontend/base/default/template/catalog/product/view/type/configurable.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/type/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/catalog/product/view/type/options/configurable.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/type/simple.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/view/type/virtual.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/widget/link/link_block.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/widget/new/column/new_default_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/widget/new/column/new_images_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/widget/new/column/new_names_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/rss/product/price.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/seo/sitemap.phtml CHANGED
@@ -20,11 +20,11 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
- <?php
28
  /**
29
  * @see Mage_Catalog_Block_Seo_Sitemap_
30
  */
@@ -33,7 +33,7 @@
33
  <?php if($_items->getSize()): ?>
34
  <ul class="sitemap">
35
  <?php foreach ($_items as $_item): ?>
36
- <li><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $_item->name ?></a></li>
37
  <?php endforeach; ?>
38
  </ul>
39
  <?php else: ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
+ <?php
28
  /**
29
  * @see Mage_Catalog_Block_Seo_Sitemap_
30
  */
33
  <?php if($_items->getSize()): ?>
34
  <ul class="sitemap">
35
  <?php foreach ($_items as $_item): ?>
36
+ <li><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->escapeHtml($_item->name) ?></a></li>
37
  <?php endforeach; ?>
38
  </ul>
39
  <?php else: ?>
app/design/frontend/base/default/template/catalog/seo/sitemap/container.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalog/seo/tree.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/cataloginventory/qtyincrements.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/cataloginventory/stockqty/composite.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/cataloginventory/stockqty/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/catalogsearch/advanced/form.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -31,6 +31,7 @@
31
  * @see Mage_CatalogSearch_Block_Advanced_Form
32
  */
33
  ?>
 
34
  <div class="page-title">
35
  <h1><?php echo $this->__('Catalog Advanced Search') ?></h1>
36
  </div>
@@ -46,16 +47,16 @@
46
  <?php switch($this->getAttributeInputType($_attribute)):
47
  case 'number': ?>
48
  <div class="input-range">
49
- <input type="text" name="<?php echo $_code ?>[from]" value="<?php echo $this->htmlEscape($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->htmlEscape($this->getAttributeLabel($_attribute)) ?>" class="input-text validate-number" />
50
  <span class="separator">-</span>
51
- <input type="text" name="<?php echo $_code ?>[to]" value="<?php echo $this->htmlEscape($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->htmlEscape($this->getAttributeLabel($_attribute)) ?>" class="input-text validate-number" />
52
  </div>
53
  <?php break;
54
  case 'price': ?>
55
  <div class="input-range">
56
- <input name="<?php echo $_code ?>[from]" value="<?php echo $this->htmlEscape($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->htmlEscape($this->getAttributeLabel($_attribute)) ?>" class="input-text validate-number" type="text" />
57
  <span class="separator">-</span>
58
- <input name="<?php echo $_code ?>[to]" value="<?php echo $this->htmlEscape($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->htmlEscape($this->getAttributeLabel($_attribute)) ?>" class="input-text validate-number" type="text" />
59
  <small>(<?php echo $this->getCurrency($_attribute); ?>)</small>
60
  </div>
61
  <?php break;
@@ -76,7 +77,7 @@
76
  <?php break;
77
  default: ?>
78
  <div class="input-box">
79
- <input type="text" name="<?php echo $_code ?>" id="<?php echo $_code ?>" value="<?php echo $this->htmlEscape($this->getAttributeValue($_attribute)) ?>" title="<?php echo $this->htmlEscape($this->getAttributeLabel($_attribute)) ?>" class="input-text <?php echo $this->getAttributeValidationClass($_attribute) ?>" />
80
  </div>
81
  <?php endswitch; ?>
82
  </li>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
31
  * @see Mage_CatalogSearch_Block_Advanced_Form
32
  */
33
  ?>
34
+ <?php $maxQueryLength= $this->helper('catalogsearch')->getMaxQueryLength();?>
35
  <div class="page-title">
36
  <h1><?php echo $this->__('Catalog Advanced Search') ?></h1>
37
  </div>
47
  <?php switch($this->getAttributeInputType($_attribute)):
48
  case 'number': ?>
49
  <div class="input-range">
50
+ <input type="text" name="<?php echo $_code ?>[from]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text validate-number" maxlength="<?php echo $maxQueryLength;?>" />
51
  <span class="separator">-</span>
52
+ <input type="text" name="<?php echo $_code ?>[to]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text validate-number" maxlength="<?php echo $maxQueryLength;?>" />
53
  </div>
54
  <?php break;
55
  case 'price': ?>
56
  <div class="input-range">
57
+ <input name="<?php echo $_code ?>[from]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text validate-number" type="text" maxlength="<?php echo $maxQueryLength;?>" />
58
  <span class="separator">-</span>
59
+ <input name="<?php echo $_code ?>[to]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text validate-number" type="text" maxlength="<?php echo $maxQueryLength;?>" />
60
  <small>(<?php echo $this->getCurrency($_attribute); ?>)</small>
61
  </div>
62
  <?php break;
77
  <?php break;
78
  default: ?>
79
  <div class="input-box">
80
+ <input type="text" name="<?php echo $_code ?>" id="<?php echo $_code ?>" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute)) ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text <?php echo $this->getAttributeValidationClass($_attribute) ?>" maxlength="<?php echo $maxQueryLength;?>" />
81
  </div>
82
  <?php endswitch; ?>
83
  </li>
app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalogsearch/form.mini.phtml CHANGED
@@ -20,20 +20,23 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
 
 
 
26
  ?>
27
- <form id="search_mini_form" action="<?php echo $this->helper('catalogsearch')->getResultUrl() ?>" method="get">
28
  <div class="form-search">
29
  <label for="search"><?php echo $this->__('Search:') ?></label>
30
- <input id="search" type="text" name="<?php echo $this->helper('catalogsearch')->getQueryParamName() ?>" value="<?php echo $this->helper('catalogsearch')->getEscapedQueryText() ?>" class="input-text" />
31
  <button type="submit" title="<?php echo $this->__('Search') ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
32
  <div id="search_autocomplete" class="search-autocomplete"></div>
33
  <script type="text/javascript">
34
  //<![CDATA[
35
  var searchForm = new Varien.searchForm('search_mini_form', 'search', '<?php echo $this->__('Search entire store here...') ?>');
36
- searchForm.initAutocomplete('<?php echo $this->helper('catalogsearch')->getSuggestUrl() ?>', 'search_autocomplete');
37
  //]]>
38
  </script>
39
  </div>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
+ /* @var $this Mage_Core_Block_Template */
27
+ /* @var $catalogSearchHelper Mage_Catalogsearch_Helper_Data */
28
+ $catalogSearchHelper = $this->helper('catalogsearch');
29
  ?>
30
+ <form id="search_mini_form" action="<?php echo $catalogSearchHelper->getResultUrl() ?>" method="get">
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>
42
  </div>
app/design/frontend/base/default/template/catalogsearch/result.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/catalogsearch/term.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/cart.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -99,7 +99,30 @@
99
  <?php if($this->getContinueShoppingUrl()): ?>
100
  <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>
101
  <?php endif; ?>
102
- <button type="submit" title="<?php echo $this->__('Update Shopping Cart') ?>" class="button btn-update"><span><span><?php echo $this->__('Update Shopping Cart') ?></span></span></button>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
103
  </td>
104
  </tr>
105
  </tfoot>
@@ -118,6 +141,8 @@
118
  <?php echo $this->getChildHtml('crosssell') ?>
119
  </div>
120
  <div class="col-2">
 
 
121
  <?php echo $this->getChildHtml('coupon') ?>
122
  <?php if (!$this->getIsVirtual()): echo $this->getChildHtml('shipping'); endif; ?>
123
  </div>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
99
  <?php if($this->getContinueShoppingUrl()): ?>
100
  <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>
101
  <?php endif; ?>
102
+ <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>
103
+ <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>
104
+ <!--[if lt IE 8]>
105
+ <input type="hidden" id="update_cart_action_container" />
106
+ <script type="text/javascript">
107
+ //<![CDATA[
108
+ Event.observe(window, 'load', function()
109
+ {
110
+ // Internet Explorer (lt 8) does not support value attribute in button elements
111
+ $emptyCartButton = $('empty_cart_button');
112
+ $cartActionContainer = $('update_cart_action_container');
113
+ if ($emptyCartButton && $cartActionContainer) {
114
+ Event.observe($emptyCartButton, 'click', function()
115
+ {
116
+ $emptyCartButton.setAttribute('name', 'update_cart_action_temp');
117
+ $cartActionContainer.setAttribute('name', 'update_cart_action');
118
+ $cartActionContainer.setValue('empty_cart');
119
+ });
120
+ }
121
+
122
+ });
123
+ //]]>
124
+ </script>
125
+ <![endif]-->
126
  </td>
127
  </tr>
128
  </tfoot>
141
  <?php echo $this->getChildHtml('crosssell') ?>
142
  </div>
143
  <div class="col-2">
144
+ <?php /* Extensions placeholder */ ?>
145
+ <?php echo $this->getChildHtml('checkout.cart.extra') ?>
146
  <?php echo $this->getChildHtml('coupon') ?>
147
  <?php if (!$this->getIsVirtual()): echo $this->getChildHtml('shipping'); endif; ?>
148
  </div>
app/design/frontend/base/default/template/checkout/cart/coupon.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/cart/crosssell.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/cart/item/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -59,11 +59,12 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
59
  <?php endif;?>
60
  <?php if ($messages = $this->getMessages()): ?>
61
  <?php foreach ($messages as $message): ?>
62
- <p class="item-msg <?php echo $message['type'] ?>">* <?php echo $message['text'] ?></p>
63
  <?php endforeach; ?>
64
  <?php endif; ?>
65
- <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()):?>
66
- <?php echo $addtInfoBlock->setItem($_item)->toHtml() ?>
 
67
  <?php endif;?>
68
  </td>
69
  <td class="a-center">
@@ -74,7 +75,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
74
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
75
  <td class="a-center">
76
  <?php if ($isVisibleProduct): ?>
77
- <input type="checkbox" value="1" name="cart[<?php echo $_item->getId() ?>][wishlist]" title="<?php echo $this->__('Move to Wishlist') ?>" class="checkbox" />
78
  <?php endif ?>
79
  </td>
80
  <?php endif ?>
@@ -180,7 +181,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
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
- <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
184
  <td class="a-right">
185
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
186
  <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
@@ -225,7 +226,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
225
  <?php endif; ?>
226
  </td>
227
  <?php endif; ?>
228
- <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
229
  <td>
230
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
231
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
59
  <?php endif;?>
60
  <?php if ($messages = $this->getMessages()): ?>
61
  <?php foreach ($messages as $message): ?>
62
+ <p class="item-msg <?php echo $message['type'] ?>">* <?php echo $this->escapeHtml($message['text']) ?></p>
63
  <?php endforeach; ?>
64
  <?php endif; ?>
65
+ <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
66
+ <?php if ($addInfoBlock): ?>
67
+ <?php echo $addInfoBlock->setItem($_item)->toHtml() ?>
68
  <?php endif;?>
69
  </td>
70
  <td class="a-center">
75
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
76
  <td class="a-center">
77
  <?php if ($isVisibleProduct): ?>
78
+ <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist use-ajax"><?php echo $this->__('Move'); ?></a>
79
  <?php endif ?>
80
  </td>
81
  <?php endif ?>
181
  <td class="a-center">
182
  <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" />
183
  </td>
184
+ <?php if (($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
185
  <td class="a-right">
186
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
187
  <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
226
  <?php endif; ?>
227
  </td>
228
  <?php endif; ?>
229
+ <?php if (($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
230
  <td>
231
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
232
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
app/design/frontend/base/default/template/checkout/cart/noItems.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -29,6 +29,8 @@
29
  </div>
30
  <div class="cart-empty">
31
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
 
32
  <p><?php echo $this->__('You have no items in your shopping cart.') ?></p>
33
  <p><?php echo $this->__('Click <a href="%s">here</a> to continue shopping.', $this->getContinueShoppingUrl()) ?></p>
 
34
  </div>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
29
  </div>
30
  <div class="cart-empty">
31
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
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>
app/design/frontend/base/default/template/checkout/cart/render/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
@@ -41,7 +41,7 @@
41
  </td>
42
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
43
  <td class="a-center">
44
- <input type="checkbox" value="1" name="cart[<?php echo $_item->getId() ?>][wishlist]" class="checkbox" />
45
  </td>
46
  <?php endif ?>
47
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
41
  </td>
42
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
43
  <td class="a-center">
44
+ <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist"><?php echo $this->__('Move'); ?></a>
45
  </td>
46
  <?php endif ?>
47
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
app/design/frontend/base/default/template/checkout/cart/render/simple.phtml CHANGED
@@ -20,10 +20,10 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
-
27
  /**
28
  * @deprecated after 1.4.0.0-alpha3
29
  */
@@ -41,7 +41,7 @@
41
  </td>
42
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
43
  <td class="a-center">
44
- <input type="checkbox" value="1" name="cart[<?php echo $_item->getId() ?>][wishlist]" class="checkbox" />
45
  </td>
46
  <?php endif ?>
47
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
+
27
  /**
28
  * @deprecated after 1.4.0.0-alpha3
29
  */
41
  </td>
42
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
43
  <td class="a-center">
44
+ <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist"><?php echo $this->__('Move'); ?></a>
45
  </td>
46
  <?php endif ?>
47
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
app/design/frontend/base/default/template/checkout/cart/shipping.phtml CHANGED
@@ -20,15 +20,11 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
- <?php
28
- /**
29
- * @see Mage_Checkout_Block_Cart_Shipping
30
- */
31
- ?>
32
  <div class="shipping">
33
  <h2><?php echo $this->__('Estimate Shipping and Tax') ?></h2>
34
  <div class="shipping-form">
@@ -53,7 +49,7 @@
53
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getEstimateRegionId() ?>");
54
  //]]>
55
  </script>
56
- <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getEstimateRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none;" />
57
  </div>
58
  </li>
59
  <?php //endif; ?>
@@ -61,14 +57,14 @@
61
  <li>
62
  <label for="city"<?php if ($this->isCityRequired()) echo ' class="required"' ?>><?php if ($this->isCityRequired()) echo '<em>*</em>' ?><?php echo $this->__('City') ?></label>
63
  <div class="input-box">
64
- <input class="input-text<?php if ($this->isCityRequired()):?> required-entry<?php endif;?>" id="city" type="text" name="estimate_city" value="<?php echo $this->htmlEscape($this->getEstimateCity()) ?>" />
65
  </div>
66
  </li>
67
  <?php endif; ?>
68
  <li>
69
  <label for="postcode"<?php if ($this->isZipCodeRequired()) echo ' class="required"' ?>><?php if ($this->isZipCodeRequired()) echo '<em>*</em>' ?><?php echo $this->__('Zip/Postal Code') ?></label>
70
  <div class="input-box">
71
- <input class="input-text validate-postcode<?php if ($this->isZipCodeRequired()):?> required-entry<?php endif;?>" type="text" id="postcode" name="estimate_postcode" value="<?php echo $this->htmlEscape($this->getEstimatePostcode()) ?>" />
72
  </div>
73
  </li>
74
  </ul>
@@ -86,16 +82,16 @@
86
  <form id="co-shipping-method-form" action="<?php echo $this->getUrl('checkout/cart/estimateUpdatePost') ?>">
87
  <dl class="sp-methods">
88
  <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
89
- <dt><?php echo $this->getCarrierName($code) ?></dt>
90
  <dd>
91
  <ul>
92
  <?php foreach ($_rates as $_rate): ?>
93
  <li<?php if ($_rate->getErrorMessage()) echo ' class="error-msg"';?>>
94
  <?php if ($_rate->getErrorMessage()): ?>
95
- <?php echo $_rate->getErrorMessage() ?>
96
  <?php else: ?>
97
- <input name="estimate_method" type="radio" value="<?php echo $this->htmlEscape($_rate->getCode()) ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio" />
98
- <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
99
  <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
100
  <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
101
  <?php echo $_excl; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
+ <?php /** @var $this Mage_Checkout_Block_Cart_Shipping */ ?>
 
 
 
 
28
  <div class="shipping">
29
  <h2><?php echo $this->__('Estimate Shipping and Tax') ?></h2>
30
  <div class="shipping-form">
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; ?>
57
  <li>
58
  <label for="city"<?php if ($this->isCityRequired()) echo ' class="required"' ?>><?php if ($this->isCityRequired()) echo '<em>*</em>' ?><?php echo $this->__('City') ?></label>
59
  <div class="input-box">
60
+ <input class="input-text<?php if ($this->isCityRequired()):?> required-entry<?php endif;?>" id="city" type="text" name="estimate_city" value="<?php echo $this->escapeHtml($this->getEstimateCity()) ?>" />
61
  </div>
62
  </li>
63
  <?php endif; ?>
64
  <li>
65
  <label for="postcode"<?php if ($this->isZipCodeRequired()) echo ' class="required"' ?>><?php if ($this->isZipCodeRequired()) echo '<em>*</em>' ?><?php echo $this->__('Zip/Postal Code') ?></label>
66
  <div class="input-box">
67
+ <input class="input-text validate-postcode<?php if ($this->isZipCodeRequired()):?> required-entry<?php endif;?>" type="text" id="postcode" name="estimate_postcode" value="<?php echo $this->escapeHtml($this->getEstimatePostcode()) ?>" />
68
  </div>
69
  </li>
70
  </ul>
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>
86
  <dd>
87
  <ul>
88
  <?php foreach ($_rates as $_rate): ?>
89
  <li<?php if ($_rate->getErrorMessage()) echo ' class="error-msg"';?>>
90
  <?php if ($_rate->getErrorMessage()): ?>
91
+ <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?>
92
  <?php else: ?>
93
+ <input name="estimate_method" type="radio" value="<?php echo $this->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio" />
94
+ <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
95
  <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
96
  <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
97
  <?php echo $_excl; ?>
app/design/frontend/base/default/template/checkout/cart/sidebar.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/cart/totals.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/multishipping/address/select.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/multishipping/billing.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/multishipping/billing/items.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/multishipping/link.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/multishipping/overview.phtml CHANGED
@@ -20,10 +20,11 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
 
27
  <div class="multiple-checkout">
28
  <div class="page-title">
29
  <h1><?php echo $this->__('Review Order') ?></h1>
@@ -51,8 +52,8 @@
51
  <h3><?php echo $this->__('Payment Method') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditBillingUrl() ?>"><?php echo $this->__('Change') ?></a></h3>
52
  </div>
53
  <div class="box-content">
54
- <input type="hidden" name="payment[cc_number]" value="<?php echo $this->htmlEscape($this->getPayment()->getCcNumber())?>" />
55
- <input type="hidden" name="payment[cc_cid]" value="<?php echo $this->htmlEscape($this->getPayment()->getCcCid())?>" />
56
  <?php echo $this->getPaymentHtml() ?>
57
  </div>
58
  </div>
@@ -81,7 +82,7 @@
81
  <div class="box-content">
82
  <?php if($_rate=$this->getShippingAddressRate($_address)): ?>
83
  <p>
84
- <?php echo $_rate->getCarrierTitle() ?> - <?php echo $_rate->getMethodTitle() ?>
85
  <?php $_excl = $this->getShippingPriceExclTax($_address); ?>
86
  <?php $_incl = $this->getShippingPriceInclTax($_address); ?>
87
  <?php echo $_excl; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
+ <?php /** @var $this Mage_Checkout_Block_Multishipping_Overview */ ?>
28
  <div class="multiple-checkout">
29
  <div class="page-title">
30
  <h1><?php echo $this->__('Review Order') ?></h1>
52
  <h3><?php echo $this->__('Payment Method') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditBillingUrl() ?>"><?php echo $this->__('Change') ?></a></h3>
53
  </div>
54
  <div class="box-content">
55
+ <input type="hidden" name="payment[cc_number]" value="<?php echo $this->escapeHtml($this->getPayment()->getCcNumber())?>" />
56
+ <input type="hidden" name="payment[cc_cid]" value="<?php echo $this->escapeHtml($this->getPayment()->getCcCid())?>" />
57
  <?php echo $this->getPaymentHtml() ?>
58
  </div>
59
  </div>
82
  <div class="box-content">
83
  <?php if($_rate=$this->getShippingAddressRate($_address)): ?>
84
  <p>
85
+ <?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?> - <?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
86
  <?php $_excl = $this->getShippingPriceExclTax($_address); ?>
87
  <?php $_incl = $this->getShippingPriceInclTax($_address); ?>
88
  <?php echo $_excl; ?>
app/design/frontend/base/default/template/checkout/multishipping/overview/item.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -29,6 +29,7 @@
29
  * Multishipping checkout shipping template
30
  *
31
  * @see Mage_Checkout_Block_Multishipping_Shipping
 
32
  */
33
  ?>
34
  <div class="multiple-checkout">
@@ -60,20 +61,20 @@
60
  <?php else: ?>
61
  <dl class="sp-methods">
62
  <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
63
- <dt><?php echo $this->getCarrierName($code) ?></dt>
64
  <dd>
65
  <ul>
66
  <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
67
  <li<?php if ($_rate->getErrorMessage()) echo ' class="error-msg"' ?>>
68
  <?php if ($_rate->getErrorMessage()): ?>
69
- <?php echo $_rate->getCarrierTitle() ?>: <?php echo $_rate->getErrorMessage() ?>
70
  <?php else: ?>
71
  <?php if ($_sole) : ?>
72
  <span class="no-display"><input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->htmlEscape($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" checked="checked"/></span>
73
  <?php else: ?>
74
- <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->htmlEscape($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
75
  <?php endif; ?>
76
- <label for="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
77
  <?php $_excl = $this->getShippingPrice($_address, $_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
78
  <?php $_incl = $this->getShippingPrice($_address, $_rate->getPrice(), true); ?>
79
  <?php echo $_excl; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
29
  * Multishipping checkout shipping template
30
  *
31
  * @see Mage_Checkout_Block_Multishipping_Shipping
32
+ * @var $this Mage_Checkout_Block_Multishipping_Shipping
33
  */
34
  ?>
35
  <div class="multiple-checkout">
61
  <?php else: ?>
62
  <dl class="sp-methods">
63
  <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
64
+ <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
65
  <dd>
66
  <ul>
67
  <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
68
  <li<?php if ($_rate->getErrorMessage()) echo ' class="error-msg"' ?>>
69
  <?php if ($_rate->getErrorMessage()): ?>
70
+ <?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?>: <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?>
71
  <?php else: ?>
72
  <?php if ($_sole) : ?>
73
  <span class="no-display"><input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->htmlEscape($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" checked="checked"/></span>
74
  <?php else: ?>
75
+ <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
76
  <?php endif; ?>
77
+ <label for="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
78
  <?php $_excl = $this->getShippingPrice($_address, $_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
79
  <?php $_incl = $this->getShippingPrice($_address, $_rate->getPrice(), true); ?>
80
  <?php echo $_excl; ?>
app/design/frontend/base/default/template/checkout/multishipping/state.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/multishipping/success.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/onepage.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -29,7 +29,6 @@
29
  </div>
30
  <script type="text/javascript" src="<?php echo $this->getJsUrl('varien/accordion.js') ?>"></script>
31
  <script type="text/javascript" src="<?php echo $this->getSkinUrl('js/opcheckout.js') ?>"></script>
32
- <script type="text/javascript">countryRegions = <?php echo $this->helper('directory')->getRegionJson() ?></script>
33
  <ol class="opc" id="checkoutSteps">
34
  <?php $i=0; foreach($this->getSteps() as $_stepId => $_stepInfo): ?>
35
  <?php if (!$this->getChild($_stepId) || !$this->getChild($_stepId)->isShow()): continue; endif; $i++ ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
29
  </div>
30
  <script type="text/javascript" src="<?php echo $this->getJsUrl('varien/accordion.js') ?>"></script>
31
  <script type="text/javascript" src="<?php echo $this->getSkinUrl('js/opcheckout.js') ?>"></script>
 
32
  <ol class="opc" id="checkoutSteps">
33
  <?php $i=0; foreach($this->getSteps() as $_stepId => $_stepInfo): ?>
34
  <?php if (!$this->getChild($_stepId) || !$this->getChild($_stepId)->isShow()): continue; endif; $i++ ?>
app/design/frontend/base/default/template/checkout/onepage/agreements.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/onepage/billing.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -39,41 +39,51 @@
39
  <fieldset>
40
  <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
41
  <ul>
42
- <li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
43
  <li class="fields">
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->htmlEscape($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" />
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->htmlEscape($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
55
  </div>
56
  </div>
57
- <?php endif ?>
58
  </li>
 
59
  <li class="wide">
60
  <label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
61
  <div class="input-box">
62
- <input type="text" title="<?php echo $this->__('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1)) ?>" class="input-text required-entry" />
 
 
 
 
 
 
 
63
  </div>
64
  </li>
65
- <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
 
66
  <li class="wide">
 
67
  <div class="input-box">
68
- <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i?>" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet($_i)) ?>" class="input-text" />
69
  </div>
70
  </li>
71
- <?php endfor ?>
72
  <li class="fields">
73
  <div class="field">
74
  <label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
75
  <div class="input-box">
76
- <input type="text" title="<?php echo $this->__('City') ?>" name="billing[city]" value="<?php echo $this->htmlEscape($this->getAddress()->getCity()) ?>" class="input-text required-entry" id="billing:city" />
77
  </div>
78
  </div>
79
  <div class="field">
@@ -87,7 +97,7 @@
87
  $('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
88
  //]]>
89
  </script>
90
- <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none;" />
91
  </div>
92
  </div>
93
  </li>
@@ -95,7 +105,7 @@
95
  <div class="field">
96
  <label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
97
  <div class="input-box">
98
- <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international required-entry" />
99
  </div>
100
  </div>
101
  <div class="field">
@@ -109,13 +119,13 @@
109
  <div class="field">
110
  <label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
111
  <div class="input-box">
112
- <input type="text" name="billing[telephone]" value="<?php echo $this->htmlEscape($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text required-entry" id="billing:telephone" />
113
  </div>
114
  </div>
115
  <div class="field">
116
  <label for="billing:fax"><?php echo $this->__('Fax') ?></label>
117
  <div class="input-box">
118
- <input type="text" name="billing[fax]" value="<?php echo $this->htmlEscape($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text" id="billing:fax" />
119
  </div>
120
  </div>
121
  </li>
@@ -167,9 +177,12 @@
167
  <?php else:?>
168
  <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
169
  <?php endif; ?>
 
170
  </ul>
171
  </fieldset>
172
- </li>
 
 
173
  <?php if ($this->canShip()): ?>
174
  <li class="control">
175
  <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>
@@ -198,6 +211,6 @@
198
  //billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
199
  $('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
200
 
201
- var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', countryRegions, undefined, 'billing:postcode');
202
  //]]>
203
  </script>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
39
  <fieldset>
40
  <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
41
  <ul>
42
+ <li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
43
  <li class="fields">
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; ?>
58
  </li>
59
+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
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; ?>
74
+ <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
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; ?>
82
  <li class="fields">
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">
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
  <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
  <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>
177
  <?php else:?>
178
  <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
179
  <?php endif; ?>
180
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
181
  </ul>
182
  </fieldset>
183
+ </li>
184
+ <?php /* Extensions placeholder */ ?>
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>
211
  //billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
212
  $('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
213
 
214
+ var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'billing:postcode');
215
  //]]>
216
  </script>
app/design/frontend/base/default/template/checkout/onepage/failure.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/onepage/link.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/onepage/login.phtml CHANGED
@@ -20,10 +20,12 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
 
 
27
  <div class="col2-set">
28
  <?php echo $this->getChildHtml('login_before')?>
29
  <div class="col-1">
@@ -79,6 +81,7 @@
79
  <input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
80
  </div>
81
  </li>
 
82
  </ul>
83
  </fieldset>
84
  </form>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
+ <?php /* Extensions placeholder */ ?>
28
+ <?php echo $this->getChildHtml('checkout.onepage.login.extra')?>
29
  <div class="col2-set">
30
  <?php echo $this->getChildHtml('login_before')?>
31
  <div class="col-1">
81
  <input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
82
  </div>
83
  </li>
84
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
85
  </ul>
86
  </fieldset>
87
  </form>
app/design/frontend/base/default/template/checkout/onepage/payment.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/onepage/payment/methods.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -47,7 +47,7 @@
47
  <span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio" /></span>
48
  <?php $oneMethod = $_code; ?>
49
  <?php endif; ?>
50
- <label for="p_method_<?php echo $_code ?>"><?php echo $this->getMethodTitle($_method) ?> <?php echo $this->getMethodLabelAfterHtml($_method) ?></label>
51
  </dt>
52
  <?php if ($html = $this->getPaymentMethodFormHtml($_method)): ?>
53
  <dd>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
47
  <span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio" /></span>
48
  <?php $oneMethod = $_code; ?>
49
  <?php endif; ?>
50
+ <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($this->getMethodTitle($_method)) ?> <?php echo $this->getMethodLabelAfterHtml($_method) ?></label>
51
  </dt>
52
  <?php if ($html = $this->getPaymentMethodFormHtml($_method)): ?>
53
  <dd>
app/design/frontend/base/default/template/checkout/onepage/progress.phtml CHANGED
@@ -20,9 +20,10 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
 
26
  ?>
27
  <div class="block block-progress opc-block-progress">
28
  <div class="block-title">
@@ -31,9 +32,10 @@
31
  <div class="block-content">
32
  <dl>
33
  <?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
34
- <?php if($this->getCheckout()->getStepData('billing', 'complete')): ?>
35
  <dt class="complete">
36
- <?php echo $this->__('Billing Address') ?> <span class="separator">|</span> <a href="#billing" onclick="checkout.accordion.openSection('opc-billing'); return false;"><?php echo $this->__('Change') ?></a>
 
37
  </dt>
38
  <dd class="complete">
39
  <address><?php echo $this->getBilling()->format('html') ?></address>
@@ -46,9 +48,10 @@
46
  <?php endif; ?>
47
 
48
  <?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
49
- <?php if($this->getCheckout()->getStepData('shipping', 'complete')): ?>
50
  <dt class="complete">
51
- <?php echo $this->__('Shipping Address') ?> <span class="separator">|</span> <a href="#payment" onclick="checkout.accordion.openSection('opc-shipping');return false;"><?php echo $this->__('Change') ?></a>
 
52
  </dt>
53
  <dd class="complete">
54
  <address><?php echo $this->getShipping()->format('html') ?></address>
@@ -61,13 +64,14 @@
61
  <?php endif; ?>
62
 
63
  <?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
64
- <?php if($this->getCheckout()->getStepData('shipping_method', 'complete')): ?>
65
  <dt class="complete">
66
- <?php echo $this->__('Shipping Method') ?> <span class="separator">|</span> <a href="#shipping_method" onclick="checkout.accordion.openSection('opc-shipping_method'); return false;"><?php echo $this->__('Change') ?></a>
 
67
  </dt>
68
  <dd class="complete">
69
  <?php if ($this->getShippingMethod()): ?>
70
- <?php echo $this->getShippingDescription() ?>
71
 
72
  <?php $_excl = $this->getShippingPriceExclTax(); ?>
73
  <?php $_incl = $this->getShippingPriceInclTax(); ?>
@@ -92,9 +96,10 @@
92
  <?php endif; ?>
93
 
94
  <?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
95
- <?php if($this->getCheckout()->getStepData('payment', 'complete')): ?>
96
  <dt class="complete">
97
- <?php echo $this->__('Payment Method') ?> <span class="separator">|</span> <a href="#payment" onclick="checkout.accordion.openSection('opc-payment'); return false;"><?php echo $this->__('Change') ?></a>
 
98
  </dt>
99
  <dd class="complete">
100
  <?php echo $this->getPaymentHtml() ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
+ /* @var $this Mage_Checkout_Block_Onepage_Progress */
27
  ?>
28
  <div class="block block-progress opc-block-progress">
29
  <div class="block-title">
32
  <div class="block-content">
33
  <dl>
34
  <?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
35
+ <?php if ($this->isStepComplete('billing')): ?>
36
  <dt class="complete">
37
+ <?php echo $this->__('Billing Address') ?> <span class="separator">|</span>
38
+ <a href="#billing" onclick="checkout.gotoSection('billing'); return false;"><?php echo $this->__('Change') ?></a>
39
  </dt>
40
  <dd class="complete">
41
  <address><?php echo $this->getBilling()->format('html') ?></address>
48
  <?php endif; ?>
49
 
50
  <?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
51
+ <?php if ($this->isStepComplete('shipping')): ?>
52
  <dt class="complete">
53
+ <?php echo $this->__('Shipping Address') ?> <span class="separator">|</span>
54
+ <a href="#payment" onclick="checkout.gotoSection('shipping');return false;"><?php echo $this->__('Change') ?></a>
55
  </dt>
56
  <dd class="complete">
57
  <address><?php echo $this->getShipping()->format('html') ?></address>
64
  <?php endif; ?>
65
 
66
  <?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
67
+ <?php if ($this->isStepComplete('shipping_method')): ?>
68
  <dt class="complete">
69
+ <?php echo $this->__('Shipping Method') ?> <span class="separator">|</span>
70
+ <a href="#shipping_method" onclick="checkout.gotoSection('shipping_method'); return false;"><?php echo $this->__('Change') ?></a>
71
  </dt>
72
  <dd class="complete">
73
  <?php if ($this->getShippingMethod()): ?>
74
+ <?php echo $this->escapeHtml($this->getShippingDescription()) ?>
75
 
76
  <?php $_excl = $this->getShippingPriceExclTax(); ?>
77
  <?php $_incl = $this->getShippingPriceInclTax(); ?>
96
  <?php endif; ?>
97
 
98
  <?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
99
+ <?php if ($this->isStepComplete('payment')): ?>
100
  <dt class="complete">
101
+ <?php echo $this->__('Payment Method') ?> <span class="separator">|</span>
102
+ <a href="#payment" onclick="checkout.gotoSection('payment'); return false;"><?php echo $this->__('Change') ?></a>
103
  </dt>
104
  <dd class="complete">
105
  <?php echo $this->getPaymentHtml() ?>
app/design/frontend/base/default/template/checkout/onepage/review.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/onepage/review/button.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/onepage/review/info.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/onepage/review/item.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/onepage/review/totals.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/checkout/onepage/shipping.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -43,36 +43,38 @@
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->htmlEscape($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" onchange="shipping.setSameAsBilling(false);" />
47
  </div>
48
  </div>
49
- <?php if(false): ?>
50
- <div class="fields">
51
- <label for="shipping:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
52
- <div class="input-box">
53
- <input type="text" name="shipping[email]" id="shipping:email" value="<?php echo $this->htmlEscape($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
54
- </div>
55
- </div>
56
- <?php endif ?>
57
  </li>
 
58
  <li class="wide">
59
  <label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
60
  <div class="input-box">
61
- <input type="text" title="<?php echo $this->__('Street Address') ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1)) ?>" class="input-text required-entry" onchange="shipping.setSameAsBilling(false);" />
62
  </div>
63
- </li>
64
- <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
 
 
 
 
 
 
 
 
65
  <li class="wide">
 
66
  <div class="input-box">
67
- <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i?>" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet($_i)) ?>" class="input-text" onchange="shipping.setSameAsBilling(false);" />
68
  </div>
69
  </li>
70
- <?php endfor ?>
71
  <li class="fields">
72
  <div class="field">
73
  <label for="shipping:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
74
  <div class="input-box">
75
- <input type="text" title="<?php echo $this->__('City') ?>" name="shipping[city]" value="<?php echo $this->htmlEscape($this->getAddress()->getCity()) ?>" class="input-text required-entry" id="shipping:city" onchange="shipping.setSameAsBilling(false);" />
76
  </div>
77
  </div>
78
  <div class="field">
@@ -86,7 +88,7 @@
86
  $('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
87
  //]]>
88
  </script>
89
- <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none;" />
90
  </div>
91
  </div>
92
  </li>
@@ -94,7 +96,7 @@
94
  <div class="field">
95
  <label for="shipping:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
96
  <div class="input-box">
97
- <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international required-entry" onchange="shipping.setSameAsBilling(false);" />
98
  </div>
99
  </div>
100
  <div class="field">
@@ -108,13 +110,13 @@
108
  <div class="field">
109
  <label for="shipping:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
110
  <div class="input-box">
111
- <input type="text" name="shipping[telephone]" value="<?php echo $this->htmlEscape($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text required-entry" id="shipping:telephone" onchange="shipping.setSameAsBilling(false);" />
112
  </div>
113
  </div>
114
  <div class="field">
115
  <label for="shipping:fax"><?php echo $this->__('Fax') ?></label>
116
  <div class="input-box">
117
- <input type="text" name="shipping[fax]" value="<?php echo $this->htmlEscape($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text" id="shipping:fax" onchange="shipping.setSameAsBilling(false);" />
118
  </div>
119
  </div>
120
  </li>
@@ -149,6 +151,6 @@
149
  //shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
150
  $('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
151
 
152
- var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', countryRegions, undefined, 'shipping:postcode');
153
  //]]>
154
  </script>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
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>
50
+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
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; ?>
65
+ <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
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; ?>
73
  <li class="fields">
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">
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
  <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
  <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>
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');
155
  //]]>
156
  </script>
app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/onepage/shipping_method/additional.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml CHANGED
@@ -20,24 +20,26 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
- <?php if (!($_shippingRateGroups = $this->getShippingRates())): ?>
 
 
28
  <p><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></p>
29
  <?php else: ?>
30
  <dl class="sp-methods">
31
  <?php $shippingCodePrice = array(); ?>
32
  <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
33
- <dt><?php echo $this->getCarrierName($code) ?></dt>
34
  <dd>
35
  <ul>
36
  <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
37
  <?php $shippingCodePrice[] = "'".$_rate->getCode()."':".(float)$_rate->getPrice(); ?>
38
  <li>
39
  <?php if ($_rate->getErrorMessage()): ?>
40
- <ul class="messages"><li class="error-msg"><ul><li><?php echo $_rate->getErrorMessage() ?></li></ul></li></ul>
41
  <?php else: ?>
42
  <?php if ($_sole) : ?>
43
  <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
@@ -53,7 +55,7 @@
53
  <?php endif; ?>
54
 
55
  <?php endif; ?>
56
- <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
57
  <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
58
  <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
59
  <?php echo $_excl; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
+ <?php /** @var $this Mage_Checkout_Block_Onepage_Shipping_Method_Available */ ?>
28
+ <?php $_shippingRateGroups = $this->getShippingRates(); ?>
29
+ <?php if (!$_shippingRateGroups): ?>
30
  <p><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></p>
31
  <?php else: ?>
32
  <dl class="sp-methods">
33
  <?php $shippingCodePrice = array(); ?>
34
  <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
35
+ <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
36
  <dd>
37
  <ul>
38
  <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
39
  <?php $shippingCodePrice[] = "'".$_rate->getCode()."':".(float)$_rate->getPrice(); ?>
40
  <li>
41
  <?php if ($_rate->getErrorMessage()): ?>
42
+ <ul class="messages"><li class="error-msg"><ul><li><?php echo $this->escapeHtml($_rate->getErrorMessage()) ?></li></ul></li></ul>
43
  <?php else: ?>
44
  <?php if ($_sole) : ?>
45
  <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
55
  <?php endif; ?>
56
 
57
  <?php endif; ?>
58
+ <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
59
  <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
60
  <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
61
  <?php echo $_excl; ?>
app/design/frontend/base/default/template/checkout/success.phtml CHANGED
@@ -20,12 +20,12 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.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 $this->__('Your order has been received') ?></h1>
29
  </div>
30
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31
  <h2 class="sub-title"><?php echo $this->__('Thank you for your purchase!') ?></h2>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.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 $this->__('Your order has been received.') ?></h1>
29
  </div>
30
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31
  <h2 class="sub-title"><?php echo $this->__('Thank you for your purchase!') ?></h2>
app/design/frontend/base/default/template/checkout/total/default.phtml CHANGED
@@ -20,14 +20,14 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
  <tr>
28
  <th colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
29
  <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
30
- <?php echo $this->getTotal()->getTitle() ?>
31
  <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?></strong><?php endif; ?>
32
  </th>
33
  <td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
  <tr>
28
  <th colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
29
  <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
30
+ <?php echo $this->escapeHtml($this->getTotal()->getTitle()); ?>
31
  <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?></strong><?php endif; ?>
32
  </th>
33
  <td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
app/design/frontend/base/default/template/checkout/total/nominal.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/checkout/total/tax.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -37,7 +37,7 @@
37
  <?php foreach ($rates as $rate): ?>
38
  <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
39
  <td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>" colspan="<?php echo $this->getColspan(); ?>">
40
- <?php echo $rate['title']; ?>
41
  <?php if (!is_null($rate['percent'])): ?>
42
  (<?php echo (float)$rate['percent']; ?>%)
43
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
37
  <?php foreach ($rates as $rate): ?>
38
  <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
39
  <td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>" colspan="<?php echo $this->getColspan(); ?>">
40
+ <?php echo $this->escapeHtml($rate['title']); ?>
41
  <?php if (!is_null($rate['percent'])): ?>
42
  (<?php echo (float)$rate['percent']; ?>%)
43
  <?php endif; ?>
app/design/frontend/base/default/template/cms/content.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/cms/content_heading.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/cms/default/home.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/cms/default/no-route.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/cms/meta.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/cms/widget/link/link_block.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/cms/widget/link/link_inline.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/cms/widget/static_block/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/contacts/form.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/core/formkey.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/core/link.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/core/messages.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/account/dashboard.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -35,6 +35,8 @@
35
  <div class="box-head">
36
  <h2><?php echo $this->__('Account Information') ?></h2>
37
  </div>
 
 
38
  <?php echo $this->getChildHtml('info') ?>
39
  <?php echo $this->getChildHtml('address') ?>
40
  </div>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
35
  <div class="box-head">
36
  <h2><?php echo $this->__('Account Information') ?></h2>
37
  </div>
38
+ <?php /* Extensions placeholder */ ?>
39
+ <?php echo $this->getChildHtml('customer.account.dashboard.extra') ?>
40
  <?php echo $this->getChildHtml('info') ?>
41
  <?php echo $this->getChildHtml('address') ?>
42
  </div>
app/design/frontend/base/default/template/customer/account/dashboard/address.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/account/dashboard/info.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -57,6 +57,8 @@
57
  </p>
58
  </div>
59
  </div>
 
 
60
  </div>
61
  <?php endif; ?>
62
  </div>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
57
  </p>
58
  </div>
59
  </div>
60
+ <?php /* Extensions placeholder */ ?>
61
+ <?php echo $this->getChildHtml('customer.account.dashboard.info.extra')?>
62
  </div>
63
  <?php endif; ?>
64
  </div>
app/design/frontend/base/default/template/customer/account/dashboard/newsletter.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/account/link/back.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/account/navigation.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/address.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/address/book.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/address/edit.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -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->htmlEscape($this->getAddress()->getCompany()) ?>" class="input-text" />
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->htmlEscape($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text required-entry" 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->htmlEscape($this->getAddress()->getFax()) ?>" class="input-text" />
67
  </div>
68
  </div>
69
  </li>
@@ -72,24 +72,34 @@
72
  <div class="fieldset">
73
  <h2 class="legend"><?php echo $this->__('Address') ?></h2>
74
  <ul class="form-list">
 
75
  <li class="wide">
76
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
77
  <div class="input-box">
78
- <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text required-entry" />
79
  </div>
80
  </li>
81
- <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
 
82
  <li class="wide">
83
  <div class="input-box">
84
- <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i?>" class="input-text" />
85
  </div>
86
  </li>
87
- <?php endfor ?>
 
 
 
 
 
 
 
 
88
  <li class="fields">
89
  <div class="field">
90
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
91
  <div class="input-box">
92
- <input type="text" name="city" value="<?php echo $this->htmlEscape($this->getAddress()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text required-entry" id="city" />
93
  </div>
94
  </div>
95
  <div class="field">
@@ -103,7 +113,7 @@
103
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
104
  //]]>
105
  </script>
106
- <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" />
107
  </div>
108
  </div>
109
  </li>
@@ -111,7 +121,7 @@
111
  <div class="field">
112
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
113
  <div class="input-box">
114
- <input type="text" name="postcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international required-entry" />
115
  </div>
116
  </div>
117
  <div class="field">
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
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>
72
  <div class="fieldset">
73
  <h2 class="legend"><?php echo $this->__('Address') ?></h2>
74
  <ul class="form-list">
75
+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
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; ?>
90
+ <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
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; ?>
98
  <li class="fields">
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">
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
  <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">
app/design/frontend/base/default/template/customer/balance.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/form/address.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -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->htmlEscape($data->getCompany()) ?>" class="input-text" />
46
  </div>
47
  </li>
48
  </ul>
@@ -50,24 +50,26 @@
50
  <div class="fieldset">
51
  <h2 class="legend"><?php echo $this->__('Address') ?></h2>
52
  <ul class="form-list">
 
53
  <li class="wide">
54
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
55
  <div class="input-box">
56
- <input type="text" name="street[]" value="<?php echo $this->htmlEscape($data->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text required-entry" />
57
  </div>
58
  </li>
59
- <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
 
60
  <li class="wide">
61
  <div class="input-box">
62
- <input type="text" name="street[]" value="<?php echo $this->htmlEscape($data->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address '.$_i) ?>" id="street_<?php echo $_i?>" class="input-text" />
63
  </div>
64
  </li>
65
- <?php endfor ?>
66
  <li class="fields">
67
  <div class="field">
68
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
69
  <div class="input-box">
70
- <input type="text" name="city" value="<?php echo $this->htmlEscape($data->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text required-entry" id="city" />
71
  </div>
72
  </div>
73
  <div class="field">
@@ -81,7 +83,7 @@
81
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
82
  //]]>
83
  </script>
84
- <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text required-entry" style="display:none;" />
85
  </div>
86
  </div>
87
  </li>
@@ -89,7 +91,7 @@
89
  <div class="field">
90
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
91
  <div class="input-box">
92
- <input type="text" name="postcode" value="<?php echo $this->htmlEscape($data->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international required-entry" />
93
  </div>
94
  </div>
95
  <div class="field">
@@ -105,13 +107,13 @@
105
  <div class="field">
106
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
107
  <div class="input-box">
108
- <input type="text" name="telephone" value="<?php echo $this->htmlEscape($data->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text" id="telephone" />
109
  </div>
110
  </div>
111
  <div class="field">
112
  <label for="fax"><?php echo $this->__('Fax') ?></label>
113
  <div class="input-box">
114
- <input type="text" name="fax" value="<?php echo $this->htmlEscape($data->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text" id="fax" />
115
  </div>
116
  </div>
117
  </li>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
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>
50
  <div class="fieldset">
51
  <h2 class="legend"><?php echo $this->__('Address') ?></h2>
52
  <ul class="form-list">
53
+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
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; ?>
68
  <li class="fields">
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">
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
  <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">
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>
app/design/frontend/base/default/template/customer/form/changepassword.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/form/confirmation.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/form/edit.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/form/forgotpassword.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -39,6 +39,7 @@
39
  <input type="text" name="email" alt="email" id="email_address" class="input-text required-entry validate-email" value="<?php echo $this->htmlEscape($this->getEmailValue()) ?>" />
40
  </div>
41
  </li>
 
42
  </ul>
43
  </div>
44
  <div class="buttons-set">
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
39
  <input type="text" name="email" alt="email" id="email_address" class="input-text required-entry validate-email" value="<?php echo $this->htmlEscape($this->getEmailValue()) ?>" />
40
  </div>
41
  </li>
42
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
43
  </ul>
44
  </div>
45
  <div class="buttons-set">
app/design/frontend/base/default/template/customer/form/login.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -36,6 +36,8 @@
36
  <h1><?php echo $this->__('Login or Create an Account') ?></h1>
37
  </div>
38
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
 
 
39
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
40
  <div class="col2-set">
41
  <div class="col-1 new-users">
@@ -61,6 +63,7 @@
61
  <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
62
  </div>
63
  </li>
 
64
  </ul>
65
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
66
  </div>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
36
  <h1><?php echo $this->__('Login or Create an Account') ?></h1>
37
  </div>
38
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
39
+ <?php /* Extensions placeholder */ ?>
40
+ <?php echo $this->getChildHtml('customer.form.login.extra')?>
41
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
42
  <div class="col2-set">
43
  <div class="col-1 new-users">
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'); ?>
67
  </ul>
68
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
69
  </div>
app/design/frontend/base/default/template/customer/form/mini.login.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/form/newsletter.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -35,6 +35,8 @@
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
  </ul>
39
  </div>
40
  <div class="buttons-set">
@@ -42,6 +44,8 @@
42
  <button type="submit" title="<?php echo $this->__('Save') ?>" class="button"><span><span><?php echo $this->__('Save') ?></span></span></button>
43
  </div>
44
  </form>
 
 
45
  <script type="text/javascript">
46
  //<![CDATA[
47
  var dataForm = new VarienForm('form-validate', true);
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
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">
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 */ ?>
48
+ <?php echo $this->getChildHtml('customer.form.newsletter.extra2')?>
49
  <script type="text/javascript">
50
  //<![CDATA[
51
  var dataForm = new VarienForm('form-validate', true);
app/design/frontend/base/default/template/customer/form/register.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -28,7 +28,7 @@
28
  /**
29
  * Create account form template
30
  *
31
- * @see Mage_Customer_Block_Form_Register
32
  */
33
  ?>
34
  <div class="account-create">
@@ -37,6 +37,8 @@
37
  </div>
38
  <?php echo $this->getChildHtml('form_fields_before')?>
39
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
 
 
40
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
41
  <div class="fieldset">
42
  <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
@@ -49,7 +51,7 @@
49
  <li>
50
  <label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
51
  <div class="input-box">
52
- <input type="text" name="email" id="email_address" value="<?php echo $this->htmlEscape($this->getFormData()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
53
  </div>
54
  </li>
55
  <?php if ($this->isNewsletterEnabled()): ?>
@@ -58,6 +60,8 @@
58
  <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" />
59
  </div>
60
  <label for="is_subscribed"><?php echo $this->__('Sign Up for Newsletter') ?></label>
 
 
61
  </li>
62
  <?php endif ?>
63
  <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
@@ -83,34 +87,36 @@
83
  <div class="field">
84
  <label for="company"><?php echo $this->__('Company') ?></label>
85
  <div class="input-box">
86
- <input type="text" name="company" id="company" value="<?php echo $this->htmlEscape($this->getFormData()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" />
87
  </div>
88
  </div>
89
  <div class="field">
90
  <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
91
  <div class="input-box">
92
- <input type="text" name="telephone" id="telephone" value="<?php echo $this->htmlEscape($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text required-entry" />
93
  </div>
94
  </div>
95
  </li>
 
96
  <li class="wide">
97
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
98
  <div class="input-box">
99
- <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getFormData()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text required-entry" />
100
  </div>
101
  </li>
102
- <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
 
103
  <li class="wide">
104
  <div class="input-box">
105
- <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getFormData()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i?>" class="input-text" />
106
  </div>
107
  </li>
108
- <?php endfor ?>
109
  <li class="fields">
110
  <div class="field">
111
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
112
  <div class="input-box">
113
- <input type="text" name="city" value="<?php echo $this->htmlEscape($this->getFormData()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text required-entry" id="city" />
114
  </div>
115
  </div>
116
  <div class="field">
@@ -124,7 +130,7 @@
124
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
125
  //]]>
126
  </script>
127
- <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none;" />
128
  </div>
129
  </div>
130
  </li>
@@ -132,7 +138,7 @@
132
  <div class="field">
133
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
134
  <div class="input-box">
135
- <input type="text" name="postcode" value="<?php echo $this->htmlEscape($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international required-entry" />
136
  </div>
137
  </div>
138
  <div class="field">
@@ -164,6 +170,7 @@
164
  </div>
165
  </div>
166
  </li>
 
167
  </ul>
168
  </div>
169
  <div class="buttons-set">
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
28
  /**
29
  * Create account form template
30
  *
31
+ * @var $this Mage_Customer_Block_Form_Register
32
  */
33
  ?>
34
  <div class="account-create">
37
  </div>
38
  <?php echo $this->getChildHtml('form_fields_before')?>
39
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
40
+ <?php /* Extensions placeholder */ ?>
41
+ <?php echo $this->getChildHtml('customer.form.register.extra')?>
42
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
43
  <div class="fieldset">
44
  <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
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()): ?>
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 */ ?>
64
+ <?php echo $this->getChildHtml('customer.form.register.newsletter')?>
65
  </li>
66
  <?php endif ?>
67
  <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
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>
100
+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
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; ?>
115
  <li class="fields">
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">
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
  <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">
170
  </div>
171
  </div>
172
  </li>
173
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
174
  </ul>
175
  </div>
176
  <div class="buttons-set">
app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/logout.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/orders.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/customer/widget/dob.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/customer/widget/gender.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/customer/widget/name.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
@@ -42,22 +42,20 @@ For checkout/onepage/shipping.phtml:
42
  ->setFieldParams('onchange="shipping.setSameAsBilling(false);"')
43
  ->toHtml() ?>
44
  */
45
- /**
46
- * @var Mage_Customer_Block_Widget_Name $this
47
- */
48
  ?>
49
  <div class="<?php echo $this->getContainerClassName()?>">
50
  <?php if ($this->showPrefix()): ?>
51
  <div class="field name-prefix">
52
  <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>
53
  <div class="input-box">
54
- <?php if ($this->getPrefixOptions()===false): ?>
55
- <input type="text" id="<?php echo $this->getFieldId('prefix')?>" name="<?php echo $this->getFieldName('prefix')?>" value="<?php echo $this->htmlEscape($this->getObject()->getPrefix()) ?>" title="<?php echo $this->getStoreLabel('prefix') ?>" class="input-text<?php if ($this->isPrefixRequired()):?> required-entry<?php endif; ?>" <?php echo $this->getFieldParams() ?> />
56
  <?php else: ?>
57
- <select id="<?php echo $this->getFieldId('prefix')?>" name="<?php echo $this->getFieldName('prefix')?>" title="<?php echo $this->getStoreLabel('prefix') ?>"<?php if ($this->isPrefixRequired()):?> class="required-entry"<?php endif; ?> <?php echo $this->getFieldParams() ?>>
58
  <?php foreach ($this->getPrefixOptions() as $_option): ?>
59
  <option value="<?php echo $_option?>"<?php if ($this->getObject()->getPrefix()==$_option):?> selected="selected"<?php endif; ?>><?php echo $this->__($_option)?></option>
60
- <?php endforeach ?>
61
  </select>
62
  <?php endif; ?>
63
  </div>
@@ -66,34 +64,35 @@ For checkout/onepage/shipping.phtml:
66
  <div class="field name-firstname">
67
  <label for="<?php echo $this->getFieldId('firstname')?>" class="required"><em>*</em><?php echo $this->getStoreLabel('firstname') ?></label>
68
  <div class="input-box">
69
- <input type="text" id="<?php echo $this->getFieldId('firstname')?>" name="<?php echo $this->getFieldName('firstname')?>" value="<?php echo $this->htmlEscape($this->getObject()->getFirstname()) ?>" title="<?php echo $this->getStoreLabel('firstname') ?>" class="input-text required-entry" <?php echo $this->getFieldParams() ?> />
70
  </div>
71
  </div>
72
  <?php if ($this->showMiddlename()): ?>
 
73
  <div class="field name-middlename">
74
- <label for="<?php echo $this->getFieldId('middlename')?>"><?php echo $this->getStoreLabel('middlename') ?></label>
75
  <div class="input-box">
76
- <input type="text" id="<?php echo $this->getFieldId('middlename')?>" name="<?php echo $this->getFieldName('middlename')?>" value="<?php echo $this->htmlEscape($this->getObject()->getMiddlename()) ?>" title="<?php echo $this->getStoreLabel('middlename') ?>" class="input-text" <?php echo $this->getFieldParams() ?> />
77
  </div>
78
  </div>
79
  <?php endif; ?>
80
  <div class="field name-lastname">
81
  <label for="<?php echo $this->getFieldId('lastname')?>" class="required"><em>*</em><?php echo $this->getStoreLabel('lastname') ?></label>
82
  <div class="input-box">
83
- <input type="text" id="<?php echo $this->getFieldId('lastname')?>" name="<?php echo $this->getFieldName('lastname')?>" value="<?php echo $this->htmlEscape($this->getObject()->getLastname()) ?>" title="<?php echo $this->getStoreLabel('lastname') ?>" class="input-text required-entry" <?php echo $this->getFieldParams() ?> />
84
  </div>
85
  </div>
86
  <?php if ($this->showSuffix()): ?>
87
  <div class="field name-suffix">
88
  <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>
89
  <div class="input-box">
90
- <?php if ($this->getSuffixOptions()===false): ?>
91
- <input type="text" id="<?php echo $this->getFieldId('suffix')?>" name="<?php echo $this->getFieldName('suffix')?>" value="<?php echo $this->htmlEscape($this->getObject()->getSuffix()) ?>" title="<?php echo $this->getStoreLabel('suffix') ?>" class="input-text<?php if ($this->isSuffixRequired()):?> required-entry<?php endif; ?>" <?php echo $this->getFieldParams() ?> />
92
  <?php else: ?>
93
- <select id="<?php echo $this->getFieldId('suffix')?>" name="<?php echo $this->getFieldName('suffix')?>" title="<?php echo $this->getStoreLabel('suffix') ?>"<?php if ($this->isSuffixRequired()):?> class="required-entry"<?php endif; ?> <?php echo $this->getFieldParams() ?>>
94
  <?php foreach ($this->getSuffixOptions() as $_option): ?>
95
  <option value="<?php echo $_option?>"<?php if ($this->getObject()->getSuffix()==$_option):?> selected="selected"<?php endif; ?>><?php echo $this->__($_option)?></option>
96
- <?php endforeach ?>
97
  </select>
98
  <?php endif; ?>
99
  </div>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
42
  ->setFieldParams('onchange="shipping.setSameAsBilling(false);"')
43
  ->toHtml() ?>
44
  */
45
+ /* @var $this Mage_Customer_Block_Widget_Name */
 
 
46
  ?>
47
  <div class="<?php echo $this->getContainerClassName()?>">
48
  <?php if ($this->showPrefix()): ?>
49
  <div class="field name-prefix">
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; ?>
59
  </select>
60
  <?php endif; ?>
61
  </div>
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()): ?>
71
+ <?php $isMiddlenameRequired = $this->isMiddlenameRequired(); ?>
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()): ?>
86
  <div class="field name-suffix">
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; ?>
96
  </select>
97
  <?php endif; ?>
98
  </div>
app/design/frontend/base/default/template/customer/widget/taxvat.phtml CHANGED
@@ -20,11 +20,11 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
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->htmlEscape($this->getTaxvat()) ?>" title="<?php echo $this->__('Tax/VAT number') ?>" class="input-text<?php if ($this->isRequired()):?> required-entry<?php endif; ?>" <?php echo $this->getFieldParams() ?> />
30
  </div>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
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>
app/design/frontend/base/default/template/customer/wishlist.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/directory/currency.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/directory/currency/switch.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/directory/js/optional_zip_countries.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/downloadable/catalog/product/links.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -40,7 +40,7 @@
40
  <?php endif; ?>
41
  <span class="label">
42
  <label for="links_<?php echo $_link->getId() ?>">
43
- <?php echo $_link->getTitle() ?>
44
  </label>
45
  <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
46
  &nbsp;(<a href="<?php echo $this->getLinkSamlpeUrl($_link) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo Mage::helper('downloadable')->__('sample') ?></a>)
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
40
  <?php endif; ?>
41
  <span class="label">
42
  <label for="links_<?php echo $_link->getId() ?>">
43
+ <?php echo $this->escapeHtml($_link->getTitle()); ?>
44
  </label>
45
  <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
46
  &nbsp;(<a href="<?php echo $this->getLinkSamlpeUrl($_link) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo Mage::helper('downloadable')->__('sample') ?></a>)
app/design/frontend/base/default/template/downloadable/catalog/product/samples.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
@@ -38,7 +38,7 @@
38
  <?php $_samples = $this->getSamples() ?>
39
  <?php foreach ($_samples as $_sample): ?>
40
  <dd>
41
- <a href="<?php echo $this->getSampleUrl($_sample) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $_sample->getTitle() ?></a>
42
  </dd>
43
  <?php endforeach; ?>
44
  </dl>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
38
  <?php $_samples = $this->getSamples() ?>
39
  <?php foreach ($_samples as $_sample): ?>
40
  <dd>
41
+ <a href="<?php echo $this->getSampleUrl($_sample) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_sample->getTitle()); ?></a>
42
  </dd>
43
  <?php endforeach; ?>
44
  </dl>
app/design/frontend/base/default/template/downloadable/catalog/product/type.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -55,7 +55,7 @@
55
  <dl class="item-options">
56
  <dt><?php echo $this->getLinksTitle() ?></dt>
57
  <?php foreach ($links as $link): ?>
58
- <dd><?php echo $link->getTitle() ?></dd>
59
  <?php endforeach; ?>
60
  </dl>
61
  <?php endif; ?>
@@ -64,7 +64,7 @@
64
  <?php if ($messages = $this->getMessages()): ?>
65
  <?php foreach ($messages as $message): ?>
66
  <div class="shopping-cart-item-message <?php echo $message['type'] ?>">
67
- * <?php echo $message['text'] ?>
68
  </div>
69
  <?php endforeach; ?>
70
  <?php endif; ?>
@@ -74,7 +74,7 @@
74
  </td>
75
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
76
  <td class="a-center">
77
- <input type="checkbox" value="1" name="cart[<?php echo $_item->getId() ?>][wishlist]" title="<?php echo $this->__('Move to Wishlist') ?>" class="checkbox" />
78
  </td>
79
  <?php endif ?>
80
  <?php if ($canApplyMsrp): ?>
@@ -180,7 +180,7 @@
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
- <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
184
  <td class="a-right">
185
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
186
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
@@ -225,7 +225,7 @@
225
  <?php endif; ?>
226
  </td>
227
  <?php endif; ?>
228
- <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
229
  <td>
230
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
231
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
55
  <dl class="item-options">
56
  <dt><?php echo $this->getLinksTitle() ?></dt>
57
  <?php foreach ($links as $link): ?>
58
+ <dd><?php echo $this->escapeHtml($link->getTitle()); ?></dd>
59
  <?php endforeach; ?>
60
  </dl>
61
  <?php endif; ?>
64
  <?php if ($messages = $this->getMessages()): ?>
65
  <?php foreach ($messages as $message): ?>
66
  <div class="shopping-cart-item-message <?php echo $message['type'] ?>">
67
+ * <?php echo $this->escapeHtml($message['text']) ?>
68
  </div>
69
  <?php endforeach; ?>
70
  <?php endif; ?>
74
  </td>
75
  <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
76
  <td class="a-center">
77
+ <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist"><?php echo $this->__('Move'); ?></a>
78
  </td>
79
  <?php endif ?>
80
  <?php if ($canApplyMsrp): ?>
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
+ <?php if (($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
184
  <td class="a-right">
185
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
186
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
225
  <?php endif; ?>
226
  </td>
227
  <?php endif; ?>
228
+ <?php if (($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
229
  <td>
230
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
231
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -50,7 +50,7 @@
50
  <dl class="item-options">
51
  <dt><?php echo $this->getLinksTitle() ?></dt>
52
  <?php foreach ($links as $link): ?>
53
- <dd><?php echo $link->getTitle() ?></dd>
54
  <?php endforeach; ?>
55
  </dl>
56
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
50
  <dl class="item-options">
51
  <dt><?php echo $this->getLinksTitle() ?></dt>
52
  <?php foreach ($links as $link): ?>
53
+ <dd><?php echo $this->escapeHtml($link->getTitle()); ?></dd>
54
  <?php endforeach; ?>
55
  </dl>
56
  <?php endif; ?>
app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -50,7 +50,7 @@
50
  <dl class="item-options">
51
  <dt><?php echo $this->getLinksTitle() ?></dt>
52
  <?php foreach ($links as $link): ?>
53
- <dd><?php echo $link->getTitle() ?></dd>
54
  <?php endforeach; ?>
55
  </dl>
56
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
50
  <dl class="item-options">
51
  <dt><?php echo $this->getLinksTitle() ?></dt>
52
  <?php foreach ($links as $link): ?>
53
+ <dd><?php echo $this->escapeHtml($link->getTitle()); ?></dd>
54
  <?php endforeach; ?>
55
  </dl>
56
  <?php endif; ?>
app/design/frontend/base/default/template/downloadable/checkout/success.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/downloadable/customer/products/list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -57,7 +57,7 @@
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->htmlEscape($_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 $_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>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
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>
app/design/frontend/base/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -41,7 +41,7 @@
41
  <dl style="margin:0; padding:0;">
42
  <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
43
  <?php foreach ($links as $link): ?>
44
- <dd style="margin:0; padding:0 0 0 9px;"><?php echo $link->getLinkTitle() ?></dd>
45
  <?php endforeach; ?>
46
  </dl>
47
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
41
  <dl style="margin:0; padding:0;">
42
  <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
43
  <?php foreach ($links as $link): ?>
44
+ <dd style="margin:0; padding:0 0 0 9px;"><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
45
  <?php endforeach; ?>
46
  </dl>
47
  <?php endif; ?>
app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -42,7 +42,7 @@
42
  <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
43
  <?php foreach ($links as $link): ?>
44
  <dd style="margin:0; padding:0 0 0 9px;">
45
- <?php echo $link->getLinkTitle() ?>&nbsp;
46
  (<a href="<?php echo $this->getPurchasedLinkUrl($link) ?>" style="color:#1E7EC8;"><?php echo Mage::helper('downloadable')->__('download') ?></a>)
47
  </dd>
48
  <?php endforeach; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
42
  <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
43
  <?php foreach ($links as $link): ?>
44
  <dd style="margin:0; padding:0 0 0 9px;">
45
+ <?php echo $this->escapeHtml($link->getLinkTitle()); ?>&nbsp;
46
  (<a href="<?php echo $this->getPurchasedLinkUrl($link) ?>" style="color:#1E7EC8;"><?php echo Mage::helper('downloadable')->__('download') ?></a>)
47
  </dd>
48
  <?php endforeach; ?>
app/design/frontend/base/default/template/downloadable/email/order/items/order/downloadable.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -42,7 +42,7 @@
42
  <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
43
  <?php foreach ($links as $link): ?>
44
  <dd style="margin:0; padding:0 0 0 9px;">
45
- <?php echo $link->getLinkTitle() ?>&nbsp;
46
  (<a href="<?php echo $this->getPurchasedLinkUrl($link) ?>" style="color:#1E7EC8;"><?php echo Mage::helper('downloadable')->__('download') ?></a>)
47
  </dd>
48
  <?php endforeach; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
42
  <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
43
  <?php foreach ($links as $link): ?>
44
  <dd style="margin:0; padding:0 0 0 9px;">
45
+ <?php echo $this->escapeHtml($link->getLinkTitle()); ?>&nbsp;
46
  (<a href="<?php echo $this->getPurchasedLinkUrl($link) ?>" style="color:#1E7EC8;"><?php echo Mage::helper('downloadable')->__('download') ?></a>)
47
  </dd>
48
  <?php endforeach; ?>
app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -56,7 +56,7 @@
56
  <dl class="item-options">
57
  <dt><?php echo $this->getLinksTitle() ?></dt>
58
  <?php foreach ($links->getPurchasedItems() as $link): ?>
59
- <dd><?php echo $link->getLinkTitle() ?></dd>
60
  <?php endforeach; ?>
61
  </dl>
62
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
56
  <dl class="item-options">
57
  <dt><?php echo $this->getLinksTitle() ?></dt>
58
  <?php foreach ($links->getPurchasedItems() as $link): ?>
59
+ <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
60
  <?php endforeach; ?>
61
  </dl>
62
  <?php endif; ?>
app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -57,7 +57,7 @@
57
  <dl class="item-options">
58
  <dt><?php echo $this->getLinksTitle() ?></dt>
59
  <?php foreach ($links->getPurchasedItems() as $link): ?>
60
- <dd><?php echo $link->getLinkTitle() ?></dd>
61
  <?php endforeach; ?>
62
  </dl>
63
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
57
  <dl class="item-options">
58
  <dt><?php echo $this->getLinksTitle() ?></dt>
59
  <?php foreach ($links->getPurchasedItems() as $link): ?>
60
+ <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
61
  <?php endforeach; ?>
62
  </dl>
63
  <?php endif; ?>
app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -56,7 +56,7 @@
56
  <dl class="item-options">
57
  <dt><?php echo $this->getLinksTitle() ?></dt>
58
  <?php foreach ($links->getPurchasedItems() as $link): ?>
59
- <dd><?php echo $link->getLinkTitle() ?></dd>
60
  <?php endforeach; ?>
61
  </dl>
62
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
56
  <dl class="item-options">
57
  <dt><?php echo $this->getLinksTitle() ?></dt>
58
  <?php foreach ($links->getPurchasedItems() as $link): ?>
59
+ <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
60
  <?php endforeach; ?>
61
  </dl>
62
  <?php endif; ?>
app/design/frontend/base/default/template/email/order/creditmemo/items.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/email/order/invoice/items.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/email/order/items.phtml CHANGED
@@ -20,11 +20,12 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
 
28
  <table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
29
  <thead>
30
  <tr>
@@ -70,3 +71,4 @@
70
  </table>
71
  <?php endif; ?>
72
  <?php endif; ?>
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
+ <?php if ($_order): ?>
29
  <table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
30
  <thead>
31
  <tr>
71
  </table>
72
  <?php endif; ?>
73
  <?php endif; ?>
74
+ <?php endif; ?>
app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/email/order/items/invoice/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/email/order/items/order/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/email/order/items/shipment/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/email/order/shipment/items.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/email/order/shipment/track.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/email/productalert/price.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/email/productalert/stock.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/giftmessage/inline.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -115,7 +115,7 @@ billing.onSave = function(evt){
115
  <input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_messages_for_order" value="1" onclick="toogleVisibilityOnObjects(this, ['allow-gift-messages-for-order-container']);"<?php if($this->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
116
  <label for="allow_gift_messages_for_order"><?php echo $this->__('Add gift options for the Entire Order') ?></label>
117
  </p>
118
- <div class="allow-gift-messages-for-order-container">
119
  <p><?php echo $this->__('You can leave this box blank if you do not wish to add a gift message for whole order.') ?></p>
120
  <input type="hidden" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][type]" value="quote" />
121
  <ul class="form-list">
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
115
  <input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_messages_for_order" value="1" onclick="toogleVisibilityOnObjects(this, ['allow-gift-messages-for-order-container']);"<?php if($this->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
116
  <label for="allow_gift_messages_for_order"><?php echo $this->__('Add gift options for the Entire Order') ?></label>
117
  </p>
118
+ <div class="allow-gift-messages-for-order-container" id="allow-gift-messages-for-order-container" style="display:none">
119
  <p><?php echo $this->__('You can leave this box blank if you do not wish to add a gift message for whole order.') ?></p>
120
  <input type="hidden" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][type]" value="quote" />
121
  <ul class="form-list">
app/design/frontend/base/default/template/googleanalytics/ga.phtml ADDED
@@ -0,0 +1,45 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <?php if (!Mage::helper('core/cookie')->isUserNotAllowSaveCookie()): ?>
28
+ <?php $accountId = Mage::getStoreConfig(Mage_GoogleAnalytics_Helper_Data::XML_PATH_ACCOUNT) ?>
29
+ <!-- BEGIN GOOGLE ANALYTICS CODEs -->
30
+ <script type="text/javascript">
31
+ //<![CDATA[
32
+ var _gaq = _gaq || [];
33
+ <?php echo $this->_getPageTrackingCode($accountId) ?>
34
+ <?php echo $this->_getOrdersTrackingCode() ?>
35
+
36
+ (function() {
37
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
38
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
39
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
40
+ })();
41
+
42
+ //]]>
43
+ </script>
44
+ <!-- END GOOGLE ANALYTICS CODE -->
45
+ <?php endif; ?>
app/design/frontend/base/default/template/googlecheckout/form.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/googlecheckout/link.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/newsletter/subscribe.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -30,8 +30,9 @@
30
  </div>
31
  <form action="<?php echo $this->getFormActionUrl() ?>" method="post" id="newsletter-validate-detail">
32
  <div class="block-content">
33
- <div class="form-subscribe-header"><?php echo $this->__('Sign up for our newsletter') ?></div>
34
- <label for="newsletter"><?php echo $this->__('Sign Up for Our Newsletter:') ?></label>
 
35
  <div class="input-box">
36
  <input type="text" name="email" id="newsletter" title="<?php echo $this->__('Sign up for our newsletter') ?>" class="input-text required-entry validate-email" />
37
  </div>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
30
  </div>
31
  <form action="<?php echo $this->getFormActionUrl() ?>" method="post" id="newsletter-validate-detail">
32
  <div class="block-content">
33
+ <div class="form-subscribe-header">
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>
app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml ADDED
@@ -0,0 +1,62 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <?php
28
+ /**
29
+ * "Grant Access" button
30
+ *
31
+ * @var $this Mage_Oauth_Block_Authorize_ButtonBaseAbstract
32
+ */
33
+ $logo = $this->getSkinUrl('images/logo-large.gif', array('_area' => 'adminhtml', '_package' => 'default'));
34
+ ?>
35
+ <div class="login-container">
36
+ <div class="login-box">
37
+ <div class="page-title">
38
+ <h1><?php echo $this->__('Authorize application') ?></h1>
39
+ </div>
40
+ <div class="form-box">
41
+ <div>
42
+ <div id="messages">
43
+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
44
+ </div>
45
+ <?php if (!$this->getHasException()) : ?>
46
+ <h2><?php echo $this->__('<strong>%s</strong> requests access to your account', $this->escapeHtml($this->getConsumer()->getName())); ?></h2>
47
+ <p><?php echo $this->__('After authorization application will have access to you account.'); ?></p>
48
+ <form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
49
+ <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
50
+ <button type="submit" class="button" title="<?php echo $this->__('Authorize') ?>">
51
+ <span><span><?php echo $this->__('Authorize') ?></span></span></button>
52
+ </form>
53
+ <form id="oauth_authorize_reject" action="<?php echo $this->getRejectUrl() ?>" method="get">
54
+ <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
55
+ <button type="submit" class="button" title="<?php echo $this->__('Reject') ?>">
56
+ <span><span><?php echo $this->__('Reject') ?></span></span></button>
57
+ </form>
58
+ <?php endif; ?>
59
+ </div>
60
+ </div>
61
+ </div>
62
+ </div>
app/design/frontend/base/default/template/oauth/authorize/button.phtml ADDED
@@ -0,0 +1,53 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ /**
27
+ * "Grant Access" button
28
+ *
29
+ * @var $this Mage_Oauth_Block_Authorize_Button
30
+ */
31
+ ?>
32
+ <div>
33
+ <div class="page-title">
34
+ <h1><?php echo $this->__('Authorize application') ?></h1>
35
+ </div>
36
+ <?php echo $this->getMessagesBlock()->toHtml() ?>
37
+
38
+ <?php if (!$this->getHasException()): ?>
39
+ <h2><?php echo $this->__('<strong>%s</strong> requests access to your account', $this->escapeHtml($this->getConsumer()->getName())); ?></h2>
40
+ <p><?php echo $this->__('After authorization application will have access to you account.'); ?></p>
41
+ <form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
42
+ <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
43
+ <button type="submit" class="button" title="<?php echo $this->__('Authorize') ?>" name="authorize">
44
+ <span><span><?php echo $this->__('Authorize') ?></span></span></button>
45
+ </form>
46
+ <form id="oauth_authorize_reject" action="<?php echo $this->getRejectUrl() ?>" method="get">
47
+ <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
48
+ <button type="submit" class="button" title="<?php echo $this->__('Reject') ?>">
49
+ <span><span><?php echo $this->__('Reject') ?></span></span></button>
50
+ </form>
51
+ <?php endif; ?>
52
+
53
+ </div>
app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml ADDED
@@ -0,0 +1,52 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /**
28
+ * Authorize confirmation simple template
29
+ *
30
+ * @var $this Mage_Oauth_Block_AuthorizeBaseAbstract
31
+ */
32
+ ?>
33
+ <div class="login-container">
34
+ <div class="login-box">
35
+ <div class="page-title">
36
+ <h1><?php echo $this->__('Confirmation Of Authorization') ?></h1>
37
+ </div>
38
+ <div class="form-box">
39
+ <?php echo $this->getMessagesBlock()->toHtml() ?>
40
+ <?php if ($this->getVerifier()): ?>
41
+ <h2><?php echo $this->__('Authorization confirmed') ?></h2>
42
+ <p><?php echo $this->__('Give the verifier code to application administrator') ?></p>
43
+ <p style="font-size: 14px;"><?php echo $this->__('Verifier code: %s', $this->getVerifier()) ?></p>
44
+ <?php endif; ?>
45
+ <button type="submit" class="button"
46
+ onclick="window.close();"
47
+ title="<?php echo $this->__('Close') ?>">
48
+ <span><span><?php echo $this->__('Close') ?></span></span>
49
+ </button>
50
+ </div>
51
+ </div>
52
+ </div>
app/design/frontend/base/default/template/oauth/authorize/confirm.phtml ADDED
@@ -0,0 +1,42 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /**
28
+ * Authorize confirm simple template
29
+ *
30
+ * @var $this Mage_Oauth_Block_Authorize
31
+ */
32
+ ?>
33
+ <div class="account-login login-only">
34
+ <div class="page-title">
35
+ <h1><?php echo $this->__('Confirmation Of Authorization') ?></h1>
36
+ </div>
37
+ <?php echo $this->getMessagesBlock()->toHtml() ?>
38
+ <?php if ($this->getVerifier()): ?>
39
+ <p><?php echo $this->__('Give the verifier code to application administrator') ?></p>
40
+ <p style="font-size: 14px;"><?php echo $this->__('Verifier code: %s', $this->getVerifier()) ?></p>
41
+ <?php endif; ?>
42
+ </div>
app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml ADDED
@@ -0,0 +1,75 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /**
28
+ * Simple login form template
29
+ *
30
+ * @var $this Mage_Oauth_Block_Authorize
31
+ */
32
+ ?>
33
+ <div class="content-container">
34
+ <div class="login-box">
35
+ <div class="page-title">
36
+ <h1><?php echo $this->__('Log In') ?></h1>
37
+ </div>
38
+ <div class="form-box">
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>
45
+ <div class="login-form simple">
46
+ <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>"/>
47
+ <div class="input-box input-left">
48
+ <label for="username">
49
+ <em class="required">*</em>&nbsp;<?php echo $this->getIdentityLabel(); ?>
50
+ </label>
51
+ <input type="text" id="username" name="login[username]" value="" class="required-entry input-text"/>
52
+ </div>
53
+ <div class="clear"></div>
54
+ <div class="input-box input-right">
55
+ <label for="login">
56
+ <em class="required">*</em>&nbsp;<?php echo $this->__('Password') ?>
57
+ </label>
58
+ <input type="password" id="login" name="login[password]" class="required-entry input-text"
59
+ value=""/></div>
60
+ <div class="clear"></div>
61
+ <div class="form-buttons">
62
+ <button type="submit" class="form-button"
63
+ title="<?php echo $this->__('Login') ?>"/><?php echo $this->__('Login') ?></button>
64
+ <button type="button" onclick="document.location.href='<?php echo $this->getRejectUrl(); ?>';"
65
+ title="<?php echo $this->__('Reject') ?>"><?php echo $this->__('Reject') ?></button>
66
+ <p class="required"><?php echo $this->__('* Required Fields') ?></p>
67
+ </div>
68
+ </div>
69
+ </fieldset>
70
+ </form>
71
+ <?php endif; ?>
72
+ </div>
73
+ <div class="bottom"></div>
74
+ </div>
75
+ </div>
app/design/frontend/base/default/template/oauth/authorize/form/login.phtml ADDED
@@ -0,0 +1,76 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /**
28
+ * Customer login form template
29
+ *
30
+ * @var $this Mage_Oauth_Block_Authorize
31
+ */
32
+
33
+ $rejectJs = "document.location.href='{$this->getRejectUrl()}';";
34
+ ?>
35
+ <div class="account-login">
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;">
42
+ <h2><?php echo $this->__('Log in as a customer') ?></h2>
43
+ <p class="description"><?php echo $this->__('Log in to use <strong>%s</strong>', $this->getConsumer()->getName()) ?></p>
44
+ <ul class="form-list">
45
+ <li>
46
+ <label for="email"><?php echo $this->__('Email Address') ?></label>
47
+ <div class="input-box">
48
+ <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') ?>" />
49
+ </div>
50
+ </li>
51
+ <li>
52
+ <label for="pass"><?php echo $this->__('Password') ?></label>
53
+ <div class="input-box">
54
+ <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
55
+ </div>
56
+ </li>
57
+ </ul>
58
+ <div class="buttons-set" style="margin-top: 20px; padding: 0;">
59
+ <button type="submit" class="button" title="<?php echo $this->__('Login') ?>" name="send" id="send2">
60
+ <span><span><?php echo $this->__('Login') ?></span></span></button>
61
+ <button type="submit" class="button" onclick="<?php echo $rejectJs; ?>"
62
+ title="<?php echo $this->__('Reject') ?>" name="send">
63
+ <span><span><?php echo $this->__('Reject') ?></span></span></button>
64
+ </div>
65
+ </div>
66
+ </div>
67
+ </div>
68
+ <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>"/>
69
+ </form>
70
+ <script type="text/javascript">
71
+ //<![CDATA[
72
+ var dataForm = new VarienForm('login-form', true);
73
+ //]]>
74
+ </script>
75
+ <?php endif; ?>
76
+ </div>
app/design/frontend/base/default/template/oauth/authorize/head-simple.phtml ADDED
@@ -0,0 +1,38 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /**
28
+ * Head block Oauth simple pages
29
+ *
30
+ * @var $this Mage_Page_Block_Html_Head
31
+ */
32
+ ?>
33
+ <meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>" />
34
+ <title><?php echo $this->getTitle() ?></title>
35
+ <link rel="icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon" />
36
+ <link rel="shortcut icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon" />
37
+
38
+ <?php echo $this->getCssJsHtml() ?>
app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml ADDED
@@ -0,0 +1,47 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /**
28
+ * Authorize rejection simple template
29
+ *
30
+ * @var $this Mage_Oauth_Block_AuthorizeBaseAbstract
31
+ */
32
+ ?>
33
+ <div class="login-container">
34
+ <div class="login-box">
35
+ <div class="page-title">
36
+ <h1><?php echo $this->__('Rejection Of Authorization') ?></h1>
37
+ </div>
38
+ <div class="form-box">
39
+ <div id="messages">
40
+ <?php echo $this->getMessagesBlock()->toHtml() ?>
41
+ </div>
42
+ <button type="submit" class="button" onclick="window.close();" title="<?php echo $this->__('Close') ?>">
43
+ <span><span><?php echo $this->__('Close') ?></span></span>
44
+ </button>
45
+ </div>
46
+ </div>
47
+ </div>
app/design/frontend/base/default/template/oauth/authorize/reject.phtml ADDED
@@ -0,0 +1,38 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /**
28
+ * Token rejection template
29
+ *
30
+ * @var $this Mage_Oauth_Block_Authorize_Button
31
+ */
32
+ ?>
33
+ <div class="account-login login-only">
34
+ <div class="page-title">
35
+ <h1><?php echo $this->__('Reject authorization') ?></h1>
36
+ </div>
37
+ <?php echo $this->getMessagesBlock()->toHtml() ?>
38
+ </div>
app/design/frontend/base/default/template/oauth/customer/token/list.phtml ADDED
@@ -0,0 +1,72 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /** @var $this Mage_Oauth_Block_Customer_Token_List */
28
+ ?>
29
+ <?php echo $this->getMessagesBlock()->toHtml() ?>
30
+ <div class="page-title">
31
+ <h1><?php echo $this->__('My Applications') ?></h1>
32
+ </div>
33
+ <?php if ($this->getCollection() && $this->count()): ?>
34
+ <?php echo $this->getToolbarHtml() ?>
35
+ <table class="data-table" id="my-apps-table">
36
+ <col />
37
+ <col width="100" align="right" />
38
+ <col width="110" align="right" />
39
+ <thead>
40
+ <tr>
41
+ <th><?php echo $this->__('App Name') ?></th>
42
+ <th><?php echo $this->__('Status') ?></th>
43
+ <th>&nbsp;</th>
44
+ </tr>
45
+ </thead>
46
+ <tbody>
47
+ <?php /** @var $item Mage_Oauth_Model_Token */ ?>
48
+ <?php foreach ($this->getCollection() as $item) : ?>
49
+ <tr>
50
+ <td><span class="app-name">
51
+ <?php echo $this->escapeHtml($item->getName()); ?></span></td>
52
+ <td><em><?php echo $this->getStatusLabel($item->getRevoked()) ?></em></td>
53
+ <td align="right">
54
+ <a href="<?php echo $this->getUpdateRevokeLink($item)?>" class="nobr"
55
+ onclick="return confirm('<?php echo $this->getChangeStatusConfirmMessage($item->getRevoked()) ?>')">
56
+ <?php echo $this->getChangeStatusLabel($item->getRevoked()) ?></a>
57
+ <span class="separator">|</span> <a href="<?php echo $this->getDeleteLink($item)?>" class="nobr"
58
+ onclick="return confirm('<?php echo $this->__('Are you sure you want to delete this application?') ?>')">
59
+ <?php echo $this->__('Delete') ?></a></td>
60
+ </tr>
61
+ <?php endforeach; ?>
62
+ </tbody>
63
+ </table>
64
+ <script type="text/javascript">
65
+ //<![CDATA[
66
+ decorateTable('my-apps-table');
67
+ //]]>
68
+ </script>
69
+ <?php echo $this->getToolbarHtml() ?>
70
+ <?php else: ?>
71
+ <p><?php echo $this->__('You have no applications.'); ?></p>
72
+ <?php endif; ?>
app/design/frontend/base/default/template/page/1column.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/2columns-left.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/2columns-right.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/3columns.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/empty.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/html/breadcrumbs.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/html/footer.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/html/head.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/html/header.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
app/design/frontend/base/default/template/page/html/notices.phtml CHANGED
@@ -20,25 +20,50 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
  <?php
28
  /**
29
- * @see Mage_Page_Block_Html_Notices
30
  */
31
  ?>
32
  <?php if ($this->displayNoscriptNotice()): ?>
33
  <noscript>
34
- <div class="noscript">
35
- <div class="noscript-inner">
36
- <p><strong><?php echo $this->__('JavaScript seem to be disabled in your browser.'); ?></strong></p>
37
- <p><?php echo $this->__('You must have JavaScript enabled in your browser to utilize the functionality of this website.'); ?></p>
 
 
38
  </div>
39
  </div>
40
  </noscript>
41
  <?php endif; ?>
42
  <?php if ($this->displayDemoNotice()): ?>
43
- <p class="demo-notice"><?php echo $this->__('This is a demo store. Any orders placed through this store will not be honored or fulfilled.') ?></p>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
44
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
  <?php
28
  /**
29
+ * @var $this Mage_Page_Block_Html_Notices
30
  */
31
  ?>
32
  <?php if ($this->displayNoscriptNotice()): ?>
33
  <noscript>
34
+ <div class="global-site-notice noscript">
35
+ <div class="notice-inner">
36
+ <p>
37
+ <strong><?php echo $this->__('JavaScript seems to be disabled in your browser.'); ?></strong><br />
38
+ <?php echo $this->__('You must have JavaScript enabled in your browser to utilize the functionality of this website.'); ?>
39
+ </p>
40
  </div>
41
  </div>
42
  </noscript>
43
  <?php endif; ?>
44
  <?php if ($this->displayDemoNotice()): ?>
45
+ <div class="global-site-notice demo-notice">
46
+ <div class="notice-inner"><p><?php echo $this->__('This is a demo store. Any orders placed through this store will not be honored or fulfilled.') ?></p></div>
47
+ </div>
48
+ <?php endif; ?>
49
+ <?php if (Mage::helper('core/cookie')->isUserNotAllowSaveCookie()): ?>
50
+ <div class="global-site-notice notice-cookie" id="notice-cookie-block" style="display: none">
51
+ <div class="notice-inner">
52
+ <p><?php echo $this->__('This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our <a href="%s">Privacy Policy page</a>. To accept cookies from this site, please click the Allow button below.', $this->getPrivacyPolicyLink()) ?></p>
53
+ <div class="actions"><button class="button" onclick="allowSaveCookie()"><span><span><?php echo $this->__('Allow');?></span></span></button></div>
54
+ </div>
55
+ </div>
56
+ <script type="text/javascript">
57
+ /* <![CDATA[ */
58
+ function allowSaveCookie() {
59
+ Mage.Cookies.set('<?php echo Mage_Core_Helper_Cookie::IS_USER_ALLOWED_SAVE_COOKIE; ?>', '<?php echo Mage::helper('core/cookie')->getAcceptedSaveCookiesWebsiteIds()?>', new Date(new Date().getTime() + <?php echo Mage::helper('core/cookie')->getCookieRestrictionLifetime() ?> * 1000));
60
+ if (Mage.Cookies.get('<?php echo Mage_Core_Helper_Cookie::IS_USER_ALLOWED_SAVE_COOKIE; ?>')) {
61
+ window.location.reload();
62
+ } else {
63
+ window.location.href = '<?php echo Mage::getUrl('cms/index/noCookies')?>';
64
+ }
65
+ }
66
+ $('notice-cookie-block').show();
67
+ /* ]]> */
68
+ </script>
69
  <?php endif; ?>
app/design/frontend/base/default/template/page/html/pager.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/html/top.links.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/html/topmenu.phtml ADDED
@@ -0,0 +1,41 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <?php
28
+ /**
29
+ * Top menu for store
30
+ *
31
+ * @see Mage_Page_Block_Html_Topmenu
32
+ */
33
+ ?>
34
+ <?php $_menu = $this->getHtml('level-top') ?>
35
+ <?php if($_menu): ?>
36
+ <div class="nav-container">
37
+ <ul id="nav">
38
+ <?php echo $_menu ?>
39
+ </ul>
40
+ </div>
41
+ <?php endif ?>
app/design/frontend/base/default/template/page/html/wrapper.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/js/calendar.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/js/cookie.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/popup.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/print.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/redirect.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/switch/flags.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/switch/languages.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/switch/stores.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/template/container.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/template/links.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/page/template/linksblock.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/pagecache/cookie.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/paygate/form/cc.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/paygate/info/cc.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/payment/catalog/product/view/profile/options.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/payment/catalog/product/view/profile/schedule.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/payment/form/banktransfer.phtml ADDED
@@ -0,0 +1,35 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <?php if ($instructions = $this->getInstructions()): ?>
28
+ <ul class="form-list checkout-agreements" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
29
+ <li>
30
+ <div class="<?php echo $this->getMethodCode() ?>-instructions-content agreement-content">
31
+ <?php echo nl2br($instructions) ?>
32
+ </div>
33
+ </li>
34
+ </ul>
35
+ <?php endif; ?>
app/design/frontend/base/default/template/payment/form/cashondelivery.phtml ADDED
@@ -0,0 +1,39 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /**
28
+ * @see Saas_Payment_Block_Form_Cashondelivery
29
+ */
30
+ ?>
31
+ <?php if ($this->getInstructions()): ?>
32
+ <ul class="form-list checkout-agreements" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
33
+ <li>
34
+ <div class="<?php echo $this->getMethodCode() ?>-instructions-content agreement-content">
35
+ <?php echo nl2br($this->getInstructions()) ?>
36
+ </div>
37
+ </li>
38
+ </ul>
39
+ <?php endif; ?>
app/design/frontend/base/default/template/payment/form/cc.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/payment/form/ccsave.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/payment/form/checkmo.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/payment/form/purchaseorder.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/payment/info/banktransfer.phtml ADDED
@@ -0,0 +1,41 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <?php
28
+ /**
29
+ * @see Mage_Payment_Block_Info
30
+ */
31
+ ?>
32
+ <p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
33
+ <?php if ($this->getInstructions()): ?>
34
+ <table>
35
+ <tbody>
36
+ <tr>
37
+ <td><?php echo nl2br($this->getInstructions()) ?></td>
38
+ </tr>
39
+ </tbody>
40
+ </table>
41
+ <?php endif; ?>
app/design/frontend/base/default/template/payment/info/checkmo.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/payment/info/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/payment/info/purchaseorder.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/paypal/express/review.phtml CHANGED
@@ -20,115 +20,90 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.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 $this->__('Review Order') ?></h1>
29
  </div>
30
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31
-
32
- <?php if ($this->getShippingAddress()): ?>
33
- <div class="info-set col2-set">
34
- <h2 class="legend"><?php echo $this->__('Shipping Information') ?></h2>
35
- <div class="col-1">
36
- <div class="box">
37
- <div class="box-title">
38
- <h3><?php echo $this->__('Shipping Address') ?><span class="separator"><?php if ($this->getCanEditShippingAddress()):?> | </span><a href="<?php echo $this->getEditUrl() ?>"><?php echo $this->__('Change Shipping Address') ?></a><?php endif;?></h3>
39
- </div>
40
- <div class="box-content">
41
- <address><?php echo $this->renderAddress($this->getShippingAddress())?></address>
42
- </div>
 
 
 
 
 
 
 
 
 
 
 
43
  </div>
44
- </div>
45
- <div class="col-2">
46
- <div class="box">
47
- <div class="box-title">
48
- <h3><?php echo $this->__('Shipping Method') ?></h3>
49
- </div>
50
- <div class="box-content">
51
- <?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?>
52
- <?php if ($groups = $this->getShippingRateGroups()):?>
53
- <?php $currentRate = $this->getCurrentShippingRate(); ?>
54
- <form method="post" id="shipping_method_form" action="<?php echo $this->escapeHtml($this->getShippingMethodSubmitUrl()) ?>">
55
- <fieldset>
56
- <select name="shipping_method" id="shipping_method" style="width:250px;" class="required-entry">
57
- <?php if (!$currentRate):?>
58
- <option value=""><?php echo $this->__('Please select a shipping method...') ?></option>
59
- <?php endif;?>
60
- <?php foreach ($groups as $code => $rates):?>
61
- <optgroup label="<?php echo $this->getCarrierName($code) ?>" style="font-style:normal;">
62
- <?php foreach ($rates as $rate):?>
63
- <option value="<?php echo $this->renderShippingRateValue($rate)?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : '' ;?>>
64
- <?php echo $this->renderShippingRateOption($rate)?>
65
- </option>
66
- <?php endforeach;?>
67
- </optgroup>
68
- <?php endforeach;?>
69
- </select>
70
- </fieldset>
71
- <p class="actions">
72
- <button id="update_shipping_method_submit" type="submit" class="button"><span><span><?php echo $this->__('Update Shipping Method') ?></span></span></button>
73
- </p>
74
- </form>
75
- <?php else: ?>
76
- <p><strong><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></strong></p>
77
- <?php endif;?>
78
  <?php else: ?>
79
- <p><strong><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate())?></strong></p>
80
  <?php endif; ?>
81
- </div>
82
  </div>
83
- </div>
84
- </div>
85
- <?php endif; ?>
86
-
87
- <div class="info-set col2-set">
88
- <h2 class="legend"><?php echo $this->__('Billing Information') ?></h2>
89
- <div class="col-1">
90
- <div class="box">
91
- <div class="box-title">
92
- <h3><?php echo $this->__('Payment Method') ?> <span class="separator">|</span>
93
- <?php if($this->getEditUrl()):?><a href="<?php echo $this->getEditUrl() ?>"><?php echo $this->__('Change Payment Method') ?></a> <?php endif ?>
94
- </h3>
95
- </div>
96
- <div class="box-content">
97
- <?php echo $this->escapeHtml($this->getPaymentMethodTitle()) ?>
98
- </div>
99
  </div>
100
  </div>
101
- <div class="col-2">
102
- <div class="box">
103
- <div class="box-title">
104
- <h3><?php echo $this->__('Billing Address') ?></h3>
105
- </div>
106
- <div class="box-content">
107
- <address>
108
- <?php echo $this->renderAddress($this->getBillingAddress()) ?><br />
109
- <?php echo $this->__('Payer Email: %s', $this->getBillingAddress()->getEmail()) ?>
110
- </address>
111
  </div>
112
  </div>
 
113
  </div>
114
- </div>
115
 
116
- <div class="info-set">
117
- <h2 class="legend"><?php echo $this->__('Items in Your Shopping Cart') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo $this->__('Edit Shopping Cart') ?></a></h2>
118
- <div id="details-reload">
119
- <?php echo $this->getChildHtml('details') ?>
 
120
  </div>
 
 
 
 
 
 
 
 
 
 
121
  </div>
122
- <form method="post" id="order_review_form" action="<?php echo $this->getPlaceOrderUrl() ?>">
123
- <?php echo $this->getChildHtml('agreements'); ?>
124
- <div class="buttons-set buttons-set-order" id="review-buttons-container">
125
- <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>
126
- <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>
127
- <span class="please-wait" id="review-please-wait" style="display:none;">
128
- <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...') ?>
129
- </span>
130
- </div>
131
- </form>
132
  <script type="text/javascript">
133
  //<![CDATA[
134
  // submit buttons are not needed when submitting with ajax
@@ -181,10 +156,16 @@ if ($('update_shipping_method_submit')) {
181
  }
182
  }
183
  <?php endif ?>
184
-
185
  PayPalExpressAjax = new OrderReviewController($('order_review_form'), $('review_button'),
186
- $('shipping_method'), $('shipping_method_form'), 'details-reload'
187
  );
188
  PayPalExpressAjax.addPleaseWait($('review-please-wait'));
 
 
 
 
 
 
 
189
  //]]>
190
  </script>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
+ /** @var $this Mage_Paypal_Block_Express_Review */
27
+
28
+ $billingBlock = $this->getChild('billing')->setFieldNamePrefix('billing')->setHideEmailAddress(true);
29
+ $shippingAddress = $this->getShippingAddress();
30
  ?>
31
  <div class="page-title">
32
  <h1><?php echo $this->__('Review Order') ?></h1>
33
  </div>
34
+ <?php echo $this->getMessagesBlock()->toHtml() ?>
35
+ <script type="text/javascript">
36
+ //<![CDATA[
37
+ var countryRegions = <?php echo $this->helper('directory')->getRegionJson() ?>
38
+ //]]>
39
+ </script>
40
+ <h2 class="sub-title">
41
+ Please confirm your addresses
42
+ </h2>
43
+ <div class="paypal-review-order">
44
+ <form method="post" id="order_review_form" action="<?php echo $this->getPlaceOrderUrl() ?>">
45
+ <?php if(!$billingBlock->isCustomerLoggedIn()): ?>
46
+ <div class="info-set col2-set">
47
+ <h2 class="legend"><?php echo $this->__('Customer Information') ?></h2>
48
+ <ul class="form-list form-list-narrow">
49
+ <li id="customer-info-form" class="address-form">
50
+ <div class="field">
51
+ <label for="customer:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
52
+ <div class="input-box">
53
+ <input type="text" name="customer-email" id="customer:email" value="<?php echo $this->escapeHtml($billingBlock->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
54
+ </div>
55
+ </div>
56
+ </li>
57
+ </ul>
58
  </div>
59
+ <?php endif ?>
60
+ <div class="info-set col2-set">
61
+ <div class="col-1" id="billing-address">
62
+ <h2 class="legend"><?php echo $this->__('Billing Address') ?></h2>
63
+ <?php if ($shippingAddress): ?>
64
+ <?php echo $billingBlock->setShowAsShippingCheckbox(true)->toHtml(); ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
65
  <?php else: ?>
66
+ <?php echo $billingBlock->toHtml(); ?>
67
  <?php endif; ?>
 
68
  </div>
69
+ <?php if ($shippingAddress): ?>
70
+ <div class="col-2" id="shipping-address">
71
+ <h2 class="legend"><?php echo $this->__('Shipping Address') ?></h2>
72
+ <?php echo $this->getChild('shipping')->setFieldNamePrefix('shipping')->setHideEmailAddress(true)->toHtml(); ?>
 
 
 
 
 
 
 
 
 
 
 
 
73
  </div>
74
  </div>
75
+
76
+ <div class="info-set col2-set">
77
+ <div class="col-2">
78
+ <div class="box paypal-shipping-method">
79
+ <div class="box-title">
80
+ <h3><?php echo $this->__('Shipping Method') ?></h3>
81
+ </div>
82
+ <div class="box-content">
83
+ <?php echo $this->getChild('shipping_method')->toHtml(); ?>
84
+ </div>
85
  </div>
86
  </div>
87
+ <?php endif; ?>
88
  </div>
 
89
 
90
+ <div class="info-set">
91
+ <h2 class="legend"><?php echo $this->__('Items in Your Shopping Cart') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo $this->__('Edit Shopping Cart') ?></a></h2>
92
+ <div id="details-reload">
93
+ <?php echo $this->getChildHtml('details') ?>
94
+ </div>
95
  </div>
96
+ <?php echo $this->getChildHtml('agreements'); ?>
97
+ <div class="buttons-set buttons-set-order" id="review-buttons-container">
98
+ <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>
99
+ <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>
100
+ <button type="button" id="update_order" class="button btn-checkout"><span><span><?php echo $this->__('Update Order Data') ?></span></span></button>
101
+ <span class="please-wait" id="review-please-wait" style="display:none;">
102
+ <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...') ?>
103
+ </span>
104
+ </div>
105
+ </form>
106
  </div>
 
 
 
 
 
 
 
 
 
 
107
  <script type="text/javascript">
108
  //<![CDATA[
109
  // submit buttons are not needed when submitting with ajax
156
  }
157
  }
158
  <?php endif ?>
 
159
  PayPalExpressAjax = new OrderReviewController($('order_review_form'), $('review_button'),
160
+ 'shipping_method', null, 'details-reload'
161
  );
162
  PayPalExpressAjax.addPleaseWait($('review-please-wait'));
163
+ PayPalExpressAjax.setShippingAddressContainer($('shipping-address'));
164
+ PayPalExpressAjax.setShippingMethodContainer('shipping-method-container');
165
+ PayPalExpressAjax.shippingMethodsUpdateUrl = '<?php echo $this->escapeHtml($this->getUpdateShippingMethodsUrl()) ?>';
166
+ PayPalExpressAjax.setUpdateButton($('update_order'),'<?php echo $this->escapeHtml($this->getUpdateOrderSubmitUrl()) ?>','details-reload');
167
+ if ($('billing:as_shipping')) {
168
+ PayPalExpressAjax.setCopyElement($('billing:as_shipping'));
169
+ }
170
  //]]>
171
  </script>
app/design/frontend/base/default/template/paypal/express/review/address.phtml ADDED
@@ -0,0 +1,145 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <?php $prefix = $this->getFieldNamePrefix();?>
28
+ <fieldset>
29
+ <ul class="form-list form-list-narrow">
30
+ <li id="<?php echo $prefix ?>-address-form" class="address-form">
31
+ <fieldset>
32
+ <input type="hidden" name="<?php echo $prefix ?>[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="<?php echo $prefix ?>:address_id" />
33
+ <ul>
34
+ <li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat($prefix . ':%s')->setFieldNameFormat($prefix . '[%s]')->toHtml() ?></li>
35
+ <li class="fields">
36
+ <div class="field">
37
+ <label for="<?php echo $prefix ?>:company"><?php echo $this->__('Company') ?></label>
38
+ <div class="input-box">
39
+ <input type="text" id="<?php echo $prefix ?>:company" name="<?php echo $prefix ?>[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
40
+ </div>
41
+ </div>
42
+ <?php if(!$this->isCustomerLoggedIn() && !$this->getHideEmailAddress()): ?>
43
+ <div class="field">
44
+ <label for="<?php echo $prefix ?>:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
45
+ <div class="input-box">
46
+ <input type="text" name="<?php echo $prefix ?>[email]" id="<?php echo $prefix ?>:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
47
+ </div>
48
+ </div>
49
+ <?php endif; ?>
50
+ </li>
51
+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
52
+ <li class="wide">
53
+ <label for="<?php echo $prefix ?>:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
54
+ <div class="input-box">
55
+ <input type="text" title="<?php echo $this->__('Street Address') ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
56
+ </div>
57
+ </li>
58
+ <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
59
+ <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
60
+ <li class="add-field">
61
+ <div class="input-box">
62
+ <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street<?php echo $_i?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
63
+ </div>
64
+ </li>
65
+ <?php endfor; ?>
66
+ <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
67
+ <li class="wide">
68
+ <label for="<?php echo $prefix ?>:vat_id"><?php echo $this->__('VAT Number') ?></label>
69
+ <div class="input-box">
70
+ <input type="text" id="<?php echo $prefix ?>:vat_id" name="<?php echo $prefix ?>[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->__('VAT Number') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
71
+ </div>
72
+ </li>
73
+ <?php endif; ?>
74
+ <li class="fields">
75
+ <div class="field">
76
+ <label for="<?php echo $prefix ?>:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
77
+ <div class="input-box">
78
+ <input type="text" title="<?php echo $this->__('City') ?>" name="<?php echo $prefix ?>[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="<?php echo $prefix ?>:city" />
79
+ </div>
80
+ </div>
81
+ <div class="field">
82
+ <label for="<?php echo $prefix ?>:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
83
+ <div class="input-box">
84
+ <select id="<?php echo $prefix ?>:region_id" name="<?php echo $prefix ?>[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
85
+ <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
86
+ </select>
87
+ <script type="text/javascript">
88
+ //<![CDATA[
89
+ $('<?php echo $prefix ?>:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
90
+ //]]>
91
+ </script>
92
+ <input type="text" id="<?php echo $prefix ?>:region" name="<?php echo $prefix ?>[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
93
+ </div>
94
+ </div>
95
+ </li>
96
+ <li class="fields">
97
+ <div class="field">
98
+ <label for="<?php echo $prefix ?>:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
99
+ <div class="input-box">
100
+ <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="<?php echo $prefix ?>[postcode]" id="<?php echo $prefix ?>:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
101
+ </div>
102
+ </div>
103
+ <div class="field">
104
+ <label for="<?php echo $prefix ?>:country_id" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
105
+ <div class="input-box">
106
+ <?php echo $this->getCountryHtmlSelect($prefix) ?>
107
+ </div>
108
+ </div>
109
+ </li>
110
+ <li class="fields">
111
+ <div class="field">
112
+ <label for="<?php echo $prefix ?>:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
113
+ <div class="input-box">
114
+ <input type="text" name="<?php echo $prefix ?>[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="<?php echo $prefix ?>:telephone" />
115
+ </div>
116
+ </div>
117
+ <div class="field">
118
+ <label for="<?php echo $prefix ?>:fax"><?php echo $this->__('Fax') ?></label>
119
+ <div class="input-box">
120
+ <input type="text" name="<?php echo $prefix ?>[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="<?php echo $prefix ?>:fax" />
121
+ </div>
122
+ </div>
123
+ </li>
124
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
125
+ <?php if ($this->getShowAsShippingCheckbox()): ?>
126
+ <li class="control">
127
+ <div class="field">
128
+ <div class="input-box">
129
+ <input type="checkbox" name="<?php echo $prefix ?>[as_shipping]" class="checkbox" value="1" title="<?php echo $this->__('Same as shipping') ?>" id="<?php echo $prefix ?>:as_shipping" <?php if ($this->getAddress()->getSameAsBilling()):?>checked="checked"<?php endif;?>/>
130
+ </div>
131
+ <label for="<?php echo $prefix ?>:as_shipping"><?php echo $this->__('Same as shipping') ?></label>
132
+ </div>
133
+ </li>
134
+ <?php endif; ?>
135
+ </ul>
136
+ </fieldset>
137
+ </li>
138
+ </ul>
139
+ </fieldset>
140
+ <script type="text/javascript">
141
+ //<![CDATA[
142
+ var <?php echo $prefix ?>RegionUpdater = new RegionUpdater('<?php echo $prefix ?>:country_id', '<?php echo $prefix ?>:region', '<?php echo $prefix ?>:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, '<?php echo $prefix ?>:postcode');
143
+ <?php echo $prefix ?>RegionUpdater.update();
144
+ //]]>
145
+ </script>
app/design/frontend/base/default/template/paypal/express/review/details.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/paypal/express/review/shipping/method.phtml ADDED
@@ -0,0 +1,53 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ /** @var $this Mage_Paypal_Block_Express_Review */
27
+ ?>
28
+ <fieldset id="shipping-method-container">
29
+ <?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?>
30
+ <?php if ($groups = $this->getShippingRateGroups()):?>
31
+ <?php $currentRate = $this->getCurrentShippingRate(); ?>
32
+ <select name="shipping_method" id="shipping_method" style="width:250px;" class="required-entry">
33
+ <?php if (!$currentRate):?>
34
+ <option value=""><?php echo $this->__('Please select a shipping method...') ?></option>
35
+ <?php endif;?>
36
+ <?php foreach ($groups as $code => $rates):?>
37
+ <optgroup label="<?php echo $this->escapeHtml($this->getCarrierName($code)) ?>" style="font-style:normal;">
38
+ <?php foreach ($rates as $rate):?>
39
+ <option value="<?php echo $this->renderShippingRateValue($rate)?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : '' ;?>>
40
+ <?php echo $this->renderShippingRateOption($rate)?>
41
+ </option>
42
+ <?php endforeach;?>
43
+ </optgroup>
44
+ <?php endforeach;?>
45
+ </select>
46
+ <?php else: ?>
47
+ <p><strong><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></strong></p>
48
+ <?php endif;?>
49
+ <?php else: ?>
50
+ <p><strong><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate())?></strong></p>
51
+ <?php endif; ?>
52
+ </fieldset>
53
+ <div style="display:none" id="shipping_method_update"><p><?php echo $this->__('Please update order data to get shipping methods and rates') ?></p></div>
app/design/frontend/base/default/template/paypal/express/shortcut.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/paypal/hss/form.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/paypal/hss/iframe.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/paypal/hss/info.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/paypal/hss/js.phtml CHANGED
@@ -20,10 +20,10 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
- $x=10
27
  /**
28
  * @see Mage_Paypal_Block_Iframe
29
  */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
+
27
  /**
28
  * @see Mage_Paypal_Block_Iframe
29
  */
app/design/frontend/base/default/template/paypal/hss/redirect.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
@@ -32,6 +32,9 @@
32
  <head>
33
  <script type="text/javascript">
34
  //<![CDATA[
 
 
 
35
  <?php if ($this->getGotoSection()): ?>
36
  for (var s = 0; s < window.top.checkout.steps.length; s++) {
37
  if (window.top.checkout.steps[s] == '<?php echo $this->getGotoSection() ?>') {
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
32
  <head>
33
  <script type="text/javascript">
34
  //<![CDATA[
35
+ if (window.top == window.self) {
36
+ window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
37
+ }
38
  <?php if ($this->getGotoSection()): ?>
39
  for (var s = 0; s < window.top.checkout.steps.length; s++) {
40
  if (window.top.checkout.steps[s] == '<?php echo $this->getGotoSection() ?>') {
app/design/frontend/base/default/template/paypal/hss/review/button.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/paypal/partner/logo.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/paypal/payflowadvanced/form.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var $this Mage_Paypal_Block_Payflow_Advanced_Form */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var $this Mage_Paypal_Block_Payflow_Advanced_Form */
app/design/frontend/base/default/template/paypal/payflowadvanced/info.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/paypal/payflowlink/form.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/paypal/payflowlink/iframe.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var $this Mage_Paypal_Block_Payflow_Link_Form */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var $this Mage_Paypal_Block_Payflow_Link_Form */
app/design/frontend/base/default/template/paypal/payflowlink/info.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/base/default/template/paypal/payment/mark.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/paypal/payment/redirect.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/paypaluk/express/review.phtml ADDED
@@ -0,0 +1,191 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ /** @var $this Mage_Paypal_Block_Express_Review */
27
+ ?>
28
+ <div class="page-title">
29
+ <h1><?php echo $this->__('Review Order') ?></h1>
30
+ </div>
31
+ <?php echo $this->getMessagesBlock()->toHtml() ?>
32
+
33
+ <?php if ($this->getShippingAddress()): ?>
34
+ <div class="info-set col2-set">
35
+ <h2 class="legend"><?php echo $this->__('Shipping Information') ?></h2>
36
+ <div class="col-1">
37
+ <div class="box">
38
+ <div class="box-title">
39
+ <h3><?php echo $this->__('Shipping Address') ?><span class="separator"><?php if ($this->getCanEditShippingAddress()):?> | </span><a href="<?php echo $this->getEditUrl() ?>"><?php echo $this->__('Change Shipping Address') ?></a><?php endif;?></h3>
40
+ </div>
41
+ <div class="box-content">
42
+ <address><?php echo $this->renderAddress($this->getShippingAddress())?></address>
43
+ </div>
44
+ </div>
45
+ </div>
46
+ <div class="col-2">
47
+ <div class="box">
48
+ <div class="box-title">
49
+ <h3><?php echo $this->__('Shipping Method') ?></h3>
50
+ </div>
51
+ <div class="box-content">
52
+ <form method="post" id="shipping_method_form" action="<?php echo $this->escapeHtml($this->getShippingMethodSubmitUrl()) ?>">
53
+ <?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?>
54
+ <?php if ($groups = $this->getShippingRateGroups()):?>
55
+ <?php $currentRate = $this->getCurrentShippingRate(); ?>
56
+ <fieldset>
57
+ <select name="shipping_method" id="shipping_method" style="width:250px;" class="required-entry">
58
+ <?php if (!$currentRate):?>
59
+ <option value=""><?php echo $this->__('Please select a shipping method...') ?></option>
60
+ <?php endif;?>
61
+ <?php foreach ($groups as $code => $rates):?>
62
+ <optgroup label="<?php echo $this->escapeHtml($this->getCarrierName($code)) ?>" style="font-style:normal;">
63
+ <?php foreach ($rates as $rate):?>
64
+ <option value="<?php echo $this->renderShippingRateValue($rate)?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : '' ;?>>
65
+ <?php echo $this->renderShippingRateOption($rate)?>
66
+ </option>
67
+ <?php endforeach;?>
68
+ </optgroup>
69
+ <?php endforeach;?>
70
+ </select>
71
+ </fieldset>
72
+ <p class="actions">
73
+ <button id="update_shipping_method_submit" type="submit" class="button"><span><span><?php echo $this->__('Update Shipping Method') ?></span></span></button>
74
+ </p>
75
+ <?php else: ?>
76
+ <p><strong><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></strong></p>
77
+ <?php endif;?>
78
+ <?php else: ?>
79
+ <p><strong><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate())?></strong></p>
80
+ <?php endif; ?>
81
+ </form>
82
+ </div>
83
+ </div>
84
+ </div>
85
+ </div>
86
+ <?php endif; ?>
87
+
88
+ <div class="info-set col2-set">
89
+ <h2 class="legend"><?php echo $this->__('Billing Information') ?></h2>
90
+ <div class="col-1">
91
+ <div class="box">
92
+ <div class="box-title">
93
+ <h3><?php echo $this->__('Payment Method') ?> <span class="separator">|</span>
94
+ <?php if($this->getEditUrl()):?><a href="<?php echo $this->getEditUrl() ?>"><?php echo $this->__('Change Payment Method') ?></a> <?php endif ?>
95
+ </h3>
96
+ </div>
97
+ <div class="box-content">
98
+ <?php echo $this->escapeHtml($this->getPaymentMethodTitle()) ?>
99
+ </div>
100
+ </div>
101
+ </div>
102
+ <div class="col-2">
103
+ <div class="box">
104
+ <div class="box-title">
105
+ <h3><?php echo $this->__('Billing Address') ?></h3>
106
+ </div>
107
+ <div class="box-content">
108
+ <address>
109
+ <?php echo $this->renderAddress($this->getBillingAddress()) ?><br />
110
+ <?php echo $this->__('Payer Email: %s', $this->getBillingAddress()->getEmail()) ?>
111
+ </address>
112
+ </div>
113
+ </div>
114
+ </div>
115
+ </div>
116
+
117
+ <div class="info-set">
118
+ <h2 class="legend"><?php echo $this->__('Items in Your Shopping Cart') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo $this->__('Edit Shopping Cart') ?></a></h2>
119
+ <div id="details-reload">
120
+ <?php echo $this->getChildHtml('details') ?>
121
+ </div>
122
+ </div>
123
+ <form method="post" id="order_review_form" action="<?php echo $this->getPlaceOrderUrl() ?>">
124
+ <?php echo $this->getChildHtml('agreements'); ?>
125
+ <div class="buttons-set buttons-set-order" id="review-buttons-container">
126
+ <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>
127
+ <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>
128
+ <span class="please-wait" id="review-please-wait" style="display:none;">
129
+ <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...') ?>
130
+ </span>
131
+ </div>
132
+ </form>
133
+ <script type="text/javascript">
134
+ //<![CDATA[
135
+ // submit buttons are not needed when submitting with ajax
136
+ $('review_submit').hide();
137
+ if ($('update_shipping_method_submit')) {
138
+ $('update_shipping_method_submit').hide();
139
+ }
140
+
141
+ <?php if ($this->getUseAjax()):?>
142
+ OrderReviewController.prototype._submitOrder = function() {
143
+ if (this._canSubmitOrder) {
144
+ if (this._pleaseWait) {
145
+ this._pleaseWait.show();
146
+ }
147
+ new Ajax.Request(this.form.action, {
148
+ parameters: {isAjax: 1, method: 'POST'},
149
+ onSuccess: function(transport) {
150
+ try{
151
+ response = eval('(' + transport.responseText + ')');
152
+ } catch (e) {
153
+ response = {};
154
+ }
155
+ if (response.redirect) {
156
+ setLocation(response.redirect);
157
+ return;
158
+ }
159
+ if (response.success) {
160
+ setLocation('<?php echo $this->getSuccessUrl()?>');
161
+ return;
162
+ } else {
163
+ var msg = response.error_messages;
164
+ if (typeof(msg)=='object') {
165
+ msg = msg.join("\n");
166
+ }
167
+ if (msg) {
168
+ $('review-please-wait').hide();
169
+ alert(msg);
170
+ return;
171
+ }
172
+ }
173
+ $('review-please-wait').hide();
174
+ alert('<?php echo $this->jsQuoteEscape($this->__('Unknown Error. Please try again later.')); ?>');
175
+ return;
176
+ },
177
+ onFailure: function(){
178
+ alert('<?php echo $this->jsQuoteEscape($this->__('Server Error. Please try again.')) ?>');
179
+ $('review-please-wait').hide();
180
+ }
181
+ });
182
+ }
183
+ }
184
+ <?php endif ?>
185
+
186
+ PayPalExpressAjax = new OrderReviewController($('order_review_form'), $('review_button'),
187
+ $('shipping_method'), $('shipping_method_form'), 'details-reload'
188
+ );
189
+ PayPalExpressAjax.addPleaseWait($('review-please-wait'));
190
+ //]]>
191
+ </script>
app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var Mage_Checkout_Block_Onepage_Billing $this */
@@ -40,41 +40,51 @@
40
  <fieldset>
41
  <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
42
  <ul>
43
- <li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
44
  <li class="fields">
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->htmlEscape($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" />
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->htmlEscape($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
56
  </div>
57
  </div>
58
- <?php endif ?>
59
  </li>
 
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->htmlEscape($this->getAddress()->getStreet(1)) ?>" class="input-text required-entry" />
64
  </div>
65
  </li>
66
- <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
 
67
  <li class="wide">
68
  <div class="input-box">
69
- <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i?>" value="<?php echo $this->htmlEscape($this->getAddress()->getStreet($_i)) ?>" class="input-text" />
70
  </div>
71
  </li>
72
- <?php endfor ?>
 
 
 
 
 
 
 
 
73
  <li class="fields">
74
  <div class="field">
75
  <label for="billing: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="billing[city]" value="<?php echo $this->htmlEscape($this->getAddress()->getCity()) ?>" class="input-text required-entry" id="billing:city" />
78
  </div>
79
  </div>
80
  <div class="field">
@@ -88,7 +98,7 @@
88
  $('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
89
  //]]>
90
  </script>
91
- <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->htmlEscape($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none;" />
92
  </div>
93
  </div>
94
  </li>
@@ -96,7 +106,7 @@
96
  <div class="field">
97
  <label for="billing: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="billing[postcode]" id="billing:postcode" value="<?php echo $this->htmlEscape($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international required-entry" />
100
  </div>
101
  </div>
102
  <div class="field">
@@ -110,13 +120,13 @@
110
  <div class="field">
111
  <label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
112
  <div class="input-box">
113
- <input type="text" name="billing[telephone]" value="<?php echo $this->htmlEscape($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text required-entry" id="billing:telephone" />
114
  </div>
115
  </div>
116
  <div class="field">
117
  <label for="billing:fax"><?php echo $this->__('Fax') ?></label>
118
  <div class="input-box">
119
- <input type="text" name="billing[fax]" value="<?php echo $this->htmlEscape($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text" id="billing:fax" />
120
  </div>
121
  </div>
122
  </li>
@@ -166,6 +176,7 @@
166
  <?php else:?>
167
  <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
168
  <?php endif; ?>
 
169
  </ul>
170
  <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
171
  </fieldset>
@@ -198,16 +209,15 @@
198
  //billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
199
  $('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
200
 
201
- var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', countryRegions, undefined, 'billing:postcode');
202
  if ($('onepage-guest-register-button')) {
203
  Event.observe($('onepage-guest-register-button'), 'click', function(event) {
204
- var billingRememberMe = $$('#billing-new-address-form li #remember-me-box');
205
- if(billingRememberMe.length > 0) {
206
- billingRememberMe = $(billingRememberMe[0].parentNode);
207
  if ($('login:guest') && $('login:guest').checked) {
208
- billingRememberMe.hide();
209
  } else if ($('login:register') && ($('login:register').checked || $('login:register').type == 'hidden')) {
210
- billingRememberMe.show();
211
  }
212
  }
213
  });
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var Mage_Checkout_Block_Onepage_Billing $this */
40
  <fieldset>
41
  <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
42
  <ul>
43
+ <li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
44
  <li class="fields">
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; ?>
59
  </li>
60
+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
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; ?>
75
+ <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
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; ?>
83
  <li class="fields">
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">
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
  <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
  <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>
176
  <?php else:?>
177
  <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
178
  <?php endif; ?>
179
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
180
  </ul>
181
  <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
182
  </fieldset>
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');
213
  if ($('onepage-guest-register-button')) {
214
  Event.observe($('onepage-guest-register-button'), 'click', function(event) {
215
+ var billingRememberMe = $('co-billing-form').select('#remember-me-box');
216
+ if (billingRememberMe.length > 0) {
 
217
  if ($('login:guest') && $('login:guest').checked) {
218
+ billingRememberMe[0].hide();
219
  } else if ($('login:register') && ($('login:register').checked || $('login:register').type == 'hidden')) {
220
+ billingRememberMe[0].show();
221
  }
222
  }
223
  });
app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -87,6 +87,7 @@
87
  <input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
88
  </div>
89
  </li>
 
90
  <?php echo $this->getChildHtml('persistent.remember.me'); ?>
91
  </ul>
92
  <input name="context" type="hidden" value="checkout" />
@@ -100,6 +101,8 @@
100
  <p class="required">&nbsp;</p>
101
  <?php if ($this->getQuote()->isAllowedGuestCheckout()): ?>
102
  <button id="onepage-guest-register-button" type="button" class="button" onclick="checkout.setMethod();"><span><span><?php echo $this->__('Continue') ?></span></span></button>
 
 
103
  <?php else: ?>
104
  <form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
105
  <button id="onepage-guest-register-button" type="submit" class="button"><span><span><?php echo $this->__('Register') ?></span></span></button>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
87
  <input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
88
  </div>
89
  </li>
90
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
91
  <?php echo $this->getChildHtml('persistent.remember.me'); ?>
92
  </ul>
93
  <input name="context" type="hidden" value="checkout" />
101
  <p class="required">&nbsp;</p>
102
  <?php if ($this->getQuote()->isAllowedGuestCheckout()): ?>
103
  <button id="onepage-guest-register-button" type="button" class="button" onclick="checkout.setMethod();"><span><span><?php echo $this->__('Continue') ?></span></span></button>
104
+ <?php elseif ($this->helper('checkout')->isCustomerMustBeLogged()): ?>
105
+ <button id="onepage-guest-register-button" type="button" class="button" onclick="window.location='<?php echo $this->helper('checkout/url')->getRegistrationUrl();?>'"><span><span><?php echo $this->__('Register') ?></span></span></button>
106
  <?php else: ?>
107
  <form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
108
  <button id="onepage-guest-register-button" type="submit" class="button"><span><span><?php echo $this->__('Register') ?></span></span></button>
app/design/frontend/base/default/template/persistent/customer/form/login.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -62,6 +62,7 @@
62
  <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
63
  </div>
64
  </li>
 
65
  <?php echo $this->getChildHtml('persistent.remember.me'); ?>
66
  </ul>
67
  <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
62
  <input type="password" name="login[password]" class="input-text required-entry validate-password" id="pass" title="<?php echo $this->__('Password') ?>" />
63
  </div>
64
  </li>
65
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
66
  <?php echo $this->getChildHtml('persistent.remember.me'); ?>
67
  </ul>
68
  <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
app/design/frontend/base/default/template/persistent/customer/form/register.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -50,7 +50,7 @@
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->htmlEscape($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()): ?>
@@ -84,34 +84,36 @@
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->htmlEscape($this->getFormData()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text" />
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->htmlEscape($this->getFormData()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text required-entry" />
94
  </div>
95
  </div>
96
  </li>
 
97
  <li class="wide">
98
  <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
99
  <div class="input-box">
100
- <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getFormData()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text required-entry" />
101
  </div>
102
  </li>
103
- <?php for ($_i=2, $_n=$this->helper('customer/address')->getStreetLines(); $_i<=$_n; $_i++): ?>
 
104
  <li class="wide">
105
  <div class="input-box">
106
- <input type="text" name="street[]" value="<?php echo $this->htmlEscape($this->getFormData()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i?>" class="input-text" />
107
  </div>
108
  </li>
109
- <?php endfor ?>
110
  <li class="fields">
111
  <div class="field">
112
  <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
113
  <div class="input-box">
114
- <input type="text" name="city" value="<?php echo $this->htmlEscape($this->getFormData()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text required-entry" id="city" />
115
  </div>
116
  </div>
117
  <div class="field">
@@ -125,7 +127,7 @@
125
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getFormData()->getRegionId() ?>");
126
  //]]>
127
  </script>
128
- <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none;" />
129
  </div>
130
  </div>
131
  </li>
@@ -133,7 +135,7 @@
133
  <div class="field">
134
  <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
135
  <div class="input-box">
136
- <input type="text" name="postcode" value="<?php echo $this->htmlEscape($this->getFormData()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international required-entry" />
137
  </div>
138
  </div>
139
  <div class="field">
@@ -165,6 +167,7 @@
165
  </div>
166
  </div>
167
  </li>
 
168
  <?php echo $this->getChildHtml('persistent.remember.me'); ?>
169
  </ul>
170
  <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
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()): ?>
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>
97
+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
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; ?>
112
  <li class="fields">
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">
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
  <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">
167
  </div>
168
  </div>
169
  </li>
170
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
171
  <?php echo $this->getChildHtml('persistent.remember.me'); ?>
172
  </ul>
173
  <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
app/design/frontend/base/default/template/persistent/remember_me.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -28,14 +28,14 @@
28
  /**
29
  * Customer "Remember Me" template
30
  *
 
31
  */
32
- /** @var $this Mage_Persistent_Block_Form_Remember */
33
  ?>
34
- <li>
35
- <div id="remember-me-box" class="input-box remember-me">
36
- <?php $rememberMeId = 'remember_me' . Mage::helper('core')->getRandomString(10); ?>
37
- <input type="checkbox" name="persistent_remember_me" class="input-checkbox" id="<?php echo $rememberMeId; ?>"<?php if ($this->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?php echo $this->__('Remember Me') ?>" />
38
- <label for="<?php echo $rememberMeId; ?>"><?php echo $this->__('Remember Me') ?></label>
39
- <a href="#"><?php echo $this->__('What\'s this?') ?></a>
40
  </div>
 
 
41
  </li>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
28
  /**
29
  * Customer "Remember Me" template
30
  *
31
+ * @var $this Mage_Persistent_Block_Form_Remember
32
  */
 
33
  ?>
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>
41
  </li>
app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/poll/active.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/poll/result.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/productalert/price.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/productalert/product/view.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/productalert/stock.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/rating/detailed.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/rating/empty.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/reports/home_product_compared.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Reports_Block_Product_Compared */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Reports_Block_Product_Compared */
app/design/frontend/base/default/template/reports/home_product_viewed.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Reports_Block_Product_Viewed */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Reports_Block_Product_Viewed */
app/design/frontend/base/default/template/reports/product_compared.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Reports_Block_Product_Compared */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Reports_Block_Product_Compared */
app/design/frontend/base/default/template/reports/product_viewed.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Reports_Block_Product_Viewed */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Reports_Block_Product_Viewed */
app/design/frontend/base/default/template/reports/widget/compared/column/compared_default_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/reports/widget/compared/column/compared_images_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/reports/widget/compared/column/compared_names_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_default_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_images_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_names_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/review/customer/list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/review/customer/recent.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/review/customer/view.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/review/form.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/review/helper/summary.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/review/helper/summary_short.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/review/product/view/count.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/review/product/view/list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/review/product/view/other.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/review/view.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/rss/list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/rss/nofeed.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/rss/order/details.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /*
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /*
app/design/frontend/base/default/template/sales/billing/agreement/view.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/billing/agreements.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/comments.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/creditmemo.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/creditmemo/items.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/details.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
@@ -71,7 +71,7 @@
71
  <div class="col2-set">
72
  <div class="col-1">
73
  <h4><?php echo $this->__('Shipping Method') ?></h4>
74
- <?php echo $_order->getShippingMethod() ?> <?php echo $_order->getShippingDescription() ?>
75
  </div>
76
  <div class="col-2">
77
  <h4><?php echo $this->__('Payment Method') ?></h4>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
71
  <div class="col2-set">
72
  <div class="col-1">
73
  <h4><?php echo $this->__('Shipping Method') ?></h4>
74
+ <?php echo $this->escapeHtml($_order->getShippingMethod()) ?> <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
75
  </div>
76
  <div class="col-2">
77
  <h4><?php echo $this->__('Payment Method') ?></h4>
app/design/frontend/base/default/template/sales/order/history.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/info.phtml CHANGED
@@ -20,11 +20,12 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
- <?php $_order = $this->getOrder() ?>
 
28
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
29
  <div class="page-title title-buttons">
30
  <h1><?php echo $this->__('Order #%s - %s', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h1>
@@ -63,11 +64,11 @@
63
  <div class="col-2">
64
  <div class="box">
65
  <div class="box-title">
66
- <h2><?php echo $this->__('Shipping Method') ?><?php /* | <a href="#"><?php echo $this->__('Track Order') ?></a>*/ ?></h2>
67
  </div>
68
  <div class="box-content">
69
  <?php if ($_order->getShippingDescription()): ?>
70
- <?php echo $_order->getShippingDescription() ?>
71
  <?php else: ?>
72
  <p><?php echo $this->helper('sales')->__('No shipping information available'); ?></p>
73
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
+ <?php /** @var $this Mage_Sales_Block_Order_Info */ ?>
28
+ <?php $_order = $this->getOrder() ?>
29
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
30
  <div class="page-title title-buttons">
31
  <h1><?php echo $this->__('Order #%s - %s', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h1>
64
  <div class="col-2">
65
  <div class="box">
66
  <div class="box-title">
67
+ <h2><?php echo $this->__('Shipping Method') ?></h2>
68
  </div>
69
  <div class="box-content">
70
  <?php if ($_order->getShippingDescription()): ?>
71
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
72
  <?php else: ?>
73
  <p><?php echo $this->helper('sales')->__('No shipping information available'); ?></p>
74
  <?php endif; ?>
app/design/frontend/base/default/template/sales/order/info/buttons.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/invoice.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/invoice/items.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/items.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/print.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -45,7 +45,7 @@
45
  <div class="col2-set">
46
  <div class="col-1">
47
  <h2><?php echo $this->__('Shipping Method') ?></h2>
48
- <?php echo $_order->getShippingDescription() ?>
49
  </div>
50
  <?php endif; ?>
51
  <div class="col-2">
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
45
  <div class="col2-set">
46
  <div class="col-1">
47
  <h2><?php echo $this->__('Shipping Method') ?></h2>
48
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
49
  </div>
50
  <?php endif; ?>
51
  <div class="col-2">
app/design/frontend/base/default/template/sales/order/print/creditmemo.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -53,7 +53,7 @@
53
  <div class="col2-set">
54
  <div class="col-1">
55
  <h3><?php echo $this->__('Shipping Method') ?></h3>
56
- <?php echo $_order->getShippingDescription() ?>
57
  </div>
58
  <?php endif; ?>
59
  <div class="col-2">
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
53
  <div class="col2-set">
54
  <div class="col-1">
55
  <h3><?php echo $this->__('Shipping Method') ?></h3>
56
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
57
  </div>
58
  <?php endif; ?>
59
  <div class="col-2">
app/design/frontend/base/default/template/sales/order/print/invoice.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -53,7 +53,7 @@
53
  <div class="col2-set">
54
  <div class="col-1">
55
  <h3><?php echo $this->__('Shipping Method') ?></h3>
56
- <?php echo $_order->getShippingDescription() ?>
57
  </div>
58
  <?php endif; ?>
59
  <div class="col-2">
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
53
  <div class="col2-set">
54
  <div class="col-1">
55
  <h3><?php echo $this->__('Shipping Method') ?></h3>
56
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
57
  </div>
58
  <?php endif; ?>
59
  <div class="col-2">
app/design/frontend/base/default/template/sales/order/print/shipment.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/recent.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/shipment.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/shipment/items.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/order/totals.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
@@ -35,9 +35,9 @@
35
  <tr class="<?php echo $_code?>">
36
  <td <?php echo $this->getLabelProperties()?>>
37
  <?php if ($_total->getStrong()):?>
38
- <strong><?php echo $_total->getLabel()?></strong>
39
  <?php else:?>
40
- <?php echo $_total->getLabel()?>
41
  <?php endif?>
42
  </td>
43
  <td <?php echo $this->getValueProperties()?>>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
35
  <tr class="<?php echo $_code?>">
36
  <td <?php echo $this->getLabelProperties()?>>
37
  <?php if ($_total->getStrong()):?>
38
+ <strong><?php echo $this->escapeHtml($_total->getLabel());?></strong>
39
  <?php else:?>
40
+ <?php echo $this->escapeHtml($_total->getLabel());?>
41
  <?php endif?>
42
  </td>
43
  <td <?php echo $this->getValueProperties()?>>
app/design/frontend/base/default/template/sales/order/trackinginfo.phtml CHANGED
@@ -20,21 +20,20 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
  <span class="field-row grid" id="shipment_tracking_info">
28
 
29
  <?php if($this->trackingInfo): ?>
30
-
31
- <strong><?php echo $this->trackingInfo->getCarrierTitle() ?></strong> - <?php echo $this->trackingInfo->getTracking() ?>
32
  <div class="info">
33
  <?php if ($this->trackingInfo->getErrorMessage()): ?>
34
- <?php echo $this->trackingInfo->getErrorMessage() ?>
35
  <?php else: ?>
36
  <?php if ($this->trackingInfo->getUrl()): ?>
37
- Please, visit for more info: <a href="<?php echo $this->trackingInfo->getUrl() ?>" target="_blank"><?php echo $this->trackingInfo->getCarrierTitle() ?></a><br />
38
  <?php endif; ?>
39
 
40
  <?php if ($this->trackingInfo->getStatus()): ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
  <span class="field-row grid" id="shipment_tracking_info">
28
 
29
  <?php if($this->trackingInfo): ?>
30
+ <strong><?php echo $this->escapeHtml($this->trackingInfo->getCarrierTitle()) ?></strong> - <?php echo $this->trackingInfo->getTracking() ?>
 
31
  <div class="info">
32
  <?php if ($this->trackingInfo->getErrorMessage()): ?>
33
+ <?php echo $this->escapeHtml($this->trackingInfo->getErrorMessage()) ?>
34
  <?php else: ?>
35
  <?php if ($this->trackingInfo->getUrl()): ?>
36
+ Please, visit for more info: <a href="<?php echo $this->trackingInfo->getUrl() ?>" target="_blank"><?php echo $this->escapeHtml($this->trackingInfo->getCarrierTitle()) ?></a><br />
37
  <?php endif; ?>
38
 
39
  <?php if ($this->trackingInfo->getStatus()): ?>
app/design/frontend/base/default/template/sales/order/view.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/payment/form/billing/agreement.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/recurring/grid.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/recurring/profile/view.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/recurring/profile/view/info.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/recurring/profiles.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/reorder/sidebar.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/sales/widget/guest/form.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var $this Mage_Sales_Block_Widget_Guest_Form */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /** @var $this Mage_Sales_Block_Widget_Guest_Form */
app/design/frontend/base/default/template/sendfriend/send.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Sendfriend_Block_Send */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Sendfriend_Block_Send */
app/design/frontend/base/default/template/shipping/tracking/ajax.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/shipping/tracking/popup.phtml CHANGED
@@ -20,12 +20,12 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
- /* @var $this Mage_Shipping_Block_Tracking_Popup */
27
  ?>
28
- <?php $_results = $this->getTrackingInfo() ?>
 
29
  <div class="page-title title-buttons">
30
  <h1><?php echo $this->__('Tracking Information'); ?></h1>
31
  <button class="button" onclick="window.close(); window.opener.focus();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
@@ -45,12 +45,12 @@
45
  <?php if(is_object($track)): ?>
46
  <tr>
47
  <th class="label"><?php echo $this->__('Tracking Number:'); ?></th>
48
- <td class="value"><?php echo $track->getTracking(); ?></td>
49
  </tr>
50
  <?php if ($track->getCarrierTitle()): ?>
51
  <tr>
52
  <th class="label"><?php echo $this->__('Carrier:'); ?></th>
53
- <td class="value"><?php echo $track->getCarrierTitle(); ?></td>
54
  </tr>
55
  <?php endif; ?>
56
  <?php if($track->getErrorMessage()): ?>
@@ -66,7 +66,7 @@
66
  <?php elseif($track->getUrl()): ?>
67
  <tr>
68
  <th class="label"><?php echo $this->__('Track:'); ?></th>
69
- <td class="value"><a href="<?php echo $track->getUrl(); ?>" onclick="this.target='_blank'"><?php echo $track->getUrl(); ?></a></td>
70
  </tr>
71
  <?php else: ?>
72
  <?php if ($track->getStatus()): ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
 
26
  ?>
27
+ <?php /** @var $this Mage_Shipping_Block_Tracking_Popup */ ?>
28
+ <?php $_results = $this->getTrackingInfo(); ?>
29
  <div class="page-title title-buttons">
30
  <h1><?php echo $this->__('Tracking Information'); ?></h1>
31
  <button class="button" onclick="window.close(); window.opener.focus();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
45
  <?php if(is_object($track)): ?>
46
  <tr>
47
  <th class="label"><?php echo $this->__('Tracking Number:'); ?></th>
48
+ <td class="value"><?php echo $this->escapeHtml($track->getTracking()); ?></td>
49
  </tr>
50
  <?php if ($track->getCarrierTitle()): ?>
51
  <tr>
52
  <th class="label"><?php echo $this->__('Carrier:'); ?></th>
53
+ <td class="value"><?php echo $this->escapeHtml($track->getCarrierTitle()); ?></td>
54
  </tr>
55
  <?php endif; ?>
56
  <?php if($track->getErrorMessage()): ?>
66
  <?php elseif($track->getUrl()): ?>
67
  <tr>
68
  <th class="label"><?php echo $this->__('Track:'); ?></th>
69
+ <td class="value"><a href="<?php echo $this->escapeHtml($track->getUrl()); ?>" onclick="this.target='_blank'"><?php echo $this->escapeHtml($track->getUrl()); ?></a></td>
70
  </tr>
71
  <?php else: ?>
72
  <?php if ($track->getStatus()): ?>
app/design/frontend/base/default/template/tag/cloud.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/tag/customer/recent.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/tag/customer/tags.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/tag/customer/view.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/tag/list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/tag/popular.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/tax/checkout/discount.phtml CHANGED
@@ -20,6 +20,6 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
app/design/frontend/base/default/template/tax/checkout/grandtotal.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
app/design/frontend/base/default/template/tax/checkout/shipping.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
@@ -57,7 +57,7 @@
57
  <?php else:?>
58
  <tr>
59
  <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
60
- <?php echo $this->getTotal()->getTitle() ?>
61
  </td>
62
  <td style="<?php echo $this->getStyle() ?>" class="a-right">
63
  <?php echo $this->helper('checkout')->formatPrice($this->getShippingExcludeTax()) ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
57
  <?php else:?>
58
  <tr>
59
  <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
60
+ <?php echo $this->escapeHtml($this->getTotal()->getTitle()) ?>
61
  </td>
62
  <td style="<?php echo $this->getStyle() ?>" class="a-right">
63
  <?php echo $this->helper('checkout')->formatPrice($this->getShippingExcludeTax()) ?>
app/design/frontend/base/default/template/tax/checkout/subtotal.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
app/design/frontend/base/default/template/tax/checkout/tax.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
@@ -45,7 +45,7 @@
45
  <?php foreach ($rates as $rate): ?>
46
  <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
47
  <td class="a-right" style="<?php echo $_style ?>" colspan="<?php echo $this->getColspan(); ?>">
48
- <?php echo $rate['title']; ?>
49
  <?php if (!is_null($rate['percent'])): ?>
50
  (<?php echo (float)$rate['percent']; ?>%)
51
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /**
45
  <?php foreach ($rates as $rate): ?>
46
  <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
47
  <td class="a-right" style="<?php echo $_style ?>" colspan="<?php echo $this->getColspan(); ?>">
48
+ <?php echo $this->escapeHtml($rate['title']); ?>
49
  <?php if (!is_null($rate['percent'])): ?>
50
  (<?php echo (float)$rate['percent']; ?>%)
51
  <?php endif; ?>
app/design/frontend/base/default/template/tax/order/tax.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -45,7 +45,7 @@
45
  <?php foreach ($rates as $rate): ?>
46
  <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>"<?php if (!$this->getIsPlaneMode()):?> style="display:none;"<?php endif;?>>
47
  <td <?php echo $this->getLabelProperties()?>>
48
- <?php echo $rate['title']; ?>
49
  <?php if (!is_null($rate['percent'])): ?>
50
  (<?php echo (float)$rate['percent']; ?>%)
51
  <?php endif; ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
45
  <?php foreach ($rates as $rate): ?>
46
  <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>"<?php if (!$this->getIsPlaneMode()):?> style="display:none;"<?php endif;?>>
47
  <td <?php echo $this->getLabelProperties()?>>
48
+ <?php echo $this->escapeHtml($rate['title']); ?>
49
  <?php if (!is_null($rate['percent'])): ?>
50
  (<?php echo (float)$rate['percent']; ?>%)
51
  <?php endif; ?>
app/design/frontend/base/default/template/wishlist/button/share.phtml ADDED
@@ -0,0 +1,30 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
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;?>
app/design/frontend/base/default/template/wishlist/button/tocart.phtml ADDED
@@ -0,0 +1,30 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
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;?>
app/design/frontend/base/default/template/wishlist/button/update.phtml ADDED
@@ -0,0 +1,30 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
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;?>
app/design/frontend/base/default/template/wishlist/email/items.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Share_Email_Items */
@@ -30,12 +30,15 @@
30
  <table cellspacing="0" cellpadding="0" border="0" width="650">
31
  <tr>
32
  <?php $i = 0; foreach ($this->getWishlistItems() as $item): $i++ ?>
 
 
 
33
  <td width="32%">
34
- <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($item) ?>"><img src="<?php echo $this->helper('catalog/image')->init($item->getProduct(), 'small_image')->resize(135); ?>" style="border:1px solid #ccc;" width="135" height="135" alt="" /></a></p>
35
- <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($item) ?>" style="color:#203548;"><strong><?php echo $this->htmlEscape($item->getName()) ?></strong></a></p>
36
  <?php if($this->hasDescription($item)): ?><p align="center" style="font-size:12px;"><?php echo $this->__('Comment') ?>:<br /><?php echo $this->getEscapedDescription($item) ?></p><?php endif; ?>
37
- <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($item) ?>" style="color:#1E7EC8;"><?php echo $this->__('View Product') ?></a> <small>
38
- <?php if ($item->getIsSalable()): ?>|</small> <a href="<?php echo $this->getAddToCartUrl($item) ?>" style="color:#1E7EC8;"><strong><?php echo $this->__('Add to Cart') ?></strong></a><?php endif;?>
39
  </p></td>
40
  <?php if ($i%3!=0): ?>
41
  <td width="2%"></td>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Share_Email_Items */
30
  <table cellspacing="0" cellpadding="0" border="0" width="650">
31
  <tr>
32
  <?php $i = 0; foreach ($this->getWishlistItems() as $item): $i++ ?>
33
+ <?php /* @var $item Mage_Wishlist_Model_Item */ ?>
34
+ <?php /* @var $_product Mage_Catalog_Model_Product */ ?>
35
+ <?php $_product = $item->getProduct(); ?>
36
  <td width="32%">
37
+ <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($_product) ?>"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(135); ?>" style="border:1px solid #ccc;" width="135" height="135" alt="" /></a></p>
38
+ <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($_product) ?>" style="color:#203548;"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
39
  <?php if($this->hasDescription($item)): ?><p align="center" style="font-size:12px;"><?php echo $this->__('Comment') ?>:<br /><?php echo $this->getEscapedDescription($item) ?></p><?php endif; ?>
40
+ <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($_product) ?>" style="color:#1E7EC8;"><?php echo $this->__('View Product') ?></a> <small>
41
+ <?php if ($_product->getIsSalable()): ?>|</small> <a href="<?php echo $this->getAddToCartUrl($_product) ?>" style="color:#1E7EC8;"><strong><?php echo $this->__('Add to Cart') ?></strong></a><?php endif;?>
42
  </p></td>
43
  <?php if ($i%3!=0): ?>
44
  <td width="2%"></td>
app/design/frontend/base/default/template/wishlist/email/rss.phtml CHANGED
@@ -20,12 +20,12 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
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(); ?>"><?php echo $this->helper('wishlist')->getRssUrl(); ?></a>
31
  </p>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
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>
app/design/frontend/base/default/template/wishlist/item/column/cart.phtml ADDED
@@ -0,0 +1,54 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /* @var $this Mage_Wishlist_Block_Customer_Wishlist_Item_Column_Cart */
28
+ /* @var Mage_Wishlist_Model_Item $item */
29
+ $item = $this->getItem();
30
+ $product = $item->getProduct();
31
+ ?>
32
+ <div class="cart-cell">
33
+ <?php echo $this->getPriceHtml($product);?>
34
+ <div class="add-to-cart-alt">
35
+ <?php if ($item->canHaveQty() && $item->getProduct()->isVisibleInSiteVisibility()): ?>
36
+ <input type="text" class="input-text qty validate-not-negative-number" name="qty[<?php echo $item->getId() ?>]" value="<?php echo $this->getAddToCartQty($item) * 1 ?>" />
37
+ <?php endif; ?>
38
+ <?php if ($product->isSaleable()): ?>
39
+ <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>
40
+ <?php else: ?>
41
+ <?php if ($product->getIsSalable()): ?>
42
+ <p class="availability in-stock"><span><?php echo $this->__('In stock') ?></span></p>
43
+ <?php else: ?>
44
+ <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
45
+ <?php endif; ?>
46
+ <?php endif; ?>
47
+ </div>
48
+ <?php foreach($this->getSortedChildren() as $childName):?>
49
+ <?php echo $this->getChildHtml($childName, false);?>
50
+ <?php endforeach;?>
51
+ <?php if ($product->isVisibleInSiteVisibility()): ?>
52
+ <p><a class="link-edit" href="<?php echo $this->getItemConfigureUrl($item) ?>"><?php echo $this->__('Edit') ?></a></p>
53
+ <?php endif ?>
54
+ </div>
app/design/frontend/base/default/template/wishlist/item/column/image.phtml ADDED
@@ -0,0 +1,33 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /* @var Mage_Wishlist_Model_Item $item */
28
+ $item = $this->getItem();
29
+ $product = $item->getProduct();
30
+ ?>
31
+ <a class="product-image" href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>">
32
+ <img src="<?php echo $this->helper('catalog/image')->init($product, 'small_image')->resize(113, 113); ?>" width="113" height="113" alt="<?php echo $this->escapeHtml($product->getName()) ?>" />
33
+ </a>
app/design/frontend/base/default/template/wishlist/item/column/info.phtml ADDED
@@ -0,0 +1,40 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+
27
+ /* @var Mage_Wishlist_Model_Item $item */
28
+ $item = $this->getItem();
29
+ $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())) ?></textarea>
34
+ <?php if($this->getSortedChildren()): ?>
35
+ <div class="item-manage">
36
+ <?php foreach($this->getSortedChildren() as $childName):?>
37
+ <?php echo $this->getChildHtml($childName, false);?>
38
+ <?php endforeach;?>
39
+ </div>
40
+ <?php endif; ?>
app/design/frontend/base/default/template/wishlist/item/column/remove.phtml ADDED
@@ -0,0 +1,29 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
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>
app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -29,7 +29,7 @@
29
  <?php $_wishlistSubmitUrl = $this->helper('wishlist')->getUpdateUrl($_wishlistItem); ?>
30
  <ul class="add-to-links">
31
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
32
- <li><a href="<?php echo $_wishlistSubmitUrl ?>" onclick="productAddToCartForm.submitLight(this, '<?php echo $_wishlistSubmitUrl ?>'); return false;" class="link-wishlist"><?php echo $this->__('Update Wishlist') ?></a></li>
33
  <?php endif; ?>
34
  <?php $_product = $this->getProduct(); ?>
35
  <?php $_compareUrl = $this->helper('catalog/product_compare')->getAddUrl($_product); ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
29
  <?php $_wishlistSubmitUrl = $this->helper('wishlist')->getUpdateUrl($_wishlistItem); ?>
30
  <ul class="add-to-links">
31
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
32
+ <li><a href="<?php echo $_wishlistSubmitUrl ?>" onclick="productAddToCartForm.submitLight(this, this.href); return false;" class="link-compare"><?php echo $this->__('Update Wishlist') ?></a></li>
33
  <?php endif; ?>
34
  <?php $_product = $this->getProduct(); ?>
35
  <?php $_compareUrl = $this->helper('catalog/product_compare')->getAddUrl($_product); ?>
app/design/frontend/base/default/template/wishlist/item/list.phtml ADDED
@@ -0,0 +1,63 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <?php
28
+ $columns = $this->getColumns();
29
+ ?>
30
+ <table class="data-table" id="wishlist-table">
31
+ <thead>
32
+ <tr>
33
+ <?php foreach ($columns as $column): ?>
34
+ <th><?php echo $column->getTitle();?></th>
35
+ <?php endforeach; ?>
36
+ </tr>
37
+ </thead>
38
+ <tbody>
39
+ <?php if (count($this->getItems())): ?>
40
+ <?php foreach ($this->getItems() as $item): ?>
41
+ <tr id="item_<?php echo $item->getId();?>">
42
+ <?php foreach ($columns as $column): ?>
43
+ <td><?php $column->setItem($item); echo $column->toHtml($item);?></td>
44
+ <?php endforeach; ?>
45
+ </tr>
46
+ <?php endforeach ?>
47
+ <?php else: ?>
48
+ <td colspan="<?php echo count($columns);?>" class="wishlist-empty"><?php echo $this->__('This Wishlist has no Items');?></td>
49
+ <?php endif; ?>
50
+ </tbody>
51
+ </table>
52
+ <?php foreach ($columns as $column): ?>
53
+ <?php echo $column->getAdditionalHtml();?>
54
+ <?php endforeach; ?>
55
+ <script type="text/javascript">
56
+ //<![CDATA[
57
+ decorateTable('wishlist-table');
58
+
59
+ <?php foreach ($columns as $column): ?>
60
+ <?php echo $column->getJs();?>
61
+ <?php endforeach; ?>
62
+ //]]>
63
+ </script>
app/design/frontend/base/default/template/wishlist/options_list.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Customer_Wishlist_Item_Options */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Customer_Wishlist_Item_Options */
app/design/frontend/base/default/template/wishlist/render/item/price.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Customer_Wishlist_Render_Item_Price */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Customer_Wishlist_Render_Item_Price */
app/design/frontend/base/default/template/wishlist/render/item/price_msrp_item.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -85,7 +85,7 @@
85
  "<?php echo $_product->getName() ?>",
86
  $("<?php echo $priceElementId ?>"),
87
  '<?php echo $_msrpPrice ?>',
88
- "<?php echo $_product->getAddToCartUrl() ?>"
89
  );
90
  </script>
91
  <?php else: ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
85
  "<?php echo $_product->getName() ?>",
86
  $("<?php echo $priceElementId ?>"),
87
  '<?php echo $_msrpPrice ?>',
88
+ "<?php echo $_product->isSalable() ? $_product->getAddToCartUrl() : '' ?>"
89
  );
90
  </script>
91
  <?php else: ?>
app/design/frontend/base/default/template/wishlist/render/item/price_msrp_rss.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
app/design/frontend/base/default/template/wishlist/shared.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Share_Wishlist */
@@ -52,8 +52,8 @@
52
  ?>
53
  <tr>
54
  <td>
55
- <a class="product-image" href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->htmlEscape($product->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($product, 'small_image')->resize(113, 113); ?>" width="113" height="113" alt="<?php echo $this->htmlEscape($product->getName()) ?>" /></a>
56
- <h2 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>"><?php echo $this->htmlEscape($product->getName()) ?></a></h2>
57
  <?php echo $this->getPriceHtml($product) ?>
58
  <?php echo $this->getDetailsHtml($item) ?>
59
  </td>
@@ -64,7 +64,7 @@
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="#" onclick="setLocation('<?php echo $this->getAddToWishlistUrl($item) ?>'); return false;" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></p>
68
  </td>
69
  </tr>
70
  <?php endforeach ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Share_Wishlist */
52
  ?>
53
  <tr>
54
  <td>
55
+ <a class="product-image" href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($product, 'small_image')->resize(113, 113); ?>" width="113" height="113" alt="<?php echo $this->escapeHtml($product->getName()) ?>" /></a>
56
+ <h2 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></h2>
57
  <?php echo $this->getPriceHtml($product) ?>
58
  <?php echo $this->getDetailsHtml($item) ?>
59
  </td>
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>
68
  </td>
69
  </tr>
70
  <?php endforeach ?>
app/design/frontend/base/default/template/wishlist/sharing.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -57,7 +57,7 @@
57
  </div>
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->getUrl('*/')?>"><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>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
57
  </div>
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>
app/design/frontend/base/default/template/wishlist/sidebar.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Customer_Sidebar */
@@ -28,7 +28,7 @@
28
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
29
  <div class="block block-wishlist">
30
  <div class="block-title">
31
- <strong><span><?php echo $this->__('My Wishlist <small>(%d)</small>', $this->getItemCount()) ?></span></strong>
32
  </div>
33
  <div class="block-content">
34
  <p class="block-subtitle"><?php echo $this->__('Last Added Items') ?></p>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Customer_Sidebar */
28
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
29
  <div class="block block-wishlist">
30
  <div class="block-title">
31
+ <strong><span><?php echo $this->getTitle(); ?></span></strong>
32
  </div>
33
  <div class="block-content">
34
  <p class="block-subtitle"><?php echo $this->__('Last Added Items') ?></p>
app/design/frontend/base/default/template/wishlist/view.phtml CHANGED
@@ -20,136 +20,57 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Customer_Wishlist */
27
  ?>
28
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
29
- <div class="my-wishlist">
30
- <div class="page-title title-buttons">
31
- <?php if ($this->helper('wishlist')->isRssAllow() && $this->hasWishlistItems()): ?>
32
- <a href="<?php echo $this->helper('wishlist')->getRssUrl(); ?>" class="link-rss"><?php echo $this->__('RSS Feed') ?></a>
33
- <?php endif; ?>
34
- <h1><?php echo $this->__('My Wishlist') ?></h1>
35
- </div>
36
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
37
- <?php if ($this->hasWishlistItems()): ?>
38
- <form id="wishlist-view-form" action="<?php echo $this->getUrl('*/*/update') ?>" method="post">
39
- <fieldset>
40
- <?php echo $this->getBlockHtml('formkey')?>
41
- <table class="data-table" id="wishlist-table">
42
- <col width="1" />
43
- <col />
44
- <col width="1" />
45
- <col width="1" />
46
- <col width="1" />
47
- <thead>
48
- <tr>
49
- <th><?php echo $this->__('Product') ?></th>
50
- <th><?php echo $this->__('Comment') ?></th>
51
- <th class="a-center"><span class="nobr"><?php echo $this->__('Added On') ?></span></th>
52
- <th class="a-center"><span class="nobr"><?php echo $this->__('Add to Cart') ?></span></th>
53
- <th>&nbsp;</th>
54
- </tr>
55
- </thead>
56
- <tbody>
57
- <?php foreach ($this->getWishlistItems() as $item): ?>
58
- <?php
59
- $product = $item->getProduct();
60
- $isVisibleProduct = $product->isVisibleInSiteVisibility();
61
- ?>
62
- <tr>
63
- <td>
64
- <a class="product-image" href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($product, 'small_image')->resize(113, 113); ?>" width="113" height="113" alt="<?php echo $this->escapeHtml($product->getName()) ?>" /></a>
65
- <h2 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></h2>
66
- <?php echo $this->getPriceHtml($product) ?>
67
- <?php echo $this->getDetailsHtml($item) ?>
68
- </td>
69
- <td>
70
- <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->getCommentValue($item); ?></textarea>
71
- </td>
72
- <td>
73
- <span class="nobr"><?php echo $this->getFormatedDate($item->getAddedAt()) ?></span>
74
- </td>
75
- <td class="a-center">
76
- <?php if ($item->canHaveQty() && $isVisibleProduct): ?>
77
- <p><input type="text" class="input-text qty" name="qty[<?php echo $item->getId() ?>]" value="<?php echo $this->getAddToCartQty($item) * 1 ?>" /></p>
78
- <?php endif; ?>
79
- <?php if ($product->isSaleable()): ?>
80
- <?php if ($isVisibleProduct): ?>
81
- <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>
82
- <?php endif ?>
83
- <?php else: ?>
84
- <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
85
- <?php endif; ?>
86
- <?php if ($isVisibleProduct): ?>
87
- <p><a href="<?php echo $this->getItemConfigureUrl($item) ?>"><?php echo $this->__('Edit') ?></a></p>
88
- <?php endif ?>
89
- </td>
90
- <td>
91
- <a href="<?php echo $this->getItemRemoveUrl($item) ?>" title="<?php echo $this->__('Remove Item') ?>" onclick="return confirmRemoveWishlistItem();" class="btn-remove btn-remove2"><?php echo $this->__('Remove item')?></a>
92
- </td>
93
- </tr>
94
- <?php endforeach ?>
95
- </tbody>
96
- </table>
97
- <script type="text/javascript">decorateTable('wishlist-table')</script>
98
- <div class="buttons-set buttons-set2">
99
- <button type="submit" onclick="this.name='save_and_share'" title="<?php echo $this->__('Share Wishlist') ?>" class="button btn-share"><span><span><?php echo $this->__('Share Wishlist') ?></span></span></button>
100
- <?php if($this->isSaleable()):?>
101
- <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>
102
- <?php endif;?>
103
- <button type="submit" title="<?php echo $this->__('Update Wishlist') ?>" onclick="this.name='do'" class="button btn-update"><span><span><?php echo $this->__('Update Wishlist') ?></span></span></button>
104
- </div>
105
- </fieldset>
106
- </form>
107
- <?php else: ?>
108
- <p><?php echo $this->__('You have no items in your wishlist.') ?></p>
109
- <?php endif ?>
110
- <script type="text/javascript">
111
- //<![CDATA[
112
- function confirmRemoveWishlistItem() {
113
- return confirm('<?php echo $this->__('Are you sure you want to remove this product from your wishlist?') ?>');
114
- }
115
 
116
- function focusComment(obj) {
117
- if( obj.value == '<?php echo $this->helper('wishlist')->defaultCommentString() ?>' ) {
118
- obj.value = '';
119
- } else if( obj.value == '' ) {
120
- obj.value = '<?php echo $this->helper('wishlist')->defaultCommentString() ?>';
121
- }
122
- }
 
 
 
 
 
 
 
 
 
123
 
124
- function addWItemToCart(itemId) {
125
- var url = '<?php echo $this->getItemAddToCartUrl('%item%') ?>';
126
- url = url.gsub('%item%', itemId);
127
- var form = $('wishlist-view-form');
128
- if (form) {
129
- var input = form['qty[' + itemId + ']'];
130
- if (input) {
131
- var separator = (url.indexOf('?') >= 0) ? '&' : '?';
132
- url += separator + input.name + '=' + encodeURIComponent(input.value);
133
- }
 
 
 
134
  }
135
- setLocation(url);
136
- }
137
-
138
- function addAllWItemsToCart() {
139
- var url = '<?php echo $this->getUrl('*/*/allcart') ?>';
140
- var separator = (url.indexOf('?') >= 0) ? '&' : '?';
141
- $$('#wishlist-view-form .qty').each(
142
- function (input, index) {
143
- url += separator + input.name + '=' + encodeURIComponent(input.value);
144
- separator = '&';
145
- }
146
- );
147
- setLocation(url);
148
- }
149
- //]]>
150
- </script>
151
- </div>
152
- <div class="buttons-set">
153
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
154
- </div>
155
  <?php endif ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  /* @var $this Mage_Wishlist_Block_Customer_Wishlist */
27
  ?>
28
  <?php if ($this->helper('wishlist')->isAllow()) : ?>
29
+ <div class="my-wishlist">
30
+ <div class="page-title title-buttons">
31
+ <?php if ($this->helper('wishlist')->isRssAllow() && $this->hasWishlistItems()): ?>
32
+ <a href="<?php echo $this->helper('wishlist')->getRssUrl($this->getWishlistInstance()->getId()); ?>" class="link-rss"><?php echo $this->__('RSS Feed') ?></a>
33
+ <?php endif; ?>
34
+ <h1><?php echo $this->getTitle(); ?></h1>
35
+ </div>
36
+ <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
37
 
38
+ <form id="wishlist-view-form" action="<?php echo $this->getUrl('*/*/update', array('wishlist_id' => $this->getWishlistInstance()->getId())) ?>" method="post">
39
+ <?php echo $this->getChildHtml('top'); ?>
40
+ <fieldset>
41
+ <?php if ($this->hasWishlistItems()): ?>
42
+ <?php echo $this->getBlockHtml('formkey');?>
43
+ <?php $this->getChild('items')->setItems($this->getWishlistItems()); ?>
44
+ <?php echo $this->getChildHtml('items');?>
45
+ <script type="text/javascript">decorateTable('wishlist-table')</script>
46
+ <?php else: ?>
47
+ <p class="wishlist-empty"><?php echo $this->__('You have no items in your wishlist.') ?></p>
48
+ <?php endif ?>
49
+ <div class="buttons-set buttons-set2">
50
+ <?php echo $this->getChild('control_buttons')->toHtml();?>
51
+ </div>
52
+ </fieldset>
53
+ </form>
54
 
55
+ <script type="text/javascript">
56
+ //<![CDATA[
57
+ var wishlistForm = new Validation($('wishlist-view-form'));
58
+ function addAllWItemsToCart() {
59
+ var url = '<?php echo $this->getUrl('*/*/allcart', array('wishlist_id' => $this->getWishlistInstance()->getId())) ?>';
60
+ var separator = (url.indexOf('?') >= 0) ? '&' : '?';
61
+ $$('#wishlist-view-form .qty').each(
62
+ function (input, index) {
63
+ url += separator + input.name + '=' + encodeURIComponent(input.value);
64
+ separator = '&';
65
+ }
66
+ );
67
+ setLocation(url);
68
  }
69
+ //]]>
70
+ </script>
71
+ </div>
72
+ <?php echo $this->getChildHtml('bottom'); ?>
73
+ <div class="buttons-set">
74
+ <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
75
+ </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
76
  <?php endif ?>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Base_Default</name>
4
- <version>1.6.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.6.2.0</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
- <date>2012-01-11</date>
14
- <time>11:50:30</time>
15
- <contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="etc"><file name="widget.xml" hash="f63caeba70daa2b5d519f4e4ce600ffd"/></dir><dir name="layout"><file name="authorizenet.xml" hash="3d014b09a6948ca0d07e663f0bb83319"/><file name="bundle.xml" hash="cad0ebd289559fca63923af7b7501c04"/><file name="catalog.xml" hash="5e09bd0bc301c8f0ce9610e27cbb9551"/><file name="catalog_msrp.xml" hash="ff5c4e7f8d08d367656f34e72d411a17"/><file name="cataloginventory.xml" hash="059cd8ec8fe165d4dfb20b1b365e0ad3"/><file name="catalogsearch.xml" hash="9618072bb6a7b560b145b41eb535ff04"/><file name="checkout.xml" hash="f7543b676b5cac8abdf2309e61013cb3"/><file name="cms.xml" hash="48295546e80ab4e5f472e76ea34f8472"/><file name="contacts.xml" hash="ecdd1586728f8592b2218d46b1e88561"/><file name="core.xml" hash="fecc935067e39799313380ea48e9e6c1"/><file name="customer.xml" hash="758374cebc9d0e2543ea84ad6e965904"/><file name="directory.xml" hash="237b6461de0764e4296c9c3c5c742e2d"/><file name="downloadable.xml" hash="3160e7698dfe684f97f5f4a6003d5b0d"/><file name="googleanalytics.xml" hash="86d401b3d4268bc1947ab84694bae81c"/><file name="googlecheckout.xml" hash="8abad55dba3bd1e6cecf5700aeef906b"/><file name="newsletter.xml" hash="2c2e01afa8aff2687b55358fca8223a8"/><file name="page.xml" hash="3392c3162eb8860738d2da6303791dd0"/><file name="pagecache.xml" hash="cfbd54dc05336c777f421d939151df03"/><file name="payment.xml" hash="2726f3e63bff0398c5d3a8a76be4189d"/><file name="paypal.xml" hash="6f48d7f83d6b620a26c27dd05cb717ad"/><file name="paypaluk.xml" hash="a32906ee52d1c4c552b9ad1240e27a7c"/><file name="persistent.xml" hash="38e568f2c513d03e6312428c67155542"/><file name="poll.xml" hash="be8b61f2898f83c3a575b27866399b1e"/><file name="productalert.xml" hash="aefe2a2415ca235afcbf0eee3160573d"/><file name="reports.xml" hash="5403dc921b7dcf8d0926c9bdf2bd4377"/><file name="review.xml" hash="520ef8a5f50453aaa5f3db2dc7e1996e"/><file name="rss.xml" hash="aa85d144ecfbd0e8a3ae8f9bc174b063"/><dir name="sales"><file name="billing_agreement.xml" hash="6a67c8633d708d7706c1350161a4d25b"/><file name="recurring_profile.xml" hash="afb5dcfc4e5918d59a03a3fcf8d7cdd0"/></dir><file name="sales.xml" hash="0c5257b2d9b7e8d95a0b56140634b2f5"/><file name="sendfriend.xml" hash="3e3fa92effc21537cb89ba7a332d8b59"/><file name="shipping.xml" hash="65df35ef39f20c49ec4a9ea3aba820ab"/><file name="tag.xml" hash="ebefadc88a6e5307e1e7f77c42cd268e"/><file name="weee.xml" hash="3141468e63406d77fbf478257767cce1"/><file name="wishlist.xml" hash="8d5055cfcc8d7f14944edd08f0db716c"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="fe575685affc4388f25080f01408f676"/><file name="iframe.phtml" hash="878ef1268c71be62bda731aec1e8aa79"/><file name="info.phtml" hash="c2ab414445bd1b3368b5c87559c70267"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="f2bfc20a43080ed1110c3fe4d2384eda"/></dir><file name="price.phtml" hash="2e090cf9179d7b59e8ab81e0a66d4711"/><dir name="view"><dir name="options"><file name="notice.phtml" hash="9c5df8fe4e2c774530968e5026240a3d"/></dir><file name="price.phtml" hash="cd7da22c87a6c9f13941f1435ef3427b"/><file name="tierprices.phtml" hash="70391f19e0bc54a7e8c596ceea57af61"/><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="d10cf4140111655ae1a5e65a73e9448d"/><file name="multi.phtml" hash="30cc14a0b5ce3ecb2ae67864d7dccdeb"/><file name="radio.phtml" hash="4b379381f722086cf3bc13cf7ab32a9c"/><file name="select.phtml" hash="de6e0780829bfd6ce37bcb69d5d3383d"/></dir><file name="options.phtml" hash="6559d2b5784629d24dfff6a612f08986"/></dir><file name="bundle.phtml" hash="6518757d10d74f4b2ae08d912bf99a4f"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="e8b621b4dc1c5195bc6b5feafe112cfe"/></dir><dir name="invoice"><file name="default.phtml" hash="394ea31ea9ac7f1407d7061ca1d77522"/></dir><dir name="order"><file name="default.phtml" hash="2949db6f7484fc9fff5688e298fdf21e"/></dir><dir name="shipment"><file name="default.phtml" hash="dabc362995275cb96c85807451367216"/></dir></dir></dir></dir><dir name="rss"><dir name="catalog"><dir name="product"><file name="price.phtml" hash="1d271485c24dc7e9d18e7c6e2fda59f8"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="8ecc1a7adc816d73b5cdd170ce18dd5a"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="35916c5c3d337262d874daea641f14a3"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="257cb4e7992496bc8bf9a3ae2f3c0e89"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="ee40a81975d9e2a849cd54267af80cd1"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="e3322c58170dc9fb0f98226aeb3d8d41"/><file name="right_col.phtml" hash="e3322c58170dc9fb0f98226aeb3d8d41"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="a422afbbc4ad2583f8c0763299b0f5e7"/><file name="view.phtml" hash="029628edc3a221b17e2c4fdf8ad86614"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="ed2e3519fb59d9de1338a2b96b106b16"/><file name="link_inline.phtml" hash="9324821268ac2d7cfbb668c1a35b8b57"/></dir></dir></dir><dir name="layer"><file name="filter.phtml" hash="7f07dae8c69eff41a17b15c27a3e26e7"/><file name="state.phtml" hash="e7a11368a9e6149bba8c820d0ad4e981"/><file name="view.phtml" hash="b6e1e399509132ed39f8ea474a642f60"/></dir><dir name="msrp"><file name="popup.phtml" hash="8bae34b23d5666071f74d00349c4c113"/></dir><dir name="navigation"><file name="left.phtml" hash="3ec84f187ebbea1e9950731a9c1df65c"/><file name="top.phtml" hash="b5afe15b614b67e7ce45c75e93b146d7"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="df52f41d9a0681aa844478f6506ebade"/><file name="sidebar.phtml" hash="4e7f669a8cbd46d91007ab7952e51de9"/></dir><file name="gallery.phtml" hash="ca91ee340cae160702cdb2cdbc7d6151"/><dir name="list"><file name="related.phtml" hash="0aec7474c026bcb63956e6b729a5fd09"/><file name="toolbar.phtml" hash="d87c9cb2faf54c136b3eb4ef0941bd80"/><file name="upsell.phtml" hash="76e2ccfb4e6f91e3dac7aeeb20e6b806"/></dir><file name="list.phtml" hash="64e9d60d16847cb664ff12e9f9d09166"/><file name="new.phtml" hash="9e2d685a596d13d1e7e4426b024ba7d1"/><file name="price.phtml" hash="946ad2821bdbe8b8ef6485262ffcd863"/><file name="price_msrp.phtml" hash="4b0bade08c56a42a3cf4cc1e2ba74c0c"/><file name="price_msrp_item.phtml" hash="3c876155d5aa6f8905fda0f77de22b93"/><file name="price_msrp_noform.phtml" hash="7543a1ba00863b5c8f2612104468118d"/><file name="price_msrp_rss.phtml" hash="b1815194a27b54fed44da2ad045a55bf"/><dir name="view"><file name="additional.phtml" hash="bb4b797e2baba894ea0aa5516b986669"/><file name="addto.phtml" hash="2666193292d9d9ee38dc5e9d0072daa3"/><file name="addtocart.phtml" hash="7a570a21026e649d31b46994cd07178d"/><file name="attributes.phtml" hash="aa0ebbb858612b3b96798868c7bb8b56"/><file name="description.phtml" hash="f694967bf8f4a9520d284eba91913120"/><file name="media.phtml" hash="5d18f9c16fdc8f49f94377c00046d05d"/><dir name="options"><file name="js.phtml" hash="4cef65b9b14c56b134404dcf471eba8c"/><dir name="type"><file name="date.phtml" hash="96bb4e38f428fb6041709e552b733f78"/><file name="default.phtml" hash="545d8cedeb20c23d83f66f473c24e9ee"/><file name="file.phtml" hash="26419fac88298374ed0cd2e9b2c0d22f"/><file name="select.phtml" hash="fc764b2f3e94fc261bf6b8d558d2897a"/><file name="text.phtml" hash="a836aecfc903d0466d96bd4e25f7fa58"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="3ea9a96f4bd6b3efe142ea7d5a6e5a39"/></dir><file name="wrapper.phtml" hash="77ce7d5a4f4fb1d41b72ec507289a235"/></dir><file name="options.phtml" hash="52098ac0825ce56179ff9952956894e9"/><file name="price.phtml" hash="daddc2f288210beabb2e676b3362f6b7"/><file name="price_clone.phtml" hash="d980a8e9aa84f3aeedc2a112f3b89055"/><file name="tierprices.phtml" hash="03f663b881bc83e2c4ac434054e3b3d2"/><dir name="type"><file name="configurable.phtml" hash="ad44caa1bd294a9f0eadef3af0e01355"/><file name="default.phtml" hash="7d681338357b9f5165642b6924da5bb4"/><file name="grouped.phtml" hash="9872f617e94bd27321f0c2d3b8e8a8fa"/><dir name="options"><file name="configurable.phtml" hash="db78b70b5e83be1fddc86f6428c2991c"/></dir><file name="simple.phtml" hash="ad44caa1bd294a9f0eadef3af0e01355"/><file name="virtual.phtml" hash="ad44caa1bd294a9f0eadef3af0e01355"/></dir></dir><file name="view.phtml" hash="4c460373037d049fa9ddd8d0538e5d1d"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="534295a2078ed9feffb31d3fa388e74d"/><file name="link_inline.phtml" hash="5d7b6eba333e3508484efb12fecb8be4"/></dir><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="e92ce2fb508e23cd14a5a8becb1c06ea"/><file name="new_images_list.phtml" hash="9203d98cb665a69b548cba7b806f7997"/><file name="new_names_list.phtml" hash="f22297b7fb2aebb255b2ffffb4d6d0e0"/></dir><dir name="content"><file name="new_grid.phtml" hash="bf189d468b68dd7add41e993a0c00be0"/><file name="new_list.phtml" hash="ee092a9aa4107d219865c1c1ee51d9ae"/></dir></dir></dir></dir><dir name="rss"><dir name="product"><file name="price.phtml" hash="cc019b43c8faecc3e0498e3715f6bc5a"/></dir></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="a71d1513ba7368094508e4f721c3efe8"/></dir><file name="sitemap.phtml" hash="6f64266cb06b050a19c6814dbefaa05f"/><file name="tree.phtml" hash="470261b75ae32b0e4df42c82c6d741dc"/></dir></dir><dir name="cataloginventory"><file name="qtyincrements.phtml" hash="8b7d5adee5daf7e06de20801c4361a6c"/><dir name="stockqty"><file name="composite.phtml" hash="efe503de9b4fa8450e124c277d141f20"/><file name="default.phtml" hash="bc4bf2f3da436016f88e0e962fb7d12c"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="3d05449b07acafdcef80ce935638bc1f"/><file name="result.phtml" hash="b907c965ebbc11ecb2c5641bc9a897fd"/></dir><file name="form.mini.phtml" hash="4377724da3b8fe8adc82479c00e98cc4"/><file name="result.phtml" hash="6a1b9285c6360bf2ade9e614910b55eb"/><file name="term.phtml" hash="d9c3661bb61932e8e58b6d84c2ed89ce"/></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="eba44b9180991c98ce4c293d04da3487"/><file name="crosssell.phtml" hash="12a188c192367e1f65fa5b38ec8c29eb"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="9c7f876a4590cfb42ed0f5b467338a75"/></dir><file name="default.phtml" hash="9e9954605897c26dfbf0f4defb4a4ff8"/></dir><file name="noItems.phtml" hash="e3955e167277acd3d6853b60a40c7887"/><dir name="render"><file name="default.phtml" hash="29ce75bcbf371e45ee9d8d8c62ca2e5d"/><file name="simple.phtml" hash="619bbb0a91946ef78d695298843d92d2"/></dir><file name="shipping.phtml" hash="93c13b60e69aadbf9049ad89f9ba5845"/><dir name="sidebar"><file name="default.phtml" hash="ae1ef6d32c067d080aa54c4be2ea7ef6"/></dir><file name="sidebar.phtml" hash="cb7ddfd840117882765d5907068bfc86"/><file name="totals.phtml" hash="758df523d4cfa396a77ae4e6da36e0a6"/></dir><file name="cart.phtml" hash="03aa15aa9ed98d18483427749825512d"/><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="5890f841fb8c1836e0aaab46cfea7971"/></dir><file name="addresses.phtml" hash="2a8a8fa4e9178083a132afa458f9af1e"/><file name="agreements.phtml" hash="ee2908b67df859eb11ba40961e238cc4"/><dir name="billing"><file name="items.phtml" hash="9b5ad70cf6030ac066884188f337960e"/></dir><file name="billing.phtml" hash="2a60b67ae559bed4341a71636350d888"/><dir name="item"><file name="default.phtml" hash="1667635f057c3ad6a1b06312818d7689"/></dir><file name="link.phtml" hash="6afc0adeb590ab9ba4913c6ac319780e"/><dir name="overview"><file name="item.phtml" hash="d2034aaebc5017bfa4718dbfe30a5c50"/></dir><file name="overview.phtml" hash="85078bbc7b18e54e72693ed35c55b011"/><file name="shipping.phtml" hash="11eb1a5113c6e4472f53101743a3b919"/><file name="state.phtml" hash="7e23eaf4442153dc77a8dbe56c1a1e23"/><file name="success.phtml" hash="bba79f1bc10619afa55dda7f6f993f7f"/></dir><dir name="onepage"><file name="agreements.phtml" hash="fd268340ecbb77804053350f311b0a6d"/><file name="billing.phtml" hash="df00d4efc259d69d86134ed593ebcac9"/><file name="failure.phtml" hash="aff5c96bf56a4b92b8517f3a0021c887"/><file name="link.phtml" hash="f7d753b83b2c884dee5f6200ba43f4f1"/><file name="login.phtml" hash="5256b8159ac5d40753911a4b8116c670"/><dir name="payment"><file name="methods.phtml" hash="c197a93d7c9aa7d21f1672734da1bce7"/></dir><file name="payment.phtml" hash="152ff2082211ff1f02b827a66b333006"/><file name="progress.phtml" hash="0e02e2bef8a221563fc57008372044d2"/><dir name="review"><file name="button.phtml" hash="28eeca062cba79dc34945807e8c98862"/><file name="info.phtml" hash="ec1a5ee2f5efbb08bc5b842dfc317ac6"/><file name="item.phtml" hash="9a399a320ef6a2658ff13994d0db9241"/><file name="totals.phtml" hash="478258f78b0240ba5618d2b09900ef10"/></dir><file name="review.phtml" hash="bf4f49fcb90e40ba9225c6d362fdf2ff"/><file name="shipping.phtml" hash="c86e20d2d08fc5c8effd769c2cb1908c"/><dir name="shipping_method"><file name="additional.phtml" hash="e63f3af8ccc648c6a72301367237ecbc"/><file name="available.phtml" hash="bb3d64323da99736b2ebdad2d9e8b5a8"/></dir><file name="shipping_method.phtml" hash="ab17c9f73c9eabaace93f509318aabe2"/></dir><file name="onepage.phtml" hash="e60c47a0a87ec81c4fbd39938c315c69"/><file name="success.phtml" hash="9b0492208ddbd2d5d70457e419f43dc3"/><dir name="total"><file name="default.phtml" hash="b8f93b97141a4897770474050933ac8c"/><file name="nominal.phtml" hash="8615df567defcfc7c02b1b9e27db6c60"/><file name="tax.phtml" hash="6effef82ec3f4a2d7afa573e29928c76"/></dir></dir><dir name="cms"><file name="content.phtml" hash="063ff5fefdc9c23a839c61fbf31e6470"/><file name="content_heading.phtml" hash="8f41c0b3480e1f932147ae20be8dc8ee"/><dir name="default"><file name="home.phtml" hash="c8dea1cdfb2769e1a5caa3ce612e20b5"/><file name="no-route.phtml" hash="c178dad9c2ab98233dcc4e6d3990aff5"/></dir><file name="meta.phtml" hash="abe2b7fdcceba1a42868059c6b051070"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="2ddcf6b1b39ff64d796b23525258e46b"/><file name="link_inline.phtml" hash="2cc4ecc541c01fb5fa34d813a2f47fca"/></dir><dir name="static_block"><file name="default.phtml" hash="68f9a573d08c42ac2ce8312a932e620a"/></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="c50f617f71eb4a3a4a631b5b9f50f8ba"/></dir><dir name="core"><file name="formkey.phtml" hash="1d6b50d2e2f162e2c8e85c6465526766"/><file name="link.phtml" hash="944b23188d46477667f56900d269a9f7"/><file name="messages.phtml" hash="fc66e2492a29a6ae8fb758970251cab4"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="8c2868b6df29ca476baf84fd90150052"/><file name="hello.phtml" hash="14367d6cd3f50a97aa7ac8438fbffcab"/><file name="info.phtml" hash="2c81a1920681022cd4a797f101fb5194"/><file name="newsletter.phtml" hash="44d420a81a7416803ec61f4430f6ba9c"/></dir><file name="dashboard.phtml" hash="2cc3826aee0f41b00635ece20ac0fb3a"/><dir name="link"><file name="back.phtml" hash="9ed3d065f422a9ebdd3153b590e8585b"/></dir><file name="navigation.phtml" hash="07599a5c6e6b772afb4ec9b43f627162"/></dir><dir name="address"><file name="book.phtml" hash="c9dab54993a888f2e98e05499f439473"/><file name="edit.phtml" hash="a3f3e1f50737a57049ab73c74b057393"/></dir><file name="address.phtml" hash="d2132a023dc5d5f69987c95162603bf4"/><file name="balance.phtml" hash="c52b49e85be687018b42ef6c6ea4af13"/><dir name="form"><file name="address.phtml" hash="1d01e813b6236ccc5715b81adf6fa786"/><file name="changepassword.phtml" hash="59470b67a15a2e0a35a6edd4d5a77d03"/><file name="confirmation.phtml" hash="5f98ff9747fb77513c8ec8b15e61f46c"/><file name="edit.phtml" hash="5f0237add360be120afb9b3b4a4a785e"/><file name="forgotpassword.phtml" hash="fe3bd253011b99756b1d2481f27d2091"/><file name="login.phtml" hash="23aa9ce76fefd3f64286823d9bcbe1cb"/><file name="mini.login.phtml" hash="12b47596bb1def2f72f733c79136cda1"/><file name="newsletter.phtml" hash="57e59f4c4cff4301bdba621d796cda1f"/><file name="register.phtml" hash="11d2621c9e0c8920df436d019668b337"/><file name="resetforgottenpassword.phtml" hash="4a6090b6fab7f80c5a008adcca56c787"/></dir><file name="logout.phtml" hash="6bfe50872dac7616174bcbb2db6e7021"/><file name="orders.phtml" hash="e2fb3e8de4f5212e215118d5cdade03c"/><dir name="widget"><file name="dob.phtml" hash="883f9d37699a67058cb72a1d0250203f"/><file name="gender.phtml" hash="dec18426118876686dea6d52eb2ddb9a"/><file name="name.phtml" hash="7cb29dfc7f728ed4a419416b301aa36a"/><file name="taxvat.phtml" hash="90b9148c009b9941024544ae9d6820b0"/></dir><file name="wishlist.phtml" hash="cf892a1a691ffa39a46d20a9507a1663"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="d6606b69bc05131a78338d80b31e6588"/></dir><file name="currency.phtml" hash="727e9b664c3df340379f096ceb43da5e"/><dir name="js"><file name="optional_zip_countries.phtml" hash="877d69b700b0f7f85fa95effe2dab499"/></dir></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="aa1fca66e1de2cf93e1dfec4de20e780"/><file name="samples.phtml" hash="4bb362041e14ac0764f6d0cdbc3cf539"/><file name="type.phtml" hash="61b84a1e14fcf7702e3301ecfaa69ac2"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="95eb2edeacae30822d146026f097f1bb"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="ffdaa27a7f27b0716dccf1e2dcec818e"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="c9a7687e3f9de4dd02d0c7f8d4ede3ae"/></dir></dir><file name="success.phtml" hash="ee767dce803b8bce5714d3105bd6b8b8"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="f06d015a218a8d1e1022aa9dec00bea0"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="cbf8d07b78ef704476b1a7e66b892be2"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="d8f9cf2be0ffe37480c84e1b33107387"/></dir><dir name="order"><file name="downloadable.phtml" hash="dcd7e841202f2504a2f22ec57c134cac"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="e524e29ff5c8862fa3c769d5758ec349"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="d60b6f8f9720b58f6ef88b352d076c8f"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="417a7caa5b6cbc63ddf0704d28be670d"/></dir></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="183ffdcb7f46349b50dd95e6eca171d7"/></dir><dir name="invoice"><file name="items.phtml" hash="45660dec4168af628c21d47eb07cde46"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="4e6ff78c2d1cc3c29a553309d9d9199f"/></dir><dir name="invoice"><file name="default.phtml" hash="4e6ff78c2d1cc3c29a553309d9d9199f"/></dir><dir name="order"><file name="default.phtml" hash="3f6855e57965ef6759793be1c9003278"/></dir><dir name="shipment"><file name="default.phtml" hash="21edf4af2be47ba2f5d7e9e9e33c5ce6"/></dir></dir><file name="items.phtml" hash="e2db101ba23a7fe32934c0bca298ce8f"/><dir name="shipment"><file name="items.phtml" hash="8abfbe44c03aebd010488a180364d936"/><file name="track.phtml" hash="10772b3dec425feb07d06bcc8020dff4"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="5337280735050c7fed3fc991496152d2"/><file name="stock.phtml" hash="eef2511f8a25b068f69de85a5e260936"/></dir></dir><dir name="giftmessage"><file name="inline.phtml" hash="1ccc1b7dd972fef3c71866deab911ff8"/></dir><dir name="googlecheckout"><file name="form.phtml" hash="6cc948fa8d1399192ae7ca0dec694f38"/><file name="link.phtml" hash="a8dcd88f66435ef88fee6ffb2e50e8c9"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="4e34ca91d5a73de122da67185de15697"/></dir><dir name="page"><file name="1column.phtml" hash="cae0a4ce47734fb7b6c37378afcce74d"/><file name="2columns-left.phtml" hash="5adb5fab1739165ec23c20784c66970d"/><file name="2columns-right.phtml" hash="3fbdf6a0f82ac7951d7ac94fe79478b0"/><file name="3columns.phtml" hash="385efb0fb0733343104169a7862e944d"/><file name="empty.phtml" hash="83b27149ba4ecc117e69075aa9ad9d00"/><dir name="html"><file name="breadcrumbs.phtml" hash="fdfa76871d3340eb6e1c59990a7d07b1"/><file name="footer.phtml" hash="8ad5f76cd0680a1c04e5cbc363eb689f"/><file name="head.phtml" hash="52bae233fd72cdb897aad7797a6aee0b"/><file name="header.phtml" hash="81105806e2e0799482556c03ed5cb9bd"/><file name="notices.phtml" hash="2121153df1305e59d159e9833d34a2c4"/><file name="pager.phtml" hash="fceedb53c9ba9a0fd00ddac954855590"/><file name="top.links.phtml" hash="b5567bf97bd53184fb84e23c73ab4778"/><file name="wrapper.phtml" hash="3dfb054e1d344808308e93c7ee65a940"/></dir><dir name="js"><file name="calendar.phtml" hash="ffb6217091bdc3c3653be54d65dde4ba"/><file name="cookie.phtml" hash="00f4c5af34f524169eea6f552db70bdf"/></dir><file name="popup.phtml" hash="b9c5fb830e2d190447a777cdb642ef99"/><file name="print.phtml" hash="9fe82c0b18b8edf5358cccaa46c664cd"/><file name="redirect.phtml" hash="1aa3ca527795bcc80fde72d5ceb61e39"/><dir name="switch"><file name="flags.phtml" hash="3068b3387472198ca78615e7b9ff4186"/><file name="languages.phtml" hash="8f08677ac13ab2e14d1197d1790ec3e5"/><file name="stores.phtml" hash="83d55bacd92f6b452a098bdd1618b268"/></dir><dir name="template"><file name="container.phtml" hash="91f81edee2cc623ff4fc04b266c97829"/><file name="links.phtml" hash="1a7fa639e00caf6bf98a6e4a37260aac"/><file name="linksblock.phtml" hash="934e8dc901db541b832d4321d8ae8204"/></dir></dir><dir name="pagecache"><file name="cookie.phtml" hash="9bd013b4db17aa1251115f023c4516b5"/></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="946900b546f2d0390a85360368ad2ac9"/></dir><dir name="info"><file name="cc.phtml" hash="884c9e4ef149bdf372bbf101a1610b3d"/></dir></dir><dir name="payment"><dir name="catalog"><dir name="product"><dir name="view"><dir name="profile"><file name="options.phtml" hash="5e9b757a45f87fd07a966082cb93f64c"/><file name="schedule.phtml" hash="d9603d2c0039055e7b8bbfb436148ad6"/></dir></dir></dir></dir><dir name="form"><file name="cc.phtml" hash="d473b5f6c11b000a760b834f340a8aab"/><file name="ccsave.phtml" hash="7ed36d33ca5ee1b608da8002d30001b3"/><file name="checkmo.phtml" hash="a46d3f8756a7c7d0bcb618235b58e852"/><file name="purchaseorder.phtml" hash="c4c5d31a5ff7e3142ab64d26e63e35d3"/></dir><dir name="info"><file name="checkmo.phtml" hash="3d5912ea23ce3c87047d96274e5f1c09"/><file name="default.phtml" hash="45910abe3326f2e32f97f4104007ec60"/><file name="purchaseorder.phtml" hash="e26250a7f256b6cd399c60fe305d8d8f"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="details.phtml" hash="271acd3c2627c6117b3fca702376780a"/></dir><file name="review.phtml" hash="d80ce136a8652ecfaf96d14e774f3a04"/><file name="shortcut.phtml" hash="ede698ae69e1e38aa97c4703a7de56cd"/></dir><dir name="hss"><file name="form.phtml" hash="8405762149f355a37787f92ab9203684"/><file name="iframe.phtml" hash="33c6f2b031162dd9d05b4d4d03b08580"/><file name="info.phtml" hash="7f5bbfc8a9b7af7d62a0626ea30b88b0"/><file name="js.phtml" hash="38c1d60029ab4603ebd484efa6c8f86f"/><file name="redirect.phtml" hash="92751b8b3f91a0bd03ffb9290e4e9a8b"/><dir name="review"><file name="button.phtml" hash="2df913bab010a61e26e6f50f65e75ca2"/></dir></dir><dir name="partner"><file name="logo.phtml" hash="3dd778703c98f87801a2db0a67fb7709"/></dir><dir name="payflowadvanced"><file name="form.phtml" hash="f570a6cbcd8199f47fc1dc8032e9f989"/><file name="iframe.phtml" hash="9a54bd85dbe4e2d4df41c213b15bc7a8"/><file name="info.phtml" hash="731c09dadf4d19498c1b5fb27c046ffb"/><file name="redirect.phtml" hash="ff12b410569b719aa6ff99e54bf491cb"/></dir><dir name="payflowlink"><file name="form.phtml" hash="8405762149f355a37787f92ab9203684"/><file name="iframe.phtml" hash="62cf6dc6b0cedb793fae360c80d0f99a"/><file name="info.phtml" hash="ff4ec41aa97cd998500e75e27f32f119"/><file name="redirect.phtml" hash="bc158ba0b7a62f9f519a5b76d902affd"/></dir><dir name="payment"><file name="mark.phtml" hash="6f3dd5cc4af3c03f261ef3f582539134"/><file name="redirect.phtml" hash="a418e461fd66e0dbfa7de2873e468507"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="5e6e40a959f59cb2a079fb828b63f1d9"/><file name="login.phtml" hash="45383442d10aaf867a04862e74ef4fe3"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="942ed2d580ce2964b1b4ab06907530cd"/><file name="register.phtml" hash="110cafe656dfce0e95ef373a2dd5a6b9"/></dir></dir><file name="remember_me.phtml" hash="e62ce9daa733a818d9056439374fe4ae"/><file name="remember_me_tooltip.phtml" hash="d91f445020d9423bd977e284b6c19073"/></dir><dir name="poll"><file name="active.phtml" hash="052052d5c1b3392a91acce706f465160"/><file name="result.phtml" hash="506c9fbf70ddb2c401c0c5f48d61439d"/></dir><dir name="productalert"><file name="price.phtml" hash="05fd4e6617bf3e3f808d0ed009334aaf"/><dir name="product"><file name="view.phtml" hash="417ea7db49d42cd5d46356c658ff2480"/></dir><file name="stock.phtml" hash="05fd4e6617bf3e3f808d0ed009334aaf"/></dir><dir name="rating"><file name="detailed.phtml" hash="fd9ac7e46e4d779eee7b991cbae85125"/><file name="empty.phtml" hash="5e29064c6d35e516fedf3bc9ce6ade43"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="9e477a9aa61ad88045bf89c260810af9"/><file name="home_product_viewed.phtml" hash="3778642fdb4ddfb10456190bfd2c7554"/><file name="product_compared.phtml" hash="e782c39b963c78e631d2069b3b115410"/><file name="product_viewed.phtml" hash="9bb1371fc186049d4b4e8a4ca7f8a1a5"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="c44460e4541183e9820807f6912c076d"/><file name="compared_images_list.phtml" hash="c7f08c2b15b268628fb4703f4daf0330"/><file name="compared_names_list.phtml" hash="c84071829631f33a7ff27a6dac20d31d"/></dir><dir name="content"><file name="compared_grid.phtml" hash="9ce0a867a65714003016f678d945d531"/><file name="compared_list.phtml" hash="dc28fa05aaa9f75e47f9851522aa6b71"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="1aaacfd26a8334acaae2c60098b2cf51"/><file name="viewed_images_list.phtml" hash="98e19e8e80471b8c8b09a5c2f8257420"/><file name="viewed_names_list.phtml" hash="290e25409c187ea7c9f4c3321a11cacc"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="cda9de8fddcc381b952c3066406aee94"/><file name="viewed_list.phtml" hash="aa8d7deaaccf1508892c91211cb04ca5"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="a45a673a79ed22742a41dc9c865d5c27"/><file name="recent.phtml" hash="9089effb0e2cb55380909e0b5496a1f7"/><file name="view.phtml" hash="f9fb00ed826c5faf2d41b6f3acb14c69"/></dir><file name="form.phtml" hash="d050439dea6ed25556628b33423eff39"/><dir name="helper"><file name="summary.phtml" hash="1bc771ee7fdceb39f77439521c1a09a8"/><file name="summary_short.phtml" hash="b3f88661ae4524d9df308658b7a5b99f"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="08a6aac14be6bdf187cee0f57785fa2d"/><file name="list.phtml" hash="6fbde1b8ef9c50216246bcadfe764168"/><file name="other.phtml" hash="f60ccea1886e06ff91dcf56195222eaa"/></dir></dir><file name="view.phtml" hash="5879e758f0cce00e9f7aa841f1f21cc9"/></dir><dir name="rss"><file name="list.phtml" hash="7d89a2e2daa0535f229414634b415be1"/><file name="nofeed.phtml" hash="45dab449e8f5fb370be8d7df7dcafad6"/><dir name="order"><file name="details.phtml" hash="567dfb8b2102096a59d823da77cf394e"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="5ab3bc8a41d39bc53f0012e075ff0bad"/></dir><file name="agreements.phtml" hash="8c2c8b2b0c00731c072d1eb7da0cb71b"/></dir><dir name="guest"><file name="form.phtml" hash="67640729a8bde8ff2d9bf773b261e3a4"/></dir><dir name="order"><file name="comments.phtml" hash="accfbecea0eb713622e5bf2a0f3d2388"/><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="69b5338925949aa8d0e78e9de69c3a2f"/></dir></dir><file name="items.phtml" hash="1bd457e8ed3d8754f238cb59f2357f5a"/></dir><file name="creditmemo.phtml" hash="7ce072207d930420f9f0ba2604353a8b"/><file name="details.phtml" hash="ed8bf797dda9076b5e5796c788797e1e"/><file name="history.phtml" hash="de1078115fed539a7d37b71be51808d3"/><dir name="info"><file name="buttons.phtml" hash="050bcda9a80d583fe754da269d0149bf"/></dir><file name="info.phtml" hash="f2f1303e760c4a1da62a1b4a1f84676c"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="fc5480b6aeb16cad678c1155caa84503"/></dir></dir><file name="items.phtml" hash="3380eefefd735545e1c32daded33e300"/></dir><file name="invoice.phtml" hash="5d07b8eb55fe6692c919d7f457f62031"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="5b9a734db36811135b7d17bd6d65bc7d"/></dir></dir><file name="items.phtml" hash="c1afc15429d72caddbc3a8fe91493bb1"/><dir name="print"><file name="creditmemo.phtml" hash="7068c9b159ad223f6c834116c00933f8"/><file name="invoice.phtml" hash="2f41190b07d93eba4b6cee0c7a8cfb99"/><file name="shipment.phtml" hash="379f993d10de6bbab0520ee37124f984"/></dir><file name="print.phtml" hash="598e60e423e1507857728ad6069bcbd8"/><file name="recent.phtml" hash="172c8c357d779282037e7b9307e92ff1"/><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="5a035a658e6de4d75c3d09ac1393b433"/></dir></dir><file name="items.phtml" hash="846e566762eb53265cc1b3dc842de39b"/></dir><file name="shipment.phtml" hash="02a879cfcd3b36b6aa2d6e269e80807b"/><file name="totals.phtml" hash="f5853735cb7b7332c2681e548dc054d9"/><file name="trackinginfo.phtml" hash="d8e3eae9c8f1f43114b7dc0ed4777a00"/><file name="view.phtml" hash="d000662a180c2e113cd2da3d3772367f"/></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="6896fea9ecb834c152a43b632d96c58e"/></dir></dir></dir><dir name="recurring"><file name="grid.phtml" hash="8ea0a85c1bb0bc757907b51c9697bef9"/><dir name="profile"><dir name="view"><file name="info.phtml" hash="da5e30740f33ca9cb0111200018d8c57"/></dir><file name="view.phtml" hash="856b3203b354cf22534992ba862b263a"/></dir><file name="profiles.phtml" hash="291f5b47f23b644486d7ccd603daa661"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="c6f0e6ff2b7c358be4713b6922e29f40"/></dir><dir name="widget"><dir name="guest"><file name="form.phtml" hash="c3808f20f5a4abf2fe348cdec5580367"/></dir></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="b0d49abec317ad26ebc97f4b4fa2e704"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="48bd7dc0156f50b97fe306dce65fedb9"/><file name="popup.phtml" hash="b91bdee55629949799ba52b0f0a128f2"/></dir></dir><dir name="tag"><file name="cloud.phtml" hash="aa3e7fbc65d5633fa70ada28f6705ca3"/><dir name="customer"><file name="recent.phtml" hash="d299a71d68fedd43e87e6d6a16a4d678"/><file name="tags.phtml" hash="3f5df7e3dcd3ff115354cc55cf3753a4"/><file name="view.phtml" hash="f1f225ecdc0fc77f9e174a34fad5de98"/></dir><file name="list.phtml" hash="7473a69abf22905d8f267ec634c90c83"/><file name="popular.phtml" hash="d1324c2aea96312a9b282b42927c60dd"/></dir><dir name="tax"><dir name="checkout"><file name="discount.phtml" hash="e62df9c7b45d7c399e9a978177ff1f06"/><file name="grandtotal.phtml" hash="e30c2d94cf5e69a330d296c8f26d69ce"/><file name="shipping.phtml" hash="6b777819d1e1806cc74f18096e0aaeed"/><file name="subtotal.phtml" hash="7f55b7a4c2889859b60502e6ffd09b38"/><file name="tax.phtml" hash="6b3f81a254f235500aa05ba2c08f60be"/></dir><dir name="order"><file name="tax.phtml" hash="f8f2ef21dc7a68bc11c92292589b70a2"/></dir></dir><dir name="wishlist"><dir name="email"><file name="items.phtml" hash="1b91decb967bcd9bdf81ac942c509b6e"/><file name="rss.phtml" hash="f1ed6701c6c0e0d78d658c74e2f30407"/></dir><dir name="item"><dir name="configure"><file name="addto.phtml" hash="534c9ca22b3d4f032a558b4791ba8596"/></dir></dir><file name="options_list.phtml" hash="823f67fb3d61d8fc93b8d2d535a29f77"/><dir name="render"><dir name="item"><file name="price.phtml" hash="42eabf4c8289c6904f45dbb5e8ff89c4"/><file name="price_msrp_item.phtml" hash="db418ffdf6b17ef622621e32098e6e4f"/><file name="price_msrp_rss.phtml" hash="1bd626d6a1b2d4f88cce14e3244d9a3e"/></dir></dir><file name="shared.phtml" hash="e93c3d57babb9f3f966c92915e0dc426"/><file name="sharing.phtml" hash="dd5e13af57673270009d67a59eb4daa0"/><file name="sidebar.phtml" hash="22606baf08da7e6891ca1ef84ea8a156"/><file name="view.phtml" hash="51628f2f579f00f38b632a4d8861bc31"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="widgets.css" hash="f3a4bf95d08d1fdbda18b2fb701dfc9a"/></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="ed0f392004a405466291071a760b285d"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><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="4b5900b9871c5b003a89028f9185f71c"/><dir name="checkout"><file name="review.js" hash="13e4f9205cea637579efab147ec3be55"/></dir><file name="giftmessage.js" hash="ae109c657833d8c29199888acf89b136"/><file name="ie6.js" hash="6b4f858b7ec45561af250200ff567a86"/><file name="msrp.js" hash="94ede6432bdab7039fdf34b221f45269"/><file name="opcheckout.js" hash="8dd380c42b5f082925a79c82a9b9bb3d"/></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.6.2.0</min><max>1.7.0.0</max></package></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Base_Default</name>
4
+ <version>1.7.0.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.7.0.0</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
+ <date>2012-04-23</date>
14
+ <time>13:47:39</time>
15
+ <contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="etc"><file name="widget.xml" hash="8bb4cd4228dbb0678cff05ded6e906f8"/></dir><dir name="layout"><file name="authorizenet.xml" hash="382b48785fd8471d4104d29c9fb5bc30"/><file name="bundle.xml" hash="912ccb3f79ee1f1484a4bb22f8706b32"/><file name="captcha.xml" hash="e054ab224725a475a11483567d1ac33c"/><file name="catalog.xml" hash="1948f0455c7a1787aedb0ec4a14492f0"/><file name="catalog_msrp.xml" hash="ced82c7cfa1bfe0fd73e0042eab284e7"/><file name="cataloginventory.xml" hash="7d757d2ebb5e18e4ba074c021ff3dc1d"/><file name="catalogsearch.xml" hash="83a9dc1912d7c1e122fcc0962905416e"/><file name="checkout.xml" hash="da474b0e224007de06505179692d8294"/><file name="cms.xml" hash="2107c8d95284efe920df846ae6b05a51"/><file name="contacts.xml" hash="42b47430b91cc41a1402ccb58c1ae56f"/><file name="core.xml" hash="db5f968694167adea202407b94dfecf2"/><file name="customer.xml" hash="6de76267c935d2276da72515f0aa389b"/><file name="directory.xml" hash="ee728b76cc1589bf7d7749792997596d"/><file name="downloadable.xml" hash="ece8513d07ff059f35ed9b13c408a2b1"/><file name="googleanalytics.xml" hash="92ff19fc36b3619a6f9a7b0d91a03e9b"/><file name="googlecheckout.xml" hash="1b694e4382ee60e2910d4b47b46ac57d"/><file name="newsletter.xml" hash="2ab782768a49ada4e05cc6c7542fc00d"/><file name="oauth.xml" hash="2a3a76eb9ef65db3f8e1fd4e8e2086ae"/><file name="page.xml" hash="29b5b167153d4e58c52e8ed49c1301cf"/><file name="pagecache.xml" hash="01839c117639d66be0e1a6932a58bc01"/><file name="payment.xml" hash="5f4b4727537cbf2c38281dcd2814c484"/><file name="paypal.xml" hash="da34589b9bfe35f8a7600574fc6d7141"/><file name="paypaluk.xml" hash="b466ae8e6a28265e46ce452cfd728059"/><file name="persistent.xml" hash="83860c509d7b481b9ecac6f36cb9356f"/><file name="poll.xml" hash="459b35221eb517f4fd541359f29f3d28"/><file name="productalert.xml" hash="880c4ed9e69f504396bc67c470b29af3"/><file name="reports.xml" hash="88153735ace2ba09096a124e8de9ac9a"/><file name="review.xml" hash="3f60db0a5b70e462915a530d3a811bac"/><file name="rss.xml" hash="8f61b4a7526599641407a76e37628f1f"/><dir name="sales"><file name="billing_agreement.xml" hash="207cae60878b779002345e64db76840e"/><file name="recurring_profile.xml" hash="f68cbd08486cb5b31c827542204b0822"/></dir><file name="sales.xml" hash="1e584bf96f256837362e7fd8169c3329"/><file name="sendfriend.xml" hash="c3efd8bd90a80688f659416cff8b3bfd"/><file name="shipping.xml" hash="f8b14e9c560efe9ff23c6ee702305572"/><file name="tag.xml" hash="b5ffd23d329a852eb4d1392d6d3e3de1"/><file name="weee.xml" hash="45a2a548b41855d6238aa59d66d01b08"/><file name="wishlist.xml" hash="0322b7c504370c1709c2f93345c44fcb"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="6c0fb3c0c0009b2468c659307978e654"/><file name="iframe.phtml" hash="d9f704aefc56138406862c9e197ab601"/><file name="info.phtml" hash="5164a83e12a9e9cc85012075a04c3762"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="58cf333f770349a390cddb9297ed50c5"/></dir><file name="price.phtml" hash="a27319faa35be81adf094b6770c4cd08"/><dir name="view"><dir name="options"><file name="notice.phtml" hash="978b70e8e92b5e6e2768398ce3d87d94"/></dir><file name="price.phtml" hash="d3039cad9edaf329ad7c549f0e3c1219"/><file name="tierprices.phtml" hash="c2e6b26ada821243c2d885671a71675e"/><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="3b45414324a8f88a82e6773ba6ee5ead"/><file name="multi.phtml" hash="21c14762b36b8152168cba3b3b76f84f"/><file name="radio.phtml" hash="9754f3df89d0bc35650594cb38acf9d2"/><file name="select.phtml" hash="2ca4e34d6b69eea0ae32812281e67136"/></dir><file name="options.phtml" hash="6151ce89ac185d2d202cde8c65ebd1b7"/></dir><file name="bundle.phtml" hash="2bd34d4c5c64f649e17dff72629074fa"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="c110d8c68f019c50bfad1ce1fbf60d56"/></dir><dir name="invoice"><file name="default.phtml" hash="57fb66c16909ad4119ba47f30f4b25c0"/></dir><dir name="order"><file name="default.phtml" hash="87438e1f8a20558584b1a4c50d33e2c5"/></dir><dir name="shipment"><file name="default.phtml" hash="957b6e798f7058a032e96ee8a8312494"/></dir></dir></dir></dir><dir name="rss"><dir name="catalog"><dir name="product"><file name="price.phtml" hash="75395433d7bcfea831f26d2e3dd6d1e5"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="da5f3be65ee868a262638caffb84aac6"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="08c3751f922753197429e5682cf92a2d"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="923110ca684a8351bba5fc9c40877d00"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="553e81dc06e27ffba4ba47c08ebae6ef"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="2329a764c68674c946ec8ecd346f2eda"/><file name="right_col.phtml" hash="2329a764c68674c946ec8ecd346f2eda"/></dir><dir name="captcha"><file name="zend.phtml" hash="2bf6634e517f8acd7cfe364dbf48f851"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="be09d324903e74d8ab256d823b9136f4"/><file name="view.phtml" hash="030152e419ec78f7dddc7423ae3bcbe2"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="154d923655194660f3c6b040b7b8fcea"/><file name="link_inline.phtml" hash="1e0d919d42534acdaa61121829273f3c"/></dir></dir></dir><dir name="layer"><file name="filter.phtml" hash="18df31d346756388c2f1009c4fd39ca4"/><file name="state.phtml" hash="0291dab90fce001ca017e32e74f00411"/><file name="view.phtml" hash="cec3350b62a989406bd158e5b372805a"/></dir><dir name="msrp"><file name="popup.phtml" hash="70d9a11d560b13c1a1430a163a671e80"/></dir><dir name="navigation"><file name="left.phtml" hash="e287afeb46a84aa5c8c1e685f51bffaa"/><file name="top.phtml" hash="8ddede3b4fd84a27d2ec3ca7dbdede25"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="4aac8eb1b1cd3caf55ff8bc3ca27084e"/><file name="sidebar.phtml" hash="46c987a848fa3bf0765bdfd11dc8c7df"/></dir><file name="gallery.phtml" hash="721ccac6c1617cb895a67e6c336738d7"/><dir name="list"><file name="related.phtml" hash="9aaed05c3353ae98a7483a620168cc49"/><file name="toolbar.phtml" hash="1d882353db63e1de4f745adceb5c418c"/><file name="upsell.phtml" hash="d2a4059f4947351afa6034a0078a1cff"/></dir><file name="list.phtml" hash="32852981bb949074ab05adfa52a2baec"/><file name="new.phtml" hash="2736170efe05a3915e99e0fc55b06c32"/><file name="price.phtml" hash="a6cca01b0a72f6f65d46df7eefcbe5e0"/><file name="price_msrp.phtml" hash="e1ef8f9193047af8e2749b4e795ced5a"/><file name="price_msrp_item.phtml" hash="1a05db808b9e33b50ccac7fa88d14bc8"/><file name="price_msrp_noform.phtml" hash="e2728b9dfa6f0df5adf08ee3aa9531bb"/><file name="price_msrp_rss.phtml" hash="8a904953f8b74b4faf58902f9a46d43d"/><dir name="view"><file name="additional.phtml" hash="7bab9dbcc43d46b0aa057dd92547e49e"/><file name="addto.phtml" hash="b20f2d46fb5c64d47eca5a08c04f92bc"/><file name="addtocart.phtml" hash="d6b9ff292fb9e482184e909200c8138d"/><file name="attributes.phtml" hash="a234143e664549fbca1d49c1e950efc5"/><file name="description.phtml" hash="a9ee13db96558372435034562dbdaa7a"/><file name="media.phtml" hash="385cb80abc228301060ffafa147c9783"/><dir name="options"><file name="js.phtml" hash="9d5c5c4786c5b9fb7125f6f3cc8c7309"/><dir name="type"><file name="date.phtml" hash="5bdfd7dc4817a500095e076a21a2c467"/><file name="default.phtml" hash="f1acbd98563c6640c4a0b6cf5abc994f"/><file name="file.phtml" hash="b72f9363f049dd486ff0a3c8b667cbc9"/><file name="select.phtml" hash="5dbbe91d0581ccb291737992c5188121"/><file name="text.phtml" hash="1aaef71a9e81521aab601aa281fa0b8e"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="6a612992021e3e65ca7b5f6e897821d5"/></dir><file name="wrapper.phtml" hash="472e04ad6c1a35dfeaa54b3012884ed6"/></dir><file name="options.phtml" hash="c1227dcadb83af6708d78a032ffd8d6c"/><file name="price.phtml" hash="f2ae6daff42b8ee7074d27c8bf5f1e6c"/><file name="price_clone.phtml" hash="732daf46245f4ee7068d5ae26defc750"/><file name="tierprices.phtml" hash="0b7f122253b505c45772eff069203a5d"/><dir name="type"><file name="configurable.phtml" hash="1a0a77285960b4227f000855e8194ed7"/><file name="default.phtml" hash="dd5d4b8859956d79ec7d42522b4f42a8"/><file name="grouped.phtml" hash="f5d7db323383b19a80ab3c55a1736dd5"/><dir name="options"><file name="configurable.phtml" hash="c37919561a3cde0d9b92fd34d44c69c1"/></dir><file name="simple.phtml" hash="1a0a77285960b4227f000855e8194ed7"/><file name="virtual.phtml" hash="1a0a77285960b4227f000855e8194ed7"/></dir></dir><file name="view.phtml" hash="92dfce1c6c3a7215dac6fda2c981d1e1"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="d48d079cdbc11c340e527b27a5956434"/><file name="link_inline.phtml" hash="80a9c2cad3491605eebbe84f73ed6a81"/></dir><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="e3bfe025786c3ad06ea7ab282c54004a"/><file name="new_images_list.phtml" hash="30299cf21fd0f2d203640875a68d3ea6"/><file name="new_names_list.phtml" hash="ea1d4cb042f6319b798d587bae7eff07"/></dir><dir name="content"><file name="new_grid.phtml" hash="b734ae1ca010b96179274741c653dd2d"/><file name="new_list.phtml" hash="427b323b0cbfc26aa4092343df5fa125"/></dir></dir></dir></dir><dir name="rss"><dir name="product"><file name="price.phtml" hash="b1b71983d3d8616116922d3b91dbcaba"/></dir></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="ed20c43980bb321548837b821e400dd8"/></dir><file name="sitemap.phtml" hash="3572cdf4d9d3389d4fde1232bb027a0f"/><file name="tree.phtml" hash="de625774b149902edf5d451101491b52"/></dir></dir><dir name="cataloginventory"><file name="qtyincrements.phtml" hash="7a605b98918c6bbbbb9694912426353e"/><dir name="stockqty"><file name="composite.phtml" hash="042b95def39d8868866297490f2e4c21"/><file name="default.phtml" hash="eec176c91060288f70cf7e9d0e656ce5"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="d5a3b4cf51f3ffcc256eb451c32725ef"/><file name="result.phtml" hash="b1e4ce41e5e31f0e9295030aab77f2f1"/></dir><file name="form.mini.phtml" hash="d1043f91cd0d8b59f15abf6da1c0c721"/><file name="result.phtml" hash="c2bdfc4b0599094a83456dd6f17d4c77"/><file name="term.phtml" hash="d5d0883f5f685228ad5e87ce294b5821"/></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="8316bd585e077c92af8b3490ec6692f0"/><file name="crosssell.phtml" hash="67a18840b776cdecc87e06f9f7e00db3"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="e403cd7b8eb8209d54ebdc13f9c6b02f"/></dir><file name="default.phtml" hash="33049442e2d15f4a729d8054ed26b507"/></dir><file name="noItems.phtml" hash="85dd62d3046bf22ec8eb3e45989c6f0b"/><dir name="render"><file name="default.phtml" hash="51e2aea1c10d6db04d9b6ee880476c1a"/><file name="simple.phtml" hash="dc0f40db32a1b349ec3037f700cced7f"/></dir><file name="shipping.phtml" hash="a495f5acc9e7e871607e810f758b0724"/><dir name="sidebar"><file name="default.phtml" hash="7aac4b7a72774e75b49197971f1f6b84"/></dir><file name="sidebar.phtml" hash="7645eb7704a606c6044a31f440a7ff6f"/><file name="totals.phtml" hash="c942cacb712272bccd142bc1217d479a"/></dir><file name="cart.phtml" hash="9dec7d807898f5d8a9e82629dd9b7e38"/><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="ab791c9b73074ae657deb56d7512c4e5"/></dir><file name="addresses.phtml" hash="35b220a8a8facbf7c458ada90f9b7dd7"/><file name="agreements.phtml" hash="26fd8740318e401add70128eaef68713"/><dir name="billing"><file name="items.phtml" hash="01e23f2f062fde7e38f14ccbd9feb526"/></dir><file name="billing.phtml" hash="dab59ccf7a0aff5e0070e8d0db892523"/><dir name="item"><file name="default.phtml" hash="d2c489f8f9ff090a9ce981d839703484"/></dir><file name="link.phtml" hash="1d52dee73ca493a7a4a89cecb28af3c9"/><dir name="overview"><file name="item.phtml" hash="3e0c7b57157458f5cb9b66f8c0ef778a"/></dir><file name="overview.phtml" hash="db9c1332c9c3bd86226554ba5d20ac88"/><file name="shipping.phtml" hash="97cbb043a3e59133743a5f843d805bc8"/><file name="state.phtml" hash="2160e6489d9a3dd42e613f2e0a185025"/><file name="success.phtml" hash="73503e4ac5789769f25ef35e34d5354f"/></dir><dir name="onepage"><file name="agreements.phtml" hash="15dbb2fb7c979e65b7abd9c7aa7cfbca"/><file name="billing.phtml" hash="82ead3fe6a2e73947eb6d2d7aa31c031"/><file name="failure.phtml" hash="715a874b056c0f5f80fb8eddda247170"/><file name="link.phtml" hash="b3f6bfdd6d75ee71b43ad9e948118888"/><file name="login.phtml" hash="0ba508df7d4921348b776b0f962d9894"/><dir name="payment"><file name="methods.phtml" hash="b3fac3fec44bec7f7feaa6c1118391d2"/></dir><file name="payment.phtml" hash="4b2283a884b0a3a7b1bb374cf3a01417"/><file name="progress.phtml" hash="9bd6c7bfff18e01ef44c509b4e906c93"/><dir name="review"><file name="button.phtml" hash="4d5c7c5a2d70f85ec324e79c7e81946b"/><file name="info.phtml" hash="02af6242925c9d28f2fe5f4518e5a677"/><file name="item.phtml" hash="c53b269b2ea75656a3fd954aff903af9"/><file name="totals.phtml" hash="6e857d144768ed8faa0be977b547b32f"/></dir><file name="review.phtml" hash="652b5fce417cb50a0158dd5d49f64778"/><file name="shipping.phtml" hash="9e787acc3888ff1620ab295af3ab9078"/><dir name="shipping_method"><file name="additional.phtml" hash="e13cd269e9feb9f0be1c10005bc19801"/><file name="available.phtml" hash="cd1e4a35c2aa344945f3cf2075122393"/></dir><file name="shipping_method.phtml" hash="f912002c2cf6872a0d9bdc689b80163d"/></dir><file name="onepage.phtml" hash="0039fbf105fe77431be0de4cb71dae51"/><file name="success.phtml" hash="008a40eebcb4d7d2fbfc10987da0d17a"/><dir name="total"><file name="default.phtml" hash="f1010ec3fd3dcb503d81f7e8d3ebb206"/><file name="nominal.phtml" hash="8df39c86e037a915d082fa61da9bb1c8"/><file name="tax.phtml" hash="7fe5f21f35b2cb2b0642ddf418917405"/></dir></dir><dir name="cms"><file name="content.phtml" hash="21fba66ee197b4e83c9f8292b98970e4"/><file name="content_heading.phtml" hash="9f7652c66d978f6c2946ba7bf419374e"/><dir name="default"><file name="home.phtml" hash="18d93ac152e47351b0039d8b3a67d59d"/><file name="no-route.phtml" hash="52106ead9e9ce41f82122f875caecfd7"/></dir><file name="meta.phtml" hash="2204e889eef9af73ca7ee62ac816b4e3"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="e02f9737283af0cf69e1e55440a0f996"/><file name="link_inline.phtml" hash="3237d384dd1603cddb3b4630b36e4908"/></dir><dir name="static_block"><file name="default.phtml" hash="0459a49fe46fcbcf6454959627be6cbf"/></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="7f1c48a5f758d40e8203fb815d13e88f"/></dir><dir name="core"><file name="formkey.phtml" hash="a490a62b731574ea6417a852bfad8d9b"/><file name="link.phtml" hash="727625ecaddeb25725fb10456e5360ec"/><file name="messages.phtml" hash="5ff72b8ec510727963f985145af5b7d7"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="ab51913386d0521441eb7704267a5224"/><file name="hello.phtml" hash="cbba873a754af5f89253d2fcbada6d3b"/><file name="info.phtml" hash="bacbc93891545a2a313bc35e4b094351"/><file name="newsletter.phtml" hash="ec6fbed4b2919fa72034e0863bb905fa"/></dir><file name="dashboard.phtml" hash="5590325dde5a68897bf19b8951bfe003"/><dir name="link"><file name="back.phtml" hash="b5c39deaa70abb1f959b066e2458783e"/></dir><file name="navigation.phtml" hash="0ccf435e39502d6f97d39dcd4050b17d"/></dir><dir name="address"><file name="book.phtml" hash="07747e72a21de6cc5ba6afa9ccc3aed1"/><file name="edit.phtml" hash="8459c2c7d85cc87d91617cc8c2ae8b9b"/></dir><file name="address.phtml" hash="1f38ef9977dead75e97cefce2d54744f"/><file name="balance.phtml" hash="7a7bed35437abcddd6430e399e8e1705"/><dir name="form"><file name="address.phtml" hash="9864ad56cde8ca90feb880e386639091"/><file name="changepassword.phtml" hash="3613bceb919a3b65b10bd6188cffc49c"/><file name="confirmation.phtml" hash="9b0556202d3b92669be0d2da5a79030d"/><file name="edit.phtml" hash="7f88a46447291262a5343cb206674c6d"/><file name="forgotpassword.phtml" hash="5ea0fa8976e6c7c4a06c3c2cd8381137"/><file name="login.phtml" hash="925493e8f89c6659123eed2957153dfe"/><file name="mini.login.phtml" hash="90a6ebf8b5d7937aef437907053fe368"/><file name="newsletter.phtml" hash="3a9d1ee4b2d703fd6031fef6316d4dd3"/><file name="register.phtml" hash="b9d48be60b0e1deab4df288aa672ac59"/><file name="resetforgottenpassword.phtml" hash="63cd00c9cea8ded57ad0e97d60b8dc88"/></dir><file name="logout.phtml" hash="0c5855ea603f53b9da95b196644d4567"/><file name="orders.phtml" hash="c7613667dc51203a2d3d0432d4ddc756"/><dir name="widget"><file name="dob.phtml" hash="8bb0c2cc4f7d203d3a48bdaa90ec4c7d"/><file name="gender.phtml" hash="4beeda46d0a8c7f37a260d569c4e74dc"/><file name="name.phtml" hash="04ade7281f3022979437ebbab9a99023"/><file name="taxvat.phtml" hash="d7f79cf8816c36e599db793b5bcea9c5"/></dir><file name="wishlist.phtml" hash="60da933d81f4951a7c4017f70bd6fb7c"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="07616da8833be0ce83ae0b4e830bd557"/></dir><file name="currency.phtml" hash="5928788713ac909b4fb026ba29bb8e30"/><dir name="js"><file name="optional_zip_countries.phtml" hash="020d75754f4dce6268fb66ef2574ea74"/></dir></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="d925d3eb9ce179af37d12f04f575a6d6"/><file name="samples.phtml" hash="d727f41614e0652592224edf189d6890"/><file name="type.phtml" hash="bf575dfcc10524abda9085022b2ece1c"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="2b513267d1402bc736f9c546bd44902e"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="02147612ab317f5db3cc81b29c119688"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="136f6fc2c807adff70630b96946fab79"/></dir></dir><file name="success.phtml" hash="69b57e8a809d32b90844f92483b39431"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="74607bfe107a369f025fb34a7c8be9c1"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="1db0fc11361b2999f616e8e874523adc"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="6a8c7a8059ae4242cc6dbc39da27a71c"/></dir><dir name="order"><file name="downloadable.phtml" hash="72c0341763d204fa79ddb292ba6da76d"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="8ec5594e5845eea204011f0aeabe73b5"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="eafe739791763e32da9b56c2fadd9c22"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="2bfabf174f1de8968513b8fc918a3d91"/></dir></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="b915fa9bf7e46c417da167a05bbbc31e"/></dir><dir name="invoice"><file name="items.phtml" hash="2c783340c75fb6b094ee927373ee3c7f"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="906763a69c5eec9736e72fb5f04f61d2"/></dir><dir name="invoice"><file name="default.phtml" hash="906763a69c5eec9736e72fb5f04f61d2"/></dir><dir name="order"><file name="default.phtml" hash="c9a37c05a9438291f6d5ceca712b22a8"/></dir><dir name="shipment"><file name="default.phtml" hash="933237ea42871008053f7f9638e429ba"/></dir></dir><file name="items.phtml" hash="55833fe30e75da39dc56e3e419922b9d"/><dir name="shipment"><file name="items.phtml" hash="eff5711a95ce4edc5d2dff5436ff919c"/><file name="track.phtml" hash="d3e57a816bea202a3ad52ac23bf824c3"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="9e46a32b215a19998acac40939797e68"/><file name="stock.phtml" hash="2f8d0482ac898f403f08e61471a77917"/></dir></dir><dir name="giftmessage"><file name="inline.phtml" hash="988db300d7680dba20da48f12c5e6b09"/></dir><dir name="googleanalytics"><file name="ga.phtml" hash="c11f860c6a5bc7215cdc74c789eea568"/></dir><dir name="googlecheckout"><file name="form.phtml" hash="dae69f2b9b5a2044c3f21633167a37c6"/><file name="link.phtml" hash="c411cd1950339b582535dec30971af4d"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="5ee3e01a6688f725cf0caa75681f0938"/></dir><dir name="oauth"><dir name="authorize"><file name="button-simple.phtml" hash="ace5caf62efbfbfef573c355a9dfbe32"/><file name="button.phtml" hash="dabdb89d5aebc87d81c4db81623f9dc7"/><file name="confirm-simple.phtml" hash="9f0dc4fb329c9c7ab06b22ee7493ce57"/><file name="confirm.phtml" hash="a585c9e6ae3c0d0924f92cc96741a0b6"/><dir name="form"><file name="login-simple.phtml" hash="af8ea937c2ced2926e1d4f5db2e742ac"/><file name="login.phtml" hash="552ef68c240f28e898c386cab9b536b1"/></dir><file name="head-simple.phtml" hash="79b7879a3404965d6dfe03a4244ee2cd"/><file name="reject-simple.phtml" hash="765e1891ecf23f2b32cc1880934e61f1"/><file name="reject.phtml" hash="a03ca7426946d9d7696d5554bb1978d9"/></dir><dir name="customer"><dir name="token"><file name="list.phtml" hash="b737547b086b60e317b24e4d6c58b83e"/></dir></dir></dir><dir name="page"><file name="1column.phtml" hash="8baf2606d5a89ead3432083920ec6eba"/><file name="2columns-left.phtml" hash="a697639e634bf256ec70eb8e5ba53fdd"/><file name="2columns-right.phtml" hash="89933fea0923c88825935409f343562d"/><file name="3columns.phtml" hash="df817532bf389200833e8497359aae3a"/><file name="empty.phtml" hash="7fde585927f37e76338ae967da54df70"/><dir name="html"><file name="breadcrumbs.phtml" hash="0407c497e9027ed264365fcb45bc6db4"/><file name="footer.phtml" hash="a28ddf35fa3dd1c2b7bbdeab5f5aceb6"/><file name="head.phtml" hash="618cd2ce6e789c3d622db270458ca764"/><file name="header.phtml" hash="266ef86528350f338e24eeabd42e1619"/><file name="notices.phtml" hash="727736b58612fac30cef87552368f057"/><file name="pager.phtml" hash="bb14f7c7fe337f98c5a50453ac933f31"/><file name="top.links.phtml" hash="156bf2c82e02940a392398b81df00d73"/><file name="topmenu.phtml" hash="3967cc1a585c91d7fe6ef81b3b9914a5"/><file name="wrapper.phtml" hash="c7f2c8566d851246535a80f108c865e6"/></dir><dir name="js"><file name="calendar.phtml" hash="96f726bb09b2c29177cb1c0d10997b1e"/><file name="cookie.phtml" hash="b6584923913a80e459124f73d0383779"/></dir><file name="popup.phtml" hash="fae1be35fbf71175f5394864792d2f12"/><file name="print.phtml" hash="208ada6325841aec23c08c29a1c60ea6"/><file name="redirect.phtml" hash="26f1c196a8cdf5d939434acf3886bc9b"/><dir name="switch"><file name="flags.phtml" hash="9c65d3837dfd3c7bb7ea81cad1177a20"/><file name="languages.phtml" hash="d67cb29ce01372828cbaa17d7415d3ad"/><file name="stores.phtml" hash="17cc715b034711f18982fd15c7a49285"/></dir><dir name="template"><file name="container.phtml" hash="5ddcc4abda0f7d063e6b60bdb9a46008"/><file name="links.phtml" hash="8ac82b00dd7537826a45285556981dd1"/><file name="linksblock.phtml" hash="ca9e3d358dce2158f8bcf3fc53e87bcd"/></dir></dir><dir name="pagecache"><file name="cookie.phtml" hash="b25d1e3f827b2f4443a834c68faa83ef"/></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="967d5d42de1fbc0b6ef629d2b35458df"/></dir><dir name="info"><file name="cc.phtml" hash="5825f0b82bf22027f09f7d44ec0354ea"/></dir></dir><dir name="payment"><dir name="catalog"><dir name="product"><dir name="view"><dir name="profile"><file name="options.phtml" hash="01dd240999cbbb2a86551c716eaf5a5c"/><file name="schedule.phtml" hash="22b416c82f1d9d0f8e7551ce081f0721"/></dir></dir></dir></dir><dir name="form"><file name="banktransfer.phtml" hash="afc452f8085f4fea63eab41475fe8c8a"/><file name="cashondelivery.phtml" hash="2d39ed0766ccf5b053898546f59c867c"/><file name="cc.phtml" hash="ea4c1b0cac282ac4f52e11751d2ba75c"/><file name="ccsave.phtml" hash="4a9cb73496d7e7b7fb8c9624439612d3"/><file name="checkmo.phtml" hash="ce79ab0d3665ca8b4d0a36ff2a4e1a58"/><file name="purchaseorder.phtml" hash="db052a891a7bf3340a8fe8e0c3e0a875"/></dir><dir name="info"><file name="banktransfer.phtml" hash="56fe0d318f1476590827da9f27432c05"/><file name="checkmo.phtml" hash="bb691b6a092d53059f1b446ac5167603"/><file name="default.phtml" hash="5f1a263e3941ad33a5f108c013446c48"/><file name="purchaseorder.phtml" hash="b6fe1e366ce9ca47d1f9ab1e6e80205a"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="address.phtml" hash="f274e591956f2277608bebf62fa2b6b9"/><file name="details.phtml" hash="f3a7b01960a0a1ffbce627de81ddbaa5"/><dir name="shipping"><file name="method.phtml" hash="b3d255b8567f88996b2ed7cc36895a6e"/></dir></dir><file name="review.phtml" hash="bc513c65ccb3d52798af9158e9bfad4f"/><file name="shortcut.phtml" hash="e9fbce886a042a262eb689cebdb1ee73"/></dir><dir name="hss"><file name="form.phtml" hash="7988a2afc2f851631223b2db66e1b064"/><file name="iframe.phtml" hash="dbb2b3fbf4ffa17b9e7fac30d996bf3f"/><file name="info.phtml" hash="0422558db314c49361ffa4e1486673b4"/><file name="js.phtml" hash="7810505ae3dc5caa48626edd367d869f"/><file name="redirect.phtml" hash="92aa527ff49a49557f991f417ba2e3f6"/><dir name="review"><file name="button.phtml" hash="7bf3b37cc2fd5dbd0fa966b4ea6e0220"/></dir></dir><dir name="partner"><file name="logo.phtml" hash="ba195494f7c48add5ae3d60c444b5de7"/></dir><dir name="payflowadvanced"><file name="form.phtml" hash="0cef01090768f89bb2dfaab4201750e4"/><file name="iframe.phtml" hash="a0a93a9784d09df119315e7f5947d11d"/><file name="info.phtml" hash="3c3d3115a34158ee1045924ad06fa5f6"/><file name="redirect.phtml" hash="2d22773588722699eb4b0943e496bbf0"/></dir><dir name="payflowlink"><file name="form.phtml" hash="7988a2afc2f851631223b2db66e1b064"/><file name="iframe.phtml" hash="990fd582d1a47def3453299a6abc8fc3"/><file name="info.phtml" hash="ef8a052347e035d9fdc3d8bea9859807"/><file name="redirect.phtml" hash="87b87bcb189c2e49f1f129086eea55ec"/></dir><dir name="payment"><file name="mark.phtml" hash="b56c11b565e9d0d889c276ae831bd2da"/><file name="redirect.phtml" hash="ef28a668d9aa843024eb9df15f4972e9"/></dir></dir><dir name="paypaluk"><dir name="express"><file name="review.phtml" hash="be6b0194d35a767e6039b6a2a6dacb82"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="4777001edc771b44e954502d71065010"/><file name="login.phtml" hash="ab849108f56631c2cef8710e73ae1a7d"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="acaeb4244b825d9e0b05692ba7199294"/><file name="register.phtml" hash="538ac6fb46e121786f654b395e714fd0"/></dir></dir><file name="remember_me.phtml" hash="49971d7037f260ea813dda47c602d816"/><file name="remember_me_tooltip.phtml" hash="7f1904fa70e1cb1f7f41a70887e913dc"/></dir><dir name="poll"><file name="active.phtml" hash="e7d7449f96b615e419c80c8397b01ca3"/><file name="result.phtml" hash="a34507d828dfd33bb0e46033a4433de0"/></dir><dir name="productalert"><file name="price.phtml" hash="cc19841da48aefc77dabcb98b0fd79f5"/><dir name="product"><file name="view.phtml" hash="2916821490ca8c89085abe46a2a2cc82"/></dir><file name="stock.phtml" hash="cc19841da48aefc77dabcb98b0fd79f5"/></dir><dir name="rating"><file name="detailed.phtml" hash="a1a8ff834909479df637e74048ae4987"/><file name="empty.phtml" hash="b5012dbc20a2aa680e9f9abad53a4844"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="da4bd834b7403046f21731b91a32c433"/><file name="home_product_viewed.phtml" hash="539160dbd855cf9d75e1a8ab0687d0fa"/><file name="product_compared.phtml" hash="c48cf6cde6ccdd7e6ff3bbefb502fc3c"/><file name="product_viewed.phtml" hash="b544fe0b5d65429d7d00983b666b5147"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="49c115fbf9c0b7ab577ec2f769fc9c66"/><file name="compared_images_list.phtml" hash="f495da64e8403fc39ae5cef5536fd799"/><file name="compared_names_list.phtml" hash="06d95bb36fdb1dc71488d41ab53da12f"/></dir><dir name="content"><file name="compared_grid.phtml" hash="fd91fd41f99841c062fa61f4f2488f9a"/><file name="compared_list.phtml" hash="63e1d17df47234ee896469e4d3c009e6"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="d8c556f26075c6bd37b7f4dcfaebf727"/><file name="viewed_images_list.phtml" hash="65e4f71aa7107de9eb66a7c078903429"/><file name="viewed_names_list.phtml" hash="b1c80805ae43fad28a910cdd1b7d3ef1"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="d7867e726774a3fdec66d662ee05d4ab"/><file name="viewed_list.phtml" hash="c1898eb1c4310bb6a26d3cc48b8923ef"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="5b39341d3d5f22c8a7f5c5c4c73b5686"/><file name="recent.phtml" hash="1f8543b904c9f8fd9d380d30d80b073a"/><file name="view.phtml" hash="52356e17b4e28d099880b7a2a0b81bf1"/></dir><file name="form.phtml" hash="3e5393dfc87ea2aa5d90f2436d0c5d25"/><dir name="helper"><file name="summary.phtml" hash="bf0128650fc24e1bf5db3b9d760db549"/><file name="summary_short.phtml" hash="54cd7f0e8a2661a3092f85370ae07292"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="073f247a61af63122c0313e102212c5d"/><file name="list.phtml" hash="8b8d26823bcf84c009d4b6b33fca8f8a"/><file name="other.phtml" hash="b5891324f64bb56d2539a2f25afda646"/></dir></dir><file name="view.phtml" hash="d1bac61b064e3ac8fb0d1d1303dd03fc"/></dir><dir name="rss"><file name="list.phtml" hash="5ff603a05468a698cbcfb1f6e96ceb43"/><file name="nofeed.phtml" hash="9ee79166da49a6d4974130d639fade32"/><dir name="order"><file name="details.phtml" hash="557a7ac9c1cf44c19036ecf7e6071099"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="0d6dded290c70941cef640f88e501157"/></dir><file name="agreements.phtml" hash="3cd6811c25cb4fb931585053d414230f"/></dir><dir name="guest"><file name="form.phtml" hash="67640729a8bde8ff2d9bf773b261e3a4"/></dir><dir name="order"><file name="comments.phtml" hash="c09175353f1c484ada1c446e0dd613e1"/><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="8959f7a6243e22ee9344183a15cd2daa"/></dir></dir><file name="items.phtml" hash="3e9ae246b578e69d58425c035e2c12ba"/></dir><file name="creditmemo.phtml" hash="0fceb4d5c33c881d8c7ef5dc15e8ff9e"/><file name="details.phtml" hash="e82dcd3d04cf2ab2da8e3b57ecc5ed44"/><file name="history.phtml" hash="5f0800e3d74de17a591a1c5ff48cfb38"/><dir name="info"><file name="buttons.phtml" hash="198facf2c29e64dfc37f9866b4560dfc"/></dir><file name="info.phtml" hash="2a9f46c911c991675c3645f0508f305f"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="ca6a4e78a8465e38c5981f9665a8ef92"/></dir></dir><file name="items.phtml" hash="b3e2d86b1f6e6798149ca9a32a2a6776"/></dir><file name="invoice.phtml" hash="d4bb81b31d057d840de9fb540052206b"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="5ec4f885fe61920552eb73ae15c0425d"/></dir></dir><file name="items.phtml" hash="7c1aac06f97f224762c3c46211d67b6a"/><dir name="print"><file name="creditmemo.phtml" hash="9de481f4fec7e3358a659b749cb3016d"/><file name="invoice.phtml" hash="70cebf1937d203dde0b377edef06be24"/><file name="shipment.phtml" hash="a5a5df6cd81f68fe7bb20a7b76328bbc"/></dir><file name="print.phtml" hash="efc77c82dcf49ef570d8d92ca8f6bed3"/><file name="recent.phtml" hash="a35cc2efbb7ef61f77dd32eb08407bc4"/><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="70d73e236263c5609baeda9123bf75e6"/></dir></dir><file name="items.phtml" hash="e45de99649b2ad8180402c1686d8a52c"/></dir><file name="shipment.phtml" hash="d7abf116a276b3ba99c712e67ca5673b"/><file name="totals.phtml" hash="5a78aa3fe60d4b13bf8451f23bb9edd9"/><file name="trackinginfo.phtml" hash="b3426ac69738b37f989739db2aafc1a0"/><file name="view.phtml" hash="fb2848ab3b63fd94a7bb52ed2a85f0be"/></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="0190a89f5aec91828fd48648054bee63"/></dir></dir></dir><dir name="recurring"><file name="grid.phtml" hash="5e0e8b0d095dcafdf4bd3815dc22bebc"/><dir name="profile"><dir name="view"><file name="info.phtml" hash="eaa2fe32350fa406853f4cf18c27c3f4"/></dir><file name="view.phtml" hash="124fcc6e1d47d8594be2c417f5f88c26"/></dir><file name="profiles.phtml" hash="8d2df9dda323013d83929e2d973b95e3"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="7d2a2b96922f0adf82fa2f2d5c7bae81"/></dir><dir name="widget"><dir name="guest"><file name="form.phtml" hash="330bf9c3c6fe0b889cb6130ae03a6f96"/></dir></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="4c674bea176212993c0509cbdada7ce6"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="49706bb11880fdf1207bc7b14862e9c4"/><file name="popup.phtml" hash="524b80e8298556e7b1138b992a48cc37"/></dir></dir><dir name="tag"><file name="cloud.phtml" hash="c43e7720cabe7eed43cdadb73272f708"/><dir name="customer"><file name="recent.phtml" hash="5a0e8df1c878a4af48851f4195b8b963"/><file name="tags.phtml" hash="d89db268db068c59176954a8e4a31320"/><file name="view.phtml" hash="9f2ded5cb70ee9110550418e72074b38"/></dir><file name="list.phtml" hash="295239afaff72eae47790cfdaf93bd1d"/><file name="popular.phtml" hash="97e200f2a189c5902de455d1d62eeeab"/></dir><dir name="tax"><dir name="checkout"><file name="discount.phtml" hash="da5eaff99799dd1de458fbfcdda65cec"/><file name="grandtotal.phtml" hash="1be9046e0b62b2271931f7a25abe9779"/><file name="shipping.phtml" hash="f01a47e00690900ee79f0b74055248f1"/><file name="subtotal.phtml" hash="ecdfe07dd328e5391612b5a9feaffc88"/><file name="tax.phtml" hash="998710737c0c0d00d5e33326ec45670f"/></dir><dir name="order"><file name="tax.phtml" hash="99e3f714f5e5c08c9e7f5063547afc48"/></dir></dir><dir name="wishlist"><dir name="button"><file name="share.phtml" hash="bf67012b25d9078cc1bdc3a971e0fa42"/><file name="tocart.phtml" hash="4ed121b0d0ddc27ec8341f9b43b55ea4"/><file name="update.phtml" hash="db71a11edc6569aa3157928f8a8f5e5f"/></dir><dir name="email"><file name="items.phtml" hash="dfd15c562df1ad10a03c7d9f445b8ec2"/><file name="rss.phtml" hash="0093593ffc7f73507afe9dce8a94d04b"/></dir><dir name="item"><dir name="column"><file name="cart.phtml" hash="30b31a6ba6d568f25a828410104f7d6e"/><file name="image.phtml" hash="599c0a0af8133a3da8332b83506cdb7e"/><file name="info.phtml" hash="601c06d57c55a3693dedf1db00cb71ae"/><file name="remove.phtml" hash="54328860de6dc52fb2e4dea2142d4a8b"/></dir><dir name="configure"><file name="addto.phtml" hash="9897e62a637904f305ca2fb1803bbf2c"/></dir><file name="list.phtml" hash="b19e0d0a8c4f672d8db3f359b9a47993"/></dir><file name="options_list.phtml" hash="e7444188a84136672d79b8130e533971"/><dir name="render"><dir name="item"><file name="price.phtml" hash="b42da15a8aa285317900d0c5cbc78e97"/><file name="price_msrp_item.phtml" hash="2b6303fd121b88763e2bb52ae19e9de4"/><file name="price_msrp_rss.phtml" hash="1e19860fbaf7a0e228ba41b5e7997312"/></dir></dir><file name="shared.phtml" hash="49eeb9d575c91815124c1d7c73845909"/><file name="sharing.phtml" hash="1981bc96ac9fb3a2ba87e13d1cda7451"/><file name="sidebar.phtml" hash="f4ddbacf6132078b0241aa1747feda5e"/><file name="view.phtml" hash="ae07051b2ce4111c186797d8be062720"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="widgets.css" hash="49d489c9cc589a27782d4bd40ce92299"/></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="1bb059cc3cfe067e9868df86e95f4da0"/><dir name="checkout"><file name="review.js" hash="3a9f485e377f6e3e004a713b7e76fdd4"/></dir><file name="giftmessage.js" hash="f87d68a8133674c0b7e0ec4aea674b61"/><file name="ie6.js" hash="93ec1d1e2a9d0a45f4ff472cc046a478"/><file name="msrp.js" hash="dd068c70b272f527adb8a87ad7c72eea"/><file name="opcheckout.js" hash="aed94eb37b332d2e3f81cc2c318a8012"/></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="b69d765373769ce7e64b7f220bb2629c"/></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.7.0.0</min><max>1.8.0.0</max></package></required></dependencies>
18
  </package>
skin/frontend/base/default/css/widgets.css CHANGED
@@ -19,7 +19,7 @@
19
  *
20
  * @category design
21
  * @package base_default
22
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
 
19
  *
20
  * @category design
21
  * @package base_default
22
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
 
skin/frontend/base/default/images/cvv.gif CHANGED
Binary file
skin/frontend/base/default/images/reload.png ADDED
Binary file
skin/frontend/base/default/js/bundle.js CHANGED
@@ -19,7 +19,7 @@
19
  *
20
  * @category design
21
  * @package base_default
22
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
  if(typeof Product=='undefined') {
19
  *
20
  * @category design
21
  * @package base_default
22
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
  if(typeof Product=='undefined') {
skin/frontend/base/default/js/checkout/review.js CHANGED
@@ -19,7 +19,7 @@
19
  *
20
  * @category design
21
  * @package base_default
22
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
 
@@ -31,7 +31,15 @@ OrderReviewController.prototype = {
31
  _canSubmitOrder : false,
32
  _pleaseWait : false,
33
  shippingSelect : false,
 
 
34
  onSubmitShippingSuccess : false,
 
 
 
 
 
 
35
 
36
  /**
37
  * Add listeners to provided objects, if any
@@ -52,12 +60,29 @@ OrderReviewController.prototype = {
52
  Event.observe(orderFormSubmit, 'click', this._submitOrder.bind(this));
53
  }
54
 
55
- if (shippingSubmitForm && shippingSelect) {
56
- this.shippingSelect = shippingSelect;
57
- Event.observe(shippingSelect, 'change', this._submitShipping.bindAsEventListener(this, shippingSubmitForm.action, shippingResultId));
58
- this._updateOrderSubmit(false);
 
 
 
 
 
 
 
 
 
59
  } else {
60
- this._canSubmitOrder = true;
 
 
 
 
 
 
 
 
61
  }
62
  },
63
 
@@ -100,18 +125,287 @@ OrderReviewController.prototype = {
100
  }
101
  },
102
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
103
  /**
104
  * Attempt to submit order
105
  */
106
  _submitOrder : function()
107
  {
108
- if (this._canSubmitOrder) {
109
  this.form.submit();
110
  this._updateOrderSubmit(true);
 
 
 
 
111
  if (this._pleaseWait) {
112
  this._pleaseWait.show();
113
  }
 
114
  }
 
115
  },
116
 
117
  /**
@@ -132,16 +426,29 @@ OrderReviewController.prototype = {
132
  */
133
  _updateOrderSubmit : function(shouldDisable)
134
  {
135
- var isDisabled = shouldDisable || !this.shippingSelect || '' == this.shippingSelect.value;
 
 
136
  this._canSubmitOrder = !isDisabled;
137
  if (this.formSubmit) {
138
- this.formSubmit.disabled = isDisabled;
139
- this.formSubmit.removeClassName('no-checkout');
140
- this.formSubmit.setStyle({opacity:1});
141
- if (isDisabled) {
142
- this.formSubmit.addClassName('no-checkout');
143
- this.formSubmit.setStyle({opacity:.5});
144
- }
 
 
 
 
 
 
 
 
 
 
 
145
  }
146
  }
147
  };
19
  *
20
  * @category design
21
  * @package base_default
22
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
 
31
  _canSubmitOrder : false,
32
  _pleaseWait : false,
33
  shippingSelect : false,
34
+ reloadByShippingSelect : false,
35
+ _copyElement : false,
36
  onSubmitShippingSuccess : false,
37
+ shippingMethodsUpdateUrl : false,
38
+ _updateShippingMethods: false,
39
+ _ubpdateOrderButton : false,
40
+ shippingMethodsContainer: false,
41
+ _submitUpdateOrderUrl : false,
42
+ _itemsGrid : false,
43
 
44
  /**
45
  * Add listeners to provided objects, if any
60
  Event.observe(orderFormSubmit, 'click', this._submitOrder.bind(this));
61
  }
62
 
63
+ if (shippingSubmitForm) {
64
+ this.reloadByShippingSelect = true;
65
+ if (shippingSubmitForm && shippingSelect) {
66
+ this.shippingSelect = shippingSelect;
67
+ Event.observe(
68
+ shippingSelect,
69
+ 'change',
70
+ this._submitShipping.bindAsEventListener(this, shippingSubmitForm.action, shippingResultId)
71
+ );
72
+ this._updateOrderSubmit(false);
73
+ } else {
74
+ this._canSubmitOrder = true;
75
+ }
76
  } else {
77
+ Form.getElements(this.form).each(this._bindElementChange, this);
78
+
79
+ if (shippingSelect && $(shippingSelect)) {
80
+ this.shippingSelect = $(shippingSelect).id;
81
+ this.shippingMethodsContainer = $(this.shippingSelect).up();
82
+ } else {
83
+ this.shippingSelect = shippingSelect;
84
+ }
85
+ this._updateOrderSubmit(false);
86
  }
87
  },
88
 
125
  }
126
  },
127
 
128
+ /**
129
+ * Set event observer to Update Order button
130
+ * @param element
131
+ * @param url - url to submit on Update button
132
+ * @param resultId - id of element to be updated
133
+ */
134
+ setUpdateButton : function(element, url, resultId)
135
+ {
136
+ if (element) {
137
+ this._ubpdateOrderButton = element;
138
+ this._submitUpdateOrderUrl = url;
139
+ this._itemsGrid = resultId;
140
+ Event.observe(element, 'click', this._submitUpdateOrder.bindAsEventListener(this, url, resultId));
141
+ if(this.shippingSelect) {
142
+ this._updateShipping();
143
+ }
144
+ this._updateOrderSubmit(!this._validateForm());
145
+ this.formValidator.reset();
146
+ this._clearValidation('');
147
+ }
148
+ },
149
+
150
+ /**
151
+ * Set event observer to copy data from shipping address to billing
152
+ * @param element
153
+ */
154
+ setCopyElement : function(element)
155
+ {
156
+ if (element) {
157
+ this._copyElement = element;
158
+ Event.observe(element, 'click', this._copyShippingToBilling.bind(this));
159
+ this._copyShippingToBilling();
160
+ }
161
+ },
162
+
163
+ /**
164
+ * Set observers to Shipping Address elements
165
+ * @param element Container of Shipping Address elements
166
+ */
167
+ setShippingAddressContainer: function(element)
168
+ {
169
+ if (element) {
170
+ Form.getElements(element).each(function(input) {
171
+ if (input.type.toLowerCase() == 'radio' || input.type.toLowerCase() == 'checkbox') {
172
+ Event.observe(input, 'click', this._onShippingChange.bindAsEventListener(this));
173
+ } else {
174
+ Event.observe(input, 'change', this._onShippingChange.bindAsEventListener(this));
175
+ }
176
+ }, this);
177
+ }
178
+ },
179
+
180
+ /**
181
+ * Sets Container element of Shipping Method
182
+ * @param element Container element of Shipping Method
183
+ */
184
+ setShippingMethodContainer: function(element)
185
+ {
186
+ if (element) {
187
+ this.shippingMethodsContainer = element;
188
+ }
189
+ },
190
+
191
+ /**
192
+ * Copy element value from shipping to billing address
193
+ * @param el
194
+ */
195
+ _copyElementValue: function(el)
196
+ {
197
+ var newId = el.id.replace('shipping:','billing:');
198
+ if (newId && $(newId) && $(newId).type != 'hidden') {
199
+ $(newId).value = el.value;
200
+ $(newId).setAttribute('readOnly', 'readonly');
201
+ $(newId).addClassName('local-validation');
202
+ $(newId).setStyle({opacity:.5});
203
+ $(newId).disable();
204
+ }
205
+ },
206
+
207
+ /**
208
+ * Copy data from shipping address to billing
209
+ */
210
+ _copyShippingToBilling : function (event)
211
+ {
212
+ if (!this._copyElement) {
213
+ return;
214
+ }
215
+ if (this._copyElement.checked) {
216
+ this._copyElementValue($('shipping:country_id'));
217
+ billingRegionUpdater.update();
218
+ $$('[id^="shipping:"]').each(this._copyElementValue);
219
+ this._clearValidation('billing');
220
+ } else {
221
+ $$('[id^="billing:"]').invoke('enable');
222
+ $$('[id^="billing:"]').each(function(el){el.removeAttribute("readOnly");});
223
+ $$('[id^="billing:"]').invoke('removeClassName', 'local-validation');
224
+ $$('[id^="billing:"]').invoke('setStyle', {opacity:1});
225
+ }
226
+ if (event) {
227
+ this._updateOrderSubmit(true);
228
+ }
229
+ },
230
+
231
+ /**
232
+ * Dispatch an ajax request of Update Order submission
233
+ * @param url - url where to submit shipping method
234
+ * @param resultId - id of element to be updated
235
+ */
236
+ _submitUpdateOrder : function(event, url, resultId)
237
+ {
238
+ this._copyShippingToBilling();
239
+ if (url && resultId && this._validateForm()) {
240
+ if (this._copyElement && this._copyElement.checked) {
241
+ this._clearValidation('billing');
242
+ }
243
+ this._updateOrderSubmit(true);
244
+ if (this._pleaseWait) {
245
+ this._pleaseWait.show();
246
+ }
247
+ this._toggleButton(this._ubpdateOrderButton, true);
248
+
249
+ arr = $$('[id^="billing:"]').invoke('enable');
250
+ var formData = this.form.serialize(true);
251
+ if (this._copyElement.checked) {
252
+ $$('[id^="billing:"]').invoke('disable');
253
+ this._copyElement.enable();
254
+ }
255
+ formData.isAjax = true;
256
+ new Ajax.Updater(resultId, url, {
257
+ parameters: formData,
258
+ onComplete: function() {
259
+ if (this._pleaseWait && !this._updateShippingMethods) {
260
+ this._pleaseWait.hide();
261
+ }
262
+ this._toggleButton(this._ubpdateOrderButton, false);
263
+ }.bind(this),
264
+ onSuccess: this._updateShippingMethodsElement.bind(this),
265
+ evalScripts: true
266
+ });
267
+ } else {
268
+ if (this._copyElement && this._copyElement.checked) {
269
+ this._clearValidation('billing');
270
+ }
271
+ }
272
+ },
273
+
274
+ /**
275
+ * Update Shipping Methods Element from server
276
+ */
277
+ _updateShippingMethodsElement : function (){
278
+ if (this._updateShippingMethods ) {
279
+ new Ajax.Updater($(this.shippingMethodsContainer).up(), this.shippingMethodsUpdateUrl, {
280
+ onComplete: this._updateShipping.bind(this),
281
+ onSuccess: this._onSubmitShippingSuccess.bind(this),
282
+ evalScripts: false
283
+ });
284
+ } else {
285
+ this._onSubmitShippingSuccess();
286
+ }
287
+ },
288
+
289
+ /**
290
+ * Update Shipping Method select element and bind events
291
+ */
292
+ _updateShipping : function () {
293
+ if ($(this.shippingSelect)) {
294
+ $(this.shippingSelect).enable();
295
+ Event.stopObserving($(this.shippingSelect), 'change');
296
+
297
+ this._bindElementChange($(this.shippingSelect));
298
+ Event.observe(
299
+ $(this.shippingSelect),
300
+ 'change',
301
+ this._submitUpdateOrder.bindAsEventListener(this, this._submitUpdateOrderUrl, this._itemsGrid)
302
+ );
303
+
304
+ $(this.shippingSelect + '_update').hide();
305
+ $(this.shippingSelect).show();
306
+ }
307
+ this._updateShippingMethods = false;
308
+ if (this._pleaseWait) {
309
+ this._pleaseWait.hide();
310
+ }
311
+ },
312
+
313
+ /**
314
+ * Validate Order form
315
+ */
316
+ _validateForm : function()
317
+ {
318
+ if (!this.form) {
319
+ return false;
320
+ }
321
+ if (!this.formValidator) {
322
+ this.formValidator = new Validation(this.form);
323
+ }
324
+
325
+ return this.formValidator.validate();
326
+ },
327
+
328
+ /**
329
+ * Actions on change Shipping Address data
330
+ * @param event
331
+ */
332
+ _onShippingChange : function(event){
333
+ var element = Event.element(event);
334
+ if (element != $(this.shippingSelect) && !($(this.shippingSelect) && $(this.shippingSelect).disabled)) {
335
+ if ($(this.shippingSelect)) {
336
+ $(this.shippingSelect).disable();
337
+ $(this.shippingSelect).hide();
338
+ if ($('advice-required-entry-' + this.shippingSelect)) {
339
+ $('advice-required-entry-' + this.shippingSelect).hide();
340
+ }
341
+ }
342
+ if (this.shippingMethodsContainer && $(this.shippingMethodsContainer)) {
343
+ $(this.shippingMethodsContainer).hide();
344
+ }
345
+
346
+ if (this.shippingSelect && $(this.shippingSelect + '_update')) {
347
+ $(this.shippingSelect + '_update').show();
348
+ }
349
+ this._updateShippingMethods = true;
350
+ }
351
+ },
352
+
353
+ /**
354
+ * Bind onChange event listener to elements for update Submit Order button state
355
+ * @param input
356
+ */
357
+ _bindElementChange : function(input){
358
+ Event.observe(input, 'change', this._onElementChange.bindAsEventListener(this))
359
+ },
360
+
361
+ /**
362
+ * Disable Submit Order button
363
+ */
364
+ _onElementChange : function(){
365
+ this._updateOrderSubmit(true);
366
+ },
367
+
368
+ /**
369
+ * Clear validation result for all form elements or for elements with id prefix
370
+ * @param idprefix
371
+ */
372
+ _clearValidation : function(idprefix)
373
+ {
374
+ var prefix = '';
375
+ if (idprefix) {
376
+ prefix = '[id*="' + idprefix + ':"]';
377
+ $$(prefix).each(function(el){
378
+ el.up().removeClassName('validation-failed')
379
+ .removeClassName('validation-passed')
380
+ .removeClassName('validation-error');
381
+ });
382
+ } else {
383
+ this.formValidator.reset();
384
+ }
385
+ $$('.validation-advice' + prefix).invoke('remove');
386
+ $$('.validation-failed' + prefix).invoke('removeClassName', 'validation-failed');
387
+ $$('.validation-passed' + prefix).invoke('removeClassName', 'validation-passed');
388
+ $$('.validation-error' + prefix).invoke('removeClassName', 'validation-error');
389
+ },
390
+
391
  /**
392
  * Attempt to submit order
393
  */
394
  _submitOrder : function()
395
  {
396
+ if (this._canSubmitOrder && (this.reloadByShippingSelect || this._validateForm())) {
397
  this.form.submit();
398
  this._updateOrderSubmit(true);
399
+ if (this._ubpdateOrderButton) {
400
+ this._ubpdateOrderButton.addClassName('no-checkout');
401
+ this._ubpdateOrderButton.setStyle({opacity:.5});
402
+ }
403
  if (this._pleaseWait) {
404
  this._pleaseWait.show();
405
  }
406
+ return;
407
  }
408
+ this._updateOrderSubmit(true);
409
  },
410
 
411
  /**
426
  */
427
  _updateOrderSubmit : function(shouldDisable)
428
  {
429
+ var isDisabled = shouldDisable || (
430
+ this.reloadByShippingSelect && (!this.shippingSelect || '' == this.shippingSelect.value)
431
+ );
432
  this._canSubmitOrder = !isDisabled;
433
  if (this.formSubmit) {
434
+ this._toggleButton(this.formSubmit, isDisabled);
435
+ }
436
+ },
437
+
438
+ /**
439
+ * Enable/Disable button
440
+ *
441
+ * @param button
442
+ * @param disable
443
+ */
444
+ _toggleButton : function(button, disable)
445
+ {
446
+ button.disabled = disable;
447
+ button.removeClassName('no-checkout');
448
+ button.setStyle({opacity:1});
449
+ if (disable) {
450
+ button.addClassName('no-checkout');
451
+ button.setStyle({opacity:.5});
452
  }
453
  }
454
  };
skin/frontend/base/default/js/giftmessage.js CHANGED
@@ -19,7 +19,7 @@
19
  *
20
  * @category design
21
  * @package base_default
22
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
  var GiftMessage = Class.create();
19
  *
20
  * @category design
21
  * @package base_default
22
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
  var GiftMessage = Class.create();
skin/frontend/base/default/js/ie6.js CHANGED
@@ -19,7 +19,7 @@
19
  *
20
  * @category design
21
  * @package base_default
22
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
 
19
  *
20
  * @category design
21
  * @package base_default
22
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
 
skin/frontend/base/default/js/msrp.js CHANGED
@@ -19,7 +19,7 @@
19
  *
20
  * @category design
21
  * @package base_default
22
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
  if (!window.Catalog) {
@@ -199,8 +199,10 @@ Catalog.Map = {
199
  var productField = $('map-popup-product-id');
200
  productField.value = this.product_id;
201
  $(cartButton).show();
 
202
  } else {
203
  $(cartButton).hide();
 
204
  }
205
 
206
  //Horizontal line
19
  *
20
  * @category design
21
  * @package base_default
22
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
  if (!window.Catalog) {
199
  var productField = $('map-popup-product-id');
200
  productField.value = this.product_id;
201
  $(cartButton).show();
202
+ $$('.additional-addtocart-box').invoke('show');
203
  } else {
204
  $(cartButton).hide();
205
+ $$('.additional-addtocart-box').invoke('hide');
206
  }
207
 
208
  //Horizontal line
skin/frontend/base/default/js/opcheckout.js CHANGED
@@ -19,7 +19,7 @@
19
  *
20
  * @category design
21
  * @package base_default
22
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
  var Checkout = Class.create();
@@ -38,17 +38,37 @@ Checkout.prototype = {
38
  this.loadWaiting = false;
39
  this.steps = ['login', 'billing', 'shipping', 'shipping_method', 'payment', 'review'];
40
 
41
- //this.onSetMethod = this.nextStep.bindAsEventListener(this);
 
 
42
 
43
  this.accordion.disallowAccessToNextSections = true;
44
  },
45
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
46
  ajaxFailure: function(){
47
  location.href = this.failureUrl;
48
  },
49
 
50
- reloadProgressBlock: function(){
51
- var updater = new Ajax.Updater('checkout-progress-wrapper', this.progressUrl, {method: 'get', onFailure: this.ajaxFailure.bind(this)});
 
 
 
 
52
  },
53
 
54
  reloadReviewBlock: function(){
@@ -90,9 +110,10 @@ Checkout.prototype = {
90
 
91
  gotoSection: function(section)
92
  {
93
- section = $('opc-'+section);
94
- section.addClassName('allow');
95
- this.accordion.openSection(section);
 
96
  },
97
 
98
  setMethod: function(){
@@ -115,9 +136,10 @@ Checkout.prototype = {
115
  this.gotoSection('billing');
116
  }
117
  else{
118
- alert(Translator.translate('Please choose to register or to checkout as a guest'));
119
  return false;
120
  }
 
121
  },
122
 
123
  setBilling: function() {
@@ -134,7 +156,6 @@ Checkout.prototype = {
134
  }
135
 
136
  // this refreshes the checkout progress column
137
- this.reloadProgressBlock();
138
 
139
  // if ($('billing:use_for_shipping') && $('billing:use_for_shipping').checked){
140
  // shipping.syncWithBilling();
@@ -151,21 +172,18 @@ Checkout.prototype = {
151
  },
152
 
153
  setShipping: function() {
154
- this.reloadProgressBlock();
155
  //this.nextStep();
156
  this.gotoSection('shipping_method');
157
  //this.accordion.openNextSection(true);
158
  },
159
 
160
  setShippingMethod: function() {
161
- this.reloadProgressBlock();
162
  //this.nextStep();
163
  this.gotoSection('payment');
164
  //this.accordion.openNextSection(true);
165
  },
166
 
167
  setPayment: function() {
168
- this.reloadProgressBlock();
169
  //this.nextStep();
170
  this.gotoSection('review');
171
  //this.accordion.openNextSection(true);
@@ -198,7 +216,6 @@ Checkout.prototype = {
198
  }
199
 
200
  if (response.goto_section) {
201
- this.reloadProgressBlock();
202
  this.gotoSection(response.goto_section);
203
  return true;
204
  }
@@ -308,6 +325,7 @@ Billing.prototype = {
308
 
309
  resetLoadWaiting: function(transport){
310
  checkout.setLoadWaiting(false);
 
311
  },
312
 
313
  /**
@@ -527,7 +545,7 @@ ShippingMethod.prototype = {
527
  validate: function() {
528
  var methods = document.getElementsByName('shipping_method');
529
  if (methods.length==0) {
530
- alert(Translator.translate('Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.'));
531
  return false;
532
  }
533
 
@@ -540,7 +558,7 @@ ShippingMethod.prototype = {
540
  return true;
541
  }
542
  }
543
- alert(Translator.translate('Please specify shipping method.'));
544
  return false;
545
  },
546
 
@@ -714,7 +732,7 @@ Payment.prototype = {
714
  }
715
  var methods = document.getElementsByName('payment[method]');
716
  if (methods.length==0) {
717
- alert(Translator.translate('Your order cannot be completed at this time as there is no payment methods available for it.'));
718
  return false;
719
  }
720
  for (var i=0; i<methods.length; i++) {
@@ -726,7 +744,7 @@ Payment.prototype = {
726
  if (result) {
727
  return true;
728
  }
729
- alert(Translator.translate('Please specify payment method.'));
730
  return false;
731
  },
732
 
@@ -877,7 +895,6 @@ Review.prototype = {
877
 
878
  if (response.goto_section) {
879
  checkout.gotoSection(response.goto_section);
880
- checkout.reloadProgressBlock();
881
  }
882
  }
883
  },
19
  *
20
  * @category design
21
  * @package base_default
22
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
  */
25
  var Checkout = Class.create();
38
  this.loadWaiting = false;
39
  this.steps = ['login', 'billing', 'shipping', 'shipping_method', 'payment', 'review'];
40
 
41
+ this.accordion.sections.each(function(section) {
42
+ Event.observe($(section).down('.step-title'), 'click', this._onSectionClick.bindAsEventListener(this));
43
+ }.bind(this));
44
 
45
  this.accordion.disallowAccessToNextSections = true;
46
  },
47
 
48
+ /**
49
+ * Section header click handler
50
+ *
51
+ * @param event
52
+ */
53
+ _onSectionClick: function(event) {
54
+ var section = $(Event.element(event).up().up());
55
+ if (section.hasClassName('allow')) {
56
+ Event.stop(event);
57
+ this.gotoSection(section.readAttribute('id').replace('opc-', ''));
58
+ return false;
59
+ }
60
+ },
61
+
62
  ajaxFailure: function(){
63
  location.href = this.failureUrl;
64
  },
65
 
66
+ reloadProgressBlock: function(toStep) {
67
+ var updater = new Ajax.Updater('checkout-progress-wrapper', this.progressUrl, {
68
+ method: 'get',
69
+ onFailure: this.ajaxFailure.bind(this),
70
+ parameters: toStep ? {toStep: toStep} : null
71
+ });
72
  },
73
 
74
  reloadReviewBlock: function(){
110
 
111
  gotoSection: function(section)
112
  {
113
+ var sectionElement = $('opc-'+section);
114
+ sectionElement.addClassName('allow');
115
+ this.accordion.openSection('opc-'+section);
116
+ this.reloadProgressBlock(section);
117
  },
118
 
119
  setMethod: function(){
136
  this.gotoSection('billing');
137
  }
138
  else{
139
+ alert(Translator.translate('Please choose to register or to checkout as a guest').stripTags());
140
  return false;
141
  }
142
+ document.body.fire('login:setMethod', {method : this.method});
143
  },
144
 
145
  setBilling: function() {
156
  }
157
 
158
  // this refreshes the checkout progress column
 
159
 
160
  // if ($('billing:use_for_shipping') && $('billing:use_for_shipping').checked){
161
  // shipping.syncWithBilling();
172
  },
173
 
174
  setShipping: function() {
 
175
  //this.nextStep();
176
  this.gotoSection('shipping_method');
177
  //this.accordion.openNextSection(true);
178
  },
179
 
180
  setShippingMethod: function() {
 
181
  //this.nextStep();
182
  this.gotoSection('payment');
183
  //this.accordion.openNextSection(true);
184
  },
185
 
186
  setPayment: function() {
 
187
  //this.nextStep();
188
  this.gotoSection('review');
189
  //this.accordion.openNextSection(true);
216
  }
217
 
218
  if (response.goto_section) {
 
219
  this.gotoSection(response.goto_section);
220
  return true;
221
  }
325
 
326
  resetLoadWaiting: function(transport){
327
  checkout.setLoadWaiting(false);
328
+ document.body.fire('billing-request:completed', {transport: transport});
329
  },
330
 
331
  /**
545
  validate: function() {
546
  var methods = document.getElementsByName('shipping_method');
547
  if (methods.length==0) {
548
+ alert(Translator.translate('Your order cannot be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.').stripTags());
549
  return false;
550
  }
551
 
558
  return true;
559
  }
560
  }
561
+ alert(Translator.translate('Please specify shipping method.').stripTags());
562
  return false;
563
  },
564
 
732
  }
733
  var methods = document.getElementsByName('payment[method]');
734
  if (methods.length==0) {
735
+ alert(Translator.translate('Your order cannot be completed at this time as there is no payment methods available for it.').stripTags());
736
  return false;
737
  }
738
  for (var i=0; i<methods.length; i++) {
744
  if (result) {
745
  return true;
746
  }
747
+ alert(Translator.translate('Please specify payment method.').stripTags());
748
  return false;
749
  },
750
 
895
 
896
  if (response.goto_section) {
897
  checkout.gotoSection(response.goto_section);
 
898
  }
899
  }
900
  },
skin/frontend/base/default/lib/prototype/windows/themes/magento.css ADDED
@@ -0,0 +1,64 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ /**
2
+ * Magento
3
+ *
4
+ * NOTICE OF LICENSE
5
+ *
6
+ * This source file is subject to the Academic Free License (AFL 3.0)
7
+ * that is bundled with this package in the file LICENSE_AFL.txt.
8
+ * It is also available through the world-wide-web at this URL:
9
+ * http://opensource.org/licenses/afl-3.0.php
10
+ * If you did not receive a copy of the license and are unable to
11
+ * obtain it through the world-wide-web, please send an email
12
+ * to license@magentocommerce.com so we can send you a copy immediately.
13
+ *
14
+ * DISCLAIMER
15
+ *
16
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
17
+ * versions in the future. If you wish to customize Magento for your
18
+ * needs please refer to http://www.magentocommerce.com for more information.
19
+ *
20
+ * @category design
21
+ * @package base_default
22
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
+ */
25
+ .dialog { border:1px solid #555; }
26
+ .dialog .bot { display:none !important; }
27
+ .overlay_magento { background-color:#000; filter:alpha(opacity=60); -moz-opacity:.6; opacity:.6; -webkit-opacity:.6; }
28
+ .top.table_window { border-bottom:1px solid #e6e6e6; background:#6a838b url(magento/top_bg.gif) 0 100% repeat-x; }
29
+
30
+ .magento_nw { width:6px; height:28px; }
31
+ .magento_n { height:28px; }
32
+ .magento_ne { width:6px; height:28px; }
33
+
34
+ .magento_w { width:6px; }
35
+ .magento_e { width:6px; }
36
+ .magento_w,
37
+ .magento_e,
38
+ .magento_content { background: #fafafa url(magento/content_bg.gif) 0 0 repeat-x; }
39
+
40
+ .magento_sw { background:#deebf0; width:5px; height:3px; }
41
+ .magento_s { background:#deebf0; height:3px; }
42
+ .magento_se,
43
+
44
+ .magento_sizer { background:#deebf0; width:5px; height:3px; }
45
+ .magento_sizer { cursor:se-resize; }
46
+
47
+ .magento_close { width:16px; height:16px; background:url(magento/window_close.png) no-repeat 0 0; position:absolute; top:5px; right:7px; cursor:pointer; z-index:1000; }
48
+ .magento_minimize { width:16px; height:16px; background:url(magento/window_minimize.png) 0 0 no-repeat; position:absolute; top:5px; right:28px; cursor:pointer; z-index:1000; }
49
+ .magento_maximize { width:16px; height:16px; background:url(magento/window_maximize.png)0 0 no-repeat; position:absolute; top:5px; right:49px; cursor:pointer; z-index:1000; }
50
+
51
+ .magento_title { float:left; width:100%; font:bold 12px/28px Arial, Helvetica, sans-serif; color:#fff; text-align:left; }
52
+
53
+ .magento_content { overflow:auto; font-size:12px; }
54
+ .magento_content,
55
+ .magento_content label { color:#333; font-family:Arial, sans-serif; }
56
+
57
+ .magento_buttons { padding:10px; text-align:right; }
58
+ .magento_buttons input.button { border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502; background:#ffac47 url(magento/btn_bg.gif) 0 100% repeat-x; padding:0 7px 1px 7px; font:bold 12px/18px Arial, Helvetica, sans-serif; color:#fff; cursor:pointer; text-align:center; white-space:nowrap; }
59
+ .magento_buttons button.button span span span { display:inline; background:none; padding:0; height:auto; }
60
+
61
+ /* FOR IE */
62
+ * html .magento_close { background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/magento/window_maximize.png", sizingMethod="crop"); }
63
+ * html .magento_minimize { background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/magento/window_close.png", sizingMethod="crop");}
64
+ * html .magento_maximize { background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/magento/window_minimize.png", sizingMethod="crop"); }
skin/frontend/base/default/lib/prototype/windows/themes/magento/btn_bg.gif ADDED
Binary file
skin/frontend/base/default/lib/prototype/windows/themes/magento/content_bg.gif ADDED
Binary file
skin/frontend/base/default/lib/prototype/windows/themes/magento/top_bg.gif ADDED
Binary file
skin/frontend/base/default/lib/prototype/windows/themes/magento/window_close.png ADDED
Binary file