Interface_Frontend_Base_Default

Version Notes

1.8.0.0

Release Info

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

Code changes from version 1.7.0.1 to 1.8.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 +1 -1
app/design/frontend/base/default/layout/captcha.xml +1 -1
app/design/frontend/base/default/layout/catalog.xml +1 -1
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 +67 -12
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 +1 -1
app/design/frontend/base/default/layout/directory.xml +1 -1
app/design/frontend/base/default/layout/downloadable.xml +1 -1
app/design/frontend/base/default/layout/googleanalytics.xml +1 -1
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 +1 -1
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 +1 -1
app/design/frontend/base/default/layout/paypaluk.xml +1 -1
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 +1 -1
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 +3 -3
app/design/frontend/base/default/template/bundle/catalog/product/price.phtml +98 -69
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 +7 -5
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml +2 -2
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml +2 -2
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml +13 -4
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml +12 -3
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 +4 -4
app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml +4 -4
app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml +6 -6
app/design/frontend/base/default/template/bundle/email/order/items/shipment/default.phtml +4 -4
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 +7 -7
app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml +7 -7
app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml +7 -7
app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml +7 -7
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 +1 -1
app/design/frontend/base/default/template/catalog/category/page.phtml +1 -1
app/design/frontend/base/default/template/catalog/category/view.phtml +2 -2
app/design/frontend/base/default/template/catalog/category/widget/link/link_block.phtml +2 -2
app/design/frontend/base/default/template/catalog/category/widget/link/link_inline.phtml +2 -2
app/design/frontend/base/default/template/catalog/layer/filter.phtml +1 -1
app/design/frontend/base/default/template/catalog/layer/state.phtml +1 -1
app/design/frontend/base/default/template/catalog/layer/view.phtml +1 -1
app/design/frontend/base/default/template/catalog/msrp/popup.phtml +1 -1
app/design/frontend/base/default/template/catalog/navigation/left.phtml +2 -2
app/design/frontend/base/default/template/catalog/navigation/top.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/compare/list.phtml +4 -4
app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/gallery.phtml +3 -3
app/design/frontend/base/default/template/catalog/product/list.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/list/related.phtml +3 -3
app/design/frontend/base/default/template/catalog/product/list/toolbar.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/list/upsell.phtml +3 -3
app/design/frontend/base/default/template/catalog/product/new.phtml +3 -3
app/design/frontend/base/default/template/catalog/product/price.phtml +60 -31
app/design/frontend/base/default/template/catalog/product/price_msrp.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/price_msrp_item.phtml +2 -1
app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/price_msrp_rss.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view.phtml +2 -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 +1 -1
app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/attributes.phtml +2 -2
app/design/frontend/base/default/template/catalog/product/view/description.phtml +1 -1
app/design/frontend/base/default/template/catalog/product/view/media.phtml +4 -4
app/design/frontend/base/default/template/catalog/product/view/options.phtml +1 -1
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 +2 -2
app/design/frontend/base/default/template/catalog/product/view/options/type/default.phtml +2 -2
app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml +2 -2
app/design/frontend/base/default/template/catalog/product/view/options/type/select.phtml +2 -2
app/design/frontend/base/default/template/catalog/product/view/options/type/text.phtml +2 -2
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 +2 -2
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 +7 -5
app/design/frontend/base/default/template/catalog/product/view/type/grouped.phtml +8 -6
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 +2 -2
app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml +2 -2
app/design/frontend/base/default/template/catalog/product/widget/new/column/new_default_list.phtml +2 -1
app/design/frontend/base/default/template/catalog/product/widget/new/column/new_images_list.phtml +2 -1
app/design/frontend/base/default/template/catalog/product/widget/new/column/new_names_list.phtml +2 -1
app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml +2 -1
app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml +2 -1
app/design/frontend/base/default/template/catalog/rss/product/price.phtml +1 -1
app/design/frontend/base/default/template/catalog/seo/sitemap.phtml +1 -1
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 +1 -1
app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml +2 -2
app/design/frontend/base/default/template/catalogsearch/form.mini.phtml +1 -1
app/design/frontend/base/default/template/catalogsearch/result.phtml +1 -1
app/design/frontend/base/default/template/catalogsearch/term.phtml +2 -2
app/design/frontend/base/default/template/checkout/cart.phtml +1 -1
app/design/frontend/base/default/template/checkout/cart/coupon.phtml +2 -2
app/design/frontend/base/default/template/checkout/cart/crosssell.phtml +3 -3
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 +6 -6
app/design/frontend/base/default/template/checkout/cart/noItems.phtml +1 -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 +2 -2
app/design/frontend/base/default/template/checkout/cart/shipping.phtml +1 -1
app/design/frontend/base/default/template/checkout/cart/sidebar.phtml +1 -1
app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml +5 -5
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 +2 -2
app/design/frontend/base/default/template/checkout/multishipping/agreements.phtml +3 -3
app/design/frontend/base/default/template/checkout/multishipping/billing.phtml +3 -3
app/design/frontend/base/default/template/checkout/multishipping/billing/items.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/item/default.phtml +4 -4
app/design/frontend/base/default/template/checkout/multishipping/link.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/overview.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/overview/item.phtml +1 -1
app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml +2 -2
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 -1
app/design/frontend/base/default/template/checkout/onepage/agreements.phtml +3 -3
app/design/frontend/base/default/template/checkout/onepage/billing.phtml +1 -1
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 +2 -2
app/design/frontend/base/default/template/checkout/onepage/payment.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/payment/info.phtml +29 -0
app/design/frontend/base/default/template/checkout/onepage/payment/methods.phtml +18 -13
app/design/frontend/base/default/template/checkout/onepage/progress.phtml +22 -78
app/design/frontend/base/default/template/checkout/onepage/progress/billing.phtml +40 -0
app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml +41 -0
app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml +44 -0
app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml +57 -0
app/design/frontend/base/default/template/checkout/onepage/review.phtml +2 -2
app/design/frontend/base/default/template/checkout/onepage/review/button.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/review/info.phtml +2 -2
app/design/frontend/base/default/template/checkout/onepage/review/item.phtml +4 -4
app/design/frontend/base/default/template/checkout/onepage/review/totals.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/shipping.phtml +1 -1
app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml +2 -2
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 +1 -1
app/design/frontend/base/default/template/checkout/success.phtml +1 -1
app/design/frontend/base/default/template/checkout/total/default.phtml +3 -3
app/design/frontend/base/default/template/checkout/total/nominal.phtml +1 -1
app/design/frontend/base/default/template/checkout/total/tax.phtml +1 -1
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 +2 -2
app/design/frontend/base/default/template/cms/widget/link/link_inline.phtml +2 -2
app/design/frontend/base/default/template/cms/widget/static_block/default.phtml +1 -1
app/design/frontend/base/default/template/contacts/form.phtml +3 -3
app/design/frontend/base/default/template/core/formkey.phtml +1 -1
app/design/frontend/base/default/template/core/link.phtml +2 -2
app/design/frontend/base/default/template/core/messages.phtml +1 -1
app/design/frontend/base/default/template/customer/account/dashboard.phtml +1 -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 +2 -2
app/design/frontend/base/default/template/customer/account/dashboard/info.phtml +3 -3
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 +1 -1
app/design/frontend/base/default/template/customer/balance.phtml +1 -1
app/design/frontend/base/default/template/customer/form/address.phtml +1 -1
app/design/frontend/base/default/template/customer/form/changepassword.phtml +1 -1
app/design/frontend/base/default/template/customer/form/confirmation.phtml +2 -2
app/design/frontend/base/default/template/customer/form/edit.phtml +6 -3
app/design/frontend/base/default/template/customer/form/forgotpassword.phtml +2 -2
app/design/frontend/base/default/template/customer/form/login.phtml +2 -2
app/design/frontend/base/default/template/customer/form/mini.login.phtml +1 -1
app/design/frontend/base/default/template/customer/form/newsletter.phtml +1 -1
app/design/frontend/base/default/template/customer/form/register.phtml +1 -1
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 +1 -1
app/design/frontend/base/default/template/customer/widget/taxvat.phtml +1 -1
app/design/frontend/base/default/template/customer/wishlist.phtml +2 -2
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 +1 -1
app/design/frontend/base/default/template/downloadable/catalog/product/samples.phtml +1 -1
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 +5 -5
app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml +4 -4
app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml +4 -4
app/design/frontend/base/default/template/downloadable/checkout/success.phtml +1 -1
app/design/frontend/base/default/template/downloadable/customer/products/list.phtml +1 -1
app/design/frontend/base/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml +4 -4
app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.phtml +4 -4
app/design/frontend/base/default/template/downloadable/email/order/items/order/downloadable.phtml +7 -7
app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +7 -7
app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +7 -7
app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml +7 -7
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 +4 -4
app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml +4 -4
app/design/frontend/base/default/template/email/order/items/invoice/default.phtml +4 -4
app/design/frontend/base/default/template/email/order/items/order/default.phtml +7 -7
app/design/frontend/base/default/template/email/order/items/shipment/default.phtml +4 -4
app/design/frontend/base/default/template/email/order/shipment/items.phtml +1 -1
app/design/frontend/base/default/template/email/order/shipment/track.phtml +3 -3
app/design/frontend/base/default/template/email/productalert/price.phtml +4 -4
app/design/frontend/base/default/template/email/productalert/stock.phtml +4 -4
app/design/frontend/base/default/template/giftmessage/inline.phtml +5 -5
app/design/frontend/base/default/template/googleanalytics/ga.phtml +1 -1
app/design/frontend/base/default/template/googlecheckout/form.phtml +1 -1
app/design/frontend/base/default/template/googlecheckout/link.phtml +3 -3
app/design/frontend/base/default/template/newsletter/subscribe.phtml +1 -1
app/design/frontend/base/default/template/oauth/authorize/button-simple.phtml +1 -1
app/design/frontend/base/default/template/oauth/authorize/button.phtml +1 -1
app/design/frontend/base/default/template/oauth/authorize/confirm-simple.phtml +1 -1
app/design/frontend/base/default/template/oauth/authorize/confirm.phtml +1 -1
app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml +1 -1
app/design/frontend/base/default/template/oauth/authorize/form/login.phtml +1 -1
app/design/frontend/base/default/template/oauth/authorize/head-simple.phtml +1 -1
app/design/frontend/base/default/template/oauth/authorize/reject-simple.phtml +1 -1
app/design/frontend/base/default/template/oauth/authorize/reject.phtml +1 -1
app/design/frontend/base/default/template/oauth/customer/token/list.phtml +1 -1
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 +4 -4
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 +2 -2
app/design/frontend/base/default/template/page/html/notices.phtml +1 -1
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 +1 -1
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 +2 -2
app/design/frontend/base/default/template/page/redirect.phtml +1 -1
app/design/frontend/base/default/template/page/switch/flags.phtml +2 -2
app/design/frontend/base/default/template/page/switch/languages.phtml +2 -2
app/design/frontend/base/default/template/page/switch/stores.phtml +3 -3
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 +2 -2
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 +1 -1
app/design/frontend/base/default/template/payment/form/cashondelivery.phtml +1 -1
app/design/frontend/base/default/template/payment/form/cc.phtml +2 -2
app/design/frontend/base/default/template/payment/form/ccsave.phtml +2 -2
app/design/frontend/base/default/template/payment/form/checkmo.phtml +1 -1
app/design/frontend/base/default/template/payment/form/purchaseorder.phtml +2 -2
app/design/frontend/base/default/template/payment/info/banktransfer.phtml +1 -1
app/design/frontend/base/default/template/payment/info/checkmo.phtml +2 -2
app/design/frontend/base/default/template/payment/info/default.phtml +2 -2
app/design/frontend/base/default/template/payment/info/purchaseorder.phtml +3 -3
app/design/frontend/base/default/template/paypal/express/review.phtml +1 -1
app/design/frontend/base/default/template/paypal/express/review/address.phtml +1 -1
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 +1 -1
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 +1 -1
app/design/frontend/base/default/template/paypal/hss/redirect.phtml +1 -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 +1 -1
app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml +1 -1
app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml +2 -2
app/design/frontend/base/default/template/persistent/customer/form/login.phtml +2 -2
app/design/frontend/base/default/template/persistent/customer/form/register.phtml +1 -1
app/design/frontend/base/default/template/persistent/remember_me.phtml +1 -1
app/design/frontend/base/default/template/persistent/remember_me_tooltip.phtml +1 -1
app/design/frontend/base/default/template/poll/active.phtml +3 -3
app/design/frontend/base/default/template/poll/result.phtml +3 -3
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 +2 -2
app/design/frontend/base/default/template/review/customer/recent.phtml +2 -2
app/design/frontend/base/default/template/review/customer/view.phtml +4 -4
app/design/frontend/base/default/template/review/form.phtml +8 -8
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 +3 -3
app/design/frontend/base/default/template/review/product/view/other.phtml +1 -1
app/design/frontend/base/default/template/review/view.phtml +4 -4
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 +8 -8
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/guest/form.phtml +31 -27
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 +7 -7
app/design/frontend/base/default/template/sales/order/details.phtml +2 -2
app/design/frontend/base/default/template/sales/order/history.phtml +2 -2
app/design/frontend/base/default/template/sales/order/info.phtml +1 -1
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 +7 -7
app/design/frontend/base/default/template/sales/order/items.phtml +3 -3
app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml +6 -6
app/design/frontend/base/default/template/sales/order/print.phtml +1 -1
app/design/frontend/base/default/template/sales/order/print/creditmemo.phtml +1 -1
app/design/frontend/base/default/template/sales/order/print/invoice.phtml +1 -1
app/design/frontend/base/default/template/sales/order/print/shipment.phtml +1 -1
app/design/frontend/base/default/template/sales/order/recent.phtml +2 -2
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 +7 -7
app/design/frontend/base/default/template/sales/order/totals.phtml +1 -1
app/design/frontend/base/default/template/sales/order/trackinginfo.phtml +1 -1
app/design/frontend/base/default/template/sales/order/view.phtml +3 -3
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 +3 -2
app/design/frontend/base/default/template/sales/widget/guest/form.phtml +4 -2
app/design/frontend/base/default/template/sendfriend/send.phtml +7 -7
app/design/frontend/base/default/template/shipping/tracking/ajax.phtml +1 -1
app/design/frontend/base/default/template/shipping/tracking/popup.phtml +1 -1
app/design/frontend/base/default/template/tag/cloud.phtml +2 -2
app/design/frontend/base/default/template/tag/customer/recent.phtml +3 -3
app/design/frontend/base/default/template/tag/customer/tags.phtml +2 -2
app/design/frontend/base/default/template/tag/customer/view.phtml +9 -7
app/design/frontend/base/default/template/tag/list.phtml +1 -1
app/design/frontend/base/default/template/tag/popular.phtml +2 -2
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 +1 -1
app/design/frontend/base/default/template/tax/checkout/subtotal.phtml +1 -1
app/design/frontend/base/default/template/tax/checkout/tax.phtml +13 -1
app/design/frontend/base/default/template/tax/order/tax.phtml +1 -1
app/design/frontend/base/default/template/wishlist/button/share.phtml +1 -1
app/design/frontend/base/default/template/wishlist/button/tocart.phtml +1 -1
app/design/frontend/base/default/template/wishlist/button/update.phtml +1 -1
app/design/frontend/base/default/template/wishlist/email/items.phtml +1 -1
app/design/frontend/base/default/template/wishlist/email/rss.phtml +1 -1
app/design/frontend/base/default/template/wishlist/item/column/cart.phtml +5 -2
app/design/frontend/base/default/template/wishlist/item/column/image.phtml +1 -1
app/design/frontend/base/default/template/wishlist/item/column/info.phtml +2 -2
app/design/frontend/base/default/template/wishlist/item/column/remove.phtml +1 -1
app/design/frontend/base/default/template/wishlist/item/configure/addto.phtml +1 -1
app/design/frontend/base/default/template/wishlist/item/list.phtml +1 -1
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 +1 -1
app/design/frontend/base/default/template/wishlist/render/item/price_msrp_rss.phtml +1 -1
app/design/frontend/base/default/template/wishlist/shared.phtml +2 -2
app/design/frontend/base/default/template/wishlist/sharing.phtml +1 -1
app/design/frontend/base/default/template/wishlist/sidebar.phtml +1 -1
app/design/frontend/base/default/template/wishlist/view.phtml +1 -1
package.xml +6 -6
skin/frontend/base/default/css/widgets.css +1 -1
skin/frontend/base/default/js/bundle.js +14 -3
skin/frontend/base/default/js/checkout/review.js +1 -1
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 +4 -3
skin/frontend/base/default/js/opcheckout.js +94 -35
skin/frontend/base/default/lib/prototype/windows/themes/magento.css +1 -1

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) ~~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	-->


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

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) ~~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


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

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) ~~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


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

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

	@@ -21,7 +21,7 @@
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


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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

@@ -21,7 +21,7 @@
+             *
              * @category    design
              * @package     base_default
-            -
             * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
              * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
              */
@@ -310,7 +310,12 @@ One page checkout main layout
                         <block type="page/html_wrapper" name="checkout.progress.wrapper" translate="label">
                             <label>Checkout Progress Wrapper</label>
                             <action method="setElementId"><value>checkout-progress-wrapper</value></action>
-            -
                            <block type="checkout/onepage_progress" name="checkout.progress" before="-" template="checkout/onepage/progress.phtml"/>
                         </block>
                     </reference>
                     <reference name="content">
@@ -328,7 +333,7 @@ One page checkout main layout
                                 <block type="checkout/onepage_shipping_method_additional" name="checkout.onepage.shipping_method.additional" as="additional" template="checkout/onepage/shipping_method/additional.phtml"/>
                             </block>
                             <block type="checkout/onepage_payment" name="checkout.onepage.payment" as="payment" template="checkout/onepage/payment.phtml">
-            -
                                <block type="checkout/onepage_payment_methods" name="checkout.payment.methods" as="methods" template="checkout/onepage/payment/methods.phtml">
                                     <action method="setMethodFormTemplate"><method>purchaseorder</method><template>payment/form/purchaseorder.phtml</template></action>
                                 </block>
                             </block>
@@ -337,9 +342,9 @@ One page checkout main layout
                     </reference>
                 </checkout_onepage_index>
-            -
            <!--
-            -
            One page checkout progress block
-            -
            -->
                 <checkout_onepage_progress>
                     <!-- Mage_Checkout -->
@@ -347,15 +352,65 @@ One page checkout progress block
                     <remove name="left"/>
                     <block type="checkout/onepage_progress" name="root" output="toHtml" template="checkout/onepage/progress.phtml">
-            -
                        <block type="checkout/onepage_payment_info" name="payment_info">
-            -
                            <action method="setInfoTemplate"><method></method><template></template></action>
-            -
                        </block>
                     </block>
                 </checkout_onepage_progress>
-            -
            <!--
-            -
            One page checkout payment methods block
-            -
            -->
                 <checkout_onepage_paymentmethod>
                     <remove name="right"/>
                     <remove name="left"/>


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

310	<block type="page/html_wrapper" name="checkout.progress.wrapper" translate="label">
311	<label>Checkout Progress Wrapper</label>
312	<action method="setElementId"><value>checkout-progress-wrapper</value></action>
313	+ <block type="checkout/onepage_progress" name="checkout.progress" before="-" template="checkout/onepage/progress.phtml">
314	+ <block type="checkout/onepage_progress" name="billing.progress" template="checkout/onepage/progress/billing.phtml"></block>
315	+ <block type="checkout/onepage_progress" name="shipping.progress" template="checkout/onepage/progress/shipping.phtml"></block>
316	+ <block type="checkout/onepage_progress" name="shippingmethod.progress" template="checkout/onepage/progress/shipping_method.phtml"></block>
317	+ <block type="checkout/onepage_progress" name="payment.progress" template="checkout/onepage/progress/payment.phtml"></block>
318	+ </block>
319	</block>
320	</reference>
321	<reference name="content">

333	<block type="checkout/onepage_shipping_method_additional" name="checkout.onepage.shipping_method.additional" as="additional" template="checkout/onepage/shipping_method/additional.phtml"/>
334	</block>
335	<block type="checkout/onepage_payment" name="checkout.onepage.payment" as="payment" template="checkout/onepage/payment.phtml">
336	+ <block type="checkout/onepage_payment_methods" name="checkout.payment.methods" as="methods" template="checkout/onepage/payment/info.phtml">
337	<action method="setMethodFormTemplate"><method>purchaseorder</method><template>payment/form/purchaseorder.phtml</template></action>
338	</block>
339	</block>

342	</reference>
343	</checkout_onepage_index>
344
345	+ <!--
346	+ One page checkout progress block
347	+ -->
348
349	<checkout_onepage_progress>
350	<!-- Mage_Checkout -->

352	<remove name="left"/>
353
354	<block type="checkout/onepage_progress" name="root" output="toHtml" template="checkout/onepage/progress.phtml">
355	+ <action method="setInfoTemplate"><method></method><template></template></action>
356	+ <block type="checkout/onepage_progress" name="billing.progress" template="checkout/onepage/progress/billing.phtml"></block>
357	+ <block type="checkout/onepage_progress" name="shipping.progress" template="checkout/onepage/progress/shipping.phtml"></block>
358	+ <block type="checkout/onepage_progress" name="shippingmethod.progress" template="checkout/onepage/progress/shipping_method.phtml"></block>
359	+ <block type="checkout/onepage_progress" name="payment.progress" template="checkout/onepage/progress/payment.phtml"></block>
360	</block>
361	</checkout_onepage_progress>
362
363	+ <!-- Individual blocks for Progress steps begins -->
364	+ <checkout_onepage_progress_billing>
365	+ <!-- Mage_Checkout -->
366	+ <remove name="right"/>
367	+ <remove name="left"/>
368	+
369	+ <block type="checkout/onepage_progress" name="root" output="toHtml" template="checkout/onepage/progress/billing.phtml">
370	+ <action method="setInfoTemplate"><method></method><template></template></action>
371	+ </block>
372	+ </checkout_onepage_progress_billing>
373	+
374	+
375	+ <checkout_onepage_progress_shipping>
376	+ <!-- Mage_Checkout -->
377	+ <remove name="right"/>
378	+ <remove name="left"/>
379	+
380	+ <block type="checkout/onepage_progress" name="root" output="toHtml" template="checkout/onepage/progress/shipping.phtml">
381	+ <action method="setInfoTemplate"><method></method><template></template></action>
382	+ </block>
383	+ </checkout_onepage_progress_shipping>
384	+
385	+
386	+ <checkout_onepage_progress_shipping_method>
387	+ <!-- Mage_Checkout -->
388	+ <remove name="right"/>
389	+ <remove name="left"/>
390	+
391	+ <block type="checkout/onepage_progress" name="root" output="toHtml" template="checkout/onepage/progress/shipping_method.phtml">
392	+ <action method="setInfoTemplate"><method></method><template></template></action>
393	+ </block>
394	+ </checkout_onepage_progress_shipping_method>
395	+
396	+ <checkout_onepage_progress_payment>
397	+ <!-- Mage_Checkout -->
398	+ <remove name="right"/>
399	+ <remove name="left"/>
400	+
401	+ <block type="checkout/onepage_progress" name="root" output="toHtml" template="checkout/onepage/progress/payment.phtml">
402	+ <block type="checkout/onepage_payment_info" name="payment_info">
403	+ <action method="setInfoTemplate"><method></method><template></template></action>
404	+ </block>
405	+ <action method="setInfoTemplate"><method></method><template></template></action>
406	+ </block>
407	+ </checkout_onepage_progress_payment>
408	+
409	+ <!-- end individual progress blocks -->
410	+
411	+ <!--
412	+ One page checkout payment methods block
413	+ -->
414	<checkout_onepage_paymentmethod>
415	<remove name="right"/>
416	<remove name="left"/>

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) ~~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	-->


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

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) ~~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	-->


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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

	@@ -21,7 +21,7 @@
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	-->


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

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) ~~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	-->
	@@ -77,6 +77,7 @@ Default layout, loads most of the pages
77	<label>Page Header</label>
78	<action method="setElementClass"><value>top-container</value></action>
79	</block>

80	</block>
81
82	<block type="page/html_breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>


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

77	<label>Page Header</label>
78	<action method="setElementClass"><value>top-container</value></action>
79	</block>
80	+ <block type="page/html_welcome" name="welcome" as="welcome"/>
81	</block>
82
83	<block type="page/html_breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~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	-->


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

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) ~~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


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

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) ~~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


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

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) ~~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	-->


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~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	-->


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~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


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

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26


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

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26


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

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26


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

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) ~~2012~~ 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,8 +35,8 @@
35	<?php for($_j=0;$_j<$this->getColumnCount();$_j++): ?>
36	<?php if($_bundle=$this->getIterableItem()): ?>
37	<td>
38	- <a href="<?php echo $_bundle->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($_bundle->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_bundle, 'small_image')->resize(125) ?>" width="125" height="125" alt="<?php echo $this->~~htmlEscape~~($_bundle->getName()) ?>" /></a>
39	- <h3 class="product-name"><a href="<?php echo $_bundle->getProductUrl() ?>"><?php echo $this->~~htmlEscape~~($_bundle->getName()) ?></a></h3>
40	<?php echo $this->getPriceHtml($_bundle, true) ?>
41	<?php echo $this->getReviewsSummaryHtml($_bundle) ?>
42	</td>


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

35	<?php for($_j=0;$_j<$this->getColumnCount();$_j++): ?>
36	<?php if($_bundle=$this->getIterableItem()): ?>
37	<td>
38	+ <a href="<?php echo $_bundle->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_bundle->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_bundle, 'small_image')->resize(125) ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($_bundle->getName()) ?>" /></a>
39	+ <h3 class="product-name"><a href="<?php echo $_bundle->getProductUrl() ?>"><?php echo $this->escapeHtml($_bundle->getName()) ?></a></h3>
40	<?php echo $this->getPriceHtml($_bundle, true) ?>
41	<?php echo $this->getReviewsSummaryHtml($_bundle) ?>
42	</td>

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

	@@ -20,36 +20,53 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	- <?php ~~$_product = $this->getProduct() ?>~~
28	- ~~<?php $_priceModel = $_product->getPriceModel() ?>~~
29	- ~~<?php~~ ~~list($_minimalPriceTax,~~ ~~$_maximalPriceTax)~~ = $~~_priceModel->getTotalPrices($_product,~~ ~~null, null, false) ?>~~
30	- ~~<?php~~ ~~list($_minimalPriceInclTax, $_maximalPriceInclTax) = $_priceModel->getTotalPrices($_product, null, true, false) ?>~~
31	- ~~<?php $_id = $_product->getId() ?>~~














32
33	- ~~<?php~~ $~~_weeeTaxAmount~~ = 0; ?>

34


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))) {
52	- $_weeeTaxAttributes = ~~Mage::helper('weee')~~->getProductWeeeAttributesForDisplay($_product);
53	}
54	}
55	?>
	@@ -60,47 +77,51 @@ if ($_product->getPriceType() == 1) {
60	<span class="price-label"><?php echo $this->__('As low as') ?>:</span>
61	<?php if ($this->displayBothPrices()): ?>
62	<span class="price-excluding-tax">
63	- <span class="label"><?php echo ~~Mage::helper('tax')~~->__('Excl. Tax:') ?></span>
64	- <?php echo ~~Mage::helper('core')~~->currency($_minimalPriceTax) ?>
65	</span>
66	- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && ~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 1, 4))): ?>
67	<span class="weee">(<small>
68	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
69	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 4))): ?>
70	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
71	<?php else: ?>
72	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
73	<?php endif; ?>
74
75	<?php echo $_weeeSeparator; ?>
76	- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo ~~Mage::helper('core')~~->currency($amount, true, true); ?>
77	<?php $_weeeSeparator = ' + '; ?>
78	<?php endforeach; ?>
79	</small>)</span>
80	<?php endif; ?>
81	<span class="price-including-tax">
82	- <span class="label"><?php echo ~~Mage::helper('tax')~~->__('Incl. Tax:') ?></span>
83	- <?php echo ~~Mage::helper('core')~~->currency($_minimalPriceInclTax) ?>
84	</span>
85	<?php else: ?>
86	- <?php ~~echo~~ ~~Mage::helper~~(~~'core')~~->~~currency~~(~~$_minimalPriceTax~~) ?>
87	- <?php if ($~~_weeeTaxAmount && $_product~~->~~getPriceType~~(~~) == 1 && Mage::helper('weee')->typeOfDisplay(~~$~~_product, array(2, 1, 4~~)~~)):~~ ?>




88	<span class="weee">(<small>
89	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
90	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 4))): ?>
91	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
92	<?php else: ?>
93	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
94	<?php endif; ?>
95
96	<?php echo $_weeeSeparator; ?>
97	- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo ~~Mage::helper('core')~~->currency($amount, true, true); ?>
98	<?php $_weeeSeparator = ' + '; ?>
99	<?php endforeach; ?>
100	</small>)</span>
101	<?php endif; ?>
102	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
103	- <?php echo ~~Mage::helper('core')~~->currency($_minimalPriceInclTax) ?>
104	<?php endif; ?>
105	<?php endif; ?>
106	</p>
	@@ -110,57 +131,61 @@ if ($_product->getPriceType() == 1) {
110	<span class="price-label"><?php echo $this->__('From') ?>:</span>
111	<?php if ($this->displayBothPrices()): ?>
112	<span class="price-excluding-tax">
113	- <span class="label"><?php echo ~~Mage::helper('tax')~~->__('Excl. Tax:') ?></span>
114	- <?php echo ~~Mage::helper('core')~~->currency($_minimalPriceTax) ?>
115	</span>
116	- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && ~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 1, 4))): ?>
117	<span class="weee">(<small>
118	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
119	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 4))): ?>
120	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
121	<?php else: ?>
122	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
123	<?php endif; ?>
124
125	<?php echo $_weeeSeparator; ?>
126	- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo ~~Mage::helper('core')~~->currency($amount, true, true); ?>
127	<?php $_weeeSeparator = ' + '; ?>
128	<?php endforeach; ?>
129	</small>)</span>
130	<?php endif; ?>
131	<span class="price-including-tax">
132	- <span class="label"><?php echo ~~Mage::helper('tax')~~->__('Incl. Tax:') ?></span>
133	- <?php echo ~~Mage::helper('core')~~->currency($_minimalPriceInclTax) ?>
134	</span>
135	<?php else: ?>
136	- <?php ~~echo~~ ~~Mage::helper~~(~~'core')~~->~~currency~~(~~$_minimalPriceTax~~) ?>
137	- <?php if ($~~_weeeTaxAmount && $_product~~->~~getPriceType~~(~~) == 1 && Mage::helper('weee')->typeOfDisplay(~~$~~_product, array(2, 1, 4~~)~~)):~~ ?>




138	<span class="weee">(<small>
139	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
140	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 4))): ?>
141	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
142	<?php else: ?>
143	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
144	<?php endif; ?>
145
146	<?php echo $_weeeSeparator; ?>
147	- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo ~~Mage::helper('core')~~->currency($amount, true, true); ?>
148	<?php $_weeeSeparator = ' + '; ?>
149	<?php endforeach; ?>
150	</small>)</span>
151	<?php endif; ?>
152	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
153	- <?php echo ~~Mage::helper('core')~~->currency($_minimalPriceInclTax) ?>
154	<?php endif; ?>
155	<?php endif; ?>
156	</p>
157	<?php
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	}
	@@ -169,94 +194,98 @@ if ($_product->getPriceType() == 1) {
169	<span class="price-label"><?php echo $this->__('To') ?>:</span>
170	<?php if ($this->displayBothPrices()): ?>
171	<span class="price-excluding-tax">
172	- <span class="label"><?php echo ~~Mage::helper('tax')~~->__('Excl. Tax:') ?></span>
173	- <?php echo ~~Mage::helper('core')~~->currency($_maximalPriceTax) ?>
174	</span>
175	- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && ~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 1, 4))): ?>
176	<span class="weee">(<small>
177	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
178	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 4))): ?>
179	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
180	<?php else: ?>
181	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
182	<?php endif; ?>
183
184	<?php echo $_weeeSeparator; ?>
185	- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo ~~Mage::helper('core')~~->currency($amount, true, true); ?>
186	<?php $_weeeSeparator = ' + '; ?>
187	<?php endforeach; ?>
188	</small>)</span>
189	<?php endif; ?>
190	<span class="price-including-tax">
191	- <span class="label"><?php echo ~~Mage::helper('tax')~~->__('Incl. Tax') ?></span>
192	- <?php echo ~~Mage::helper('core')~~->currency($_maximalPriceInclTax) ?>
193	</span>
194	<?php else: ?>
195	- <?php ~~echo~~ ~~Mage::helper~~(~~'core')~~->~~currency~~(~~$_maximalPriceTax~~) ?>
196	- <?php if ($~~_weeeTaxAmount && $_product~~->~~getPriceType~~(~~) == 1 && Mage::helper('weee')->typeOfDisplay(~~$~~_product, array(2, 1, 4~~)~~)):~~ ?>




197	<span class="weee">(<small>
198	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
199	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 4))): ?>
200	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
201	<?php else: ?>
202	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
203	<?php endif; ?>
204
205	<?php echo $_weeeSeparator; ?>
206	- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo ~~Mage::helper('core')~~->currency($amount, true, true); ?>
207	<?php $_weeeSeparator = ' + '; ?>
208	<?php endforeach; ?>
209	</small>)</span>
210	<?php endif; ?>
211	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
212	- <?php echo ~~Mage::helper('core')~~->currency($_maximalPriceInclTax) ?>
213	<?php endif; ?>
214	<?php endif; ?>
215	</p>
216	<?php else: ?>
217	<?php if ($this->displayBothPrices()): ?>
218	<span class="price-excluding-tax">
219	- <span class="label"><?php echo ~~Mage::helper('tax')~~->__('Excl. Tax:') ?></span>
220	- <?php echo ~~Mage::helper('core')~~->currency($_minimalPriceTax) ?>
221	</span>
222	- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && ~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 1, 4))): ?>
223	<span class="weee">(<small>
224	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
225	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 4))): ?>
226	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
227	<?php else: ?>
228	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
229	<?php endif; ?>
230
231	<?php echo $_weeeSeparator; ?>
232	- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo ~~Mage::helper('core')~~->currency($amount, true, true); ?>
233	<?php $_weeeSeparator = ' + '; ?>
234	<?php endforeach; ?>
235	</small>)</span>
236	<?php endif; ?>
237	<span class="price-including-tax">
238	- <span class="label"><?php echo ~~Mage::helper('tax')~~->__('Incl. Tax:') ?></span>
239	- <?php echo ~~Mage::helper('core')~~->currency($_minimalPriceInclTax) ?>
240	</span>
241	<?php else: ?>
242	- <?php echo ~~Mage::helper('core')~~->currency($_minimalPriceTax) ?>
243	- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && ~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 1, 4))): ?>
244	<span class="weee">(<small>
245	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
246	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, array(2, 4))): ?>
247	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
248	<?php else: ?>
249	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
250	<?php endif; ?>
251
252	<?php echo $_weeeSeparator; ?>
253	- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo ~~Mage::helper('core')~~->currency($amount, true, true); ?>
254	<?php $_weeeSeparator = ' + '; ?>
255	<?php endforeach; ?>
256	</small>)</span>
257	<?php endif; ?>
258	- <?php if (~~Mage::helper('weee')~~->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
259	- <?php echo ~~Mage::helper('core')~~->currency($_minimalPriceInclTax) ?>
260	<?php endif; ?>
261	<?php endif; ?>
262	<?php endif; ?>


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	+ <?php
28	+ /**
29	+ * @var $this Mage_Bundle_Block_Catalog_Product_Price
30	+ */
31	+ /**
32	+ * @var $_coreHelper Mage_Core_Helper_Data
33	+ * @var $_weeeHelper Mage_Weee_Helper_Data
34	+ * @var $_taxHelper Mage_Tax_Helper_Data
35	+ */
36	+ $_coreHelper = $this->helper('core');
37	+ $_weeeHelper = $this->helper('weee');
38	+ $_taxHelper = $this->helper('tax');
39	+
40	+ /**
41	+ * @var $_product Mage_Catalog_Model_Product
42	+ * @var $_priceModel Mage_Bundle_Model_Product_Price
43	+ */
44	+ $_product = $this->getProduct();
45	+ $_priceModel = $_product->getPriceModel();
46
47	+ list($_minimalPriceTax, $_maximalPriceTax) = $_priceModel->getTotalPrices($_product, null, null, false);
48	+ list($_minimalPriceInclTax, $_maximalPriceInclTax) = $_priceModel->getTotalPrices($_product, null, true, false);
49
50	+ $_weeeTaxAmount = 0;
51	+ ?>
52	<?php
53	if ($_product->getPriceType() == 1) {
54	+ $_weeeTaxAmount = $_weeeHelper->getAmount($_product);
55	$_weeeTaxAmountInclTaxes = $_weeeTaxAmount;
56	+ if ($_weeeHelper->isTaxable()) {
57	+ $_attributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true);
58	+ $_weeeTaxAmountInclTaxes = $_weeeHelper->getAmountInclTaxes($_attributes);
59	}
60	+ if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))) {
61	$_minimalPriceTax += $_weeeTaxAmount;
62	$_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
63	}
64	+ if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)) {
65	$_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
66	}
67
68	+ if ($_weeeHelper->typeOfDisplay($_product, array(1, 2, 4))) {
69	+ $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForDisplay($_product);
70	}
71	}
72	?>

77	<span class="price-label"><?php echo $this->__('As low as') ?>:</span>
78	<?php if ($this->displayBothPrices()): ?>
79	<span class="price-excluding-tax">
80	+ <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
81	+ <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
82	</span>
83	+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
84	<span class="weee">(<small>
85	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
86	+ <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
87	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
88	<?php else: ?>
89	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
90	<?php endif; ?>
91
92	<?php echo $_weeeSeparator; ?>
93	+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
94	<?php $_weeeSeparator = ' + '; ?>
95	<?php endforeach; ?>
96	</small>)</span>
97	<?php endif; ?>
98	<span class="price-including-tax">
99	+ <span class="label"><?php echo $_taxHelper->__('Incl. Tax:') ?></span>
100	+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
101	</span>
102	<?php else: ?>
103	+ <?php if ($_taxHelper->displayPriceIncludingTax()): ?>
104	+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
105	+ <?php else: ?>
106	+ <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
107	+ <?php endif; ?>
108	+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
109	<span class="weee">(<small>
110	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
111	+ <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
112	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
113	<?php else: ?>
114	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
115	<?php endif; ?>
116
117	<?php echo $_weeeSeparator; ?>
118	+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
119	<?php $_weeeSeparator = ' + '; ?>
120	<?php endforeach; ?>
121	</small>)</span>
122	<?php endif; ?>
123	+ <?php if ($_weeeHelper->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
124	+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
125	<?php endif; ?>
126	<?php endif; ?>
127	</p>

131	<span class="price-label"><?php echo $this->__('From') ?>:</span>
132	<?php if ($this->displayBothPrices()): ?>
133	<span class="price-excluding-tax">
134	+ <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
135	+ <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
136	</span>
137	+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
138	<span class="weee">(<small>
139	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
140	+ <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
141	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
142	<?php else: ?>
143	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
144	<?php endif; ?>
145
146	<?php echo $_weeeSeparator; ?>
147	+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
148	<?php $_weeeSeparator = ' + '; ?>
149	<?php endforeach; ?>
150	</small>)</span>
151	<?php endif; ?>
152	<span class="price-including-tax">
153	+ <span class="label"><?php echo $_taxHelper->__('Incl. Tax:') ?></span>
154	+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
155	</span>
156	<?php else: ?>
157	+ <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
158	+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
159	+ <?php else: ?>
160	+ <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
161	+ <?php endif; ?>
162	+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
163	<span class="weee">(<small>
164	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
165	+ <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
166	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
167	<?php else: ?>
168	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
169	<?php endif; ?>
170
171	<?php echo $_weeeSeparator; ?>
172	+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
173	<?php $_weeeSeparator = ' + '; ?>
174	<?php endforeach; ?>
175	</small>)</span>
176	<?php endif; ?>
177	+ <?php if ($_weeeHelper->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
178	+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
179	<?php endif; ?>
180	<?php endif; ?>
181	</p>
182	<?php
183	if ($_product->getPriceType() == 1) {
184	+ if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))) {
185	$_maximalPriceTax += $_weeeTaxAmount;
186	$_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
187	}
188	+ if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)) {
189	$_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
190	}
191	}

194	<span class="price-label"><?php echo $this->__('To') ?>:</span>
195	<?php if ($this->displayBothPrices()): ?>
196	<span class="price-excluding-tax">
197	+ <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
198	+ <?php echo $_coreHelper->currency($_maximalPriceTax) ?>
199	</span>
200	+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
201	<span class="weee">(<small>
202	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
203	+ <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
204	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
205	<?php else: ?>
206	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
207	<?php endif; ?>
208
209	<?php echo $_weeeSeparator; ?>
210	+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
211	<?php $_weeeSeparator = ' + '; ?>
212	<?php endforeach; ?>
213	</small>)</span>
214	<?php endif; ?>
215	<span class="price-including-tax">
216	+ <span class="label"><?php echo $_taxHelper->__('Incl. Tax') ?></span>
217	+ <?php echo $_coreHelper->currency($_maximalPriceInclTax) ?>
218	</span>
219	<?php else: ?>
220	+ <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
221	+ <?php echo $_coreHelper->currency($_maximalPriceInclTax) ?>
222	+ <?php else: ?>
223	+ <?php echo $_coreHelper->currency($_maximalPriceTax) ?>
224	+ <?php endif; ?>
225	+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
226	<span class="weee">(<small>
227	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
228	+ <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
229	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
230	<?php else: ?>
231	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
232	<?php endif; ?>
233
234	<?php echo $_weeeSeparator; ?>
235	+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
236	<?php $_weeeSeparator = ' + '; ?>
237	<?php endforeach; ?>
238	</small>)</span>
239	<?php endif; ?>
240	+ <?php if ($_weeeHelper->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
241	+ <?php echo $_coreHelper->currency($_maximalPriceInclTax) ?>
242	<?php endif; ?>
243	<?php endif; ?>
244	</p>
245	<?php else: ?>
246	<?php if ($this->displayBothPrices()): ?>
247	<span class="price-excluding-tax">
248	+ <span class="label"><?php echo $_taxHelper->__('Excl. Tax:') ?></span>
249	+ <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
250	</span>
251	+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
252	<span class="weee">(<small>
253	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
254	+ <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
255	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
256	<?php else: ?>
257	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
258	<?php endif; ?>
259
260	<?php echo $_weeeSeparator; ?>
261	+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
262	<?php $_weeeSeparator = ' + '; ?>
263	<?php endforeach; ?>
264	</small>)</span>
265	<?php endif; ?>
266	<span class="price-including-tax">
267	+ <span class="label"><?php echo $_taxHelper->__('Incl. Tax:') ?></span>
268	+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
269	</span>
270	<?php else: ?>
271	+ <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
272	+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
273	<span class="weee">(<small>
274	<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
275	+ <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
276	<?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
277	<?php else: ?>
278	<?php $amount = $_weeeTaxAttribute->getAmount(); ?>
279	<?php endif; ?>
280
281	<?php echo $_weeeSeparator; ?>
282	+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($amount, true, true); ?>
283	<?php $_weeeSeparator = ' + '; ?>
284	<?php endforeach; ?>
285	</small>)</span>
286	<?php endif; ?>
287	+ <?php if ($_weeeHelper->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
288	+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
289	<?php endif; ?>
290	<?php endif; ?>
291	<?php endif; ?>

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


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

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


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

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


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

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26
	@@ -34,10 +34,12 @@
34	//]]>
35	</script>
36	<?php endif; ?>
37	- <?php if ($~~_product~~->~~isAvailable~~()): ?>
38	- ~~<p class="availability in-stock"><?~~php ~~echo~~ $~~this~~->~~helper~~(~~'catalog'~~)~~->__('Availability~~:') ?> ~~<span><?php echo $this->helper('catalog')->__('In stock') ?></span></p>~~
39	- <?php ~~else~~: ?>
40	- ~~<p class="availability out-of-stock"><?~~php ~~echo $this->helper('catalog')->__('Availability~~:') ?> ~~<span><?php echo $this->helper('catalog')->__('Out of stock') ?></span></p>~~


41	<?php endif; ?>
42	<div class="price-box-bundle">
43	<?php echo $this->getPriceHtml($_product) ?>


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

34	//]]>
35	</script>
36	<?php endif; ?>
37	+ <?php if ($this->displayProductStockStatus()): ?>
38	+ <?php if ($_product->isAvailable()): ?>
39	+ <p class="availability in-stock"><?php echo $this->helper('catalog')->__('Availability:') ?> <span><?php echo $this->helper('catalog')->__('In stock') ?></span></p>
40	+ <?php else: ?>
41	+ <p class="availability out-of-stock"><?php echo $this->helper('catalog')->__('Availability:') ?> <span><?php echo $this->helper('catalog')->__('Out of stock') ?></span></p>
42	+ <?php endif; ?>
43	<?php endif; ?>
44	<div class="price-box-bundle">
45	<?php echo $this->getPriceHtml($_product) ?>

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26
	@@ -29,7 +29,7 @@
29	<?php /* @var $this Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Checkbox */ ?>
30	<?php $_option = $this->getOption() ?>
31	<?php $_selections = $_option->getSelections() ?>
32	- <dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->~~htmlEscape~~($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
33	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
34	<div class="input-box">
35	<?php if (count($_selections) == 1 && $_option->getRequired()): ?>


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

29	<?php /* @var $this Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Checkbox */ ?>
30	<?php $_option = $this->getOption() ?>
31	<?php $_selections = $_option->getSelections() ?>
32	+ <dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
33	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
34	<div class="input-box">
35	<?php if (count($_selections) == 1 && $_option->getRequired()): ?>

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26
	@@ -29,7 +29,7 @@
29	<?php /* @var $this Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Multi */ ?>
30	<?php $_option = $this->getOption() ?>
31	<?php $_selections = $_option->getSelections() ?>
32	- <dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->~~htmlEscape~~($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
33	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
34	<div class="input-box">
35	<?php if (count($_selections) == 1 && $_option->getRequired()): ?>


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

29	<?php /* @var $this Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Multi */ ?>
30	<?php $_option = $this->getOption() ?>
31	<?php $_selections = $_option->getSelections() ?>
32	+ <dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
33	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
34	<div class="input-box">
35	<?php if (count($_selections) == 1 && $_option->getRequired()): ?>

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26
	@@ -31,14 +31,19 @@
31	<?php $_selections = $_option->getSelections(); ?>
32	<?php $_default = $_option->getDefaultSelection(); ?>
33	<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>

34
35	<dt>
36	- <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->~~htmlEscape~~($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
37	</dt>
38	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
39	<div class="input-box">
40	- <?php if ($~~this->_showSingle()):~~ ?>
41	- <?php ~~echo~~ $this->~~getSelectionTitlePrice~~(~~$_selections[0]~~) ?>




42	<input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" />
43	<?php else:?>
44	<ul class="options-list">
	@@ -48,6 +53,9 @@
48	</li>
49	<?php endif; ?>
50	<?php foreach ($_selections as $_selection): ?>



51	<li><input type="radio" onclick="bundle.changeSelection(this)" class="radio<?php echo $_option->getRequired()?' validate-one-required-by-name':'' ?> change-container-classname" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]"<?php if ($this->_isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>value="<?php echo $_selection->getSelectionId() ?>"/>
52	<span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionTitlePrice($_selection) ?></label></span>
53	<?php if ($_option->getRequired()): ?>
	@@ -59,6 +67,7 @@
59	<div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
60	<?php endif; ?>
61	</div>

62	<span class="qty-holder">
63	<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input onkeyup="bundle.changeOptionQty(this, event)" onblur="bundle.changeOptionQty(this, event)" <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
64	</span>


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

31	<?php $_selections = $_option->getSelections(); ?>
32	<?php $_default = $_option->getDefaultSelection(); ?>
33	<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
34	+ <?php $tierPriceHtml = ''; ?>
35
36	<dt>
37	+ <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
38	</dt>
39	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
40	<div class="input-box">
41	+ <?php /** @var $_selection Mage_Catalog_Model_Product*/ ?>
42	+ <?php if ($this->_showSingle()): ?>
43	+ <?php echo $this->getSelectionTitlePrice($_selections[0]); ?>
44	+ <?php if ($_selections[0]->getSelectionCanChangeQty()): ?>
45	+ <?php $tierPriceHtml = $this->getTierPriceHtml($_selections[0]); ?>
46	+ <?php endif; ?>
47	<input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" />
48	<?php else:?>
49	<ul class="options-list">

53	</li>
54	<?php endif; ?>
55	<?php foreach ($_selections as $_selection): ?>
56	+ <?php if ($_selection->getSelectionCanChangeQty() && $this->_isSelected($_selection)): ?>
57	+ <?php $tierPriceHtml = $this->getTierPriceHtml($_selection); ?>
58	+ <?php endif; ?>
59	<li><input type="radio" onclick="bundle.changeSelection(this)" class="radio<?php echo $_option->getRequired()?' validate-one-required-by-name':'' ?> change-container-classname" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]"<?php if ($this->_isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>value="<?php echo $_selection->getSelectionId() ?>"/>
60	<span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionTitlePrice($_selection) ?></label></span>
61	<?php if ($_option->getRequired()): ?>

67	<div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
68	<?php endif; ?>
69	</div>
70	+ <span id="bundle-option-<?php echo $_option->getId() ?>-tier-prices"> <?php echo $tierPriceHtml; ?></span>
71	<span class="qty-holder">
72	<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input onkeyup="bundle.changeOptionQty(this, event)" onblur="bundle.changeOptionQty(this, event)" <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
73	</span>

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26
	@@ -31,24 +31,33 @@
31	<?php $_selections = $_option->getSelections(); ?>
32	<?php $_default = $_option->getDefaultSelection(); ?>
33	<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>

34
35	<dt>
36	- <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->~~htmlEscape~~($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
37	</dt>
38	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
39	<div class="input-box">

40	<?php if ($this->_showSingle()): ?>
41	- <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>



42	<input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
43	<?php else:?>
44	<select onchange="bundle.changeSelection(this)" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]" class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> bundle-option-select change-container-classname">
45	<option value=""><?php echo $this->__('Choose a selection...') ?></option>
46	<?php foreach ($_selections as $_selection): ?>



47	<option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->_isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>><?php echo $this->getSelectionTitlePrice($_selection, false) ?></option>
48	<?php endforeach; ?>
49	</select>
50	<?php endif; ?>
51	</div>

52	<span class="qty-holder">
53	<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input onkeyup="bundle.changeOptionQty(this, event)" onblur="bundle.changeOptionQty(this, event)" <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
54	</span>


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

31	<?php $_selections = $_option->getSelections(); ?>
32	<?php $_default = $_option->getDefaultSelection(); ?>
33	<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
34	+ <?php $tierPriceHtml = ''; ?>
35
36	<dt>
37	+ <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
38	</dt>
39	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
40	<div class="input-box">
41	+ <?php /** @var $_selection Mage_Catalog_Model_Product*/ ?>
42	<?php if ($this->_showSingle()): ?>
43	+ <?php echo $this->getSelectionTitlePrice($_selections[0]); ?>
44	+ <?php if ($_selections[0]->getSelectionCanChangeQty()): ?>
45	+ <?php $tierPriceHtml = $this->getTierPriceHtml($_selections[0]); ?>
46	+ <?php endif; ?>
47	<input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
48	<?php else:?>
49	<select onchange="bundle.changeSelection(this)" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]" class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> bundle-option-select change-container-classname">
50	<option value=""><?php echo $this->__('Choose a selection...') ?></option>
51	<?php foreach ($_selections as $_selection): ?>
52	+ <?php if ($_selection->getSelectionCanChangeQty() && $this->_isSelected($_selection)): ?>
53	+ <?php $tierPriceHtml = $this->getTierPriceHtml($_selection); ?>
54	+ <?php endif; ?>
55	<option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->_isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>><?php echo $this->getSelectionTitlePrice($_selection, false) ?></option>
56	<?php endforeach; ?>
57	</select>
58	<?php endif; ?>
59	</div>
60	+ <span id="bundle-option-<?php echo $_option->getId() ?>-tier-prices"> <?php echo $tierPriceHtml; ?></span>
61	<span class="qty-holder">
62	<label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?> </label><input onkeyup="bundle.changeOptionQty(this, event)" onblur="bundle.changeOptionQty(this, event)" <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
63	</span>

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>


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

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) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
	@@ -53,11 +53,11 @@
53	<?php endif; ?>
54	<tr id="order-item-row-<?php echo $_item->getId() ?>">
55	<?php if (!$_item->getOrderItem()->getParentItem()): ?>
56	- <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->~~htmlEscape~~($_item->getName()) ?></strong></td>
57	<?php else: ?>
58	<td align="left" valign="top" style="padding:3px 19px"><?php echo $this->getValueHtml($_item)?></td>
59	<?php endif; ?>
60	- <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->~~htmlEscape~~($_item->getSku()) ?></td>
61	<td align="center" valign="top" style="padding:3px 9px">
62	<?php if ($this->canShowPriceInfo($_item)): ?>
63	<?php echo $_item->getQty()*1 ?>
	@@ -159,7 +159,7 @@
159	<?php endforeach; ?>
160	</dl>
161	<?php endif; ?>
162	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
163	</td>
164	<td> </td>
165	<td> </td>


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

Interface_Frontend_Base_Default - Version 1.8.0.0

Version Notes

Release Info

Code changes from version 1.7.0.1 to 1.8.0.0