Interface_Frontend_Rwd_Default - Version 1.9.1.0

Version Notes

1.9.1.0

Download this release

Release Info

Developer Magento Core Team
Extension Interface_Frontend_Rwd_Default
Version 1.9.1.0
Comparing to
See all releases


Code changes from version 1.9.0.1 to 1.9.1.0

Files changed (223) hide show
  1. app/design/frontend/rwd/default/etc/theme.xml +3 -3
  2. app/design/frontend/rwd/default/etc/widget.xml +3 -3
  3. app/design/frontend/rwd/default/layout/bundle.xml +3 -3
  4. app/design/frontend/rwd/default/layout/captcha.xml +0 -4
  5. app/design/frontend/rwd/default/layout/catalog.xml +3 -3
  6. app/design/frontend/rwd/default/layout/catalog_msrp.xml +5 -39
  7. app/design/frontend/rwd/default/layout/catalogsearch.xml +3 -3
  8. app/design/frontend/rwd/default/layout/checkout.xml +3 -3
  9. app/design/frontend/rwd/default/layout/cms.xml +3 -3
  10. app/design/frontend/rwd/default/layout/configurableswatches.xml +79 -0
  11. app/design/frontend/rwd/default/layout/contacts.xml +3 -3
  12. app/design/frontend/rwd/default/layout/customer.xml +3 -3
  13. app/design/frontend/rwd/default/layout/directory.xml +3 -3
  14. app/design/frontend/rwd/default/layout/downloadable.xml +3 -3
  15. app/design/frontend/rwd/default/layout/newsletter.xml +3 -3
  16. app/design/frontend/rwd/default/layout/oauth.xml +3 -3
  17. app/design/frontend/rwd/default/layout/page.xml +5 -4
  18. app/design/frontend/rwd/default/layout/paypal.xml +14 -14
  19. app/design/frontend/rwd/default/layout/persistent.xml +3 -3
  20. app/design/frontend/rwd/default/layout/poll.xml +0 -4
  21. app/design/frontend/rwd/default/layout/review.xml +3 -3
  22. app/design/frontend/rwd/default/layout/rss.xml +3 -3
  23. app/design/frontend/rwd/default/layout/sales.xml +24 -18
  24. app/design/frontend/rwd/default/layout/tag.xml +0 -4
  25. app/design/frontend/rwd/default/layout/wishlist.xml +4 -4
  26. app/design/frontend/rwd/default/locale/en_US/translate.csv +0 -20
  27. app/design/frontend/rwd/default/template/authorizenet/directpost/form.phtml +3 -3
  28. app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle.phtml +3 -3
  29. app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/availability.phtml +3 -3
  30. app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml +3 -3
  31. app/design/frontend/rwd/default/template/bundle/email/order/items/creditmemo/default.phtml +177 -0
  32. app/design/frontend/rwd/default/template/bundle/email/order/items/invoice/default.phtml +178 -0
  33. app/design/frontend/rwd/default/template/bundle/email/order/items/order/default.phtml +175 -0
  34. app/design/frontend/rwd/default/template/bundle/email/order/items/shipment/default.phtml +100 -0
  35. app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml +3 -3
  36. app/design/frontend/rwd/default/template/captcha/zend.phtml +51 -0
  37. app/design/frontend/rwd/default/template/catalog/layer/filter.phtml +3 -3
  38. app/design/frontend/rwd/default/template/catalog/layer/state.phtml +3 -3
  39. app/design/frontend/rwd/default/template/catalog/layer/view.phtml +3 -3
  40. app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml +3 -3
  41. app/design/frontend/rwd/default/template/catalog/navigation/left.phtml +3 -3
  42. app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml +3 -3
  43. app/design/frontend/rwd/default/template/catalog/product/compare/sidebar.phtml +3 -3
  44. app/design/frontend/rwd/default/template/catalog/product/list.phtml +29 -22
  45. app/design/frontend/rwd/default/template/catalog/product/list/related.phtml +3 -3
  46. app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml +3 -3
  47. app/design/frontend/rwd/default/template/catalog/product/list/upsell.phtml +3 -3
  48. app/design/frontend/rwd/default/template/catalog/product/new.phtml +0 -64
  49. app/design/frontend/rwd/default/template/catalog/product/price.phtml +463 -0
  50. app/design/frontend/rwd/default/template/catalog/product/view.phtml +4 -4
  51. app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml +3 -3
  52. app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml +3 -3
  53. app/design/frontend/rwd/default/template/catalog/product/view/media.phtml +11 -23
  54. app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml +3 -3
  55. app/design/frontend/rwd/default/template/catalog/product/view/type/availability/default.phtml +3 -3
  56. app/design/frontend/rwd/default/template/catalog/product/view/type/availability/grouped.phtml +3 -3
  57. app/design/frontend/rwd/default/template/catalog/product/view/type/default.phtml +3 -3
  58. app/design/frontend/rwd/default/template/catalog/product/view/type/grouped.phtml +4 -4
  59. app/design/frontend/rwd/default/template/catalog/product/view/type/options/configurable.phtml +4 -4
  60. app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_default_list.phtml +3 -3
  61. app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_images_list.phtml +3 -3
  62. app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_names_list.phtml +3 -3
  63. app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml +6 -5
  64. app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml +3 -3
  65. app/design/frontend/rwd/default/template/cataloginventory/stockqty/composite.phtml +3 -3
  66. app/design/frontend/rwd/default/template/catalogsearch/advanced/form.phtml +4 -4
  67. app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml +3 -3
  68. app/design/frontend/rwd/default/template/catalogsearch/result.phtml +4 -4
  69. app/design/frontend/rwd/default/template/centinel/authentication/start.phtml +3 -3
  70. app/design/frontend/rwd/default/template/checkout/cart.phtml +5 -5
  71. app/design/frontend/rwd/default/template/checkout/cart/coupon.phtml +3 -3
  72. app/design/frontend/rwd/default/template/checkout/cart/crosssell.phtml +15 -13
  73. app/design/frontend/rwd/default/template/checkout/cart/item/configure/updatecart.phtml +3 -3
  74. app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml +3 -3
  75. app/design/frontend/rwd/default/template/checkout/cart/minicart.phtml +4 -4
  76. app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml +6 -6
  77. app/design/frontend/rwd/default/template/checkout/cart/minicart/items.phtml +11 -10
  78. app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml +3 -3
  79. app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml +3 -3
  80. app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml +4 -4
  81. app/design/frontend/rwd/default/template/checkout/cart/sidebar.phtml +3 -3
  82. app/design/frontend/rwd/default/template/checkout/cart/sidebar/default.phtml +3 -3
  83. app/design/frontend/rwd/default/template/checkout/multishipping/addresses.phtml +81 -0
  84. app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml +4 -4
  85. app/design/frontend/rwd/default/template/checkout/multishipping/item/default.phtml +3 -3
  86. app/design/frontend/rwd/default/template/checkout/multishipping/overview.phtml +245 -0
  87. app/design/frontend/rwd/default/template/checkout/multishipping/overview/item.phtml +242 -0
  88. app/design/frontend/rwd/default/template/checkout/onepage.phtml +3 -3
  89. app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml +3 -3
  90. app/design/frontend/rwd/default/template/checkout/onepage/progress.phtml +3 -3
  91. app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml +5 -4
  92. app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml +11 -7
  93. app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml +3 -3
  94. app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml +75 -0
  95. app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/state/swatch.phtml +59 -0
  96. app/design/frontend/rwd/default/template/configurableswatches/catalog/media/js.phtml +39 -0
  97. app/design/frontend/rwd/default/template/configurableswatches/catalog/product/list/swatches.phtml +77 -0
  98. app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/configurable/swatch-js.phtml +31 -0
  99. app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/options/configurable/swatches.phtml +86 -0
  100. app/design/frontend/rwd/default/template/contacts/form.phtml +4 -4
  101. app/design/frontend/rwd/default/template/customer/account/dashboard.phtml +4 -4
  102. app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml +3 -3
  103. app/design/frontend/rwd/default/template/customer/account/navigation.phtml +3 -3
  104. app/design/frontend/rwd/default/template/customer/address/edit.phtml +4 -4
  105. app/design/frontend/rwd/default/template/customer/form/address.phtml +4 -4
  106. app/design/frontend/rwd/default/template/customer/form/changepassword.phtml +4 -4
  107. app/design/frontend/rwd/default/template/customer/form/confirmation.phtml +4 -4
  108. app/design/frontend/rwd/default/template/customer/form/edit.phtml +4 -4
  109. app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml +4 -4
  110. app/design/frontend/rwd/default/template/customer/form/mini.login.phtml +3 -3
  111. app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml +4 -4
  112. app/design/frontend/rwd/default/template/directory/currency.phtml +3 -3
  113. app/design/frontend/rwd/default/template/downloadable/catalog/product/type.phtml +3 -3
  114. app/design/frontend/rwd/default/template/downloadable/checkout/cart/item/default.phtml +3 -3
  115. app/design/frontend/rwd/default/template/downloadable/checkout/onepage/review/item.phtml +3 -3
  116. app/design/frontend/rwd/default/template/downloadable/customer/products/list.phtml +4 -4
  117. app/design/frontend/rwd/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml +138 -0
  118. app/design/frontend/rwd/default/template/downloadable/email/order/items/invoice/downloadable.phtml +146 -0
  119. app/design/frontend/rwd/default/template/downloadable/email/order/items/order/downloadable.phtml +148 -0
  120. app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml +3 -3
  121. app/design/frontend/rwd/default/template/email/catalog/product/list.phtml +193 -0
  122. app/design/frontend/rwd/default/template/email/catalog/product/new.phtml +51 -0
  123. app/design/frontend/rwd/default/template/email/order/creditmemo/items.phtml +59 -0
  124. app/design/frontend/rwd/default/template/email/order/invoice/items.phtml +58 -0
  125. app/design/frontend/rwd/default/template/email/order/items.phtml +89 -0
  126. app/design/frontend/rwd/default/template/email/order/items/creditmemo/default.phtml +126 -0
  127. app/design/frontend/rwd/default/template/email/order/items/invoice/default.phtml +126 -0
  128. app/design/frontend/rwd/default/template/email/order/items/order/default.phtml +138 -0
  129. app/design/frontend/rwd/default/template/email/order/items/shipment/default.phtml +49 -0
  130. app/design/frontend/rwd/default/template/email/order/shipment/items.phtml +56 -0
  131. app/design/frontend/rwd/default/template/email/order/shipment/track.phtml +46 -0
  132. app/design/frontend/rwd/default/template/email/order/totals/wrapper.phtml +35 -0
  133. app/design/frontend/rwd/default/template/email/productalert/price.phtml +55 -0
  134. app/design/frontend/rwd/default/template/email/productalert/stock.phtml +55 -0
  135. app/design/frontend/rwd/default/template/newsletter/subscribe.phtml +3 -3
  136. app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml +3 -3
  137. app/design/frontend/rwd/default/template/page/1column.phtml +8 -8
  138. app/design/frontend/rwd/default/template/page/2columns-left.phtml +8 -8
  139. app/design/frontend/rwd/default/template/page/2columns-right.phtml +8 -8
  140. app/design/frontend/rwd/default/template/page/3columns.phtml +8 -8
  141. app/design/frontend/rwd/default/template/page/empty.phtml +8 -8
  142. app/design/frontend/rwd/default/template/page/html/footer.phtml +3 -3
  143. app/design/frontend/rwd/default/template/page/html/header.phtml +12 -22
  144. app/design/frontend/rwd/default/template/page/html/pager.phtml +3 -3
  145. app/design/frontend/rwd/default/template/page/html/topmenu.phtml +3 -3
  146. app/design/frontend/rwd/default/template/page/html/topmenu/renderer.phtml +5 -5
  147. app/design/frontend/rwd/default/template/page/popup.phtml +8 -8
  148. app/design/frontend/rwd/default/template/page/print.phtml +8 -8
  149. app/design/frontend/rwd/default/template/page/template/links.phtml +3 -3
  150. app/design/frontend/rwd/default/template/payment/form/cc.phtml +3 -3
  151. app/design/frontend/rwd/default/template/payment/form/ccsave.phtml +3 -3
  152. app/design/frontend/rwd/default/template/payment/info/default.phtml +3 -3
  153. app/design/frontend/rwd/default/template/paypal/bml.phtml +3 -3
  154. app/design/frontend/rwd/default/template/paypal/express/minicart/shortcut.phtml +4 -4
  155. app/design/frontend/rwd/default/template/paypal/express/product/shortcut.phtml +4 -4
  156. app/design/frontend/rwd/default/template/paypal/express/review.phtml +3 -3
  157. app/design/frontend/rwd/default/template/paypal/express/review/address.phtml +3 -3
  158. app/design/frontend/rwd/default/template/paypal/express/review/details.phtml +3 -3
  159. app/design/frontend/rwd/default/template/paypal/express/review/shipping/method.phtml +3 -3
  160. app/design/frontend/rwd/default/template/paypal/partner/us_logo.phtml +41 -0
  161. app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml +3 -3
  162. app/design/frontend/rwd/default/template/persistent/checkout/onepage/login.phtml +5 -5
  163. app/design/frontend/rwd/default/template/persistent/customer/form/login.phtml +4 -4
  164. app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml +4 -4
  165. app/design/frontend/rwd/default/template/persistent/remember_me.phtml +3 -3
  166. app/design/frontend/rwd/default/template/persistent/remember_me_tooltip.phtml +5 -5
  167. app/design/frontend/rwd/default/template/rating/detailed.phtml +48 -0
  168. app/design/frontend/rwd/default/template/reports/product_viewed.phtml +3 -3
  169. app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_default_list.phtml +3 -3
  170. app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_images_list.phtml +3 -3
  171. app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_names_list.phtml +3 -3
  172. app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml +4 -4
  173. app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml +3 -3
  174. app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_default_list.phtml +3 -3
  175. app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_images_list.phtml +3 -3
  176. app/design/frontend/rwd/default/template/reports/widget/viewed/column/viewed_names_list.phtml +3 -3
  177. app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_grid.phtml +4 -4
  178. app/design/frontend/rwd/default/template/reports/widget/viewed/content/viewed_list.phtml +3 -3
  179. app/design/frontend/rwd/default/template/review/customer/view.phtml +3 -3
  180. app/design/frontend/rwd/default/template/review/form.phtml +3 -3
  181. app/design/frontend/rwd/default/template/review/product/view/list.phtml +7 -5
  182. app/design/frontend/rwd/default/template/review/view.phtml +3 -3
  183. app/design/frontend/rwd/default/template/sales/billing/agreement/view.phtml +110 -0
  184. app/design/frontend/rwd/default/template/sales/billing/agreements.phtml +99 -0
  185. app/design/frontend/rwd/default/template/sales/order/creditmemo/items.phtml +9 -9
  186. app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml +3 -3
  187. app/design/frontend/rwd/default/template/sales/order/history.phtml +4 -4
  188. app/design/frontend/rwd/default/template/sales/order/invoice/items.phtml +61 -0
  189. app/design/frontend/rwd/default/template/sales/order/invoice/items/renderer/default.phtml +332 -0
  190. app/design/frontend/rwd/default/template/sales/order/items.phtml +3 -3
  191. app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml +3 -3
  192. app/design/frontend/rwd/default/template/sales/order/recent.phtml +3 -3
  193. app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml +3 -3
  194. app/design/frontend/rwd/default/template/sales/recurring/grid.phtml +80 -0
  195. app/design/frontend/rwd/default/template/sales/recurring/profile/view.phtml +109 -0
  196. app/design/frontend/rwd/default/template/sales/widget/guest/form.phtml +5 -5
  197. app/design/frontend/rwd/default/template/sendfriend/send.phtml +4 -4
  198. app/design/frontend/rwd/default/template/wishlist/button/update.phtml +3 -3
  199. app/design/frontend/rwd/default/template/wishlist/item/column/cart.phtml +3 -3
  200. app/design/frontend/rwd/default/template/wishlist/item/column/info.phtml +4 -4
  201. app/design/frontend/rwd/default/template/wishlist/item/column/price.phtml +3 -3
  202. app/design/frontend/rwd/default/template/wishlist/item/column/quantity.phtml +3 -3
  203. app/design/frontend/rwd/default/template/wishlist/item/list.phtml +17 -6
  204. app/design/frontend/rwd/default/template/wishlist/shared.phtml +4 -4
  205. app/design/frontend/rwd/default/template/wishlist/sidebar.phtml +3 -3
  206. app/design/frontend/rwd/default/template/wishlist/view.phtml +4 -4
  207. package.xml +6 -6
  208. skin/frontend/rwd/default/css/madisonisland-ie8.css +4 -4
  209. skin/frontend/rwd/default/css/madisonisland.css +4 -4
  210. skin/frontend/rwd/default/css/scaffold-forms.css +4 -4
  211. skin/frontend/rwd/default/css/styles-ie8.css +943 -295
  212. skin/frontend/rwd/default/css/styles.css +1249 -363
  213. skin/frontend/rwd/default/images/logo_email.gif +0 -0
  214. skin/frontend/rwd/default/js/app.js +709 -173
  215. skin/frontend/rwd/default/js/configurableswatches/product-media.js +235 -0
  216. skin/frontend/rwd/default/js/configurableswatches/swatches-list.js +77 -0
  217. skin/frontend/rwd/default/js/configurableswatches/swatches-product.js +803 -0
  218. skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevateZoom-3.0.8.min.js +1 -1
  219. skin/frontend/rwd/default/js/lib/elevatezoom/jquery.elevatezoom.js +1583 -1583
  220. skin/frontend/rwd/default/js/lib/enquire.js +1 -1
  221. skin/frontend/rwd/default/js/lib/fastclick.js +1 -1
  222. skin/frontend/rwd/default/js/lib/imagesloaded.js +1 -1
  223. skin/frontend/rwd/default/js/lib/jquery-1.10.2.js +0 -3049
app/design/frontend/rwd/default/etc/theme.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
  -->
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/rwd/default/etc/widget.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
  -->
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/rwd/default/layout/bundle.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/rwd/default/layout/captcha.xml DELETED
@@ -1,4 +0,0 @@
1
- <?xml version="1.0"?>
2
- <layout version="0.1.0">
3
- <!-- Remove all captcha functionality from theme layout -->
4
- </layout>
 
 
 
 
app/design/frontend/rwd/default/layout/catalog.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/rwd/default/layout/catalog_msrp.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
@@ -30,54 +30,20 @@
30
  <!--
31
  Default layout, loads most of the pages
32
  -->
33
- <catalog_category_default>
34
- <update handle="MAP_popup" />
35
- </catalog_category_default>
36
- <catalog_category_layered>
37
- <update handle="MAP_popup" />
38
- </catalog_category_layered>
39
- <catalog_product_compare_index>
40
- <update handle="MAP_popup" />
41
- </catalog_product_compare_index>
42
  <catalog_product_view>
43
- <update handle="MAP_popup" />
44
  <update handle="MAP_price_msrp_item" />
45
  </catalog_product_view>
46
- <checkout_cart_index>
47
- <update handle="MAP_popup" />
48
- </checkout_cart_index>
49
- <checkout_onepage_success>
50
- <update handle="MAP_popup" />
51
- </checkout_onepage_success>
52
- <checkout_onepage_failure>
53
- <update handle="MAP_popup" />
54
- </checkout_onepage_failure>
55
  <wishlist_index_index>
56
- <update handle="MAP_popup" />
57
  <update handle="MAP_price_msrp_wishlist_item" />
58
  </wishlist_index_index>
59
  <wishlist_shared_index>
60
- <update handle="MAP_popup" />
61
  <update handle="MAP_price_msrp_wishlist_item" />
62
  </wishlist_shared_index>
63
  <review_product_list>
64
- <update handle="MAP_popup" />
65
  <update handle="MAP_price_msrp_item" />
66
  </review_product_list>
67
- <catalogsearch_result_index>
68
- <update handle="MAP_popup" />
69
- </catalogsearch_result_index>
70
- <catalogsearch_advanced_result>
71
- <update handle="MAP_popup" />
72
- </catalogsearch_advanced_result>
73
- <tag_product_list>
74
- <update handle="MAP_popup" />
75
- </tag_product_list>
76
- <tag_customer_view>
77
- <update handle="MAP_popup" />
78
- </tag_customer_view>
79
 
80
- <MAP_popup>
81
  <reference name="head">
82
  <action method="addItem" ifconfig="sales/msrp/enabled"><type>skin_js</type><name>js/msrp.js</name></action>
83
  <action method="addItem" ifconfig="sales/msrp/enabled"><type>skin_js</type><name>js/msrp_rwd.js</name></action>
@@ -85,7 +51,7 @@ Default layout, loads most of the pages
85
  <reference name="content">
86
  <block type="core/template" template="catalog/msrp/popup.phtml" name="product.tooltip"></block>
87
  </reference>
88
- </MAP_popup>
89
  <MAP_price_msrp_item>
90
  <reference name="catalog_product_price_template">
91
  <action method="addPriceBlockType"><type>msrp</type><block>catalog/product_price</block><template>catalog/product/price_msrp_item.phtml</template></action>
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
30
  <!--
31
  Default layout, loads most of the pages
32
  -->
 
 
 
 
 
 
 
 
 
33
  <catalog_product_view>
 
34
  <update handle="MAP_price_msrp_item" />
35
  </catalog_product_view>
 
 
 
 
 
 
 
 
 
36
  <wishlist_index_index>
 
37
  <update handle="MAP_price_msrp_wishlist_item" />
38
  </wishlist_index_index>
39
  <wishlist_shared_index>
 
40
  <update handle="MAP_price_msrp_wishlist_item" />
41
  </wishlist_shared_index>
42
  <review_product_list>
 
43
  <update handle="MAP_price_msrp_item" />
44
  </review_product_list>
 
 
 
 
 
 
 
 
 
 
 
 
45
 
46
+ <default>
47
  <reference name="head">
48
  <action method="addItem" ifconfig="sales/msrp/enabled"><type>skin_js</type><name>js/msrp.js</name></action>
49
  <action method="addItem" ifconfig="sales/msrp/enabled"><type>skin_js</type><name>js/msrp_rwd.js</name></action>
51
  <reference name="content">
52
  <block type="core/template" template="catalog/msrp/popup.phtml" name="product.tooltip"></block>
53
  </reference>
54
+ </default>
55
  <MAP_price_msrp_item>
56
  <reference name="catalog_product_price_template">
57
  <action method="addPriceBlockType"><type>msrp</type><block>catalog/product_price</block><template>catalog/product/price_msrp_item.phtml</template></action>
app/design/frontend/rwd/default/layout/catalogsearch.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/rwd/default/layout/checkout.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/rwd/default/layout/cms.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
  -->
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/rwd/default/layout/configurableswatches.xml ADDED
@@ -0,0 +1,79 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magento.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.magento.com for more information.
21
+ *
22
+ * @category design
23
+ * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
+ */
27
+ -->
28
+ <layout version="0.1.0">
29
+
30
+ <product_list>
31
+ <reference name="head">
32
+ <action method="addItem"><type>skin_js</type><name>js/configurableswatches/product-media.js</name></action>
33
+ <action method="addItem"><type>skin_js</type><name>js/configurableswatches/swatches-list.js</name></action>
34
+ </reference>
35
+ <reference name="product_list.name.after">
36
+ <block type="core/template" name="product_list.swatches" template="configurableswatches/catalog/product/list/swatches.phtml" />
37
+ </reference>
38
+ <reference name="product_list.after">
39
+ <block type="configurableswatches/catalog_media_js_list" name="configurableswatches.media.js.list" />
40
+ </reference>
41
+ </product_list>
42
+
43
+ <catalog_category_default>
44
+ <update handle="product_list"/>
45
+ </catalog_category_default>
46
+
47
+ <catalog_category_layered>
48
+ <update handle="product_list"/>
49
+ </catalog_category_layered>
50
+
51
+ <catalogsearch_result_index>
52
+ <update handle="product_list"/>
53
+ </catalogsearch_result_index>
54
+
55
+ <catalogsearch_advanced_result>
56
+ <update handle="product_list"/>
57
+ </catalogsearch_advanced_result>
58
+
59
+ <PRODUCT_TYPE_configurable>
60
+ <reference name="head">
61
+ <action method="addItem"><type>skin_js</type><name>js/configurableswatches/product-media.js</name></action>
62
+ <action method="addItem"><type>skin_js</type><name>js/configurableswatches/swatches-product.js</name></action>
63
+ </reference>
64
+ <reference name="product.info.media">
65
+ <action method="setGalleryFilterHelper"><helper>configurableswatches/productimg</helper></action>
66
+ <action method="setGalleryFilterMethod"><method>filterImageInGallery</method></action>
67
+ </reference>
68
+ <reference name="product.info.media.after">
69
+ <block type="configurableswatches/catalog_media_js_product" name="configurableswatches.media.js.product" />
70
+ </reference>
71
+ <reference name="product.info.options.configurable.renderers">
72
+ <block type="configurableswatches/catalog_product_view_type_configurable_swatches" template="configurableswatches/catalog/product/view/type/options/configurable/swatches.phtml" />
73
+ </reference>
74
+ <reference name="product.info.options.configurable.after">
75
+ <block type="core/template" template="configurableswatches/catalog/product/view/type/configurable/swatch-js.phtml" />
76
+ </reference>
77
+ </PRODUCT_TYPE_configurable>
78
+
79
+ </layout>
app/design/frontend/rwd/default/layout/contacts.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
  -->
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/rwd/default/layout/customer.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/rwd/default/layout/directory.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/rwd/default/layout/downloadable.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/rwd/default/layout/newsletter.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/rwd/default/layout/oauth.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
  -->
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/rwd/default/layout/page.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
  -->
@@ -36,6 +36,8 @@
36
 
37
  <block type="page/html_head" name="head" as="head">
38
  <action method="addJs"><script>prototype/prototype.js</script></action>
 
 
39
  <action method="addJs"><script>lib/ccard.js</script></action>
40
  <action method="addJs"><script>prototype/validation.js</script></action>
41
  <action method="addJs"><script>scriptaculous/builder.js</script></action>
@@ -54,7 +56,6 @@
54
  <action method="removeItem"><type>skin_js</type><name>js/ie6.js</name></action>
55
 
56
  <!-- Add vendor dependencies -->
57
- <action method="addItem"><type>skin_js</type><name>js/lib/jquery-1.10.2.min.js</name></action>
58
  <action method="addItem"><type>skin_js</type><name>js/lib/modernizr.custom.min.js</name></action>
59
  <action method="addItem"><type>skin_js</type><name>js/lib/selectivizr.js</name></action>
60
  <action method="addItem"><type>skin_js</type><name>js/lib/matchMedia.js</name></action>
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
36
 
37
  <block type="page/html_head" name="head" as="head">
38
  <action method="addJs"><script>prototype/prototype.js</script></action>
39
+ <action method="addJs"><script>lib/jquery/jquery-1.10.2.min.js</script></action>
40
+ <action method="addJs"><script>lib/jquery/noconflict.js</script></action>
41
  <action method="addJs"><script>lib/ccard.js</script></action>
42
  <action method="addJs"><script>prototype/validation.js</script></action>
43
  <action method="addJs"><script>scriptaculous/builder.js</script></action>
56
  <action method="removeItem"><type>skin_js</type><name>js/ie6.js</name></action>
57
 
58
  <!-- Add vendor dependencies -->
 
59
  <action method="addItem"><type>skin_js</type><name>js/lib/modernizr.custom.min.js</name></action>
60
  <action method="addItem"><type>skin_js</type><name>js/lib/selectivizr.js</name></action>
61
  <action method="addItem"><type>skin_js</type><name>js/lib/matchMedia.js</name></action>
app/design/frontend/rwd/default/layout/paypal.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
@@ -103,24 +103,24 @@ Available logo types can be assigned with action="setLogoType":
103
  </reference>
104
  <update handle="SHORTCUT_popup" />
105
  <reference name="right">
106
- <!--<block type="paypal/logo" name="paypal.partner.right.logo" template="paypal/partner/logo.phtml">-->
107
  <!--action method="setLogoType"><value>wePrefer_150x60</value></action-->
108
- <!--</block>-->
109
  </reference>
110
  </catalog_product_view>
111
 
112
  <catalog_category_default>
113
  <update handle="SHORTCUT_popup" />
114
- <!--<reference name="right">-->
115
- <!--<block type="paypal/logo" name="paypal.partner.right.logo" template="paypal/partner/logo.phtml"/>-->
116
- <!--</reference>-->
117
  </catalog_category_default>
118
 
119
  <catalog_category_layered>
120
  <update handle="SHORTCUT_popup" />
121
- <!--<reference name="right">-->
122
- <!--<block type="paypal/logo" name="paypal.partner.right.logo" template="paypal/partner/logo.phtml"/>-->
123
- <!--</reference>-->
124
  </catalog_category_layered>
125
 
126
  <catalog_product_compare_index>
@@ -157,9 +157,9 @@ Available logo types can be assigned with action="setLogoType":
157
  </checkout_onepage_failure>
158
 
159
  <cms_index_index>
160
- <!--<reference name="right">-->
161
- <!--<block type="paypal/logo" name="paypal.partner.right.logo" template="paypal/partner/logo.phtml"/>-->
162
- <!--</reference>-->
163
  </cms_index_index>
164
 
165
  <default>
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
103
  </reference>
104
  <update handle="SHORTCUT_popup" />
105
  <reference name="right">
106
+ <block type="paypal/logo" name="paypal.partner.right.logo" template="paypal/partner/logo.phtml">
107
  <!--action method="setLogoType"><value>wePrefer_150x60</value></action-->
108
+ </block>
109
  </reference>
110
  </catalog_product_view>
111
 
112
  <catalog_category_default>
113
  <update handle="SHORTCUT_popup" />
114
+ <reference name="right">
115
+ <block type="paypal/logo" name="paypal.partner.right.logo" template="paypal/partner/logo.phtml"/>
116
+ </reference>
117
  </catalog_category_default>
118
 
119
  <catalog_category_layered>
120
  <update handle="SHORTCUT_popup" />
121
+ <reference name="right">
122
+ <block type="paypal/logo" name="paypal.partner.right.logo" template="paypal/partner/logo.phtml"/>
123
+ </reference>
124
  </catalog_category_layered>
125
 
126
  <catalog_product_compare_index>
157
  </checkout_onepage_failure>
158
 
159
  <cms_index_index>
160
+ <reference name="right">
161
+ <block type="paypal/logo" name="paypal.partner.right.logo" template="paypal/partner/logo.phtml"/>
162
+ </reference>
163
  </cms_index_index>
164
 
165
  <default>
app/design/frontend/rwd/default/layout/persistent.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/rwd/default/layout/poll.xml DELETED
@@ -1,4 +0,0 @@
1
- <?xml version="1.0"?>
2
- <layout version="0.1.0">
3
- <!-- Remove all poll functionality from theme layout -->
4
- </layout>
 
 
 
 
app/design/frontend/rwd/default/layout/review.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
app/design/frontend/rwd/default/layout/rss.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
  -->
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/frontend/rwd/default/layout/sales.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
@@ -273,11 +273,13 @@ Email layouts section
273
  <block type="sales/order_email_items" name="items" template="email/order/items.phtml">
274
  <action method="addItemRender"><type>default</type><block>sales/order_email_items_order_default</block><template>email/order/items/order/default.phtml</template></action>
275
  <action method="addItemRender"><type>grouped</type><block>sales/order_email_items_order_grouped</block><template>email/order/items/order/default.phtml</template></action>
276
- <block type="sales/order_totals" name="order_totals" template="sales/order/totals.phtml">
277
- <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
278
- <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
279
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
280
- <action method="setIsPlaneMode"><value>1</value></action>
 
 
281
  </block>
282
  </block>
283
  </block>
@@ -288,11 +290,13 @@ Email layouts section
288
  <block type="sales/order_email_invoice_items" name="items" template="email/order/invoice/items.phtml">
289
  <action method="addItemRender"><type>default</type><block>sales/order_email_items_default</block><template>email/order/items/invoice/default.phtml</template></action>
290
  <action method="addItemRender"><type>grouped</type><block>sales/order_email_items_order_grouped</block><template>email/order/items/invoice/default.phtml</template></action>
291
- <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
292
- <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
293
- <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
294
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
295
- <action method="setIsPlaneMode"><value>1</value></action>
 
 
296
  </block>
297
  </block>
298
  </block>
@@ -310,11 +314,13 @@ Email layouts section
310
  <block type="sales/order_email_creditmemo_items" name="items" template="email/order/creditmemo/items.phtml">
311
  <action method="addItemRender"><type>default</type><block>sales/order_email_items_default</block><template>email/order/items/creditmemo/default.phtml</template></action>
312
  <action method="addItemRender"><type>grouped</type><block>sales/order_email_items_order_grouped</block><template>email/order/items/creditmemo/default.phtml</template></action>
313
- <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
314
- <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
315
- <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
316
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
317
- <action method="setIsPlaneMode"><value>1</value></action>
 
 
318
  </block>
319
  </block>
320
  </block>
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
273
  <block type="sales/order_email_items" name="items" template="email/order/items.phtml">
274
  <action method="addItemRender"><type>default</type><block>sales/order_email_items_order_default</block><template>email/order/items/order/default.phtml</template></action>
275
  <action method="addItemRender"><type>grouped</type><block>sales/order_email_items_order_grouped</block><template>email/order/items/order/default.phtml</template></action>
276
+ <block type="core/template" name="order_totals_wrapper" as="order_totals" template="email/order/totals/wrapper.phtml">
277
+ <block type="sales/order_totals" name="order_totals" template="sales/order/totals.phtml">
278
+ <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
279
+ <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
280
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
281
+ <action method="setIsPlaneMode"><value>1</value></action>
282
+ </block>
283
  </block>
284
  </block>
285
  </block>
290
  <block type="sales/order_email_invoice_items" name="items" template="email/order/invoice/items.phtml">
291
  <action method="addItemRender"><type>default</type><block>sales/order_email_items_default</block><template>email/order/items/invoice/default.phtml</template></action>
292
  <action method="addItemRender"><type>grouped</type><block>sales/order_email_items_order_grouped</block><template>email/order/items/invoice/default.phtml</template></action>
293
+ <block type="core/template" name="invoice_totals_wrapper" as="invoice_totals" template="email/order/totals/wrapper.phtml">
294
+ <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
295
+ <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
296
+ <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
297
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
298
+ <action method="setIsPlaneMode"><value>1</value></action>
299
+ </block>
300
  </block>
301
  </block>
302
  </block>
314
  <block type="sales/order_email_creditmemo_items" name="items" template="email/order/creditmemo/items.phtml">
315
  <action method="addItemRender"><type>default</type><block>sales/order_email_items_default</block><template>email/order/items/creditmemo/default.phtml</template></action>
316
  <action method="addItemRender"><type>grouped</type><block>sales/order_email_items_order_grouped</block><template>email/order/items/creditmemo/default.phtml</template></action>
317
+ <block type="core/template" name="creditmemo_totals_wrapper" as="creditmemo_totals" template="email/order/totals/wrapper.phtml">
318
+ <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
319
+ <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
320
+ <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
321
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
322
+ <action method="setIsPlaneMode"><value>1</value></action>
323
+ </block>
324
  </block>
325
  </block>
326
  </block>
app/design/frontend/rwd/default/layout/tag.xml DELETED
@@ -1,4 +0,0 @@
1
- <?xml version="1.0"?>
2
- <layout version="0.1.0">
3
- <!-- Remove all tags functionality from theme layout -->
4
- </layout>
 
 
 
 
app/design/frontend/rwd/default/layout/wishlist.xml CHANGED
@@ -11,17 +11,17 @@
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 rwd_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
 
@@ -85,7 +85,7 @@ Wishlist pages
85
  </block>
86
  <block type="wishlist/customer_wishlist_item_column_cart" name="customer.wishlist.item.quantity" template="wishlist/item/column/quantity.phtml">
87
  <action method="setTitle" translate="title">
88
- <title>Quantity</title>
89
  </action>
90
  <block type="wishlist/customer_wishlist_item_options" name="customer.wishlist.item.options" />
91
  </block>
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@magento.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.magento.com for more information.
21
  *
22
  * @category design
23
  * @package rwd_default
24
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
85
  </block>
86
  <block type="wishlist/customer_wishlist_item_column_cart" name="customer.wishlist.item.quantity" template="wishlist/item/column/quantity.phtml">
87
  <action method="setTitle" translate="title">
88
+ <title>Qty</title>
89
  </action>
90
  <block type="wishlist/customer_wishlist_item_options" name="customer.wishlist.item.options" />
91
  </block>
app/design/frontend/rwd/default/locale/en_US/translate.csv DELETED
@@ -1,20 +0,0 @@
1
- "###","- - - - - - - - - - - - - - - - - - - - -"
2
- "###","Custom phrases that exist only in this theme."
3
- "###","- - - - - - - - - - - - - - - - - - - - -"
4
- "###","Page Module"
5
- "Results per page","Results per page"
6
- "%s-%s of %s","%s-%s of %s"
7
- "###","Catalog Module"
8
- "Filter","Filter"
9
- "View Details","View Details"
10
- "Share on Facebook","Share on Facebook"
11
- "Share on Twitter","Share on Twitter"
12
- "###","Checkout Module"
13
- "Are you sure you want to leave this page? You will need to go through the checkout steps again.","Are you sure you want to leave this page? You will need to go through the checkout steps again."
14
- "Zip/Postal Code","Zip"
15
- "Discount Codes?","Discount Codes?"
16
- "###","Customer Module"
17
- "Registration is free and easy!","Registration is free and easy!"
18
- "Faster checkout","Faster checkout"
19
- "Save multiple shipping addresses","Save multiple shipping addresses"
20
- "View and track orders and more","View and track orders and more"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/rwd/default/template/authorizenet/directpost/form.phtml CHANGED
@@ -10,17 +10,17 @@
10
  * http://opensource.org/licenses/afl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category design
22
  * @package rwd_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
 
10
  * http://opensource.org/licenses/afl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category design
22
  * @package rwd_default
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle.phtml CHANGED
@@ -10,17 +10,17 @@
10
  * http://opensource.org/licenses/afl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category design
22
  * @package rwd_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
 
10
  * http://opensource.org/licenses/afl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category design
22
  * @package rwd_default
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/availability.phtml CHANGED
@@ -10,17 +10,17 @@
10
  * http://opensource.org/licenses/afl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category design
22
  * @package rwd_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
  $_product = $this->getProduct() ?>
10
  * http://opensource.org/licenses/afl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category design
22
  * @package rwd_default
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  $_product = $this->getProduct() ?>
app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml CHANGED
@@ -10,17 +10,17 @@
10
  * http://opensource.org/licenses/afl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category design
22
  * @package rwd_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
 
10
  * http://opensource.org/licenses/afl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category design
22
  * @package rwd_default
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
 
app/design/frontend/rwd/default/template/bundle/email/order/items/creditmemo/default.phtml ADDED
@@ -0,0 +1,177 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package rwd_default
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <?php $parentItem = $this->getItem() ?>
28
+ <?php $_order = $this->getItem()->getOrder(); ?>
29
+
30
+ <?php $items = $this->getChilds($parentItem) ?>
31
+
32
+ <?php $_prevOptionId = '' ?>
33
+
34
+ <?php foreach ($items as $_item): ?>
35
+
36
+ <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
37
+ <?php $_showlastRow = true ?>
38
+ <?php else: ?>
39
+ <?php $_showlastRow = false ?>
40
+ <?php endif; ?>
41
+
42
+ <?php if ($_item->getOrderItem()->getParentItem()): ?>
43
+ <?php $attributes = $this->getSelectionAttributes($_item) ?>
44
+ <?php if ($_prevOptionId != $attributes['option_id']): ?>
45
+ <tr>
46
+ <td class="bundle-item"><strong><em><?php echo $attributes['option_label'] ?></em></strong></td>
47
+ <td class="bundle-item">&nbsp;</td>
48
+ <td class="bundle-item">&nbsp;</td>
49
+ </tr>
50
+ <?php $_prevOptionId = $attributes['option_id'] ?>
51
+ <?php endif; ?>
52
+ <?php endif; ?>
53
+ <tr id="order-item-row-<?php echo $_item->getId() ?>">
54
+ <?php if (!$_item->getOrderItem()->getParentItem()): ?>
55
+ <td class="bundle-item-parent product-info">
56
+ <p class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></p>
57
+ <p class="sku"><?php echo $this->__('SKU'); ?>: <?php echo $this->escapeHtml($this->getSku($_item)) ?></p>
58
+ </td>
59
+ <td class="bundle-item-parent align-center">
60
+ <?php if ($this->canShowPriceInfo($_item)): ?>
61
+ <?php echo $_item->getQty()*1 ?>
62
+ <?php else: ?>
63
+ &nbsp;
64
+ <?php endif; ?>
65
+ </td>
66
+ <td class="bundle-item-parent align-right">
67
+ <?php else: ?>
68
+ <td class="bundle-item bundle-details product-info"><div><?php echo $this->getValueHtml($_item)?></div></td>
69
+ <td class="bundle-item bundle-details align-center">
70
+ <?php if ($this->canShowPriceInfo($_item)): ?>
71
+ <?php echo $_item->getQty()*1 ?>
72
+ <?php else: ?>
73
+ &nbsp;
74
+ <?php endif; ?>
75
+ </td>
76
+ <td class="bundle-item align-right">
77
+ <?php endif; ?>
78
+ <?php if ($this->canShowPriceInfo($_item)): ?>
79
+ <?php if ($this->helper('tax')->displaySalesPriceExclTax($_order->getStore()) || $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
80
+ <?php if ($this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
81
+ <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
82
+ <?php endif; ?>
83
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
84
+ <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
85
+ <?php else: ?>
86
+ <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
87
+ <?php endif; ?>
88
+
89
+
90
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
91
+ <br />
92
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
93
+ <small>
94
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
95
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
96
+ <?php endforeach; ?>
97
+ </small>
98
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
99
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
100
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
101
+ <?php endforeach; ?>
102
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
103
+ <small>
104
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
105
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
106
+ <?php endforeach; ?>
107
+ </small>
108
+ <?php endif; ?>
109
+
110
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
111
+ <br />
112
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
113
+ <?php endif; ?>
114
+ <?php endif; ?>
115
+ <?php endif; ?>
116
+
117
+
118
+ <?php if ($this->helper('tax')->displaySalesPriceInclTax($_order->getStore()) || $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
119
+ <?php if ($this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
120
+ <br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
121
+ <?php endif; ?>
122
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
123
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
124
+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
125
+ <?php else: ?>
126
+ <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
127
+ <?php endif; ?>
128
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
129
+ <br />
130
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
131
+ <small>
132
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
133
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
134
+ <?php endforeach; ?>
135
+ </small>
136
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
137
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
138
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
139
+ <?php endforeach; ?>
140
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
141
+ <small>
142
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
143
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
144
+ <?php endforeach; ?>
145
+ </small>
146
+ <?php endif; ?>
147
+
148
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
149
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
150
+ <?php endif; ?>
151
+ <?php endif; ?>
152
+ <?php endif; ?>
153
+ <?php else: ?>
154
+ &nbsp;
155
+ <?php endif; ?>
156
+ </td>
157
+ </tr>
158
+ <?php endforeach; ?>
159
+
160
+ <?php if ($_showlastRow): ?>
161
+ <tr>
162
+ <td align="left" valign="top" style="padding:3px 9px">
163
+ <?php if ($this->getItemOptions()): ?>
164
+ <dl style="margin:0; padding:0;">
165
+ <?php foreach ($this->getItemOptions() as $option): ?>
166
+ <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
167
+ <dd style="margin:0; padding:0 0 0 9px;"><?php echo $option['value'] ?></dd>
168
+ <?php endforeach; ?>
169
+ </dl>
170
+ <?php endif; ?>
171
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
172
+ </td>
173
+ <td>&nbsp;</td>
174
+ <td>&nbsp;</td>
175
+ <td>&nbsp;</td>
176
+ </tr>
177
+ <?php endif; ?>
app/design/frontend/rwd/default/template/bundle/email/order/items/invoice/default.phtml ADDED
@@ -0,0 +1,178 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package rwd_default
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+
28
+ <?php $parentItem = $this->getItem() ?>
29
+ <?php $items = $this->getChilds($parentItem) ?>
30
+ <?php $_index = 0 ?>
31
+ <?php $_order = $this->getItem()->getOrder(); ?>
32
+
33
+ <?php $_prevOptionId = '' ?>
34
+
35
+ <?php foreach ($items as $_item): ?>
36
+
37
+ <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
38
+ <?php $_showlastRow = true ?>
39
+ <?php else: ?>
40
+ <?php $_showlastRow = false ?>
41
+ <?php endif; ?>
42
+
43
+ <?php if ($_item->getOrderItem()->getParentItem()): ?>
44
+ <?php $attributes = $this->getSelectionAttributes($_item) ?>
45
+ <?php if ($_prevOptionId != $attributes['option_id']): ?>
46
+ <tr>
47
+ <td class="bundle-item"><strong><em><?php echo $attributes['option_label'] ?></em></strong></td>
48
+ <td class="bundle-item">&nbsp;</td>
49
+ <td class="bundle-item">&nbsp;</td>
50
+ </tr>
51
+ <?php $_prevOptionId = $attributes['option_id'] ?>
52
+ <?php endif; ?>
53
+ <?php endif; ?>
54
+ <tr id="order-item-row-<?php echo $_item->getId() ?>">
55
+ <?php if (!$_item->getOrderItem()->getParentItem()): ?>
56
+ <td class="bundle-item-parent product-info">
57
+ <p class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></p>
58
+ <p class="sku"><?php echo $this->__('SKU'); ?>: <?php echo $this->escapeHtml($this->getSku($_item)) ?></p>
59
+ </td>
60
+ <td class="bundle-item-parent align-center">
61
+ <?php if ($this->canShowPriceInfo($_item)): ?>
62
+ <?php echo $_item->getQty()*1 ?>
63
+ <?php else: ?>
64
+ &nbsp;
65
+ <?php endif; ?>
66
+ </td>
67
+ <td class="bundle-item-parent align-right">
68
+ <?php else: ?>
69
+ <td class="bundle-item bundle-details product-info"><div><?php echo $this->getValueHtml($_item)?></div></td>
70
+ <td class="bundle-item align-center">
71
+ <?php if ($this->canShowPriceInfo($_item)): ?>
72
+ <?php echo $_item->getQty()*1 ?>
73
+ <?php else: ?>
74
+ &nbsp;
75
+ <?php endif; ?>
76
+ </td>
77
+ <td class="bundle-item align-right">
78
+ <?php endif; ?>
79
+ <?php if ($this->canShowPriceInfo($_item)): ?>
80
+ <?php if ($this->helper('tax')->displaySalesPriceExclTax($_order->getStore()) || $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
81
+ <?php if ($this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
82
+ <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
83
+ <?php endif; ?>
84
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
85
+ <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
86
+ <?php else: ?>
87
+ <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
88
+ <?php endif; ?>
89
+
90
+
91
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
92
+ <br />
93
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
94
+ <small>
95
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
96
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
97
+ <?php endforeach; ?>
98
+ </small>
99
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
100
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
101
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
102
+ <?php endforeach; ?>
103
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
104
+ <small>
105
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
106
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
107
+ <?php endforeach; ?>
108
+ </small>
109
+ <?php endif; ?>
110
+
111
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
112
+ <br />
113
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
114
+ <?php endif; ?>
115
+ <?php endif; ?>
116
+ <?php endif; ?>
117
+
118
+
119
+ <?php if ($this->helper('tax')->displaySalesPriceInclTax($_order->getStore()) || $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
120
+ <?php if ($this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
121
+ <br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
122
+ <?php endif; ?>
123
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
124
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
125
+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
126
+ <?php else: ?>
127
+ <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
128
+ <?php endif; ?>
129
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
130
+ <br />
131
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
132
+ <small>
133
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
134
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
135
+ <?php endforeach; ?>
136
+ </small>
137
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
138
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
139
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
140
+ <?php endforeach; ?>
141
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
142
+ <small>
143
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
144
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
145
+ <?php endforeach; ?>
146
+ </small>
147
+ <?php endif; ?>
148
+
149
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
150
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_inc + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
151
+ <?php endif; ?>
152
+ <?php endif; ?>
153
+ <?php endif; ?>
154
+ <?php else: ?>
155
+ &nbsp;
156
+ <?php endif; ?>
157
+ </td>
158
+ </tr>
159
+ <?php endforeach; ?>
160
+
161
+ <?php if ($_showlastRow): ?>
162
+ <tr>
163
+ <td align="left" valign="top" style="padding:3px 9px">
164
+ <?php if ($this->getItemOptions()): ?>
165
+ <dl style="margin:0; padding:0;">
166
+ <?php foreach ($this->getItemOptions() as $option): ?>
167
+ <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
168
+ <dd style="margin:0; padding:0 0 0 9px;"><?php echo $option['value'] ?></dd>
169
+ <?php endforeach; ?>
170
+ </dl>
171
+ <?php endif; ?>
172
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
173
+ </td>
174
+ <td>&nbsp;</td>
175
+ <td>&nbsp;</td>
176
+ <td>&nbsp;</td>
177
+ </tr>
178
+ <?php endif; ?>
app/design/frontend/rwd/default/template/bundle/email/order/items/order/default.phtml ADDED
@@ -0,0 +1,175 @@