Interface_Frontend_Base_Default - Version 1.9.0.0

Version Notes

1.9.0.0

Download this release

Release Info

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


Code changes from version 1.8.1.0 to 1.9.0.0

Files changed (446) hide show
  1. app/design/frontend/base/default/etc/theme.xml +30 -0
  2. app/design/frontend/base/default/etc/widget.xml +1 -1
  3. app/design/frontend/base/default/layout/authorizenet.xml +1 -1
  4. app/design/frontend/base/default/layout/bml.xml +129 -0
  5. app/design/frontend/base/default/layout/bundle.xml +1 -1
  6. app/design/frontend/base/default/layout/captcha.xml +1 -1
  7. app/design/frontend/base/default/layout/catalog.xml +1 -1
  8. app/design/frontend/base/default/layout/catalog_msrp.xml +1 -1
  9. app/design/frontend/base/default/layout/cataloginventory.xml +1 -1
  10. app/design/frontend/base/default/layout/catalogsearch.xml +1 -1
  11. app/design/frontend/base/default/layout/checkout.xml +1 -1
  12. app/design/frontend/base/default/layout/cms.xml +1 -1
  13. app/design/frontend/base/default/layout/contacts.xml +1 -1
  14. app/design/frontend/base/default/layout/core.xml +1 -1
  15. app/design/frontend/base/default/layout/customer.xml +1 -1
  16. app/design/frontend/base/default/layout/directory.xml +1 -1
  17. app/design/frontend/base/default/layout/downloadable.xml +1 -1
  18. app/design/frontend/base/default/layout/googleanalytics.xml +1 -1
  19. app/design/frontend/base/default/layout/newsletter.xml +1 -1
  20. app/design/frontend/base/default/layout/oauth.xml +1 -1
  21. app/design/frontend/base/default/layout/page.xml +1 -1
  22. app/design/frontend/base/default/layout/pagecache.xml +1 -1
  23. app/design/frontend/base/default/layout/payment.xml +1 -1
  24. app/design/frontend/base/default/layout/paypal.xml +1 -3
  25. app/design/frontend/base/default/layout/paypaluk.xml +3 -2
  26. app/design/frontend/base/default/layout/persistent.xml +1 -1
  27. app/design/frontend/base/default/layout/poll.xml +1 -1
  28. app/design/frontend/base/default/layout/productalert.xml +1 -1
  29. app/design/frontend/base/default/layout/reports.xml +1 -1
  30. app/design/frontend/base/default/layout/review.xml +1 -1
  31. app/design/frontend/base/default/layout/rss.xml +1 -1
  32. app/design/frontend/base/default/layout/sales.xml +1 -1
  33. app/design/frontend/base/default/layout/sales/billing_agreement.xml +1 -1
  34. app/design/frontend/base/default/layout/sales/recurring_profile.xml +1 -1
  35. app/design/frontend/base/default/layout/sendfriend.xml +1 -1
  36. app/design/frontend/base/default/layout/shipping.xml +1 -1
  37. app/design/frontend/base/default/layout/tag.xml +1 -1
  38. app/design/frontend/base/default/layout/weee.xml +1 -1
  39. app/design/frontend/base/default/layout/wishlist.xml +1 -1
  40. app/design/frontend/base/default/template/authorizenet/directpost/form.phtml +1 -1
  41. app/design/frontend/base/default/template/authorizenet/directpost/iframe.phtml +1 -1
  42. app/design/frontend/base/default/template/authorizenet/directpost/info.phtml +1 -1
  43. app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml +1 -1
  44. app/design/frontend/base/default/template/bundle/catalog/product/price.phtml +1 -1
  45. app/design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml +5 -3
  46. app/design/frontend/base/default/template/bundle/catalog/product/view/options/notice.phtml +1 -1
  47. app/design/frontend/base/default/template/bundle/catalog/product/view/price.phtml +1 -1
  48. app/design/frontend/base/default/template/bundle/catalog/product/view/tierprices.phtml +1 -1
  49. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml +2 -1
  50. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml +1 -1
  51. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml +1 -1
  52. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml +1 -1
  53. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml +1 -1
  54. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/options.phtml +1 -1
  55. app/design/frontend/base/default/template/bundle/email/order/items/creditmemo/default.phtml +1 -1
  56. app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml +1 -1
  57. app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml +1 -1
  58. app/design/frontend/base/default/template/bundle/email/order/items/shipment/default.phtml +1 -1
  59. app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml +1 -1
  60. app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml +1 -1
  61. app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml +1 -1
  62. app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml +1 -1
  63. app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml +1 -1
  64. app/design/frontend/base/default/template/callouts/left_col.phtml +1 -1
  65. app/design/frontend/base/default/template/callouts/right_col.phtml +1 -1
  66. app/design/frontend/base/default/template/captcha/zend.phtml +1 -1
  67. app/design/frontend/base/default/template/catalog/category/page.phtml +1 -1
  68. app/design/frontend/base/default/template/catalog/category/view.phtml +1 -1
  69. app/design/frontend/base/default/template/catalog/category/widget/link/link_block.phtml +1 -1
  70. app/design/frontend/base/default/template/catalog/category/widget/link/link_inline.phtml +1 -1
  71. app/design/frontend/base/default/template/catalog/layer/filter.phtml +1 -1
  72. app/design/frontend/base/default/template/catalog/layer/state.phtml +1 -1
  73. app/design/frontend/base/default/template/catalog/layer/view.phtml +1 -1
  74. app/design/frontend/base/default/template/catalog/msrp/popup.phtml +1 -1
  75. app/design/frontend/base/default/template/catalog/navigation/left.phtml +1 -1
  76. app/design/frontend/base/default/template/catalog/navigation/top.phtml +1 -1
  77. app/design/frontend/base/default/template/catalog/product/compare/list.phtml +1 -1
  78. app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml +1 -1
  79. app/design/frontend/base/default/template/catalog/product/gallery.phtml +1 -1
  80. app/design/frontend/base/default/template/catalog/product/list.phtml +1 -1
  81. app/design/frontend/base/default/template/catalog/product/list/related.phtml +1 -1
  82. app/design/frontend/base/default/template/catalog/product/list/toolbar.phtml +1 -1
  83. app/design/frontend/base/default/template/catalog/product/list/upsell.phtml +1 -1
  84. app/design/frontend/base/default/template/catalog/product/new.phtml +1 -1
  85. app/design/frontend/base/default/template/catalog/product/price.phtml +1 -1
  86. app/design/frontend/base/default/template/catalog/product/price_msrp.phtml +3 -3
  87. app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml +1 -1
  88. app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml +1 -1
  89. app/design/frontend/base/default/template/catalog/product/price_msrp_rss.phtml +1 -1
  90. app/design/frontend/base/default/template/catalog/product/view.phtml +1 -1
  91. app/design/frontend/base/default/template/catalog/product/view/additional.phtml +1 -1
  92. app/design/frontend/base/default/template/catalog/product/view/addto.phtml +1 -1
  93. app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml +2 -2
  94. app/design/frontend/base/default/template/catalog/product/view/attributes.phtml +1 -1
  95. app/design/frontend/base/default/template/catalog/product/view/description.phtml +1 -1
  96. app/design/frontend/base/default/template/catalog/product/view/media.phtml +1 -1
  97. app/design/frontend/base/default/template/catalog/product/view/options.phtml +1 -1
  98. app/design/frontend/base/default/template/catalog/product/view/options/js.phtml +1 -1
  99. app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml +1 -1
  100. app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml +1 -1
  101. app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml +1 -1
  102. app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml +1 -1
  103. app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml +1 -1
  104. app/design/frontend/base/default/template/catalog/product/view/options/wrapper.phtml +1 -1
  105. app/design/frontend/base/default/template/catalog/product/view/options/wrapper/bottom.phtml +1 -1
  106. app/design/frontend/base/default/template/catalog/product/view/price.phtml +1 -1
  107. app/design/frontend/base/default/template/catalog/product/view/price_clone.phtml +1 -1
  108. app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml +1 -1
  109. app/design/frontend/base/default/template/catalog/product/view/type/configurable.phtml +1 -1
  110. app/design/frontend/base/default/template/catalog/product/view/type/default.phtml +1 -1
  111. app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml +1 -1
  112. app/design/frontend/base/default/template/catalog/product/view/type/options/configurable.phtml +1 -1
  113. app/design/frontend/base/default/template/catalog/product/view/type/simple.phtml +1 -1
  114. app/design/frontend/base/default/template/catalog/product/view/type/virtual.phtml +1 -1
  115. app/design/frontend/base/default/template/catalog/product/widget/link/link_block.phtml +1 -1
  116. app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml +1 -1
  117. app/design/frontend/base/default/template/catalog/product/widget/new/column/new_default_list.phtml +1 -1
  118. app/design/frontend/base/default/template/catalog/product/widget/new/column/new_images_list.phtml +1 -1
  119. app/design/frontend/base/default/template/catalog/product/widget/new/column/new_names_list.phtml +1 -1
  120. app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml +1 -1
  121. app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml +1 -1
  122. app/design/frontend/base/default/template/catalog/rss/product/price.phtml +1 -1
  123. app/design/frontend/base/default/template/catalog/seo/sitemap.phtml +1 -1
  124. app/design/frontend/base/default/template/catalog/seo/sitemap/container.phtml +1 -1
  125. app/design/frontend/base/default/template/catalog/seo/tree.phtml +1 -1
  126. app/design/frontend/base/default/template/cataloginventory/qtyincrements.phtml +1 -1
  127. app/design/frontend/base/default/template/cataloginventory/stockqty/composite.phtml +1 -1
  128. app/design/frontend/base/default/template/cataloginventory/stockqty/default.phtml +1 -1
  129. app/design/frontend/base/default/template/catalogsearch/advanced/form.phtml +1 -1
  130. app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml +1 -1
  131. app/design/frontend/base/default/template/catalogsearch/form.mini.phtml +1 -1
  132. app/design/frontend/base/default/template/catalogsearch/result.phtml +1 -1
  133. app/design/frontend/base/default/template/catalogsearch/term.phtml +1 -1
  134. app/design/frontend/base/default/template/checkout/cart.phtml +1 -1
  135. app/design/frontend/base/default/template/checkout/cart/coupon.phtml +1 -1
  136. app/design/frontend/base/default/template/checkout/cart/crosssell.phtml +1 -1
  137. app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.phtml +1 -1
  138. app/design/frontend/base/default/template/checkout/cart/item/default.phtml +1 -1
  139. app/design/frontend/base/default/template/checkout/cart/noItems.phtml +1 -1
  140. app/design/frontend/base/default/template/checkout/cart/render/default.phtml +1 -1
  141. app/design/frontend/base/default/template/checkout/cart/render/simple.phtml +1 -1
  142. app/design/frontend/base/default/template/checkout/cart/shipping.phtml +1 -1
  143. app/design/frontend/base/default/template/checkout/cart/sidebar.phtml +1 -1
  144. app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml +1 -1
  145. app/design/frontend/base/default/template/checkout/cart/totals.phtml +1 -1
  146. app/design/frontend/base/default/template/checkout/multishipping/address/select.phtml +1 -1
  147. app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml +3 -3
  148. app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml +1 -1
  149. app/design/frontend/base/default/template/checkout/multishipping/billing.phtml +2 -2
  150. app/design/frontend/base/default/template/checkout/multishipping/billing/items.phtml +1 -1
  151. app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml +1 -1
  152. app/design/frontend/base/default/template/checkout/multishipping/link.phtml +1 -1
  153. app/design/frontend/base/default/template/checkout/multishipping/overview.phtml +2 -2
  154. app/design/frontend/base/default/template/checkout/multishipping/overview/item.phtml +1 -1
  155. app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml +2 -2
  156. app/design/frontend/base/default/template/checkout/multishipping/state.phtml +1 -1
  157. app/design/frontend/base/default/template/checkout/multishipping/success.phtml +3 -3
  158. app/design/frontend/base/default/template/checkout/onepage.phtml +1 -1
  159. app/design/frontend/base/default/template/checkout/onepage/agreements.phtml +1 -1
  160. app/design/frontend/base/default/template/checkout/onepage/billing.phtml +1 -1
  161. app/design/frontend/base/default/template/checkout/onepage/failure.phtml +1 -1
  162. app/design/frontend/base/default/template/checkout/onepage/link.phtml +1 -1
  163. app/design/frontend/base/default/template/checkout/onepage/login.phtml +1 -1
  164. app/design/frontend/base/default/template/checkout/onepage/payment.phtml +1 -1
  165. app/design/frontend/base/default/template/checkout/onepage/payment/info.phtml +1 -1
  166. app/design/frontend/base/default/template/checkout/onepage/payment/methods.phtml +1 -1
  167. app/design/frontend/base/default/template/checkout/onepage/progress.phtml +1 -1
  168. app/design/frontend/base/default/template/checkout/onepage/progress/billing.phtml +1 -1
  169. app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml +1 -1
  170. app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml +1 -1
  171. app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml +1 -1
  172. app/design/frontend/base/default/template/checkout/onepage/review.phtml +1 -1
  173. app/design/frontend/base/default/template/checkout/onepage/review/button.phtml +1 -1
  174. app/design/frontend/base/default/template/checkout/onepage/review/info.phtml +1 -1
  175. app/design/frontend/base/default/template/checkout/onepage/review/item.phtml +1 -1
  176. app/design/frontend/base/default/template/checkout/onepage/review/totals.phtml +1 -1
  177. app/design/frontend/base/default/template/checkout/onepage/shipping.phtml +1 -1
  178. app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml +1 -1
  179. app/design/frontend/base/default/template/checkout/onepage/shipping_method/additional.phtml +1 -1
  180. app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml +1 -1
  181. app/design/frontend/base/default/template/checkout/success.phtml +1 -1
  182. app/design/frontend/base/default/template/checkout/total/default.phtml +1 -1
  183. app/design/frontend/base/default/template/checkout/total/nominal.phtml +1 -1
  184. app/design/frontend/base/default/template/checkout/total/tax.phtml +1 -1
  185. app/design/frontend/base/default/template/cms/content.phtml +1 -1
  186. app/design/frontend/base/default/template/cms/content_heading.phtml +1 -1
  187. app/design/frontend/base/default/template/cms/default/home.phtml +1 -1
  188. app/design/frontend/base/default/template/cms/default/no-route.phtml +1 -1
  189. app/design/frontend/base/default/template/cms/meta.phtml +1 -1
  190. app/design/frontend/base/default/template/cms/widget/link/link_block.phtml +1 -1
  191. app/design/frontend/base/default/template/cms/widget/link/link_inline.phtml +1 -1
  192. app/design/frontend/base/default/template/cms/widget/static_block/default.phtml +1 -1
  193. app/design/frontend/base/default/template/contacts/form.phtml +1 -1
  194. app/design/frontend/base/default/template/core/formkey.phtml +1 -1
  195. app/design/frontend/base/default/template/core/link.phtml +1 -1
  196. app/design/frontend/base/default/template/core/messages.phtml +1 -1
  197. app/design/frontend/base/default/template/customer/account/dashboard.phtml +1 -1
  198. app/design/frontend/base/default/template/customer/account/dashboard/address.phtml +1 -1
  199. app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml +1 -1
  200. app/design/frontend/base/default/template/customer/account/dashboard/info.phtml +1 -1
  201. app/design/frontend/base/default/template/customer/account/dashboard/newsletter.phtml +1 -1
  202. app/design/frontend/base/default/template/customer/account/link/back.phtml +1 -1
  203. app/design/frontend/base/default/template/customer/account/navigation.phtml +1 -1
  204. app/design/frontend/base/default/template/customer/address.phtml +1 -1
  205. app/design/frontend/base/default/template/customer/address/book.phtml +1 -1
  206. app/design/frontend/base/default/template/customer/address/edit.phtml +2 -2
  207. app/design/frontend/base/default/template/customer/balance.phtml +1 -1
  208. app/design/frontend/base/default/template/customer/form/address.phtml +2 -2
  209. app/design/frontend/base/default/template/customer/form/changepassword.phtml +1 -1
  210. app/design/frontend/base/default/template/customer/form/confirmation.phtml +1 -1
  211. app/design/frontend/base/default/template/customer/form/edit.phtml +1 -1
  212. app/design/frontend/base/default/template/customer/form/forgotpassword.phtml +1 -1
  213. app/design/frontend/base/default/template/customer/form/login.phtml +1 -1
  214. app/design/frontend/base/default/template/customer/form/mini.login.phtml +1 -1
  215. app/design/frontend/base/default/template/customer/form/newsletter.phtml +1 -1
  216. app/design/frontend/base/default/template/customer/form/register.phtml +1 -1
  217. app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml +1 -1
  218. app/design/frontend/base/default/template/customer/logout.phtml +1 -1
  219. app/design/frontend/base/default/template/customer/orders.phtml +1 -1
  220. app/design/frontend/base/default/template/customer/widget/dob.phtml +1 -1
  221. app/design/frontend/base/default/template/customer/widget/gender.phtml +1 -1
  222. app/design/frontend/base/default/template/customer/widget/name.phtml +1 -1
  223. app/design/frontend/base/default/template/customer/widget/taxvat.phtml +1 -1
  224. app/design/frontend/base/default/template/customer/wishlist.phtml +1 -1
  225. app/design/frontend/base/default/template/directory/currency.phtml +1 -1
  226. app/design/frontend/base/default/template/directory/currency/switch.phtml +1 -1
  227. app/design/frontend/base/default/template/directory/js/optional_zip_countries.phtml +1 -1
  228. app/design/frontend/base/default/template/downloadable/catalog/product/links.phtml +1 -1
  229. app/design/frontend/base/default/template/downloadable/catalog/product/samples.phtml +1 -1
  230. app/design/frontend/base/default/template/downloadable/catalog/product/type.phtml +1 -1
  231. app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml +1 -1
  232. app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml +1 -1
  233. app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml +1 -1
  234. app/design/frontend/base/default/template/downloadable/checkout/success.phtml +1 -1
  235. app/design/frontend/base/default/template/downloadable/customer/products/list.phtml +1 -1
  236. app/design/frontend/base/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml +1 -1
  237. app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.phtml +1 -1
  238. app/design/frontend/base/default/template/downloadable/email/order/items/order/downloadable.phtml +1 -1
  239. app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +1 -1
  240. app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +1 -1
  241. app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml +1 -1
  242. app/design/frontend/base/default/template/email/order/creditmemo/items.phtml +1 -1
  243. app/design/frontend/base/default/template/email/order/invoice/items.phtml +1 -1
  244. app/design/frontend/base/default/template/email/order/items.phtml +1 -1
  245. app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml +1 -1
  246. app/design/frontend/base/default/template/email/order/items/invoice/default.phtml +1 -1
  247. app/design/frontend/base/default/template/email/order/items/order/default.phtml +1 -1
  248. app/design/frontend/base/default/template/email/order/items/shipment/default.phtml +1 -1
  249. app/design/frontend/base/default/template/email/order/shipment/items.phtml +1 -1
  250. app/design/frontend/base/default/template/email/order/shipment/track.phtml +1 -1
  251. app/design/frontend/base/default/template/email/productalert/price.phtml +1 -1
  252. app/design/frontend/base/default/template/email/productalert/stock.phtml +1 -1
  253. app/design/frontend/base/default/template/giftmessage/inline.phtml +1 -1
  254. app/design/frontend/base/default/template/googleanalytics/ga.phtml +1 -1
  255. app/design/frontend/base/default/template/newsletter/subscribe.phtml +1 -1
  256. app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml +1 -1
  257. app/design/frontend/base/default/template/oauth/authorize/button.phtml +1 -1
  258. app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml +1 -1
  259. app/design/frontend/base/default/template/oauth/authorize/confirm.phtml +1 -1
  260. app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml +1 -1
  261. app/design/frontend/base/default/template/oauth/authorize/form/login.phtml +1 -1
  262. app/design/frontend/base/default/template/oauth/authorize/head-simple.phtml +1 -1
  263. app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml +1 -1
  264. app/design/frontend/base/default/template/oauth/authorize/reject.phtml +1 -1
  265. app/design/frontend/base/default/template/oauth/customer/token/list.phtml +1 -1
  266. app/design/frontend/base/default/template/page/1column.phtml +1 -1
  267. app/design/frontend/base/default/template/page/2columns-left.phtml +1 -1
  268. app/design/frontend/base/default/template/page/2columns-right.phtml +1 -1
  269. app/design/frontend/base/default/template/page/3columns.phtml +1 -1
  270. app/design/frontend/base/default/template/page/empty.phtml +1 -1
  271. app/design/frontend/base/default/template/page/html/breadcrumbs.phtml +1 -1
  272. app/design/frontend/base/default/template/page/html/cookienotice.phtml +1 -1
  273. app/design/frontend/base/default/template/page/html/footer.phtml +1 -1
  274. app/design/frontend/base/default/template/page/html/head.phtml +1 -1
  275. app/design/frontend/base/default/template/page/html/header.phtml +1 -1
  276. app/design/frontend/base/default/template/page/html/notices.phtml +1 -1
  277. app/design/frontend/base/default/template/page/html/pager.phtml +1 -1
  278. app/design/frontend/base/default/template/page/html/top.links.phtml +1 -1
  279. app/design/frontend/base/default/template/page/html/topmenu.phtml +1 -1
  280. app/design/frontend/base/default/template/page/html/wrapper.phtml +1 -1
  281. app/design/frontend/base/default/template/page/js/calendar.phtml +1 -1
  282. app/design/frontend/base/default/template/page/js/cookie.phtml +1 -1
  283. app/design/frontend/base/default/template/page/popup.phtml +1 -1
  284. app/design/frontend/base/default/template/page/print.phtml +1 -1
  285. app/design/frontend/base/default/template/page/redirect.phtml +1 -1
  286. app/design/frontend/base/default/template/page/switch/flags.phtml +1 -1
  287. app/design/frontend/base/default/template/page/switch/languages.phtml +1 -1
  288. app/design/frontend/base/default/template/page/switch/stores.phtml +1 -1
  289. app/design/frontend/base/default/template/page/template/container.phtml +1 -1
  290. app/design/frontend/base/default/template/page/template/links.phtml +1 -1
  291. app/design/frontend/base/default/template/page/template/linksblock.phtml +1 -1
  292. app/design/frontend/base/default/template/pagecache/cookie.phtml +1 -1
  293. app/design/frontend/base/default/template/paygate/form/cc.phtml +1 -1
  294. app/design/frontend/base/default/template/paygate/info/cc.phtml +1 -1
  295. app/design/frontend/base/default/template/payment/catalog/product/view/profile/options.phtml +1 -1
  296. app/design/frontend/base/default/template/payment/catalog/product/view/profile/schedule.phtml +1 -1
  297. app/design/frontend/base/default/template/payment/form/banktransfer.phtml +1 -1
  298. app/design/frontend/base/default/template/payment/form/cashondelivery.phtml +1 -1
  299. app/design/frontend/base/default/template/payment/form/cc.phtml +1 -1
  300. app/design/frontend/base/default/template/payment/form/ccsave.phtml +1 -1
  301. app/design/frontend/base/default/template/payment/form/checkmo.phtml +1 -1
  302. app/design/frontend/base/default/template/payment/form/purchaseorder.phtml +1 -1
  303. app/design/frontend/base/default/template/payment/info/banktransfer.phtml +1 -1
  304. app/design/frontend/base/default/template/payment/info/checkmo.phtml +1 -1
  305. app/design/frontend/base/default/template/payment/info/default.phtml +1 -1
  306. app/design/frontend/base/default/template/payment/info/purchaseorder.phtml +1 -1
  307. app/design/frontend/base/default/template/paypal/bml.phtml +40 -0
  308. app/design/frontend/base/default/template/paypal/express/review.phtml +87 -81
  309. app/design/frontend/base/default/template/paypal/express/review/address.phtml +0 -145
  310. app/design/frontend/base/default/template/paypal/express/review/details.phtml +1 -1
  311. app/design/frontend/base/default/template/paypal/express/review/shipping/method.phtml +1 -1
  312. app/design/frontend/base/default/template/paypal/express/shortcut.phtml +23 -5
  313. app/design/frontend/base/default/template/paypal/hss/form.phtml +1 -1
  314. app/design/frontend/base/default/template/paypal/hss/iframe.phtml +1 -1
  315. app/design/frontend/base/default/template/paypal/hss/info.phtml +1 -1
  316. app/design/frontend/base/default/template/paypal/hss/js.phtml +1 -1
  317. app/design/frontend/base/default/template/paypal/hss/redirect.phtml +1 -1
  318. app/design/frontend/base/default/template/paypal/hss/review/button.phtml +1 -1
  319. app/design/frontend/base/default/template/paypal/partner/logo.phtml +1 -1
  320. app/design/frontend/base/default/template/paypal/payflowadvanced/form.phtml +1 -1
  321. app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml +1 -1
  322. app/design/frontend/base/default/template/paypal/payflowadvanced/info.phtml +1 -1
  323. app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml +1 -1
  324. app/design/frontend/base/default/template/paypal/payflowlink/form.phtml +1 -1
  325. app/design/frontend/base/default/template/paypal/payflowlink/iframe.phtml +1 -1
  326. app/design/frontend/base/default/template/paypal/payflowlink/info.phtml +1 -1
  327. app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml +1 -1
  328. app/design/frontend/base/default/template/paypal/payment/mark.phtml +4 -2
  329. app/design/frontend/base/default/template/paypal/payment/redirect.phtml +1 -1
  330. app/design/frontend/base/default/template/paypaluk/express/review.phtml +0 -191
  331. app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml +1 -1
  332. app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml +1 -1
  333. app/design/frontend/base/default/template/persistent/customer/form/login.phtml +1 -1
  334. app/design/frontend/base/default/template/persistent/customer/form/register.phtml +1 -1
  335. app/design/frontend/base/default/template/persistent/remember_me.phtml +1 -1
  336. app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml +1 -1
  337. app/design/frontend/base/default/template/poll/active.phtml +1 -1
  338. app/design/frontend/base/default/template/poll/result.phtml +1 -1
  339. app/design/frontend/base/default/template/productalert/price.phtml +1 -1
  340. app/design/frontend/base/default/template/productalert/product/view.phtml +1 -1
  341. app/design/frontend/base/default/template/productalert/stock.phtml +1 -1
  342. app/design/frontend/base/default/template/rating/detailed.phtml +1 -1
  343. app/design/frontend/base/default/template/rating/empty.phtml +1 -1
  344. app/design/frontend/base/default/template/reports/home_product_compared.phtml +1 -1
  345. app/design/frontend/base/default/template/reports/home_product_viewed.phtml +1 -1
  346. app/design/frontend/base/default/template/reports/product_compared.phtml +1 -1
  347. app/design/frontend/base/default/template/reports/product_viewed.phtml +1 -1
  348. app/design/frontend/base/default/template/reports/widget/compared/column/compared_default_list.phtml +1 -1
  349. app/design/frontend/base/default/template/reports/widget/compared/column/compared_images_list.phtml +1 -1
  350. app/design/frontend/base/default/template/reports/widget/compared/column/compared_names_list.phtml +1 -1
  351. app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml +1 -1
  352. app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml +1 -1
  353. app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_default_list.phtml +1 -1
  354. app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_images_list.phtml +1 -1
  355. app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_names_list.phtml +1 -1
  356. app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml +1 -1
  357. app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml +1 -1
  358. app/design/frontend/base/default/template/review/customer/list.phtml +1 -1
  359. app/design/frontend/base/default/template/review/customer/recent.phtml +1 -1
  360. app/design/frontend/base/default/template/review/customer/view.phtml +1 -1
  361. app/design/frontend/base/default/template/review/form.phtml +1 -1
  362. app/design/frontend/base/default/template/review/helper/summary.phtml +1 -1
  363. app/design/frontend/base/default/template/review/helper/summary_short.phtml +1 -1
  364. app/design/frontend/base/default/template/review/product/view/count.phtml +1 -1
  365. app/design/frontend/base/default/template/review/product/view/list.phtml +1 -1
  366. app/design/frontend/base/default/template/review/product/view/other.phtml +1 -1
  367. app/design/frontend/base/default/template/review/view.phtml +1 -1
  368. app/design/frontend/base/default/template/rss/list.phtml +1 -1
  369. app/design/frontend/base/default/template/rss/nofeed.phtml +1 -1
  370. app/design/frontend/base/default/template/rss/order/details.phtml +1 -1
  371. app/design/frontend/base/default/template/sales/billing/agreement/view.phtml +1 -1
  372. app/design/frontend/base/default/template/sales/billing/agreements.phtml +1 -1
  373. app/design/frontend/base/default/template/sales/order/comments.phtml +1 -1
  374. app/design/frontend/base/default/template/sales/order/creditmemo.phtml +1 -1
  375. app/design/frontend/base/default/template/sales/order/creditmemo/items.phtml +1 -1
  376. app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml +1 -1
  377. app/design/frontend/base/default/template/sales/order/details.phtml +1 -1
  378. app/design/frontend/base/default/template/sales/order/history.phtml +1 -1
  379. app/design/frontend/base/default/template/sales/order/info.phtml +1 -1
  380. app/design/frontend/base/default/template/sales/order/info/buttons.phtml +1 -1
  381. app/design/frontend/base/default/template/sales/order/invoice.phtml +1 -1
  382. app/design/frontend/base/default/template/sales/order/invoice/items.phtml +1 -1
  383. app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml +1 -1
  384. app/design/frontend/base/default/template/sales/order/items.phtml +1 -1
  385. app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml +1 -1
  386. app/design/frontend/base/default/template/sales/order/print.phtml +1 -1
  387. app/design/frontend/base/default/template/sales/order/print/creditmemo.phtml +1 -1
  388. app/design/frontend/base/default/template/sales/order/print/invoice.phtml +1 -1
  389. app/design/frontend/base/default/template/sales/order/print/shipment.phtml +1 -1
  390. app/design/frontend/base/default/template/sales/order/recent.phtml +1 -1
  391. app/design/frontend/base/default/template/sales/order/shipment.phtml +1 -1
  392. app/design/frontend/base/default/template/sales/order/shipment/items.phtml +1 -1
  393. app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml +1 -1
  394. app/design/frontend/base/default/template/sales/order/totals.phtml +1 -1
  395. app/design/frontend/base/default/template/sales/order/trackinginfo.phtml +1 -1
  396. app/design/frontend/base/default/template/sales/order/view.phtml +1 -1
  397. app/design/frontend/base/default/template/sales/payment/form/billing/agreement.phtml +1 -1
  398. app/design/frontend/base/default/template/sales/recurring/grid.phtml +1 -1
  399. app/design/frontend/base/default/template/sales/recurring/profile/view.phtml +1 -1
  400. app/design/frontend/base/default/template/sales/recurring/profile/view/info.phtml +1 -1
  401. app/design/frontend/base/default/template/sales/recurring/profiles.phtml +1 -1
  402. app/design/frontend/base/default/template/sales/reorder/sidebar.phtml +1 -1
  403. app/design/frontend/base/default/template/sales/widget/guest/form.phtml +1 -1
  404. app/design/frontend/base/default/template/sendfriend/send.phtml +1 -1
  405. app/design/frontend/base/default/template/shipping/tracking/ajax.phtml +1 -1
  406. app/design/frontend/base/default/template/shipping/tracking/popup.phtml +1 -1
  407. app/design/frontend/base/default/template/tag/cloud.phtml +1 -1
  408. app/design/frontend/base/default/template/tag/customer/recent.phtml +1 -1
  409. app/design/frontend/base/default/template/tag/customer/tags.phtml +1 -1
  410. app/design/frontend/base/default/template/tag/customer/view.phtml +1 -1
  411. app/design/frontend/base/default/template/tag/list.phtml +1 -1
  412. app/design/frontend/base/default/template/tag/popular.phtml +1 -1
  413. app/design/frontend/base/default/template/tax/checkout/discount.phtml +1 -1
  414. app/design/frontend/base/default/template/tax/checkout/grandtotal.phtml +1 -1
  415. app/design/frontend/base/default/template/tax/checkout/shipping.phtml +1 -1
  416. app/design/frontend/base/default/template/tax/checkout/subtotal.phtml +1 -1
  417. app/design/frontend/base/default/template/tax/checkout/tax.phtml +1 -1
  418. app/design/frontend/base/default/template/tax/order/tax.phtml +1 -1
  419. app/design/frontend/base/default/template/wishlist/button/share.phtml +1 -1
  420. app/design/frontend/base/default/template/wishlist/button/tocart.phtml +1 -1
  421. app/design/frontend/base/default/template/wishlist/button/update.phtml +1 -1
  422. app/design/frontend/base/default/template/wishlist/email/items.phtml +1 -1
  423. app/design/frontend/base/default/template/wishlist/email/rss.phtml +1 -1
  424. app/design/frontend/base/default/template/wishlist/item/column/cart.phtml +1 -1
  425. app/design/frontend/base/default/template/wishlist/item/column/image.phtml +1 -1
  426. app/design/frontend/base/default/template/wishlist/item/column/info.phtml +1 -1
  427. app/design/frontend/base/default/template/wishlist/item/column/remove.phtml +1 -1
  428. app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml +1 -1
  429. app/design/frontend/base/default/template/wishlist/item/list.phtml +1 -1
  430. app/design/frontend/base/default/template/wishlist/options_list.phtml +1 -1
  431. app/design/frontend/base/default/template/wishlist/render/item/price.phtml +1 -1
  432. app/design/frontend/base/default/template/wishlist/render/item/price_msrp_item.phtml +1 -1
  433. app/design/frontend/base/default/template/wishlist/render/item/price_msrp_rss.phtml +1 -1
  434. app/design/frontend/base/default/template/wishlist/shared.phtml +1 -1
  435. app/design/frontend/base/default/template/wishlist/sharing.phtml +1 -1
  436. app/design/frontend/base/default/template/wishlist/sidebar.phtml +1 -1
  437. app/design/frontend/base/default/template/wishlist/view.phtml +1 -1
  438. package.xml +6 -6
  439. skin/frontend/base/default/css/widgets.css +1 -1
  440. skin/frontend/base/default/js/bundle.js +4 -4
  441. skin/frontend/base/default/js/checkout/review.js +1 -1
  442. skin/frontend/base/default/js/giftmessage.js +1 -1
  443. skin/frontend/base/default/js/ie6.js +1 -1
  444. skin/frontend/base/default/js/msrp.js +1 -1
  445. skin/frontend/base/default/js/opcheckout.js +1 -1
  446. skin/frontend/base/default/lib/prototype/windows/themes/magento.css +1 -1
app/design/frontend/base/default/etc/theme.xml ADDED
@@ -0,0 +1,30 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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) 2014 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
+ <theme>
29
+ <parent />
30
+ </theme>
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) 2013 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) 2014 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) 2013 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) 2014 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/bml.xml ADDED
@@ -0,0 +1,129 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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) 2014 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
+ <cms_index_index>
31
+ <reference name="top.container">
32
+ <block type="paypal/bml_banners" name="bml.center.logo" template="paypal/bml.phtml">
33
+ <action method="setSection"><section>homepage</section></action>
34
+ <action method="setPosition"><position>0</position></action>
35
+ </block>
36
+ </reference>
37
+ <reference name="right">
38
+ <block type="paypal/bml_banners" name="bml.right.logo" template="paypal/bml.phtml">
39
+ <action method="setSection"><section>homepage</section></action>
40
+ <action method="setPosition"><position>1</position></action>
41
+ </block>
42
+ </reference>
43
+ </cms_index_index>
44
+
45
+ <cms_index_defaultindex>
46
+ <reference name="top.container">
47
+ <block type="paypal/bml_banners" name="bml.center.logo" template="paypal/bml.phtml">
48
+ <action method="setSection"><section>homepage</section></action>
49
+ <action method="setPosition"><position>0</position></action>
50
+ </block>
51
+ </reference>
52
+ <reference name="right">
53
+ <block type="paypal/bml_banners" name="bml.right.logo" template="paypal/bml.phtml">
54
+ <action method="setSection"><section>homepage</section></action>
55
+ <action method="setPosition"><position>1</position></action>
56
+ </block>
57
+ </reference>
58
+ </cms_index_defaultindex>
59
+
60
+ <catalog_category_default>
61
+ <reference name="top.container">
62
+ <block type="paypal/bml_banners" name="bml.center.logo" template="paypal/bml.phtml">
63
+ <action method="setSection"><section>categorypage</section></action>
64
+ <action method="setPosition"><position>0</position></action>
65
+ </block>
66
+ </reference>
67
+ <reference name="right">
68
+ <block type="paypal/bml_banners" name="bml.right.logo" template="paypal/bml.phtml">
69
+ <action method="setSection"><section>categorypage</section></action>
70
+ <action method="setPosition"><position>1</position></action>
71
+ </block>
72
+ </reference>
73
+ </catalog_category_default>
74
+
75
+ <catalog_category_layered>
76
+ <reference name="top.container">
77
+ <block type="paypal/bml_banners" name="bml.center.logo" template="paypal/bml.phtml">
78
+ <action method="setSection"><section>categorypage</section></action>
79
+ <action method="setPosition"><position>0</position></action>
80
+ </block>
81
+ </reference>
82
+ <reference name="right">
83
+ <block type="paypal/bml_banners" name="bml.right.logo" template="paypal/bml.phtml">
84
+ <action method="setSection"><section>categorypage</section></action>
85
+ <action method="setPosition"><position>1</position></action>
86
+ </block>
87
+
88
+ </reference>
89
+ </catalog_category_layered>
90
+
91
+ <catalog_product_view>
92
+ <reference name="top.container">
93
+ <block type="paypal/bml_banners" name="bml.center.logo" template="paypal/bml.phtml">
94
+ <action method="setSection"><section>productpage</section></action>
95
+ <action method="setPosition"><position>0</position></action>
96
+ </block>
97
+ </reference>
98
+ <reference name="product.info.addtocart">
99
+ <block type="paypal/bml_banners" name="bml.right.logo" after="product.info.addtocart.paypal" template="paypal/bml.phtml">
100
+ <action method="setSection"><section>productpage</section></action>
101
+ <action method="setPosition"><position>1</position></action>
102
+ </block>
103
+ </reference>
104
+ </catalog_product_view>
105
+
106
+ <checkout_cart_index>
107
+ <reference name="top.container">
108
+ <block type="paypal/bml_banners" name="bml.center.logo" template="paypal/bml.phtml">
109
+ <action method="setSection"><section>checkout</section></action>
110
+ <action method="setPosition"><position>0</position></action>
111
+ </block>
112
+ </reference>
113
+ <reference name="checkout.cart.methods">
114
+ <block type="paypal/bml_banners" name="bml.right.logo" after="checkout.cart.methods.onepage.bottom" template="paypal/bml.phtml">
115
+ <action method="setSection"><section>checkout</section></action>
116
+ <action method="setPosition"><position>1</position></action>
117
+ </block>
118
+ </reference>
119
+ </checkout_cart_index>
120
+
121
+ <checkout_onepage_index>
122
+ <reference name="top.container">
123
+ <block type="paypal/bml_banners" name="bml.center.logo" template="paypal/bml.phtml">
124
+ <action method="setSection"><section>checkout</section></action>
125
+ <action method="setPosition"><position>0</position></action>
126
+ </block>
127
+ </reference>
128
+ </checkout_onepage_index>
129
+ </layout>
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) 2013 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) 2014 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/captcha.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2013 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) 2014 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/catalog.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2013 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) 2014 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/catalog_msrp.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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/cms.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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/directory.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2013 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) 2014 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) 2013 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) 2014 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/googleanalytics.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2013 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) 2014 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) 2013 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) 2014 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 CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2013 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) 2014 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/page.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2013 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) 2014 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/pagecache.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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,8 +53,6 @@
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>
21
  *
22
  * @category design
23
  * @package base_default
24
+ * @copyright Copyright (c) 2014 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" name="express.review.shipping.method" as="shipping_method" template="paypal/express/review/shipping/method.phtml"/>
57
  <block type="paypal/express_review_details" name="paypal.express.review.details" as="details" template="paypal/express/review/details.phtml">
58
  <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/paypaluk.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2013 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,8 +51,9 @@
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>
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) 2014 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="paypal/express/review.phtml">
55
  <action method="setPaypalActionPrefix"><prefix>paypaluk</prefix></action>
56
+ <block type="paypal/express_review" name="express.review.shipping.method" as="shipping_method" template="paypal/express/review/shipping/method.phtml"/>
57
  <block type="paypal/express_review_details" name="paypal.express.review.details" as="details" template="paypal/express/review/details.phtml">
58
  <action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
59
  <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/persistent.xml CHANGED
@@ -21,7 +21,7 @@
21
  *
22
  * @category design
23
  * @package base_default
24
- * @copyright Copyright (c) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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) 2013 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) 2014 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/template/authorizenet/directpost/form.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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/option_tierprices.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2013 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,9 @@
30
  * @see Mage_Catalog_Block_Product_View
31
  */
32
  $_product = $this->getProduct();
33
- $_tierPrices = $this->getTierPrices($_product, $this->getParent());
 
 
34
  $_finalPriceInclTax = $this->helper('tax')->getPrice($_product, $_product->getFinalPrice(), true);
35
 
36
  /** @var $_catalogHelper Mage_Catalog_Helper_Data */
@@ -42,7 +44,7 @@ if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
42
  }
43
 
44
  ?>
45
- <?php if (count($_tierPrices) > 0): ?>
46
  <ul class="<?php echo ($this->getInGrouped() ? 'tier-prices-grouped product-pricing-grouped' : 'tier-prices product-pricing'); ?>">
47
  <?php if ($this->getInGrouped()): ?>
48
  <?php $_tierPrices = $this->getTierPrices($_product); ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 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
  * @see Mage_Catalog_Block_Product_View
31
  */
32
  $_product = $this->getProduct();
33
+ if ($this->getParent()->getPriceType() != Mage_Bundle_Model_Product_Price::PRICE_TYPE_FIXED) {
34
+ $_tierPrices = $this->getTierPrices($_product, $this->getParent());
35
+ }
36
  $_finalPriceInclTax = $this->helper('tax')->getPrice($_product, $_product->getFinalPrice(), true);
37
 
38
  /** @var $_catalogHelper Mage_Catalog_Helper_Data */
44
  }
45
 
46
  ?>
47
+ <?php if (isset($_tierPrices) && count($_tierPrices) > 0): ?>
48
  <ul class="<?php echo ($this->getInGrouped() ? 'tier-prices-grouped product-pricing-grouped' : 'tier-prices product-pricing'); ?>">
49
  <?php if ($this->getInGrouped()): ?>
50
  <?php $_tierPrices = $this->getTierPrices($_product); ?>
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 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,6 +30,7 @@
30
  <?php if ($_product->isSaleable()): ?>
31
  <script type="text/javascript">
32
  //<![CDATA[
 
33
  var bundle = new Product.Bundle(<?php echo $this->getJsonConfig() ?>);
34
  var taxCalcMethod = "<?php echo Mage::helper('tax')->getConfig()->getAlgorithm($_product->getStore()) ?>";
35
  var CACL_UNIT_BASE = "<?php echo Mage_Tax_Model_Calculation::CALC_UNIT_BASE ?>";
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 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
  <?php if ($_product->isSaleable()): ?>
31
  <script type="text/javascript">
32
  //<![CDATA[
33
+ var skipTierPricePercentUpdate = true;
34
  var bundle = new Product.Bundle(<?php echo $this->getJsonConfig() ?>);
35
  var taxCalcMethod = "<?php echo Mage::helper('tax')->getConfig()->getAlgorithm($_product->getStore()) ?>";
36
  var CACL_UNIT_BASE = "<?php echo Mage_Tax_Model_Calculation::CALC_UNIT_BASE ?>";
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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 CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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/page.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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/state.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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/view.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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/msrp/popup.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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/left.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 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 */
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 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 */
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) 2013 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) 2014 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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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_msrp.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
@@ -49,7 +49,7 @@
49
  <?php if ($this->helper('catalog')->isShowPriceOnGesture($_product)): ?>
50
  var newLink = Catalog.Map.addHelpLink(
51
  $('<?php echo $helpLinkId ?>'),
52
- "<?php echo $_product->getName() ?>",
53
  <?php echo $this->getRealPriceJs($_product) ?>,
54
  '<?php echo $_msrpPrice ?>',
55
  "<?php echo $_product->isSalable() ? $_product->getAddToCartUrl() : '' ?>"
@@ -58,7 +58,7 @@
58
  <?php else: ?>
59
  Catalog.Map.addHelpLink(
60
  $('<?php echo $helpLinkId ?>'),
61
- null,
62
  null,
63
  null,
64
  "<?php echo $_product->getProductUrl() ?>"
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
49
  <?php if ($this->helper('catalog')->isShowPriceOnGesture($_product)): ?>
50
  var newLink = Catalog.Map.addHelpLink(
51
  $('<?php echo $helpLinkId ?>'),
52
+ "<?php echo $this->escapeHtml($_product->getName()) ?>",
53
  <?php echo $this->getRealPriceJs($_product) ?>,
54
  '<?php echo $_msrpPrice ?>',
55
  "<?php echo $_product->isSalable() ? $_product->getAddToCartUrl() : '' ?>"
58
  <?php else: ?>
59
  Catalog.Map.addHelpLink(
60
  $('<?php echo $helpLinkId ?>'),
61
+ "<?php echo $this->escapeHtml($_product->getName()) ?>",
62
  null,
63
  null,
64
  "<?php echo $_product->getProductUrl() ?>"
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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_msrp_noform.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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_msrp_rss.phtml CHANGED
@@ -20,7 +20,7 @@
20
  *
21
  * @category design
22
  * @package base_default
23
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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) 2013 Magento Inc. (http://www.magentocommerce.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
20
  *
21
  * @category design
22
  * @package base_default
23
+ * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
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/additional.phtml CHANGED