Interface_Frontend_Base_Default

Version Notes

1.7.0.0

Release Info

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

Code changes from version 1.6.2.0 to 1.7.0.0

Files changed (445) hide show

app/design/frontend/base/default/etc/widget.xml +1 -1
app/design/frontend/base/default/layout/authorizenet.xml +1 -1
app/design/frontend/base/default/layout/bundle.xml +2 -8
app/design/frontend/base/default/layout/captcha.xml +106 -0
app/design/frontend/base/default/layout/catalog.xml +1 -22
app/design/frontend/base/default/layout/catalog_msrp.xml +1 -1
app/design/frontend/base/default/layout/cataloginventory.xml +1 -1
app/design/frontend/base/default/layout/catalogsearch.xml +1 -1
app/design/frontend/base/default/layout/checkout.xml +3 -3
app/design/frontend/base/default/layout/cms.xml +1 -1
app/design/frontend/base/default/layout/contacts.xml +1 -1
app/design/frontend/base/default/layout/core.xml +1 -1
app/design/frontend/base/default/layout/customer.xml +3 -3
app/design/frontend/base/default/layout/directory.xml +1 -1
app/design/frontend/base/default/layout/downloadable.xml +1 -7
app/design/frontend/base/default/layout/googleanalytics.xml +2 -2
app/design/frontend/base/default/layout/googlecheckout.xml +1 -1
app/design/frontend/base/default/layout/newsletter.xml +1 -1
app/design/frontend/base/default/layout/oauth.xml +137 -0
app/design/frontend/base/default/layout/page.xml +2 -1
app/design/frontend/base/default/layout/pagecache.xml +1 -1
app/design/frontend/base/default/layout/payment.xml +1 -1
app/design/frontend/base/default/layout/paypal.xml +4 -1
app/design/frontend/base/default/layout/paypaluk.xml +2 -2
app/design/frontend/base/default/layout/persistent.xml +1 -1
app/design/frontend/base/default/layout/poll.xml +1 -1
app/design/frontend/base/default/layout/productalert.xml +1 -1
app/design/frontend/base/default/layout/reports.xml +1 -1
app/design/frontend/base/default/layout/review.xml +1 -1
app/design/frontend/base/default/layout/rss.xml +1 -1
app/design/frontend/base/default/layout/sales.xml +1 -1
app/design/frontend/base/default/layout/sales/billing_agreement.xml +1 -1
app/design/frontend/base/default/layout/sales/recurring_profile.xml +1 -1
app/design/frontend/base/default/layout/sendfriend.xml +1 -1
app/design/frontend/base/default/layout/shipping.xml +1 -1
app/design/frontend/base/default/layout/tag.xml +1 -1
app/design/frontend/base/default/layout/weee.xml +1 -1
app/design/frontend/base/default/layout/wishlist.xml +33 -13
app/design/frontend/base/default/template/authorizenet/directpost/form.phtml +1 -1
app/design/frontend/base/default/template/authorizenet/directpost/iframe.phtml +1 -1
app/design/frontend/base/default/template/authorizenet/directpost/info.phtml +1 -1
app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml +1 -1
app/design/frontend/base/default/template/bundle/catalog/product/price.phtml +10 -5
app/design/frontend/base/default/template/bundle/catalog/product/view/options/notice.phtml +1 -1
app/design/frontend/base/default/template/bundle/catalog/product/view/price.phtml +1 -1
app/design/frontend/base/default/template/bundle/catalog/product/view/tierprices.phtml +1 -1
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml +1 -1
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml +1 -1
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml +1 -1
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml +1 -1
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml +1 -1
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/options.phtml +1 -1
app/design/frontend/base/default/template/bundle/email/order/items/creditmemo/default.phtml +1 -1
app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml +1 -1
app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml +1 -1
app/design/frontend/base/default/template/bundle/email/order/items/shipment/default.phtml +1 -1
app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml +1 -1
app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml +1 -1
app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml +1 -1
app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml +1 -1
app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml +1 -1
app/design/frontend/base/default/template/callouts/left_col.phtml +1 -1
app/design/frontend/base/default/template/callouts/right_col.phtml +1 -1
app/design/frontend/base/default/template/captcha/zend.phtml +51 -0
app/design/frontend/base/default/template/catalog/category/page.phtml +1 -1
app/design/frontend/base/default/template/catalog/category/view.phtml +1 -1
app/design/frontend/base/default/template/catalog/category/widget/link/link_block.phtml +1 -1
app/design/frontend/base/default/template/catalog/category/widget/link/link_inline.phtml +1 -1
app/design/frontend/base/default/template/catalog/layer/filter.phtml +3 -1
app/design/frontend/base/default/template/catalog/layer/state.phtml +11 -4
app/design/frontend/base/default/template/catalog/layer/view.phtml +4 -1
app/design/frontend/base/default/template/catalog/msrp/popup.phtml +4 -3
app/design/frontend/base/default/template/catalog/navigation/left.phtml +1 -1
app/design/frontend/base/default/template/catalog/navigation/top.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/compare/list.phtml +6 -4
app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/gallery.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/list.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/list/related.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/list/toolbar.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/list/upsell.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/new.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/price.phtml +63 -49
app/design/frontend/base/default/template/catalog/product/price_msrp.phtml +2 -2
app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml +2 -2
app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml +2 -2
app/design/frontend/base/default/template/catalog/product/price_msrp_rss.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view.phtml +8 -1
app/design/frontend/base/default/template/catalog/product/view/additional.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/addto.phtml +2 -2
app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/attributes.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/description.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/media.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/options.phtml +36 -25
app/design/frontend/base/default/template/catalog/product/view/options/js.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/options/type/date.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/options/wrapper.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/options/wrapper/bottom.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/price.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/price_clone.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml +10 -5
app/design/frontend/base/default/template/catalog/product/view/type/configurable.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/type/default.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/type/options/configurable.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/type/simple.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/type/virtual.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/widget/link/link_block.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/widget/new/column/new_default_list.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/widget/new/column/new_images_list.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/widget/new/column/new_names_list.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml +1 -1
app/design/frontend/base/default/template/catalog/rss/product/price.phtml +1 -1
app/design/frontend/base/default/template/catalog/seo/sitemap.phtml +3 -3
app/design/frontend/base/default/template/catalog/seo/sitemap/container.phtml +1 -1
app/design/frontend/base/default/template/catalog/seo/tree.phtml +1 -1
app/design/frontend/base/default/template/cataloginventory/qtyincrements.phtml +1 -1
app/design/frontend/base/default/template/cataloginventory/stockqty/composite.phtml +1 -1
app/design/frontend/base/default/template/cataloginventory/stockqty/default.phtml +1 -1
app/design/frontend/base/default/template/catalogsearch/advanced/form.phtml +7 -6
app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml +1 -1
app/design/frontend/base/default/template/catalogsearch/form.mini.phtml +7 -4
app/design/frontend/base/default/template/catalogsearch/result.phtml +1 -1
app/design/frontend/base/default/template/catalogsearch/term.phtml +1 -1
app/design/frontend/base/default/template/checkout/cart.phtml +27 -2
app/design/frontend/base/default/template/checkout/cart/coupon.phtml +1 -1
app/design/frontend/base/default/template/checkout/cart/crosssell.phtml +1 -1
app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.phtml +1 -1
app/design/frontend/base/default/template/checkout/cart/item/default.phtml +8 -7
app/design/frontend/base/default/template/checkout/cart/noItems.phtml +3 -1
app/design/frontend/base/default/template/checkout/cart/render/default.phtml +2 -2
app/design/frontend/base/default/template/checkout/cart/render/simple.phtml +3 -3
app/design/frontend/base/default/template/checkout/cart/shipping.phtml +9 -13
app/design/frontend/base/default/template/checkout/cart/sidebar.phtml +1 -1
app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml +1 -1
app/design/frontend/base/default/template/checkout/cart/totals.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/address/select.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/addresses.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/billing.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/billing/items.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/link.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/overview.phtml +5 -4
app/design/frontend/base/default/template/checkout/multishipping/overview/item.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml +6 -5
app/design/frontend/base/default/template/checkout/multishipping/state.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/success.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage.phtml +1 -2
app/design/frontend/base/default/template/checkout/onepage/agreements.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/billing.phtml +29 -16
app/design/frontend/base/default/template/checkout/onepage/failure.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/link.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/login.phtml +4 -1
app/design/frontend/base/default/template/checkout/onepage/payment.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/payment/methods.phtml +2 -2
app/design/frontend/base/default/template/checkout/onepage/progress.phtml +15 -10
app/design/frontend/base/default/template/checkout/onepage/review.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/review/button.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/review/info.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/review/item.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/review/totals.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/shipping.phtml +23 -21
app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/shipping_method/additional.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml +7 -5
app/design/frontend/base/default/template/checkout/success.phtml +2 -2
app/design/frontend/base/default/template/checkout/total/default.phtml +2 -2
app/design/frontend/base/default/template/checkout/total/nominal.phtml +1 -1
app/design/frontend/base/default/template/checkout/total/tax.phtml +2 -2
app/design/frontend/base/default/template/cms/content.phtml +1 -1
app/design/frontend/base/default/template/cms/content_heading.phtml +1 -1
app/design/frontend/base/default/template/cms/default/home.phtml +1 -1
app/design/frontend/base/default/template/cms/default/no-route.phtml +1 -1
app/design/frontend/base/default/template/cms/meta.phtml +1 -1
app/design/frontend/base/default/template/cms/widget/link/link_block.phtml +1 -1
app/design/frontend/base/default/template/cms/widget/link/link_inline.phtml +1 -1
app/design/frontend/base/default/template/cms/widget/static_block/default.phtml +1 -1
app/design/frontend/base/default/template/contacts/form.phtml +1 -1
app/design/frontend/base/default/template/core/formkey.phtml +1 -1
app/design/frontend/base/default/template/core/link.phtml +1 -1
app/design/frontend/base/default/template/core/messages.phtml +1 -1
app/design/frontend/base/default/template/customer/account/dashboard.phtml +3 -1
app/design/frontend/base/default/template/customer/account/dashboard/address.phtml +1 -1
app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml +1 -1
app/design/frontend/base/default/template/customer/account/dashboard/info.phtml +3 -1
app/design/frontend/base/default/template/customer/account/dashboard/newsletter.phtml +1 -1
app/design/frontend/base/default/template/customer/account/link/back.phtml +1 -1
app/design/frontend/base/default/template/customer/account/navigation.phtml +1 -1
app/design/frontend/base/default/template/customer/address.phtml +1 -1
app/design/frontend/base/default/template/customer/address/book.phtml +1 -1
app/design/frontend/base/default/template/customer/address/edit.phtml +21 -11
app/design/frontend/base/default/template/customer/balance.phtml +1 -1
app/design/frontend/base/default/template/customer/form/address.phtml +13 -11
app/design/frontend/base/default/template/customer/form/changepassword.phtml +1 -1
app/design/frontend/base/default/template/customer/form/confirmation.phtml +1 -1
app/design/frontend/base/default/template/customer/form/edit.phtml +1 -1
app/design/frontend/base/default/template/customer/form/forgotpassword.phtml +2 -1
app/design/frontend/base/default/template/customer/form/login.phtml +4 -1
app/design/frontend/base/default/template/customer/form/mini.login.phtml +1 -1
app/design/frontend/base/default/template/customer/form/newsletter.phtml +5 -1
app/design/frontend/base/default/template/customer/form/register.phtml +19 -12
app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml +1 -1
app/design/frontend/base/default/template/customer/logout.phtml +1 -1
app/design/frontend/base/default/template/customer/orders.phtml +1 -1
app/design/frontend/base/default/template/customer/widget/dob.phtml +1 -1
app/design/frontend/base/default/template/customer/widget/gender.phtml +1 -1
app/design/frontend/base/default/template/customer/widget/name.phtml +15 -16
app/design/frontend/base/default/template/customer/widget/taxvat.phtml +2 -2
app/design/frontend/base/default/template/customer/wishlist.phtml +1 -1
app/design/frontend/base/default/template/directory/currency.phtml +1 -1
app/design/frontend/base/default/template/directory/currency/switch.phtml +1 -1
app/design/frontend/base/default/template/directory/js/optional_zip_countries.phtml +1 -1
app/design/frontend/base/default/template/downloadable/catalog/product/links.phtml +2 -2
app/design/frontend/base/default/template/downloadable/catalog/product/samples.phtml +2 -2
app/design/frontend/base/default/template/downloadable/catalog/product/type.phtml +1 -1
app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml +6 -6
app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml +2 -2
app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml +2 -2
app/design/frontend/base/default/template/downloadable/checkout/success.phtml +1 -1
app/design/frontend/base/default/template/downloadable/customer/products/list.phtml +2 -2
app/design/frontend/base/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml +2 -2
app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.phtml +2 -2
app/design/frontend/base/default/template/downloadable/email/order/items/order/downloadable.phtml +2 -2
app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +2 -2
app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +2 -2
app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml +2 -2
app/design/frontend/base/default/template/email/order/creditmemo/items.phtml +1 -1
app/design/frontend/base/default/template/email/order/invoice/items.phtml +1 -1
app/design/frontend/base/default/template/email/order/items.phtml +3 -1
app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml +1 -1
app/design/frontend/base/default/template/email/order/items/invoice/default.phtml +1 -1
app/design/frontend/base/default/template/email/order/items/order/default.phtml +1 -1
app/design/frontend/base/default/template/email/order/items/shipment/default.phtml +1 -1
app/design/frontend/base/default/template/email/order/shipment/items.phtml +1 -1
app/design/frontend/base/default/template/email/order/shipment/track.phtml +1 -1
app/design/frontend/base/default/template/email/productalert/price.phtml +1 -1
app/design/frontend/base/default/template/email/productalert/stock.phtml +1 -1
app/design/frontend/base/default/template/giftmessage/inline.phtml +2 -2
app/design/frontend/base/default/template/googleanalytics/ga.phtml +45 -0
app/design/frontend/base/default/template/googlecheckout/form.phtml +1 -1
app/design/frontend/base/default/template/googlecheckout/link.phtml +1 -1
app/design/frontend/base/default/template/newsletter/subscribe.phtml +4 -3
app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml +62 -0
app/design/frontend/base/default/template/oauth/authorize/button.phtml +53 -0
app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml +52 -0
app/design/frontend/base/default/template/oauth/authorize/confirm.phtml +42 -0
app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml +75 -0
app/design/frontend/base/default/template/oauth/authorize/form/login.phtml +76 -0
app/design/frontend/base/default/template/oauth/authorize/head-simple.phtml +38 -0
app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml +47 -0
app/design/frontend/base/default/template/oauth/authorize/reject.phtml +38 -0
app/design/frontend/base/default/template/oauth/customer/token/list.phtml +72 -0
app/design/frontend/base/default/template/page/1column.phtml +1 -1
app/design/frontend/base/default/template/page/2columns-left.phtml +1 -1
app/design/frontend/base/default/template/page/2columns-right.phtml +1 -1
app/design/frontend/base/default/template/page/3columns.phtml +1 -1
app/design/frontend/base/default/template/page/empty.phtml +1 -1
app/design/frontend/base/default/template/page/html/breadcrumbs.phtml +1 -1
app/design/frontend/base/default/template/page/html/footer.phtml +1 -1
app/design/frontend/base/default/template/page/html/head.phtml +1 -1
app/design/frontend/base/default/template/page/html/header.phtml +1 -1
app/design/frontend/base/default/template/page/html/notices.phtml +32 -7
app/design/frontend/base/default/template/page/html/pager.phtml +1 -1
app/design/frontend/base/default/template/page/html/top.links.phtml +1 -1
app/design/frontend/base/default/template/page/html/topmenu.phtml +41 -0
app/design/frontend/base/default/template/page/html/wrapper.phtml +1 -1
app/design/frontend/base/default/template/page/js/calendar.phtml +1 -1
app/design/frontend/base/default/template/page/js/cookie.phtml +1 -1
app/design/frontend/base/default/template/page/popup.phtml +1 -1
app/design/frontend/base/default/template/page/print.phtml +1 -1
app/design/frontend/base/default/template/page/redirect.phtml +1 -1
app/design/frontend/base/default/template/page/switch/flags.phtml +1 -1
app/design/frontend/base/default/template/page/switch/languages.phtml +1 -1
app/design/frontend/base/default/template/page/switch/stores.phtml +1 -1
app/design/frontend/base/default/template/page/template/container.phtml +1 -1
app/design/frontend/base/default/template/page/template/links.phtml +1 -1
app/design/frontend/base/default/template/page/template/linksblock.phtml +1 -1
app/design/frontend/base/default/template/pagecache/cookie.phtml +1 -1
app/design/frontend/base/default/template/paygate/form/cc.phtml +1 -1
app/design/frontend/base/default/template/paygate/info/cc.phtml +1 -1
app/design/frontend/base/default/template/payment/catalog/product/view/profile/options.phtml +1 -1
app/design/frontend/base/default/template/payment/catalog/product/view/profile/schedule.phtml +1 -1
app/design/frontend/base/default/template/payment/form/banktransfer.phtml +35 -0
app/design/frontend/base/default/template/payment/form/cashondelivery.phtml +39 -0
app/design/frontend/base/default/template/payment/form/cc.phtml +1 -1
app/design/frontend/base/default/template/payment/form/ccsave.phtml +1 -1
app/design/frontend/base/default/template/payment/form/checkmo.phtml +1 -1
app/design/frontend/base/default/template/payment/form/purchaseorder.phtml +1 -1
app/design/frontend/base/default/template/payment/info/banktransfer.phtml +41 -0
app/design/frontend/base/default/template/payment/info/checkmo.phtml +1 -1
app/design/frontend/base/default/template/payment/info/default.phtml +1 -1
app/design/frontend/base/default/template/payment/info/purchaseorder.phtml +1 -1
app/design/frontend/base/default/template/paypal/express/review.phtml +74 -93
app/design/frontend/base/default/template/paypal/express/review/address.phtml +145 -0
app/design/frontend/base/default/template/paypal/express/review/details.phtml +1 -1
app/design/frontend/base/default/template/paypal/express/review/shipping/method.phtml +53 -0
app/design/frontend/base/default/template/paypal/express/shortcut.phtml +1 -1
app/design/frontend/base/default/template/paypal/hss/form.phtml +1 -1
app/design/frontend/base/default/template/paypal/hss/iframe.phtml +1 -1
app/design/frontend/base/default/template/paypal/hss/info.phtml +1 -1
app/design/frontend/base/default/template/paypal/hss/js.phtml +2 -2
app/design/frontend/base/default/template/paypal/hss/redirect.phtml +4 -1
app/design/frontend/base/default/template/paypal/hss/review/button.phtml +1 -1
app/design/frontend/base/default/template/paypal/partner/logo.phtml +1 -1
app/design/frontend/base/default/template/paypal/payflowadvanced/form.phtml +1 -1
app/design/frontend/base/default/template/paypal/payflowadvanced/iframe.phtml +1 -1
app/design/frontend/base/default/template/paypal/payflowadvanced/info.phtml +1 -1
app/design/frontend/base/default/template/paypal/payflowadvanced/redirect.phtml +1 -1
app/design/frontend/base/default/template/paypal/payflowlink/form.phtml +1 -1
app/design/frontend/base/default/template/paypal/payflowlink/iframe.phtml +1 -1
app/design/frontend/base/default/template/paypal/payflowlink/info.phtml +1 -1
app/design/frontend/base/default/template/paypal/payflowlink/redirect.phtml +1 -1
app/design/frontend/base/default/template/paypal/payment/mark.phtml +1 -1
app/design/frontend/base/default/template/paypal/payment/redirect.phtml +1 -1
app/design/frontend/base/default/template/paypaluk/express/review.phtml +191 -0
app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml +30 -20
app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml +4 -1
app/design/frontend/base/default/template/persistent/customer/form/login.phtml +2 -1
app/design/frontend/base/default/template/persistent/customer/form/register.phtml +14 -11
app/design/frontend/base/default/template/persistent/remember_me.phtml +8 -8
app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml +1 -1
app/design/frontend/base/default/template/poll/active.phtml +1 -1
app/design/frontend/base/default/template/poll/result.phtml +1 -1
app/design/frontend/base/default/template/productalert/price.phtml +1 -1
app/design/frontend/base/default/template/productalert/product/view.phtml +1 -1
app/design/frontend/base/default/template/productalert/stock.phtml +1 -1
app/design/frontend/base/default/template/rating/detailed.phtml +1 -1
app/design/frontend/base/default/template/rating/empty.phtml +1 -1
app/design/frontend/base/default/template/reports/home_product_compared.phtml +1 -1
app/design/frontend/base/default/template/reports/home_product_viewed.phtml +1 -1
app/design/frontend/base/default/template/reports/product_compared.phtml +1 -1
app/design/frontend/base/default/template/reports/product_viewed.phtml +1 -1
app/design/frontend/base/default/template/reports/widget/compared/column/compared_default_list.phtml +1 -1
app/design/frontend/base/default/template/reports/widget/compared/column/compared_images_list.phtml +1 -1
app/design/frontend/base/default/template/reports/widget/compared/column/compared_names_list.phtml +1 -1
app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml +1 -1
app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml +1 -1
app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_default_list.phtml +1 -1
app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_images_list.phtml +1 -1
app/design/frontend/base/default/template/reports/widget/viewed/column/viewed_names_list.phtml +1 -1
app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_grid.phtml +1 -1
app/design/frontend/base/default/template/reports/widget/viewed/content/viewed_list.phtml +1 -1
app/design/frontend/base/default/template/review/customer/list.phtml +1 -1
app/design/frontend/base/default/template/review/customer/recent.phtml +1 -1
app/design/frontend/base/default/template/review/customer/view.phtml +1 -1
app/design/frontend/base/default/template/review/form.phtml +1 -1
app/design/frontend/base/default/template/review/helper/summary.phtml +1 -1
app/design/frontend/base/default/template/review/helper/summary_short.phtml +1 -1
app/design/frontend/base/default/template/review/product/view/count.phtml +1 -1
app/design/frontend/base/default/template/review/product/view/list.phtml +1 -1
app/design/frontend/base/default/template/review/product/view/other.phtml +1 -1
app/design/frontend/base/default/template/review/view.phtml +1 -1
app/design/frontend/base/default/template/rss/list.phtml +1 -1
app/design/frontend/base/default/template/rss/nofeed.phtml +1 -1
app/design/frontend/base/default/template/rss/order/details.phtml +1 -1
app/design/frontend/base/default/template/sales/billing/agreement/view.phtml +1 -1
app/design/frontend/base/default/template/sales/billing/agreements.phtml +1 -1
app/design/frontend/base/default/template/sales/order/comments.phtml +1 -1
app/design/frontend/base/default/template/sales/order/creditmemo.phtml +1 -1
app/design/frontend/base/default/template/sales/order/creditmemo/items.phtml +1 -1
app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml +1 -1
app/design/frontend/base/default/template/sales/order/details.phtml +2 -2
app/design/frontend/base/default/template/sales/order/history.phtml +1 -1
app/design/frontend/base/default/template/sales/order/info.phtml +5 -4
app/design/frontend/base/default/template/sales/order/info/buttons.phtml +1 -1
app/design/frontend/base/default/template/sales/order/invoice.phtml +1 -1
app/design/frontend/base/default/template/sales/order/invoice/items.phtml +1 -1
app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml +1 -1
app/design/frontend/base/default/template/sales/order/items.phtml +1 -1
app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml +1 -1
app/design/frontend/base/default/template/sales/order/print.phtml +2 -2
app/design/frontend/base/default/template/sales/order/print/creditmemo.phtml +2 -2
app/design/frontend/base/default/template/sales/order/print/invoice.phtml +2 -2
app/design/frontend/base/default/template/sales/order/print/shipment.phtml +1 -1
app/design/frontend/base/default/template/sales/order/recent.phtml +1 -1
app/design/frontend/base/default/template/sales/order/shipment.phtml +1 -1
app/design/frontend/base/default/template/sales/order/shipment/items.phtml +1 -1
app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml +1 -1
app/design/frontend/base/default/template/sales/order/totals.phtml +3 -3
app/design/frontend/base/default/template/sales/order/trackinginfo.phtml +4 -5
app/design/frontend/base/default/template/sales/order/view.phtml +1 -1
app/design/frontend/base/default/template/sales/payment/form/billing/agreement.phtml +1 -1
app/design/frontend/base/default/template/sales/recurring/grid.phtml +1 -1
app/design/frontend/base/default/template/sales/recurring/profile/view.phtml +1 -1
app/design/frontend/base/default/template/sales/recurring/profile/view/info.phtml +1 -1
app/design/frontend/base/default/template/sales/recurring/profiles.phtml +1 -1
app/design/frontend/base/default/template/sales/reorder/sidebar.phtml +1 -1
app/design/frontend/base/default/template/sales/widget/guest/form.phtml +1 -1
app/design/frontend/base/default/template/sendfriend/send.phtml +1 -1
app/design/frontend/base/default/template/shipping/tracking/ajax.phtml +1 -1
app/design/frontend/base/default/template/shipping/tracking/popup.phtml +6 -6
app/design/frontend/base/default/template/tag/cloud.phtml +1 -1
app/design/frontend/base/default/template/tag/customer/recent.phtml +1 -1
app/design/frontend/base/default/template/tag/customer/tags.phtml +1 -1
app/design/frontend/base/default/template/tag/customer/view.phtml +1 -1
app/design/frontend/base/default/template/tag/list.phtml +1 -1
app/design/frontend/base/default/template/tag/popular.phtml +1 -1
app/design/frontend/base/default/template/tax/checkout/discount.phtml +1 -1
app/design/frontend/base/default/template/tax/checkout/grandtotal.phtml +1 -1
app/design/frontend/base/default/template/tax/checkout/shipping.phtml +2 -2
app/design/frontend/base/default/template/tax/checkout/subtotal.phtml +1 -1
app/design/frontend/base/default/template/tax/checkout/tax.phtml +2 -2
app/design/frontend/base/default/template/tax/order/tax.phtml +2 -2
app/design/frontend/base/default/template/wishlist/button/share.phtml +30 -0
app/design/frontend/base/default/template/wishlist/button/tocart.phtml +30 -0
app/design/frontend/base/default/template/wishlist/button/update.phtml +30 -0
app/design/frontend/base/default/template/wishlist/email/items.phtml +8 -5
app/design/frontend/base/default/template/wishlist/email/rss.phtml +2 -2
app/design/frontend/base/default/template/wishlist/item/column/cart.phtml +54 -0
app/design/frontend/base/default/template/wishlist/item/column/image.phtml +33 -0
app/design/frontend/base/default/template/wishlist/item/column/info.phtml +40 -0
app/design/frontend/base/default/template/wishlist/item/column/remove.phtml +29 -0
app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml +2 -2
app/design/frontend/base/default/template/wishlist/item/list.phtml +63 -0
app/design/frontend/base/default/template/wishlist/options_list.phtml +1 -1
app/design/frontend/base/default/template/wishlist/render/item/price.phtml +1 -1
app/design/frontend/base/default/template/wishlist/render/item/price_msrp_item.phtml +2 -2
app/design/frontend/base/default/template/wishlist/render/item/price_msrp_rss.phtml +1 -1
app/design/frontend/base/default/template/wishlist/shared.phtml +4 -4
app/design/frontend/base/default/template/wishlist/sharing.phtml +2 -2
app/design/frontend/base/default/template/wishlist/sidebar.phtml +2 -2
app/design/frontend/base/default/template/wishlist/view.phtml +45 -124
package.xml +6 -6
skin/frontend/base/default/css/widgets.css +1 -1
skin/frontend/base/default/images/cvv.gif +0 -0
skin/frontend/base/default/images/reload.png +0 -0
skin/frontend/base/default/js/bundle.js +1 -1
skin/frontend/base/default/js/checkout/review.js +322 -15
skin/frontend/base/default/js/giftmessage.js +1 -1
skin/frontend/base/default/js/ie6.js +1 -1
skin/frontend/base/default/js/msrp.js +3 -1
skin/frontend/base/default/js/opcheckout.js +35 -18
skin/frontend/base/default/lib/prototype/windows/themes/magento.css +64 -0
skin/frontend/base/default/lib/prototype/windows/themes/magento/btn_bg.gif +0 -0
skin/frontend/base/default/lib/prototype/windows/themes/magento/content_bg.gif +0 -0
skin/frontend/base/default/lib/prototype/windows/themes/magento/top_bg.gif +0 -0
skin/frontend/base/default/lib/prototype/windows/themes/magento/window_close.png +0 -0

app/design/frontend/base/default/etc/widget.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->

app/design/frontend/base/default/layout/authorizenet.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/bundle.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27
	@@ -92,12 +92,6 @@ Adding custom product price block
92	</reference>
93	</default>
94
95	- <wishlist_index_index>
96	- <reference name="customer.wishlist">
97	- <action method="addOptionsRenderCfg"><type>bundle</type><helper>bundle/catalog_product_configuration</helper></action>
98	- </reference>
99	- </wishlist_index_index>
100	-
101	<catalog_product_view>
102	<reference name="catalog.product.related">
103	<action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
	@@ -227,7 +221,7 @@ Additional block for bundle product type
227	<reference name="product.info.options.wrapper.bottom">
228	<remove name="product.tierprices" />
229	<block type="bundle/catalog_product_view" name="bundle.tierprices" as="tierprices" before="-" template="bundle/catalog/product/view/tierprices.phtml"/>
230	- <block type="cataloginventory/qtyincrements" name="product.info.~~extrahint~~" as="~~extrahint~~" template="cataloginventory/qtyincrements.phtml"/>
231	</reference>
232	<reference name="product.clone_prices">
233	<action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/view/price.phtml</template></action>


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

92	</reference>
93	</default>
94






95	<catalog_product_view>
96	<reference name="catalog.product.related">
97	<action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>

221	<reference name="product.info.options.wrapper.bottom">
222	<remove name="product.tierprices" />
223	<block type="bundle/catalog_product_view" name="bundle.tierprices" as="tierprices" before="-" template="bundle/catalog/product/view/tierprices.phtml"/>
224	+ <block type="cataloginventory/qtyincrements" name="product.info.qtyincrements" before="-" template="cataloginventory/qtyincrements.phtml"/>
225	</reference>
226	<reference name="product.clone_prices">
227	<action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/view/price.phtml</template></action>

app/design/frontend/base/default/layout/captcha.xml ADDED Viewed

	@@ -0,0 +1,106 @@


1	+ <?xml version="1.0"?>
2	+ <!--
3	+ /**
4	+ * Magento
5	+ *
6	+ * NOTICE OF LICENSE
7	+ *
8	+ * This source file is subject to the Academic Free License (AFL 3.0)
9	+ * that is bundled with this package in the file LICENSE_AFL.txt.
10	+ * It is also available through the world-wide-web at this URL:
11	+ * http://opensource.org/licenses/afl-3.0.php
12	+ * If you did not receive a copy of the license and are unable to
13	+ * obtain it through the world-wide-web, please send an email
14	+ * to license@magentocommerce.com so we can send you a copy immediately.
15	+ *
16	+ * DISCLAIMER
17	+ *
18	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
19	+ * versions in the future. If you wish to customize Magento for your
20	+ * needs please refer to http://www.magentocommerce.com for more information.
21	+ *
22	+ * @category design
23	+ * @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	+ */
27	+
28	+ -->
29	+ <layout version="0.1.0">
30	+ <customer_account_login>
31	+ <reference name="customer_form_login">
32	+ <block type="core/text_list" name="form.additional.info">
33	+ <block type="captcha/captcha" name="captcha">
34	+ <reference name="head">
35	+ <action method="addJs"><file>mage/captcha.js</file></action>
36	+ </reference>
37	+ <action method="setFormId"><formId>user_login</formId></action>
38	+ <action method="setImgWidth"><width>230</width></action>
39	+ <action method="setImgHeight"><width>50</width></action>
40	+ </block>
41	+ </block>
42	+ </reference>
43	+ </customer_account_login>
44	+ <customer_account_forgotpassword>
45	+ <reference name="forgotPassword">
46	+ <block type="core/text_list" name="form.additional.info">
47	+ <block type="captcha/captcha" name="captcha">
48	+ <reference name="head">
49	+ <action method="addJs"><file>mage/captcha.js</file></action>
50	+ </reference>
51	+ <action method="setFormId"><formId>user_forgotpassword</formId></action>
52	+ <action method="setImgWidth"><width>230</width></action>
53	+ <action method="setImgHeight"><width>50</width></action>
54	+ </block>
55	+ </block>
56	+ </reference>
57	+ </customer_account_forgotpassword>
58	+ <customer_account_create>
59	+ <reference name="customer_form_register">
60	+ <block type="core/text_list" name="form.additional.info">
61	+ <block type="captcha/captcha" name="captcha">
62	+ <reference name="head">
63	+ <action method="addJs"><file>mage/captcha.js</file></action>
64	+ </reference>
65	+ <action method="setFormId"><formId>user_create</formId></action>
66	+ <action method="setImgWidth"><width>230</width></action>
67	+ <action method="setImgHeight"><width>50</width></action>
68	+ </block>
69	+ </block>
70	+ </reference>
71	+ </customer_account_create>
72	+ <checkout_onepage_index>
73	+ <reference name="checkout.onepage.login">
74	+ <block type="core/text_list" name="form.additional.info">
75	+ <block type="captcha/captcha" name="captcha">
76	+ <reference name="head">
77	+ <action method="addJs"><file>mage/captcha.js</file></action>
78	+ </reference>
79	+ <action method="setFormId"><formId>user_login</formId></action>
80	+ <action method="setImgWidth"><width>230</width></action>
81	+ <action method="setImgHeight"><width>50</width></action>
82	+ </block>
83	+ </block>
84	+ </reference>
85	+ <reference name="checkout.onepage.billing">
86	+ <block type="core/text_list" name="form.additional.info">
87	+ <block type="captcha/captcha" name="captcha.guest.checkout">
88	+ <reference name="head">
89	+ <action method="addJs"><file>mage/captcha.js</file></action>
90	+ </reference>
91	+ <action method="setFormId"><formId>guest_checkout</formId></action>
92	+ <action method="setImgWidth"><width>230</width></action>
93	+ <action method="setImgHeight"><width>50</width></action>
94	+ </block>
95	+ <block type="captcha/captcha" name="captcha.register.during.checkout">
96	+ <reference name="head">
97	+ <action method="addJs"><file>mage/captcha.js</file></action>
98	+ </reference>
99	+ <action method="setFormId"><formId>register_during_checkout</formId></action>
100	+ <action method="setImgWidth"><width>230</width></action>
101	+ <action method="setImgHeight"><width>50</width></action>
102	+ </block>
103	+ </block>
104	+ </reference>
105	+ </checkout_onepage_index>
106	+ </layout>

app/design/frontend/base/default/layout/catalog.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27
	@@ -45,9 +45,6 @@ Default layout, loads most of the pages
45	<default>
46
47	<!-- Mage_Catalog -->
48	- <reference name="top.menu">
49	- <block type="catalog/navigation" name="catalog.topnav" template="catalog/navigation/top.phtml"/>
50	- </reference>
51	<reference name="left">
52	<block type="core/template" name="left.permanent.callout" template="callouts/left_col.phtml">
53	<action method="setImgSrc"><src>images/media/col_left_callout.jpg</src></action>
	@@ -418,22 +415,4 @@ SEO Site Map
418	<action method="addLink" translate="label title" module="catalog"><label>Categories Sitemap</label><url helper="catalog/map/getCategoryUrl"/><title>Categories Sitemap</title></action>
419	</reference>
420	</catalog_seo_sitemap_product>
421	-
422	-
423	- <!--
424	- Catalog search terms block
425	- -->
426	-
427	- <catalog_seo_searchterm_popular translate="label">
428	- <label>Catalog Seo Popular Search Terms</label>
429	- <remove name="right"/>
430	- <remove name="left"/>
431	- <reference name="root">
432	- <action method="setTemplate"><template>page/1column.phtml</template></action>
433	- </reference>
434	- <reference name="content">
435	- <block type="catalog/seo_searchterm" name="seo.searchterm" template="catalog/seo/searchterm.phtml"/>
436	- </reference>
437	- </catalog_seo_searchterm_popular>
438	-
439	</layout>


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

45	<default>
46
47	<!-- Mage_Catalog -->



48	<reference name="left">
49	<block type="core/template" name="left.permanent.callout" template="callouts/left_col.phtml">
50	<action method="setImgSrc"><src>images/media/col_left_callout.jpg</src></action>

415	<action method="addLink" translate="label title" module="catalog"><label>Categories Sitemap</label><url helper="catalog/map/getCategoryUrl"/><title>Categories Sitemap</title></action>
416	</reference>
417	</catalog_seo_sitemap_product>


















418	</layout>

app/design/frontend/base/default/layout/catalog_msrp.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/cataloginventory.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/catalogsearch.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/checkout.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27
	@@ -96,7 +96,7 @@ Default layout, loads most of the pages
96	<label>Additional Product Info</label>
97	</block>
98	</checkout_cart_index>
99	-
100	<checkout_cart_configure translate="label">
101	<label>Configure Cart Item</label>
102	<update handle="catalog_product_view"/>
	@@ -104,7 +104,7 @@ Default layout, loads most of the pages
104	<block type="checkout/cart_item_configure" name="checkout.cart.item.configure.block"></block>
105	</reference>
106	</checkout_cart_configure>
107	-
108	<!--
109	Multi address shipping checkout main layout,
110	will be rendered on all checkout pages


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

96	<label>Additional Product Info</label>
97	</block>
98	</checkout_cart_index>
99	+
100	<checkout_cart_configure translate="label">
101	<label>Configure Cart Item</label>
102	<update handle="catalog_product_view"/>

104	<block type="checkout/cart_item_configure" name="checkout.cart.item.configure.block"></block>
105	</reference>
106	</checkout_cart_configure>
107	+
108	<!--
109	Multi address shipping checkout main layout,
110	will be rendered on all checkout pages

app/design/frontend/base/default/layout/cms.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->

app/design/frontend/base/default/layout/contacts.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->

app/design/frontend/base/default/layout/core.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/customer.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27
	@@ -91,7 +91,7 @@ Layout for customer login page
91	<action method="setTemplate"><template>page/1column.phtml</template></action>
92	</reference>
93	<reference name="content">
94	- <block type="customer/form_login" name="customer_form_login" template="customer/form/login.phtml"/>
95	</reference>
96	</customer_account_login>
97
	@@ -149,7 +149,7 @@ New customer registration
149	</reference>
150	<reference name="content">
151	<!--<block type="core/template" name="forgotPassword" template="customer/form/forgotpassword.phtml"/>-->
152	- <block type="customer/account_forgotpassword" name="forgotPassword" template="customer/form/forgotpassword.phtml"/>
153	</reference>
154	</customer_account_forgotpassword>
155


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

91	<action method="setTemplate"><template>page/1column.phtml</template></action>
92	</reference>
93	<reference name="content">
94	+ <block type="customer/form_login" name="customer_form_login" template="customer/form/login.phtml" />
95	</reference>
96	</customer_account_login>
97

149	</reference>
150	<reference name="content">
151	<!--<block type="core/template" name="forgotPassword" template="customer/form/forgotpassword.phtml"/>-->
152	+ <block type="customer/account_forgotpassword" name="forgotPassword" template="customer/form/forgotpassword.phtml" />
153	</reference>
154	</customer_account_forgotpassword>
155

app/design/frontend/base/default/layout/directory.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/downloadable.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27
	@@ -127,12 +127,6 @@
127	</reference>
128	</sales_order_creditmemo>
129
130	- <wishlist_index_index>
131	- <reference name="customer.wishlist">
132	- <action method="addOptionsRenderCfg"><type>downloadable</type><helper>downloadable/catalog_product_configuration</helper></action>
133	- </reference>
134	- </wishlist_index_index>
135	-
136	<!--
137	Print pages
138	-->


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

127	</reference>
128	</sales_order_creditmemo>
129






130	<!--
131	Print pages
132	-->

app/design/frontend/base/default/layout/googleanalytics.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27
	@@ -35,7 +35,7 @@ Default layout, loads most of the pages
35	<default>
36	<!-- Mage_GoogleAnalytics -->
37	<reference name="after_body_start">
38	- <block type="googleanalytics/ga" name="google_analytics" as="google_analytics" />
39	</reference>
40	</default>
41	</layout>


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

35	<default>
36	<!-- Mage_GoogleAnalytics -->
37	<reference name="after_body_start">
38	+ <block type="googleanalytics/ga" name="google_analytics" as="google_analytics" template="googleanalytics/ga.phtml" />
39	</reference>
40	</default>
41	</layout>

app/design/frontend/base/default/layout/googlecheckout.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/newsletter.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/oauth.xml ADDED Viewed

	@@ -0,0 +1,137 @@


1	+ <?xml version="1.0"?>
2	+ <!--
3	+ /**
4	+ * Magento
5	+ *
6	+ * NOTICE OF LICENSE
7	+ *
8	+ * This source file is subject to the Academic Free License (AFL 3.0)
9	+ * that is bundled with this package in the file LICENSE_AFL.txt.
10	+ * It is also available through the world-wide-web at this URL:
11	+ * http://opensource.org/licenses/afl-3.0.php
12	+ * If you did not receive a copy of the license and are unable to
13	+ * obtain it through the world-wide-web, please send an email
14	+ * to license@magentocommerce.com so we can send you a copy immediately.
15	+ *
16	+ * DISCLAIMER
17	+ *
18	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
19	+ * versions in the future. If you wish to customize Magento for your
20	+ * needs please refer to http://www.magentocommerce.com for more information.
21	+ *
22	+ * @category design
23	+ * @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	+ */
27	+ -->
28	+ <layout version="1.0.0.0">
29	+ <oauth_root_handle>
30	+ <reference name="root">
31	+ <action method="setTemplate">
32	+ <template>page/1column.phtml</template>
33	+ </action>
34	+ </reference>
35	+ <reference name="head">
36	+ <action method="removeItem"><type>js</type><name>lib/ccard.js</name></action>
37	+ <action method="removeItem"><type>js</type><name>scriptaculous/controls.js</name></action>
38	+ <action method="removeItem"><type>js</type><name>scriptaculous/builder.js</name></action>
39	+ <action method="removeItem"><type>js</type><name>scriptaculous/dragdrop.js</name></action>
40	+ <action method="removeItem"><type>js</type><name>scriptaculous/controls.js</name></action>
41	+ <action method="removeItem"><type>js</type><name>scriptaculous/slider.js</name></action>
42	+ <action method="removeItem"><type>js</type><name>varien/js.js</name></action>
43	+ <action method="removeItem"><type>js</type><name>varien/menu.js</name></action>
44	+ </reference>
45	+ <remove name="top.links"/>
46	+ <remove name="top.search"/>
47	+ <remove name="top.menu"/>
48	+ <remove name="footer"/>
49	+ </oauth_root_handle>
50	+
51	+ <oauth_root_handle_simple>
52	+ <remove name="js_cookie" />
53	+ <block type="page/html" name="root" output="toHtml" template="page/empty.phtml">
54	+ <block type="page/html_head" name="head" as="head" template="oauth/authorize/head-simple.phtml">
55	+ <action method="addCss"><stylesheet>css/oauth-simple.css</stylesheet></action>
56	+ </block>
57	+ <block type="core/text_list" name="content"/>
58	+ </block>
59	+ </oauth_root_handle_simple>
60	+
61	+ <!-- Authorization -->
62	+ <oauth_authorize_index translate="label">
63	+ <update handle="oauth_root_handle"/>
64	+ <label>OAuth authorization for customer</label>
65	+ <reference name="content">
66	+ <block type="oauth/authorize" name="oauth.authorize.form" template="oauth/authorize/form/login.phtml"/>
67	+ <block type="oauth/authorize_button" name="oauth.authorize.button" template="oauth/authorize/button.phtml" />
68	+ </reference>
69	+ </oauth_authorize_index>
70	+
71	+ <oauth_authorize_simple translate="label">
72	+ <update handle="oauth_root_handle_simple"/>
73	+ <remove name="header"/>
74	+ <label>OAuth authorization Pop Up for customer</label>
75	+ <reference name="content">
76	+ <block type="oauth/authorize" name="oauth.authorize.form" template="oauth/authorize/form/login-simple.phtml"/>
77	+ <block type="oauth/authorize_button" name="oauth.authorize.button" template="oauth/authorize/button-simple.phtml" />
78	+ </reference>
79	+ </oauth_authorize_simple>
80	+ <!-- EOF Authorization -->
81	+
82	+ <!-- Confirm Authorization -->
83	+ <oauth_authorize_confirm translate="label">
84	+ <update handle="oauth_root_handle"/>
85	+ <label>Confirm OAuth token authorization</label>
86	+ <reference name="content">
87	+ <block type="oauth/authorize_button" name="oauth.authorize.confirm" template="oauth/authorize/confirm.phtml"/>
88	+ </reference>
89	+ </oauth_authorize_confirm>
90	+
91	+ <oauth_authorize_confirmsimple translate="label">
92	+ <update handle="oauth_root_handle_simple"/>
93	+ <remove name="header"/>
94	+ <reference name="content">
95	+ <block type="oauth/authorize_button" name="oauth.authorize.confirm" template="oauth/authorize/confirm-simple.phtml"/>
96	+ </reference>
97	+ </oauth_authorize_confirmsimple>
98	+ <!-- EOF Confirm Authorization -->
99	+
100	+ <!-- Reject Authorization -->
101	+ <oauth_authorize_reject translate="label">
102	+ <update handle="oauth_root_handle"/>
103	+ <label>Reject OAuth token authorization</label>
104	+ <reference name="content">
105	+ <block type="oauth/authorize_button" name="oauth.authorize.reject" template="oauth/authorize/reject.phtml"/>
106	+ </reference>
107	+ </oauth_authorize_reject>
108	+
109	+ <oauth_authorize_rejectsimple translate="label">
110	+ <update handle="oauth_root_handle_simple"/>
111	+ <remove name="header"/>
112	+ <reference name="content">
113	+ <block type="oauth/authorize_button" name="oauth.authorize.reject" template="oauth/authorize/reject-simple.phtml"/>
114	+ </reference>
115	+ </oauth_authorize_rejectsimple>
116	+ <!-- EOF Reject Authorization -->
117	+
118	+ <!-- My Applications-->
119	+ <customer_account>
120	+ <reference name="customer_account_navigation">
121	+ <action method="addLink" translate="label" module="oauth">
122	+ <name>OAuth Customer Tokens</name>
123	+ <path>oauth/customer_token</path>
124	+ <label>My Applications</label>
125	+ </action>
126	+ </reference>
127	+ </customer_account>
128	+
129	+ <oauth_customer_token_index translate="label">
130	+ <label>Customer My Account My OAuth Applications</label>
131	+ <update handle="customer_account"/>
132	+ <reference name="my.account.wrapper">
133	+ <block type="oauth/customer_token_list" name="oauth_customer_token_list" template="oauth/customer/token/list.phtml"/>
134	+ </reference>
135	+ </oauth_customer_token_index>
136	+ <!-- EOF My Applications-->
137	+ </layout>

app/design/frontend/base/default/layout/page.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->
	@@ -71,6 +71,7 @@ Default layout, loads most of the pages
71	<block type="page/switch" name="store_language" as="store_language" template="page/switch/languages.phtml"/>
72	<block type="core/text_list" name="top.menu" as="topMenu" translate="label">
73	<label>Navigation Bar</label>

74	</block>
75	<block type="page/html_wrapper" name="top.container" as="topContainer" translate="label">
76	<label>Page Header</label>


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->

71	<block type="page/switch" name="store_language" as="store_language" template="page/switch/languages.phtml"/>
72	<block type="core/text_list" name="top.menu" as="topMenu" translate="label">
73	<label>Navigation Bar</label>
74	+ <block type="page/html_topmenu" name="catalog.topnav" template="page/html/topmenu.phtml"/>
75	</block>
76	<block type="page/html_wrapper" name="top.container" as="topContainer" translate="label">
77	<label>Page Header</label>

app/design/frontend/base/default/layout/pagecache.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/payment.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/paypal.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27
	@@ -53,6 +53,9 @@
53	</reference>
54	<reference name="content">
55	<block type="paypal/express_review" name="paypal.express.review" template="paypal/express/review.phtml">



56	<block type="paypal/express_review_details" name="paypal.express.review.details" as="details" template="paypal/express/review/details.phtml">
57	<action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
58	<action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>checkout/onepage/review/item.phtml</template></action>


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

53	</reference>
54	<reference name="content">
55	<block type="paypal/express_review" name="paypal.express.review" template="paypal/express/review.phtml">
56	+ <block type="paypal/express_review_billing" name="express.review.billing" as="billing" template="paypal/express/review/address.phtml"/>
57	+ <block type="paypal/express_review_shipping" name="express.review.shipping" as="shipping" template="paypal/express/review/address.phtml"/>
58	+ <block type="paypal/express_review" name="express.review.shipping.method" as="shipping_method" template="paypal/express/review/shipping/method.phtml"/>
59	<block type="paypal/express_review_details" name="paypal.express.review.details" as="details" template="paypal/express/review/details.phtml">
60	<action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
61	<action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>checkout/onepage/review/item.phtml</template></action>

app/design/frontend/base/default/layout/paypaluk.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27
	@@ -51,7 +51,7 @@
51	<action method="setTemplate"><template>page/1column.phtml</template></action>
52	</reference>
53	<reference name="content">
54	- <block type="paypal/express_review" name="paypal.express.review" template="~~paypal~~/express/review.phtml">
55	<action method="setPaypalActionPrefix"><prefix>paypaluk</prefix></action>
56	<block type="paypal/express_review_details" name="paypal.express.review.details" as="details" template="paypal/express/review/details.phtml">
57	<action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

51	<action method="setTemplate"><template>page/1column.phtml</template></action>
52	</reference>
53	<reference name="content">
54	+ <block type="paypal/express_review" name="paypal.express.review" template="paypaluk/express/review.phtml">
55	<action method="setPaypalActionPrefix"><prefix>paypaluk</prefix></action>
56	<block type="paypal/express_review_details" name="paypal.express.review.details" as="details" template="paypal/express/review/details.phtml">
57	<action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>

app/design/frontend/base/default/layout/persistent.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/poll.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/productalert.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->

app/design/frontend/base/default/layout/reports.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/review.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/rss.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->

app/design/frontend/base/default/layout/sales.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/sales/billing_agreement.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/sales/recurring_profile.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/sendfriend.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27	-->

app/design/frontend/base/default/layout/shipping.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/tag.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/weee.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

app/design/frontend/base/default/layout/wishlist.xml CHANGED Viewed

	@@ -21,7 +21,7 @@
21	*
22	* @category design
23	* @package base_default
24	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27
	@@ -33,15 +33,14 @@ Default layout, loads most of the pages
33	-->
34
35	<default>
36	-
37	<reference name="top.links">
38	- <block type="wishlist/links" name="wishlist_link"/>
39	<action method="addLinkBlock"><blockName>wishlist_link</blockName></action>
40	</reference>
41
42	<!-- Mage_Wishlist -->
43	<reference name="right">
44	- <block type="wishlist/customer_sidebar" name="wishlist_sidebar" as="wishlist" after="cart_sidebar" template="wishlist/sidebar.phtml"/>
45	</reference>
46	</default>
47
	@@ -61,7 +60,6 @@ Customer account home dashboard layout
61	-->
62
63	<customer_account_index>
64	-
65	<reference name="right">
66	<action method="unsetChild"><name>wishlist</name></action>
67	</reference>
	@@ -74,10 +72,32 @@ Wishlist pages
74	<wishlist_index_index translate="label">
75	<label>Customer My Account My Wishlist</label>
76	<!-- Mage_Wishlist -->
77	- <update handle="customer_account"/>
78	<reference name="my.account.wrapper">
79	<block type="wishlist/customer_wishlist" name="customer.wishlist" template="wishlist/view.phtml">
80	- <~~block~~ ~~type~~="~~wishlist/customer_wishlist_item_options~~" ~~name~~="~~customer.wishlist.item.options~~" ~~as="item_options"/>~~






















81	</block>
82	</reference>
83	<reference name="right">
	@@ -88,20 +108,20 @@ Wishlist pages
88	<wishlist_index_share translate="label">
89	<label>Customer My Account Wishlist Sharing Form</label>
90	<!-- Mage_Wishlist -->
91	- <update handle="customer_account"/>
92	<reference name="my.account.wrapper">
93	- <block type="wishlist/customer_sharing" name="wishlist.sharing" template="wishlist/sharing.phtml"/>
94	</reference>
95	<reference name="right">
96	<action method="unsetChild"><name>wishlist_customer_sidebar</name></action>
97	</reference>
98	</wishlist_index_share>
99	-
100	<wishlist_index_configure translate="label">
101	<label>Configure Wishlist Item</label>
102	- <update handle="catalog_product_view"/>
103	<reference name="product.info">
104	- <block type="wishlist/item_configure" name="product.info.addto" as="addto" template="wishlist/item/configure/addto.phtml"/>
105	</reference>
106	<reference name="product.info.options.wrapper.bottom">
107	<action method="unsetChild"><name>product.info.addto</name></action>
	@@ -113,7 +133,7 @@ Wishlist pages
113	<label>Customer Shared Wishlist View</label>
114	<!-- Mage_Wishlist -->
115	<reference name="content">
116	- <block type="wishlist/share_wishlist" name="customer.wishlist" template="wishlist/shared.phtml"/>
117	</reference>
118	</wishlist_shared_index>
119	</layout>


21	*
22	* @category design
23	* @package base_default
24	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
25	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26	*/
27

33	-->
34
35	<default>

36	<reference name="top.links">
37	+ <block type="wishlist/links" name="wishlist_link" />
38	<action method="addLinkBlock"><blockName>wishlist_link</blockName></action>
39	</reference>
40
41	<!-- Mage_Wishlist -->
42	<reference name="right">
43	+ <block type="wishlist/customer_sidebar" name="wishlist_sidebar" as="wishlist" after="cart_sidebar" template="wishlist/sidebar.phtml" />
44	</reference>
45	</default>
46

60	-->
61
62	<customer_account_index>

63	<reference name="right">
64	<action method="unsetChild"><name>wishlist</name></action>
65	</reference>

72	<wishlist_index_index translate="label">
73	<label>Customer My Account My Wishlist</label>
74	<!-- Mage_Wishlist -->
75	+ <update handle="customer_account" />
76	<reference name="my.account.wrapper">
77	<block type="wishlist/customer_wishlist" name="customer.wishlist" template="wishlist/view.phtml">
78	+ <action method="setTitle" translate="title">
79	+ <title>My Wishlist</title>
80	+ </action>
81	+ <block type="wishlist/customer_wishlist_items" name="customer.wishlist.items" as="items" template="wishlist/item/list.phtml">
82	+ <block type="wishlist/customer_wishlist_item_column_image" name="customer.wishlist.item.image" template="wishlist/item/column/image.phtml" />
83	+ <block type="wishlist/customer_wishlist_item_column_comment" name="customer.wishlist.item.info" template="wishlist/item/column/info.phtml">
84	+ <action method="setTitle" translate="title">
85	+ <title>Product Details and Comment</title>
86	+ </action>
87	+ </block>
88	+ <block type="wishlist/customer_wishlist_item_column_cart" name="customer.wishlist.item.cart" template="wishlist/item/column/cart.phtml">
89	+ <action method="setTitle" translate="title">
90	+ <title>Add to Cart</title>
91	+ </action>
92	+ <block type="wishlist/customer_wishlist_item_options" name="customer.wishlist.item.options" />
93	+ </block>
94	+ <block type="wishlist/customer_wishlist_item_column_remove" name="customer.wishlist.item.remove" template="wishlist/item/column/remove.phtml" />
95	+ </block>
96	+ <block type="core/text_list" name="customer.wishlist.buttons" as="control_buttons">
97	+ <block type="wishlist/customer_wishlist_button" name="customer.wishlist.button.share" template="wishlist/button/share.phtml" />
98	+ <block type="wishlist/customer_wishlist_button" name="customer.wishlist.button.toCart" template="wishlist/button/tocart.phtml" />
99	+ <block type="wishlist/customer_wishlist_button" name="customer.wishlist.button.update" template="wishlist/button/update.phtml" />
100	+ </block>
101	</block>
102	</reference>
103	<reference name="right">

108	<wishlist_index_share translate="label">
109	<label>Customer My Account Wishlist Sharing Form</label>
110	<!-- Mage_Wishlist -->
111	+ <update handle="customer_account" />
112	<reference name="my.account.wrapper">
113	+ <block type="wishlist/customer_sharing" name="wishlist.sharing" template="wishlist/sharing.phtml" />
114	</reference>
115	<reference name="right">
116	<action method="unsetChild"><name>wishlist_customer_sidebar</name></action>
117	</reference>
118	</wishlist_index_share>
119	+
120	<wishlist_index_configure translate="label">
121	<label>Configure Wishlist Item</label>
122	+ <update handle="catalog_product_view" />
123	<reference name="product.info">
124	+ <block type="wishlist/item_configure" name="product.info.addto" as="addto" template="wishlist/item/configure/addto.phtml" />
125	</reference>
126	<reference name="product.info.options.wrapper.bottom">
127	<action method="unsetChild"><name>product.info.addto</name></action>

133	<label>Customer Shared Wishlist View</label>
134	<!-- Mage_Wishlist -->
135	<reference name="content">
136	+ <block type="wishlist/share_wishlist" name="customer.wishlist" template="wishlist/shared.phtml" />
137	</reference>
138	</wishlist_shared_index>
139	</layout>

app/design/frontend/base/default/template/authorizenet/directpost/form.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26

app/design/frontend/base/default/template/authorizenet/directpost/iframe.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26

app/design/frontend/base/default/template/authorizenet/directpost/info.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26

app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>

app/design/frontend/base/default/template/bundle/catalog/product/price.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
	@@ -35,12 +35,17 @@
35	<?php
36	if ($_product->getPriceType() == 1) {
37	$_weeeTaxAmount = Mage::helper('weee')->getAmount($_product);





38	if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
39	$_minimalPriceTax += $_weeeTaxAmount;
40	- $_minimalPriceInclTax += $~~_weeeTaxAmount~~;
41	}
42	if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
43	- $_minimalPriceInclTax += $~~_weeeTaxAmount~~;
44	}
45
46	if (Mage::helper('weee')->typeOfDisplay($_product, array(1, 2, 4))) {
	@@ -153,10 +158,10 @@ if ($_product->getPriceType() == 1) {
153	if ($_product->getPriceType() == 1) {
154	if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
155	$_maximalPriceTax += $_weeeTaxAmount;
156	- $_maximalPriceInclTax += $~~_weeeTaxAmount~~;
157	}
158	if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
159	- $_maximalPriceInclTax += $~~_weeeTaxAmount~~;
160	}
161	}
162	?>


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>

35	<?php
36	if ($_product->getPriceType() == 1) {
37	$_weeeTaxAmount = Mage::helper('weee')->getAmount($_product);
38	+ $_weeeTaxAmountInclTaxes = $_weeeTaxAmount;
39	+ if (Mage::helper('weee')->isTaxable()) {
40	+ $_attributes = Mage::helper('weee')->getProductWeeeAttributesForRenderer($_product, null, null, null, true);
41	+ $_weeeTaxAmountInclTaxes = Mage::helper('weee')->getAmountInclTaxes($_attributes);
42	+ }
43	if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
44	$_minimalPriceTax += $_weeeTaxAmount;
45	+ $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
46	}
47	if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
48	+ $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
49	}
50
51	if (Mage::helper('weee')->typeOfDisplay($_product, array(1, 2, 4))) {

158	if ($_product->getPriceType() == 1) {
159	if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
160	$_maximalPriceTax += $_weeeTaxAmount;
161	+ $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
162	}
163	if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
164	+ $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
165	}
166	}
167	?>

app/design/frontend/base/default/template/bundle/catalog/product/view/options/notice.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>

app/design/frontend/base/default/template/bundle/catalog/product/view/price.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>

app/design/frontend/base/default/template/bundle/catalog/product/view/tierprices.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>

app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26

app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26

app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26

app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26

app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26

app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/options.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>

app/design/frontend/base/default/template/bundle/email/order/items/creditmemo/default.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>

app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>

app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>

app/design/frontend/base/default/template/bundle/email/order/items/shipment/default.phtml CHANGED Viewed

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2011~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


20	*
21

Interface_Frontend_Base_Default - Version 1.7.0.0

Version Notes

Release Info

Code changes from version 1.6.2.0 to 1.7.0.0