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	?>

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->escapeHtml($_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->escapeHtml($_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	<?php endforeach; ?>
160	</dl>
161	<?php endif; ?>
162	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
163	</td>
164	<td> </td>
165	<td> </td>

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

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

54	<?php endif; ?>
55	<tr id="order-item-row-<?php echo $_item->getId() ?>">
56	<?php if (!$_item->getOrderItem()->getParentItem()): ?>
57	+ <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
58	<?php else: ?>
59	<td align="left" valign="top" style="padding:3px 19px"><?php echo $this->getValueHtml($_item)?></td>
60	<?php endif; ?>
61	+ <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
62	<td align="center" valign="top" style="padding:3px 9px">
63	<?php if ($this->canShowPriceInfo($_item)): ?>
64	<?php echo $_item->getQty()*1 ?>

160	<?php endforeach; ?>
161	</dl>
162	<?php endif; ?>
163	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
164	</td>
165	<td> </td>
166	<td> </td>

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

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
	@@ -54,11 +54,11 @@
54	<?php endif; ?>
55	<tr id="order-item-row-<?php echo $_item->getId() ?>">
56	<?php if (!$_item->getParentItem()): ?>
57	- <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->~~htmlEscape~~($_item->getName()) ?></strong></td>
58	<?php else: ?>
59	<td align="left" valign="top" style="padding:3px 19px"><?php echo $this->getValueHtml($_item)?></td>
60	<?php endif; ?>
61	- <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->~~htmlEscape~~($_item->getSku()) ?></td>
62	<td align="center" valign="top" style="padding:3px 9px">
63	<?php if (!$_item->getParentItem()): ?>
64	<?php echo $_item->getQtyOrdered()*1 ?>
	@@ -162,9 +162,9 @@
162	<?php endif; ?>
163	<?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
164	<br /><strong><?php echo $this->__('Gift Message') ?></strong>
165	- <br /><?php echo $this->__('From:'); ?> <?php echo $this->~~htmlEscape~~($_giftMessage->getSender()) ?>
166	- <br /><?php echo $this->__('To:'); ?> <?php echo $this->~~htmlEscape~~($_giftMessage->getRecipient()) ?>
167	- <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->~~htmlEscape~~($_giftMessage->getMessage()) ?>
168	<?php endif; ?>
169	</td>
170	<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	?>

54	<?php endif; ?>
55	<tr id="order-item-row-<?php echo $_item->getId() ?>">
56	<?php if (!$_item->getParentItem()): ?>
57	+ <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
58	<?php else: ?>
59	<td align="left" valign="top" style="padding:3px 19px"><?php echo $this->getValueHtml($_item)?></td>
60	<?php endif; ?>
61	+ <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
62	<td align="center" valign="top" style="padding:3px 9px">
63	<?php if (!$_item->getParentItem()): ?>
64	<?php echo $_item->getQtyOrdered()*1 ?>

162	<?php endif; ?>
163	<?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
164	<br /><strong><?php echo $this->__('Gift Message') ?></strong>
165	+ <br /><?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
166	+ <br /><?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
167	+ <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
168	<?php endif; ?>
169	</td>
170	<td> </td>

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

	@@ -20,7 +20,7 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
	@@ -52,11 +52,11 @@
52	<?php endif; ?>
53	<tr id="order-item-row-<?php echo $_item->getId() ?>">
54	<?php if (!$_item->getParentItem()): ?>
55	- <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->~~htmlEscape~~($_item->getName()) ?></strong></td>
56	<?php else: ?>
57	<td align="left" valign="top" style="padding:3px 19px"><?php echo $this->getValueHtml($_item) ?></td>
58	<?php endif; ?>
59	- <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->~~htmlEscape~~($_item->getSku()) ?></td>
60	<td align="center" valign="top" style="padding:3px 9px">
61	<?php if (($this->isShipmentSeparately() && $_item->getParentItem()) \|\| (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
62	<?php if (isset($shipItems[$_item->getId()])): ?>
	@@ -84,7 +84,7 @@
84	<?php endforeach; ?>
85	</dl>
86	<?php endif; ?>
87	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
88	</td>
89	<td> </td>
90	<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	?>

52	<?php endif; ?>
53	<tr id="order-item-row-<?php echo $_item->getId() ?>">
54	<?php if (!$_item->getParentItem()): ?>
55	+ <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
56	<?php else: ?>
57	<td align="left" valign="top" style="padding:3px 19px"><?php echo $this->getValueHtml($_item) ?></td>
58	<?php endif; ?>
59	+ <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
60	<td align="center" valign="top" style="padding:3px 9px">
61	<?php if (($this->isShipmentSeparately() && $_item->getParentItem()) \|\| (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
62	<?php if (isset($shipItems[$_item->getId()])): ?>

84	<?php endforeach; ?>
85	</dl>
86	<?php endif; ?>
87	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
88	</td>
89	<td> </td>
90	<td> </td>

app/design/frontend/base/default/template/bundle/rss/catalog/product/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/sales/order/creditmemo/items/renderer.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	?>
	@@ -58,12 +58,12 @@
58	<?php endif; ?>
59	<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
60	<?php if (!$_item->getOrderItem()->getParentItem()): ?>
61	- <td><h4 class="product-name"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></h4>
62	</td>
63	<?php else: ?>
64	<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
65	<?php endif; ?>
66	- <td><?php echo $this->~~htmlEscape~~($_item->getSku()) ?></td>
67	<td class="a-right">
68	<?php if ($this->canShowPriceInfo($_item)): ?>
69	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
	@@ -293,7 +293,7 @@
293	<?php if($_options = $this->getItemOptions()): ?>
294	<dl class="item-options">
295	<?php foreach ($_options as $_option) : ?>
296	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
297	<?php if (!$this->getPrintStatus()): ?>
298	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
299	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
	@@ -301,19 +301,19 @@
301	<?php if (isset($_formatedOptionValue['full_view'])): ?>
302	<div class="truncated_full_value">
303	<dl class="item-options">
304	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
305	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
306	</dl>
307	</div>
308	<?php endif; ?>
309	</dd>
310	<?php else: ?>
311	- <dd><?php echo $this->~~htmlEscape~~( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
312	<?php endif; ?>
313	<?php endforeach; ?>
314	</dl>
315	<?php endif; ?>
316	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
317	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
318	<a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
319	<?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	?>

58	<?php endif; ?>
59	<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
60	<?php if (!$_item->getOrderItem()->getParentItem()): ?>
61	+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
62	</td>
63	<?php else: ?>
64	<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
65	<?php endif; ?>
66	+ <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
67	<td class="a-right">
68	<?php if ($this->canShowPriceInfo($_item)): ?>
69	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>

293	<?php if($_options = $this->getItemOptions()): ?>
294	<dl class="item-options">
295	<?php foreach ($_options as $_option) : ?>
296	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
297	<?php if (!$this->getPrintStatus()): ?>
298	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
299	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>

301	<?php if (isset($_formatedOptionValue['full_view'])): ?>
302	<div class="truncated_full_value">
303	<dl class="item-options">
304	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
305	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
306	</dl>
307	</div>
308	<?php endif; ?>
309	</dd>
310	<?php else: ?>
311	+ <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
312	<?php endif; ?>
313	<?php endforeach; ?>
314	</dl>
315	<?php endif; ?>
316	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
317	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
318	<a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
319	<?php endif; ?>

app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.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	?>
	@@ -56,11 +56,11 @@
56	<?php endif; ?>
57	<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
58	<?php if (!$_item->getOrderItem()->getParentItem()): ?>
59	- <td><h4 class="product-name"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></h4></td>
60	<?php else: ?>
61	<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
62	<?php endif; ?>
63	- <td><?php echo $this->~~htmlEscape~~($_item->getSku()) ?></td>
64	<td class="a-right">
65	<?php if ($this->canShowPriceInfo($_item)): ?>
66	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
	@@ -319,7 +319,7 @@
319	<?php if($_options = $this->getItemOptions()): ?>
320	<dl class="item-options">
321	<?php foreach ($_options as $_option) : ?>
322	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
323	<?php if (!$this->getPrintStatus()): ?>
324	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
325	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
	@@ -327,19 +327,19 @@
327	<?php if (isset($_formatedOptionValue['full_view'])): ?>
328	<div class="truncated_full_value">
329	<dl class="item-options">
330	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
331	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
332	</dl>
333	</div>
334	<?php endif; ?>
335	</dd>
336	<?php else: ?>
337	- <dd><?php echo $this->~~htmlEscape~~( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
338	<?php endif; ?>
339	<?php endforeach; ?>
340	</dl>
341	<?php endif; ?>
342	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
343	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
344	<a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
345	<?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	?>

56	<?php endif; ?>
57	<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
58	<?php if (!$_item->getOrderItem()->getParentItem()): ?>
59	+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4></td>
60	<?php else: ?>
61	<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
62	<?php endif; ?>
63	+ <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
64	<td class="a-right">
65	<?php if ($this->canShowPriceInfo($_item)): ?>
66	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>

319	<?php if($_options = $this->getItemOptions()): ?>
320	<dl class="item-options">
321	<?php foreach ($_options as $_option) : ?>
322	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
323	<?php if (!$this->getPrintStatus()): ?>
324	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
325	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>

327	<?php if (isset($_formatedOptionValue['full_view'])): ?>
328	<div class="truncated_full_value">
329	<dl class="item-options">
330	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
331	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
332	</dl>
333	</div>
334	<?php endif; ?>
335	</dd>
336	<?php else: ?>
337	+ <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
338	<?php endif; ?>
339	<?php endforeach; ?>
340	</dl>
341	<?php endif; ?>
342	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
343	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
344	<a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
345	<?php endif; ?>

app/design/frontend/base/default/template/bundle/sales/order/items/renderer.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	?>
	@@ -55,11 +55,11 @@
55	<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
56
57	<?php if (!$_item->getParentItem()): ?>
58	- <td><h3 class="product-name"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></h3></td>
59	<?php else: ?>
60	<td><div class="option-value"><?php echo $this->getValueHtml($_item)?></div></td>
61	<?php endif; ?>
62	- <td><?php echo $this->~~htmlEscape~~(Mage::helper('core/string')->splitInjection($_item->getSku())) ?></td>
63	<td class="a-right">
64	<?php if (!$_item->getParentItem()): ?>
65	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
	@@ -342,7 +342,7 @@
342	<?php if($_options = $this->getItemOptions()): ?>
343	<dl class="item-options">
344	<?php foreach ($_options as $_option) : ?>
345	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
346	<?php if (!$this->getPrintStatus()): ?>
347	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
348	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
	@@ -350,19 +350,19 @@
350	<?php if (isset($_formatedOptionValue['full_view'])): ?>
351	<div class="truncated_full_value">
352	<dl class="item-options">
353	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
354	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
355	</dl>
356	</div>
357	<?php endif; ?>
358	</dd>
359	<?php else: ?>
360	- <dd><?php echo $this->~~htmlEscape~~( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
361	<?php endif; ?>
362	<?php endforeach; ?>
363	</dl>
364	<?php endif; ?>
365	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
366	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
367	<a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
368	<?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	?>

55	<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
56
57	<?php if (!$_item->getParentItem()): ?>
58	+ <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3></td>
59	<?php else: ?>
60	<td><div class="option-value"><?php echo $this->getValueHtml($_item)?></div></td>
61	<?php endif; ?>
62	+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($_item->getSku())) ?></td>
63	<td class="a-right">
64	<?php if (!$_item->getParentItem()): ?>
65	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>

342	<?php if($_options = $this->getItemOptions()): ?>
343	<dl class="item-options">
344	<?php foreach ($_options as $_option) : ?>
345	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
346	<?php if (!$this->getPrintStatus()): ?>
347	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
348	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>

350	<?php if (isset($_formatedOptionValue['full_view'])): ?>
351	<div class="truncated_full_value">
352	<dl class="item-options">
353	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
354	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
355	</dl>
356	</div>
357	<?php endif; ?>
358	</dd>
359	<?php else: ?>
360	+ <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
361	<?php endif; ?>
362	<?php endforeach; ?>
363	</dl>
364	<?php endif; ?>
365	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
366	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
367	<a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
368	<?php endif; ?>

app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.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<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
55	<?php if (!$_item->getParentItem()): ?>
56	- <td><h4 class="product-name"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></h4></td>
57	<?php else: ?>
58	<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
59	<?php endif; ?>
60	- <td><?php echo $this->~~htmlEscape~~($_item->getSku()) ?></td>
61	<td class="a-center">
62	<?php if (($this->isShipmentSeparately() && $_item->getParentItem()) \|\| (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
63	<?php if (isset($shipItems[$_item->getId()])): ?>
	@@ -80,7 +80,7 @@
80	<?php if($_options = $this->getItemOptions()): ?>
81	<dl class="item-options">
82	<?php foreach ($_options as $_option) : ?>
83	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
84	<?php if (!$this->getPrintStatus()): ?>
85	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
86	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
	@@ -88,19 +88,19 @@
88	<?php if (isset($_formatedOptionValue['full_view'])): ?>
89	<div class="truncated_full_value">
90	<dl class="item-options">
91	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
92	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
93	</dl>
94	</div>
95	<?php endif; ?>
96	</dd>
97	<?php else: ?>
98	- <dd><?php echo $this->~~htmlEscape~~( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
99	<?php endif; ?>
100	<?php endforeach; ?>
101	</dl>
102	<?php endif; ?>
103	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
104	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
105	<a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
106	<?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	?>

53	<?php endif; ?>
54	<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
55	<?php if (!$_item->getParentItem()): ?>
56	+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4></td>
57	<?php else: ?>
58	<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
59	<?php endif; ?>
60	+ <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
61	<td class="a-center">
62	<?php if (($this->isShipmentSeparately() && $_item->getParentItem()) \|\| (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
63	<?php if (isset($shipItems[$_item->getId()])): ?>

80	<?php if($_options = $this->getItemOptions()): ?>
81	<dl class="item-options">
82	<?php foreach ($_options as $_option) : ?>
83	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
84	<?php if (!$this->getPrintStatus()): ?>
85	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
86	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>

88	<?php if (isset($_formatedOptionValue['full_view'])): ?>
89	<div class="truncated_full_value">
90	<dl class="item-options">
91	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
92	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
93	</dl>
94	</div>
95	<?php endif; ?>
96	</dd>
97	<?php else: ?>
98	+ <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
99	<?php endif; ?>
100	<?php endforeach; ?>
101	</dl>
102	<?php endif; ?>
103	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
104	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
105	<a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
106	<?php endif; ?>

app/design/frontend/base/default/template/callouts/left_col.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/callouts/right_col.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/captcha/zend.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/catalog/category/page.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/catalog/category/view.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	?>
	@@ -36,7 +36,7 @@
36	$_category = $this->getCurrentCategory();
37	$_imgHtml = '';
38	if ($_imgUrl = $_category->getImageUrl()) {
39	- $_imgHtml = '<p class="category-image"><img src="'.$_imgUrl.'" alt="'.$this->~~htmlEscape~~($_category->getName()).'" title="'.$this->~~htmlEscape~~($_category->getName()).'" /></p>';
40	$_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
41	}
42	?>


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	?>

36	$_category = $this->getCurrentCategory();
37	$_imgHtml = '';
38	if ($_imgUrl = $_category->getImageUrl()) {
39	+ $_imgHtml = '<p class="category-image"><img src="'.$_imgUrl.'" alt="'.$this->escapeHtml($_category->getName()).'" title="'.$this->escapeHtml($_category->getName()).'" /></p>';
40	$_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
41	}
42	?>

app/design/frontend/base/default/template/catalog/category/widget/link/link_block.phtml CHANGED Viewed

	@@ -20,8 +20,8 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	- <span class="widget widget-category-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->~~htmlEscape~~($this->getAnchorText()) ?></span></a></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	?>
27	+ <span class="widget widget-category-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>

app/design/frontend/base/default/template/catalog/category/widget/link/link_inline.phtml CHANGED Viewed

	@@ -20,8 +20,8 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	- <span class="widget widget-category-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->~~htmlEscape~~($this->getAnchorText()) ?></span></a></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	?>
27	+ <span class="widget widget-category-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>

app/design/frontend/base/default/template/catalog/layer/filter.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/catalog/layer/state.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/catalog/layer/view.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/catalog/msrp/popup.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/catalog/navigation/left.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
	@@ -46,7 +46,7 @@
46	<?php foreach ($_categories as $_category): ?>
47	<?php if($_category->getIsActive()): ?>
48	<li>
49	- <a href="<?php echo $this->getCategoryUrl($_category) ?>"<?php if ($this->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $this->~~htmlEscape~~($_category->getName()) ?></a> (<?php echo $_category->getProductCount() ?>)
50	</li>
51	<?php endif; ?>
52	<?php endforeach ?>


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

46	<?php foreach ($_categories as $_category): ?>
47	<?php if($_category->getIsActive()): ?>
48	<li>
49	+ <a href="<?php echo $this->getCategoryUrl($_category) ?>"<?php if ($this->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $this->escapeHtml($_category->getName()) ?></a> (<?php echo $_category->getProductCount() ?>)
50	</li>
51	<?php endif; ?>
52	<?php endforeach ?>

app/design/frontend/base/default/template/catalog/navigation/top.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/catalog/product/compare/list.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	/* @var $this Mage_Catalog_Block_Product_Compare_List */
	@@ -71,7 +71,7 @@
71	<?php endif; ?>
72	<?php if ($this->helper('wishlist')->isAllow()) : ?>
73	<ul class="add-to-links">
74	- <li><a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist" ~~onclick="setPLocation(this.href, true)"~~><?php echo $this->__('Add to Wishlist') ?></a></li>
75	</ul>
76	<?php endif; ?>
77	</td>
	@@ -92,7 +92,7 @@
92	<?php echo $this->getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?>
93	<?php break;
94	case "small_image": ?>
95	- <img src="<?php echo $this->helper('catalog/image')->init($_item, 'small_image')->resize(125, 125); ?>" width="125" height="125" alt="<?php echo $this->~~htmlEscape~~($_item->getName()) ?>" title="<?php echo $this->~~htmlEscape~~($_item->getName()) ?>" />
96	<?php break;
97	case "date":
98	echo substr($this->getProductAttributeValue($_item, $_attribute),0,10);
	@@ -124,7 +124,7 @@
124	<?php endif; ?>
125	<?php if ($this->helper('wishlist')->isAllow()) : ?>
126	<ul class="add-to-links">
127	- <li><a href="<?php echo $this->getAddToWishlistUrl($_item);?>" class="link-wishlist" ~~onclick="setPLocation(this.href, true)"~~><?php echo $this->__('Add to Wishlist') ?></a></li>
128	</ul>
129	<?php endif; ?>
130	</td>


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

71	<?php endif; ?>
72	<?php if ($this->helper('wishlist')->isAllow()) : ?>
73	<ul class="add-to-links">
74	+ <li><a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
75	</ul>
76	<?php endif; ?>
77	</td>

92	<?php echo $this->getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?>
93	<?php break;
94	case "small_image": ?>
95	+ <img src="<?php echo $this->helper('catalog/image')->init($_item, 'small_image')->resize(125, 125); ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>" />
96	<?php break;
97	case "date":
98	echo substr($this->getProductAttributeValue($_item, $_attribute),0,10);

124	<?php endif; ?>
125	<?php if ($this->helper('wishlist')->isAllow()) : ?>
126	<ul class="add-to-links">
127	+ <li><a href="<?php echo $this->getAddToWishlistUrl($_item);?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></li>
128	</ul>
129	<?php endif; ?>
130	</td>

app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml CHANGED 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	/* @var $this Mage_Catalog_Block_Product_Compare_Sidebar */


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

app/design/frontend/base/default/template/catalog/product/gallery.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	?>
	@@ -37,10 +37,10 @@
37	<?php endif; ?>
38	</div>
39	<?php endif; ?>
40	- <?php if($_imageTitle = $this->~~htmlEscape~~($this->getCurrentImage()->getLabel())): ?>
41	<h1 class="image-label"><?php echo $_imageTitle ?></h1>
42	<?php endif; ?>
43	- <img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'image', $this->getImageFile()); ?>"<?php if($_width): ?> width="<?php echo $_width ?>"<?php endif; ?> alt="<?php echo $this->~~htmlEscape~~($this->getCurrentImage()->getLabel()) ?>" title="<?php echo $this->~~htmlEscape~~($this->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" class="image" />
44	<div class="buttons-set"><a href="#" onclick="window.close(); return false;" class="button"><span><?php echo $this->__('Close Window') ?></span></a></div>
45	<?php if($this->getPreviusImageUrl() \|\| $this->getNextImageUrl()): ?>
46	<div class="nav">


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	?>

37	<?php endif; ?>
38	</div>
39	<?php endif; ?>
40	+ <?php if($_imageTitle = $this->escapeHtml($this->getCurrentImage()->getLabel())): ?>
41	<h1 class="image-label"><?php echo $_imageTitle ?></h1>
42	<?php endif; ?>
43	+ <img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'image', $this->getImageFile()); ?>"<?php if($_width): ?> width="<?php echo $_width ?>"<?php endif; ?> alt="<?php echo $this->escapeHtml($this->getCurrentImage()->getLabel()) ?>" title="<?php echo $this->escapeHtml($this->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" class="image" />
44	<div class="buttons-set"><a href="#" onclick="window.close(); return false;" class="button"><span><?php echo $this->__('Close Window') ?></span></a></div>
45	<?php if($this->getPreviusImageUrl() \|\| $this->getNextImageUrl()): ?>
46	<div class="nav">

app/design/frontend/base/default/template/catalog/product/list.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/catalog/product/list/related.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	?>
	@@ -40,9 +40,9 @@
40	<?php endif; ?>
41	<?php endif; ?>
42	<div class="product">
43	- <a href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($_item->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(50) ?>" width="50" height="50" alt="<?php echo $this->~~htmlEscape~~($_item->getName()) ?>" /></a>
44	<div class="product-details">
45	- <p class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></a></p>
46	<?php echo $this->getPriceHtml($_item, true, '-related') ?>
47	<?php if ($this->helper('wishlist')->isAllow()) : ?>
48	<a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a>


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	?>

40	<?php endif; ?>
41	<?php endif; ?>
42	<div class="product">
43	+ <a href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(50) ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" /></a>
44	<div class="product-details">
45	+ <p class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></p>
46	<?php echo $this->getPriceHtml($_item, true, '-related') ?>
47	<?php if ($this->helper('wishlist')->isAllow()) : ?>
48	<a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a>

app/design/frontend/base/default/template/catalog/product/list/toolbar.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/catalog/product/list/upsell.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($_link=$this->getIterableItem()): ?>
37	<td>
38	- <a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($_link->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_link, 'small_image')->resize(125) ?>" width="125" height="125" alt="<?php echo $this->~~htmlEscape~~($_link->getName()) ?>" /></a>
39	- <h3 class="product-name"><a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($_link->getName()) ?>"><?php echo $this->~~htmlEscape~~($_link->getName()) ?></a></h3>
40	<?php echo $this->getPriceHtml($_link, true, '-upsell') ?>
41	<?php echo $this->getReviewsSummaryHtml($_link) ?>
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($_link=$this->getIterableItem()): ?>
37	<td>
38	+ <a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_link->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_link, 'small_image')->resize(125) ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($_link->getName()) ?>" /></a>
39	+ <h3 class="product-name"><a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_link->getName()) ?>"><?php echo $this->escapeHtml($_link->getName()) ?></a></h3>
40	<?php echo $this->getPriceHtml($_link, true, '-upsell') ?>
41	<?php echo $this->getReviewsSummaryHtml($_link) ?>
42	</td>

app/design/frontend/base/default/template/catalog/product/new.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	?>
	@@ -32,8 +32,8 @@
32	<ul class="products-grid">
33	<?php endif ?>
34	<li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
35	- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(135) ?>" width="135" height="135" alt="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>" /></a>
36	- <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>"><?php echo $this->~~htmlEscape~~($_product->getName()) ?></a></h3>
37	<?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
38	<?php echo $this->getPriceHtml($_product, true, '-new') ?>
39	<div class="actions">


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	?>

32	<ul class="products-grid">
33	<?php endif ?>
34	<li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
35	+ <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(135) ?>" width="135" height="135" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a>
36	+ <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><?php echo $this->escapeHtml($_product->getName()) ?></a></h3>
37	<?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
38	<?php echo $this->getPriceHtml($_product, true, '-new') ?>
39	<div class="actions">

app/design/frontend/base/default/template/catalog/product/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	?>
	@@ -47,6 +47,7 @@
47	$_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() \|\| $_taxHelper->displayBothPrices());
48	$_minimalPriceValue = $_product->getMinimalPrice();
49	$_minimalPrice = $_taxHelper->getPrice($_product, $_minimalPriceValue, $_simplePricesTax);

50	?>
51
52	<?php if (!$_product->isGrouped()): ?>
	@@ -89,18 +90,18 @@
89	<?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
90	</span>
91	</span>







92	<span class="price-including-tax">
93	<span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
94	<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
95	<?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
96	</span>
97	- <span class="weee">(
98	- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
99	- <?php echo $_weeeSeparator; ?>
100	- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
101	- <?php $_weeeSeparator = ' + '; ?>
102	- <?php endforeach; ?>
103	- )</span>
104	</span>
105	<?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
106	<span class="price-excluding-tax">
	@@ -218,7 +219,7 @@
218
219	<?php if ($_taxHelper->displayBothPrices()): ?>
220	<p class="special-price">
221	- <span class="price-label"><?php echo $~~this->__('Special~~ ~~Price:')~~ ?></span>
222	<span class="price-excluding-tax">
223	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
224	<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
	@@ -234,7 +235,7 @@
234	</p>
235	<?php else: ?>
236	<p class="special-price">
237	- <span class="price-label"><?php echo $~~this->__('Special~~ ~~Price:')~~ ?></span>
238	<span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
239	<?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmountInclTaxes, true, false) ?>
240	</span>
	@@ -249,28 +250,46 @@
249	</span>
250	</p>
251
252	- <p class="special-price">
253	- ~~<span class="price-label"><?~~php ~~echo~~ $~~this~~->__(~~'Special Price~~:') ~~?></span>~~

254	<span class="price-excluding-tax">
255	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
256	<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
257	- <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmount, true, false) ?>
258	</span>
259	</span>
260	- <span class="weee">(
261	- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
262	- <?php echo $_weeeSeparator; ?>
263	- <?php echo $_weeeTaxAttribute->getName(); ~~?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true);~~ ?>
264	- <?php $~~_weeeSeparator~~ = ~~' + '~~; ?>
265	- <?php ~~endforeach~~; ?>
266	- ~~)</span>~~
267	- <span ~~class="price-including-tax"~~>

268	<span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
269	<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
270	<?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
271	</span>
272	- </span>
273	- ~~</p>~~
















274	<?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
275	<p class="old-price">
276	<span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
	@@ -280,7 +299,7 @@
280	</p>
281
282	<p class="special-price">
283	- <span class="price-label"><?php echo $~~this->__('Special~~ ~~Price:')~~ ?></span>
284	<span class="price-excluding-tax">
285	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
286	<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
	@@ -310,7 +329,7 @@
310	</p>
311
312	<p class="special-price">
313	- <span class="price-label"><?php echo $~~this->__('Special~~ ~~Price:')~~ ?></span>
314	<span class="price-excluding-tax">
315	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
316	<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
	@@ -339,7 +358,7 @@
339
340	<?php if ($_taxHelper->displayBothPrices()): ?>
341	<p class="special-price">
342	- <span class="price-label"><?php echo $~~this->__('Special~~ ~~Price:')~~ ?></span>
343	<span class="price-excluding-tax">
344	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
345	<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
	@@ -355,7 +374,7 @@
355	</p>
356	<?php else: ?>
357	<p class="special-price">
358	- <span class="price-label"><?php echo $~~this->__('Special~~ ~~Price:')~~ ?></span>
359	<span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
360	<?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
361	</span>
	@@ -391,13 +410,23 @@
391
392	<?php else: /* if (!$_product->isGrouped()): */ ?>
393	<?php
394	- $~~_exclTax~~ = $~~_taxHelper~~->~~getPrice~~(~~$_product, $_minimalPriceValue~~);
395	- ~~$_inclTax~~ ~~= $_taxHelper->getPrice~~($~~_product,~~ $_minimalPriceValue, ~~true);~~








396	?>
397	- <?php if ($~~this->getDisplayMinimalPrice(~~) ~~&& $_minimalPriceValue)~~: ?>
398	<div class="price-box">
399	- <p class="minimal-price">

400	<span class="price-label"><?php echo $this->__('Starting at:') ?></span>

401	<?php if ($_taxHelper->displayBothPrices()): ?>
402	<span class="price-excluding-tax">
403	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></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	?>

47	$_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() \|\| $_taxHelper->displayBothPrices());
48	$_minimalPriceValue = $_product->getMinimalPrice();
49	$_minimalPrice = $_taxHelper->getPrice($_product, $_minimalPriceValue, $_simplePricesTax);
50	+ $_specialPriceStoreLabel = $this->getProductAttribute('special_price')->getStoreLabel();
51	?>
52
53	<?php if (!$_product->isGrouped()): ?>

90	<?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
91	</span>
92	</span>
93	+ <span class="weee">(
94	+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
95	+ <?php echo $_weeeSeparator; ?>
96	+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
97	+ <?php $_weeeSeparator = ' + '; ?>
98	+ <?php endforeach; ?>
99	+ )</span>
100	<span class="price-including-tax">
101	<span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
102	<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
103	<?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
104	</span>







105	</span>
106	<?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
107	<span class="price-excluding-tax">

219
220	<?php if ($_taxHelper->displayBothPrices()): ?>
221	<p class="special-price">
222	+ <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
223	<span class="price-excluding-tax">
224	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
225	<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">

235	</p>
236	<?php else: ?>
237	<p class="special-price">
238	+ <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
239	<span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
240	<?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmountInclTaxes, true, false) ?>
241	</span>

250	</span>
251	</p>
252
253	+ <p class="special-price">
254	+ <?php if ($_taxHelper->displayBothPrices()): ?>
255	+ <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
256	<span class="price-excluding-tax">
257	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
258	<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
259	+ <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmount, true, false) ?>
260	</span>
261	</span>
262	+ <span class="weee">(
263	+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
264	+ <?php echo $_weeeSeparator; ?>
265	+ <?php echo $_weeeTaxAttribute->getName(); ?>
266	+ : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
267	+ <?php $_weeeSeparator = ' + '; ?>
268	+ <?php endforeach; ?>
269	+ )</span>
270	+ <span class="price-including-tax">
271	<span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
272	<span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
273	<?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
274	</span>
275	+ </span>
276	+ <?php else: ?>
277	+ <p class="special-price">
278	+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
279	+ <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
280	+ <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmountInclTaxes, true, false) ?>
281	+ </span>
282	+ </p>
283	+ <span class="weee">(
284	+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
285	+ <?php echo $_weeeSeparator; ?>
286	+ <?php echo $_weeeTaxAttribute->getName(); ?>
287	+ : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
288	+ <?php $_weeeSeparator = ' + '; ?>
289	+ <?php endforeach; ?>
290	+ )</span>
291	+ <?php endif; ?>
292	+ </p>
293	<?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
294	<p class="old-price">
295	<span class="price-label"><?php echo $this->__('Regular Price:') ?></span>

299	</p>
300
301	<p class="special-price">
302	+ <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
303	<span class="price-excluding-tax">
304	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
305	<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">

329	</p>
330
331	<p class="special-price">
332	+ <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
333	<span class="price-excluding-tax">
334	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
335	<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">

358
359	<?php if ($_taxHelper->displayBothPrices()): ?>
360	<p class="special-price">
361	+ <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
362	<span class="price-excluding-tax">
363	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
364	<span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">

374	</p>
375	<?php else: ?>
376	<p class="special-price">
377	+ <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
378	<span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
379	<?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
380	</span>

410
411	<?php else: /* if (!$_product->isGrouped()): */ ?>
412	<?php
413	+ $showMinPrice = $this->getDisplayMinimalPrice();
414	+ if ($showMinPrice && $_minimalPriceValue) {
415	+ $_exclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue);
416	+ $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, true);
417	+ $price = $showMinPrice ? $_minimalPriceValue : 0;
418	+ } else {
419	+ $price = $_product->getFinalPrice();
420	+ $_exclTax = $_taxHelper->getPrice($_product, $price);
421	+ $_inclTax = $_taxHelper->getPrice($_product, $price, true);
422	+ }
423	?>
424	+ <?php if ($price): ?>
425	<div class="price-box">
426	+ <p<?php if ($showMinPrice): ?> class="minimal-price"<?php endif ?>>
427	+ <?php if ($showMinPrice): ?>
428	<span class="price-label"><?php echo $this->__('Starting at:') ?></span>
429	+ <?php endif ?>
430	<?php if ($_taxHelper->displayBothPrices()): ?>
431	<span class="price-excluding-tax">
432	<span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>

app/design/frontend/base/default/template/catalog/product/price_msrp.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/catalog/product/price_msrp_item.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	?>
	@@ -78,6 +78,7 @@
78	);
79	}
80	}

81	}
82	});
83


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	?>

78	);
79	}
80	}
81	+ optionsPrice.reload();
82	}
83	});
84

app/design/frontend/base/default/template/catalog/product/price_msrp_noform.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/catalog/product/price_msrp_rss.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/catalog/product/view.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
	@@ -40,6 +40,7 @@
40	<div class="product-view">
41	<div class="product-essential">
42	<form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post" id="product_addtocart_form"<?php if($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>

43	<div class="no-display">
44	<input type="hidden" name="product" value="<?php echo $_product->getId() ?>" />
45	<input type="hidden" name="related_product" id="related-products-field" value="" />


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

40	<div class="product-view">
41	<div class="product-essential">
42	<form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post" id="product_addtocart_form"<?php if($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
43	+ <?php echo $this->getBlockHtml('formkey') ?>
44	<div class="no-display">
45	<input type="hidden" name="product" value="<?php echo $_product->getId() ?>" />
46	<input type="hidden" name="related_product" id="related-products-field" value="" />

app/design/frontend/base/default/template/catalog/product/view/additional.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/catalog/product/view/addto.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/catalog/product/view/addtocart.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/catalog/product/view/attributes.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
	@@ -42,7 +42,7 @@
42	<tbody>
43	<?php foreach ($_additional as $_data): ?>
44	<tr>
45	- <th class="label"><?php echo $this->~~htmlEscape~~($this->__($_data['label'])) ?></th>
46	<td class="data"><?php echo $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
47	</tr>
48	<?php endforeach; ?>


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

42	<tbody>
43	<?php foreach ($_additional as $_data): ?>
44	<tr>
45	+ <th class="label"><?php echo $this->escapeHtml($this->__($_data['label'])) ?></th>
46	<td class="data"><?php echo $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
47	</tr>
48	<?php endforeach; ?>

app/design/frontend/base/default/template/catalog/product/view/description.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/catalog/product/view/media.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
	@@ -37,7 +37,7 @@
37	<?php if ($_product->getImage() != 'no_selection' && $_product->getImage()): ?>
38	<p class="product-image product-image-zoom">
39	<?php
40	- $_img = '<img id="image" src="'.$this->helper('catalog/image')->init($_product, 'image').'" alt="'.$this->~~htmlEscape~~($this->getImageLabel()).'" title="'.$this->~~htmlEscape~~($this->getImageLabel()).'" />';
41	echo $_helper->productAttribute($_product, $_img, 'image');
42	?>
43	</p>
	@@ -59,7 +59,7 @@
59	<?php else: ?>
60	<p class="product-image">
61	<?php
62	- $_img = '<img src="'.$this->helper('catalog/image')->init($_product, 'image')->resize(265).'" alt="'.$this->~~htmlEscape~~($this->getImageLabel()).'" title="'.$this->~~htmlEscape~~($this->getImageLabel()).'" />';
63	echo $_helper->productAttribute($_product, $_img, 'image');
64	?>
65	</p>
	@@ -70,7 +70,7 @@
70	<ul>
71	<?php foreach ($this->getGalleryImages() as $_image): ?>
72	<li>
73	- <a href="#" onclick="popWin('<?php echo $this->getGalleryUrl($_image) ?>', 'gallery', 'width=300,height=300,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;" title="<?php echo $this->~~htmlEscape~~($_image->getLabel()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'thumbnail', $_image->getFile())->resize(56); ?>" width="56" height="56" alt="<?php echo $this->~~htmlEscape~~($_image->getLabel()) ?>" /></a>
74	</li>
75	<?php endforeach; ?>
76	</ul>


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

37	<?php if ($_product->getImage() != 'no_selection' && $_product->getImage()): ?>
38	<p class="product-image product-image-zoom">
39	<?php
40	+ $_img = '<img id="image" src="'.$this->helper('catalog/image')->init($_product, 'image').'" alt="'.$this->escapeHtml($this->getImageLabel()).'" title="'.$this->escapeHtml($this->getImageLabel()).'" />';
41	echo $_helper->productAttribute($_product, $_img, 'image');
42	?>
43	</p>

59	<?php else: ?>
60	<p class="product-image">
61	<?php
62	+ $_img = '<img src="'.$this->helper('catalog/image')->init($_product, 'image')->resize(265).'" alt="'.$this->escapeHtml($this->getImageLabel()).'" title="'.$this->escapeHtml($this->getImageLabel()).'" />';
63	echo $_helper->productAttribute($_product, $_img, 'image');
64	?>
65	</p>

70	<ul>
71	<?php foreach ($this->getGalleryImages() as $_image): ?>
72	<li>
73	+ <a href="#" onclick="popWin('<?php echo $this->getGalleryUrl($_image) ?>', 'gallery', 'width=300,height=300,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;" title="<?php echo $this->escapeHtml($_image->getLabel()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'thumbnail', $_image->getFile())->resize(56); ?>" width="56" height="56" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" /></a>
74	</li>
75	<?php endforeach; ?>
76	</ul>

app/design/frontend/base/default/template/catalog/product/view/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	/* @var $this Mage_Catalog_Block_Product_View_Options */


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

app/design/frontend/base/default/template/catalog/product/view/options/js.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/catalog/product/view/options/type/date.phtml CHANGED Viewed

	@@ -20,13 +20,13 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_option = $this->getOption() ?>
28	<?php $_optionId = $_option->getId() ?>
29	- <dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->~~htmlEscape~~($_option->getTitle()) ?></label>
30	<?php echo $this->getFormatedPrice() ?></dt>
31	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
32


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 $_option = $this->getOption() ?>
28	<?php $_optionId = $_option->getId() ?>
29	+ <dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label>
30	<?php echo $this->getFormatedPrice() ?></dt>
31	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
32

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

	@@ -20,11 +20,11 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_option = $this->getOption() ?>
28	<dt>
29	- <label><?php echo $this->~~htmlEscape~~($_option->getTitle()) ?></label>
30	</dt>


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 $_option = $this->getOption() ?>
28	<dt>
29	+ <label><?php echo $this->escapeHtml($_option->getTitle()) ?></label>
30	</dt>

app/design/frontend/base/default/template/catalog/product/view/options/type/file.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	?>
	@@ -74,7 +74,7 @@
74	//]]>
75	</script>
76
77	- <dt><label <?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->~~htmlEscape~~($_option->getTitle()) ?></label>
78	<?php echo $this->getFormatedPrice() ?></dt>
79	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
80	<?php if ($_fileExists): ?>


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	?>

74	//]]>
75	</script>
76
77	+ <dt><label <?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label>
78	<?php echo $this->getFormatedPrice() ?></dt>
79	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
80	<?php if ($_fileExists): ?>

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

	@@ -20,14 +20,14 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27
28	<?php /* @var $this Mage_Catalog_Block_Product_View_Options_Type_Select */ ?>
29	<?php $_option = $this->getOption() ?>
30	- <dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->~~htmlEscape~~($_option->getTitle()) ?></label></dt>
31	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
32	<div class="input-box">
33	<?php echo $this->getValuesHtml() ?>


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
28	<?php /* @var $this Mage_Catalog_Block_Product_View_Options_Type_Select */ ?>
29	<?php $_option = $this->getOption() ?>
30	+ <dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label></dt>
31	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
32	<div class="input-box">
33	<?php echo $this->getValuesHtml() ?>

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

	@@ -20,12 +20,12 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_option = $this->getOption(); ?>
28	- <dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->~~htmlEscape~~($_option->getTitle()) ?></label>
29	<?php echo $this->getFormatedPrice() ?></dt>
30	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
31	<div class="input-box">


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 $_option = $this->getOption(); ?>
28	+ <dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label>
29	<?php echo $this->getFormatedPrice() ?></dt>
30	<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
31	<div class="input-box">

app/design/frontend/base/default/template/catalog/product/view/options/wrapper.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/catalog/product/view/options/wrapper/bottom.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/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/catalog/product/view/price_clone.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/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	?>
	@@ -49,7 +49,7 @@ if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
49	<?php endif; ?>
50	<?php Mage::helper('weee')->processTierPrices($_product, $_tierPrices); ?>
51	<?php foreach ($_tierPrices as $_index => $_price): ?>
52	- <li>
53	<?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
54	<?php if ($this->getInGrouped()): ?>
55	<?php echo $this->__('Buy %1$s for', $_price['price_qty']) ?>:


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

49	<?php endif; ?>
50	<?php Mage::helper('weee')->processTierPrices($_product, $_tierPrices); ?>
51	<?php foreach ($_tierPrices as $_index => $_price): ?>
52	+ <li class="tier-price tier-<?php echo $_index; ?>">
53	<?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
54	<?php if ($this->getInGrouped()): ?>
55	<?php echo $this->__('Buy %1$s for', $_price['price_qty']) ?>:

app/design/frontend/base/default/template/catalog/product/view/type/configurable.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/catalog/product/view/type/default.phtml CHANGED Viewed

	@@ -20,17 +20,19 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	<?php /* @var $this Mage_Catalog_Block_Product_View_Abstract */?>
28	<?php $_product = $this->getProduct() ?>
29
30	- <?php if ($~~_product~~->~~isAvailable~~()): ?>
31	- ~~<p class="availability in-stock"><?~~php ~~echo~~ $~~this~~->__(~~'Availability~~:') ?> ~~<span><?php echo $this->__('In stock') ?></span></p>~~
32	- <?php ~~else~~: ?>
33	- ~~<p class="availability out-of-stock"><?~~php ~~echo $this->__('Availability~~:') ?> ~~<span><?php echo $this->__('Out of stock') ?></span></p>~~


34	<?php endif; ?>
35	<?php echo $this->getChildHtml('product_type_data_extra') ?>
36	<?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	?>
27	<?php /* @var $this Mage_Catalog_Block_Product_View_Abstract */?>
28	<?php $_product = $this->getProduct() ?>
29
30	+ <?php if ($this->displayProductStockStatus()): ?>
31	+ <?php if ($_product->isAvailable()): ?>
32	+ <p class="availability in-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('In stock') ?></span></p>
33	+ <?php else: ?>
34	+ <p class="availability out-of-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('Out of stock') ?></span></p>
35	+ <?php endif; ?>
36	<?php endif; ?>
37	<?php echo $this->getChildHtml('product_type_data_extra') ?>
38	<?php echo $this->getPriceHtml($_product) ?>

app/design/frontend/base/default/template/catalog/product/view/type/grouped.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,10 +35,12 @@
35	<?php $_product = $this->getProduct(); ?>
36	<?php $_associatedProducts = $this->getAssociatedProducts(); ?>
37	<?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
38	- <?php if ($~~_product~~->~~isAvailable~~() ~~&& $_hasAssociatedProducts~~): ?>
39	- ~~<p class="availability in-stock"><?~~php ~~echo~~ $~~this~~->__(~~'Availability:'~~) ?> ~~<span><?php echo~~ $~~this->__('In stock'~~) ~~?></span></p>~~
40	- <?php ~~else~~: ?>
41	- ~~<p class="availability out-of-stock"><?~~php ~~echo $this->__('Availability~~:') ?> ~~<span><?php echo $this->__('Out of stock') ?></span></p>~~


42	<?php endif; ?>
43	<?php echo $this->getChildHtml('product_type_data_extra') ?>
44	<table class="data-table grouped-items-table" id="super-product-table">
	@@ -61,7 +63,7 @@
61	<?php foreach ($_associatedProducts as $_item): ?>
62	<?php $_finalPriceInclTax = $this->helper('tax')->getPrice($_item, $_item->getFinalPrice(), true) ?>
63	<tr>
64	- <td><?php echo $this->~~htmlEscape~~($_item->getName()) ?></td>
65	<?php if ($this->getCanShowProductPrice($_product)): ?>
66	<td class="a-right">
67	<?php if ($this->getCanShowProductPrice($_item)): ?>


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 $_product = $this->getProduct(); ?>
36	<?php $_associatedProducts = $this->getAssociatedProducts(); ?>
37	<?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
38	+ <?php if ($this->displayProductStockStatus()): ?>
39	+ <?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
40	+ <p class="availability in-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('In stock') ?></span></p>
41	+ <?php else: ?>
42	+ <p class="availability out-of-stock"><?php echo $this->__('Availability:') ?> <span><?php echo $this->__('Out of stock') ?></span></p>
43	+ <?php endif; ?>
44	<?php endif; ?>
45	<?php echo $this->getChildHtml('product_type_data_extra') ?>
46	<table class="data-table grouped-items-table" id="super-product-table">

63	<?php foreach ($_associatedProducts as $_item): ?>
64	<?php $_finalPriceInclTax = $this->helper('tax')->getPrice($_item, $_item->getFinalPrice(), true) ?>
65	<tr>
66	+ <td><?php echo $this->escapeHtml($_item->getName()) ?></td>
67	<?php if ($this->getCanShowProductPrice($_product)): ?>
68	<td class="a-right">
69	<?php if ($this->getCanShowProductPrice($_item)): ?>

app/design/frontend/base/default/template/catalog/product/view/type/options/configurable.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/catalog/product/view/type/simple.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/catalog/product/view/type/virtual.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/catalog/product/widget/link/link_block.phtml CHANGED Viewed

	@@ -20,8 +20,8 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	- <span class="widget widget-product-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->~~htmlEscape~~($this->getAnchorText()) ?></span></a></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	?>
27	+ <span class="widget widget-product-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>

app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml CHANGED Viewed

	@@ -20,8 +20,8 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	- <span class="widget widget-product-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->~~htmlEscape~~($this->getAnchorText()) ?></span></a></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	?>
27	+ <span class="widget widget-product-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>

app/design/frontend/base/default/template/catalog/product/widget/new/column/new_default_list.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,6 +31,7 @@
31	<strong><span><?php echo $this->__('New Products') ?></span></strong>
32	</div>
33	<div class="block-content">

34	<?php $suffix = $this->getNameInLayout(); ?>
35	<ol class="mini-products-list" id="widget-new-products-<?php echo $suffix; ?>">
36	<?php foreach ($_products->getItems() as $_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	?>

31	<strong><span><?php echo $this->__('New Products') ?></span></strong>
32	</div>
33	<div class="block-content">
34	+ <?php echo $this->getPagerHtml() ?>
35	<?php $suffix = $this->getNameInLayout(); ?>
36	<ol class="mini-products-list" id="widget-new-products-<?php echo $suffix; ?>">
37	<?php foreach ($_products->getItems() as $_product): ?>

app/design/frontend/base/default/template/catalog/product/widget/new/column/new_images_list.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,6 +31,7 @@
31	<strong><span><?php echo $this->__('New Products') ?></span></strong>
32	</div>
33	<div class="block-content">

34	<?php $suffix = $this->getNameInLayout(); ?>
35	<ol class="mini-products-images-list" id="widget-new-products-<?php echo $suffix; ?>">
36	<?php foreach ($_products->getItems() as $_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	?>

31	<strong><span><?php echo $this->__('New Products') ?></span></strong>
32	</div>
33	<div class="block-content">
34	+ <?php echo $this->getPagerHtml() ?>
35	<?php $suffix = $this->getNameInLayout(); ?>
36	<ol class="mini-products-images-list" id="widget-new-products-<?php echo $suffix; ?>">
37	<?php foreach ($_products->getItems() as $_product): ?>

app/design/frontend/base/default/template/catalog/product/widget/new/column/new_names_list.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,6 +31,7 @@
31	<strong><span><?php echo $this->__('New Products') ?></span></strong>
32	</div>
33	<div class="block-content">

34	<?php $suffix = $this->getNameInLayout(); ?>
35	<ol id="widget-new-products-<?php echo $suffix; ?>">
36	<?php foreach ($_products->getItems() as $_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	?>

31	<strong><span><?php echo $this->__('New Products') ?></span></strong>
32	</div>
33	<div class="block-content">
34	+ <?php echo $this->getPagerHtml() ?>
35	<?php $suffix = $this->getNameInLayout(); ?>
36	<ol id="widget-new-products-<?php echo $suffix; ?>">
37	<?php foreach ($_products->getItems() as $_product): ?>

app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.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	?>
	@@ -30,6 +30,7 @@
30	<h2><?php echo $this->__('New Products') ?></h2>
31	</div>
32	<div class="widget-products">

33	<?php $_columnCount = $this->getColumnCount(); ?>
34	<?php $i=0; foreach ($_products->getItems() as $_product): ?>
35	<?php if ($i++%$_columnCount==0): ?>


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

30	<h2><?php echo $this->__('New Products') ?></h2>
31	</div>
32	<div class="widget-products">
33	+ <?php echo $this->getPagerHtml() ?>
34	<?php $_columnCount = $this->getColumnCount(); ?>
35	<?php $i=0; foreach ($_products->getItems() as $_product): ?>
36	<?php if ($i++%$_columnCount==0): ?>

app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.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	?>
	@@ -30,6 +30,7 @@
30	<h2><?php echo $this->__('New Products') ?></h2>
31	</div>
32	<div class="widget-products">

33	<ol class="products-list">
34	<?php $i=0; foreach ($_products->getItems() as $_product): ?>
35	<li class="item<?php echo (++$i == count($_products))?' last':''; ?>">


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

30	<h2><?php echo $this->__('New Products') ?></h2>
31	</div>
32	<div class="widget-products">
33	+ <?php echo $this->getPagerHtml() ?>
34	<ol class="products-list">
35	<?php $i=0; foreach ($_products->getItems() as $_product): ?>
36	<li class="item<?php echo (++$i == count($_products))?' last':''; ?>">

app/design/frontend/base/default/template/catalog/rss/product/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/catalog/seo/sitemap.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/catalog/seo/sitemap/container.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/catalog/seo/tree.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/cataloginventory/qtyincrements.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/cataloginventory/stockqty/composite.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/cataloginventory/stockqty/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


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/catalogsearch/advanced/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/catalogsearch/advanced/result.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	?>
	@@ -42,7 +42,7 @@
42	<?php if(@$searchCriterias[$side]): ?>
43	<ul>
44	<?php foreach($searchCriterias[$side] as $criteria): ?>
45	- <li><strong><?php echo $this->~~htmlEscape~~($this->helper('catalog')->__($criteria['name'])); ?>:</strong> <?php echo $this->~~htmlEscape~~($criteria['value']); ?></li>
46	<?php endforeach; ?>
47	</ul>
48	<?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	?>

42	<?php if(@$searchCriterias[$side]): ?>
43	<ul>
44	<?php foreach($searchCriterias[$side] as $criteria): ?>
45	+ <li><strong><?php echo $this->escapeHtml($this->helper('catalog')->__($criteria['name'])); ?>:</strong> <?php echo $this->escapeHtml($criteria['value']); ?></li>
46	<?php endforeach; ?>
47	</ul>
48	<?php endif; ?>

app/design/frontend/base/default/template/catalogsearch/form.mini.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	/* @var $this Mage_Core_Block_Template */


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

app/design/frontend/base/default/template/catalogsearch/result.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/catalogsearch/term.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	?>
	@@ -30,7 +30,7 @@
30	<?php if( sizeof($this->getTerms()) > 0 ): ?>
31	<ul class="tags-list">
32	<?php foreach ($this->getTerms() as $_term): ?>
33	- <li><a href="<?php echo $this->getSearchUrl($_term) ?>" style="font-size:<?php echo $_term->getRatio()*70+75 ?>%;"><?php echo $this->~~htmlEscape~~($_term->getName()) ?></a></li>
34	<?php endforeach; ?>
35	</ul>
36	<?php else: ?>


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

30	<?php if( sizeof($this->getTerms()) > 0 ): ?>
31	<ul class="tags-list">
32	<?php foreach ($this->getTerms() as $_term): ?>
33	+ <li><a href="<?php echo $this->getSearchUrl($_term) ?>" style="font-size:<?php echo $_term->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_term->getName()) ?></a></li>
34	<?php endforeach; ?>
35	</ul>
36	<?php else: ?>

app/design/frontend/base/default/template/checkout/cart.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/checkout/cart/coupon.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,7 +31,7 @@
31	<label for="coupon_code"><?php echo $this->__('Enter your coupon code if you have one.') ?></label>
32	<input type="hidden" name="remove" id="remove-coupone" value="0" />
33	<div class="input-box">
34	- <input class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $this->~~htmlEscape~~($this->getCouponCode()) ?>" />
35	</div>
36	<div class="buttons-set">
37	<button type="button" title="<?php echo $this->__('Apply Coupon') ?>" class="button" onclick="discountForm.submit(false)" value="<?php echo $this->__('Apply Coupon') ?>"><span><span><?php echo $this->__('Apply Coupon') ?></span></span></button>


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	<label for="coupon_code"><?php echo $this->__('Enter your coupon code if you have one.') ?></label>
32	<input type="hidden" name="remove" id="remove-coupone" value="0" />
33	<div class="input-box">
34	+ <input class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $this->escapeHtml($this->getCouponCode()) ?>" />
35	</div>
36	<div class="buttons-set">
37	<button type="button" title="<?php echo $this->__('Apply Coupon') ?>" class="button" onclick="discountForm.submit(false)" value="<?php echo $this->__('Apply Coupon') ?>"><span><span><?php echo $this->__('Apply Coupon') ?></span></span></button>

app/design/frontend/base/default/template/checkout/cart/crosssell.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	?>
	@@ -37,9 +37,9 @@
37	<ul id="crosssell-products-list">
38	<?php foreach ($this->getItems() as $_item): ?>
39	<li class="item">
40	- <a class="product-image" href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($_item->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->~~htmlEscape~~($_item->getName()) ?>" /></a>
41	<div class="product-details">
42	- <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></a></h3>
43	<?php echo $this->getPriceHtml($_item, true) ?>
44	<button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_item) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
45	<ul class="add-to-links">


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	?>

37	<ul id="crosssell-products-list">
38	<?php foreach ($this->getItems() as $_item): ?>
39	<li class="item">
40	+ <a class="product-image" href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" /></a>
41	<div class="product-details">
42	+ <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></h3>
43	<?php echo $this->getPriceHtml($_item, true) ?>
44	<button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_item) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
45	<ul class="add-to-links">

app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.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/checkout/cart/item/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	?>
	@@ -30,25 +30,25 @@ $isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility();
30	$canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM);
31	?>
32	<tr>
33	- <td><?php if ($this->hasProductUrl()):?><a href="<?php echo $this->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($this->getProductName()) ?>" class="product-image"><?php endif;?><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" width="75" height="75" alt="<?php echo $this->~~htmlEscape~~($this->getProductName()) ?>" /><?php if ($this->hasProductUrl()):?></a><?php endif;?></td>
34	<td>
35	<h2 class="product-name">
36	<?php if ($this->hasProductUrl()):?>
37	- <a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->~~htmlEscape~~($this->getProductName()) ?></a>
38	<?php else: ?>
39	- <?php echo $this->~~htmlEscape~~($this->getProductName()) ?>
40	<?php endif; ?>
41	</h2>
42	<?php if ($_options = $this->getOptionList()):?>
43	<dl class="item-options">
44	<?php foreach ($_options as $_option) : ?>
45	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
46	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
47	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
48	<?php if (isset($_formatedOptionValue['full_view'])): ?>
49	<div class="truncated_full_value">
50	<dl class="item-options">
51	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
52	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
53	</dl>
54	</div>


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

30	$canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM);
31	?>
32	<tr>
33	+ <td><?php if ($this->hasProductUrl()):?><a href="<?php echo $this->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductName()) ?>" class="product-image"><?php endif;?><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /><?php if ($this->hasProductUrl()):?></a><?php endif;?></td>
34	<td>
35	<h2 class="product-name">
36	<?php if ($this->hasProductUrl()):?>
37	+ <a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a>
38	<?php else: ?>
39	+ <?php echo $this->escapeHtml($this->getProductName()) ?>
40	<?php endif; ?>
41	</h2>
42	<?php if ($_options = $this->getOptionList()):?>
43	<dl class="item-options">
44	<?php foreach ($_options as $_option) : ?>
45	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
46	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
47	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
48	<?php if (isset($_formatedOptionValue['full_view'])): ?>
49	<div class="truncated_full_value">
50	<dl class="item-options">
51	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
52	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
53	</dl>
54	</div>

app/design/frontend/base/default/template/checkout/cart/noItems.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/checkout/cart/render/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
	@@ -31,7 +31,7 @@
31	<?php $_item = $this->getItem() ?>
32	<tr>
33	<td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item')?>" class="btn-remove2"><?php echo $this->__('Remove Item')?></a></td>
34	- <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->~~htmlEscape~~($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->~~htmlEscape~~($this->getItemName($_item)) ?>" /></a></td>
35	<td>
36	<h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
37	<?php echo $this->getItemDescription($_item) ?>


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 $_item = $this->getItem() ?>
32	<tr>
33	<td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item')?>" class="btn-remove2"><?php echo $this->__('Remove Item')?></a></td>
34	+ <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" /></a></td>
35	<td>
36	<h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
37	<?php echo $this->getItemDescription($_item) ?>

app/design/frontend/base/default/template/checkout/cart/render/simple.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,7 +31,7 @@
31	<?php $_item = $this->getItem() ?>
32	<tr>
33	<td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item')?>" class="btn-remove2"><?php echo $this->__('Remove Item')?></a></td>
34	- <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->~~htmlEscape~~($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->~~htmlEscape~~($this->getItemName($_item)) ?>" /></a></td>
35	<td>
36	<h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
37	<?php echo $this->getItemDescription($_item) ?>


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 $_item = $this->getItem() ?>
32	<tr>
33	<td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item')?>" class="btn-remove2"><?php echo $this->__('Remove Item')?></a></td>
34	+ <td><a href="<?php echo $this->getItemUrl($_item) ?>" title="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($this->getItemName($_item)) ?>" /></a></td>
35	<td>
36	<h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
37	<?php echo $this->getItemDescription($_item) ?>

app/design/frontend/base/default/template/checkout/cart/shipping.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/checkout/cart/sidebar.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/checkout/cart/sidebar/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	?>
	@@ -31,16 +31,16 @@
31	?>
32	<li class="item">
33	<?php if ($this->hasProductUrl()): ?>
34	- <a href="<?php echo $this->getProductUrl()?>" title="<?php echo $this->~~htmlEscape~~($this->getProductName()) ?>" class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->~~htmlEscape~~($this->getProductName()) ?>" /></a>
35	<?php else: ?>
36	- <span class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->~~htmlEscape~~($this->getProductName()) ?>" /></span>
37	<?php endif; ?>
38	<div class="product-details">
39	<a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo $this->__('Remove This Item') ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove this item from the shopping cart?') ?>');" class="btn-remove"><?php echo $this->__('Remove This Item') ?></a>
40	<?php if ($isVisibleProduct): ?>
41	<a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item') ?>" class="btn-edit"><?php echo $this->__('Edit item')?></a>
42	<?php endif ?>
43	- <p class="product-name"><?php if ($this->hasProductUrl()): ?><a href="<?php echo $this->getProductUrl() ?>"><?php endif; ?><?php echo $this->~~htmlEscape~~($this->getProductName()) ?><?php if ($this->hasProductUrl()): ?></a><?php endif; ?></p>
44	<strong><?php echo $this->getQty() ?></strong> x
45
46	<?php if ($canApplyMsrp): ?>
	@@ -127,7 +127,7 @@
127	<div class="truncated_full_value">
128	<dl class="item-options">
129	<?php foreach ($_options as $_option) : ?>
130	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
131	<dd>
132	<?php if (is_array($_option['value'])): ?>
133	<?php echo nl2br(implode("\n", $_option['value'])) ?>


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	?>
32	<li class="item">
33	<?php if ($this->hasProductUrl()): ?>
34	+ <a href="<?php echo $this->getProductUrl()?>" title="<?php echo $this->escapeHtml($this->getProductName()) ?>" class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></a>
35	<?php else: ?>
36	+ <span class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></span>
37	<?php endif; ?>
38	<div class="product-details">
39	<a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo $this->__('Remove This Item') ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove this item from the shopping cart?') ?>');" class="btn-remove"><?php echo $this->__('Remove This Item') ?></a>
40	<?php if ($isVisibleProduct): ?>
41	<a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item') ?>" class="btn-edit"><?php echo $this->__('Edit item')?></a>
42	<?php endif ?>
43	+ <p class="product-name"><?php if ($this->hasProductUrl()): ?><a href="<?php echo $this->getProductUrl() ?>"><?php endif; ?><?php echo $this->escapeHtml($this->getProductName()) ?><?php if ($this->hasProductUrl()): ?></a><?php endif; ?></p>
44	<strong><?php echo $this->getQty() ?></strong> x
45
46	<?php if ($canApplyMsrp): ?>

127	<div class="truncated_full_value">
128	<dl class="item-options">
129	<?php foreach ($_options as $_option) : ?>
130	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
131	<dd>
132	<?php if (is_array($_option['value'])): ?>
133	<?php echo nl2br(implode("\n", $_option['value'])) ?>

app/design/frontend/base/default/template/checkout/cart/totals.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/checkout/multishipping/address/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	?>


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/checkout/multishipping/addresses.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	?>
	@@ -64,7 +64,7 @@
64	<?php if ($_item->getQuoteItem()) :?>
65	<tr>
66	<td><?php echo $this->getItemHtml($_item->getQuoteItem())?></td>
67	- <td><input type="text" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->~~htmlEscape~~($_item->getQty()) ?>" size="2" class="input-text qty" /></td>
68	<td><?php if ($_item->getProduct()->getIsVirtual()): echo $this->__('Shipping selection is not applicable.'); else: echo $this->getAddressesHtmlSelect($_item, $_index); endif; ?></td>
69	<td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item') ?>" class="btn-remove2"><?php echo $this->__('Remove Item') ?></a></td>
70	</tr>


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	?>

64	<?php if ($_item->getQuoteItem()) :?>
65	<tr>
66	<td><?php echo $this->getItemHtml($_item->getQuoteItem())?></td>
67	+ <td><input type="text" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" /></td>
68	<td><?php if ($_item->getProduct()->getIsVirtual()): echo $this->__('Shipping selection is not applicable.'); else: echo $this->getAddressesHtmlSelect($_item, $_index); endif; ?></td>
69	<td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo $this->__('Remove Item') ?>" class="btn-remove2"><?php echo $this->__('Remove Item') ?></a></td>
70	</tr>

app/design/frontend/base/default/template/checkout/multishipping/agreements.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	?>
	@@ -38,11 +38,11 @@
38	<?php if ($_a->getIsHtml()):?>
39	<?php echo $_a->getContent() ?>
40	<?php else:?>
41	- <?php echo nl2br($this->~~htmlEscape~~($_a->getContent())) ?>
42	<?php endif; ?>
43	</div>
44	<p class="agree">
45	- <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->~~htmlEscape~~($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->~~htmlEscape~~($_a->getCheckboxText()) ?></label>
46	</p>
47	</li>
48	<?php endforeach ?>


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	?>

38	<?php if ($_a->getIsHtml()):?>
39	<?php echo $_a->getContent() ?>
40	<?php else:?>
41	+ <?php echo nl2br($this->escapeHtml($_a->getContent())) ?>
42	<?php endif; ?>
43	</div>
44	<p class="agree">
45	+ <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->escapeHtml($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->escapeHtml($_a->getCheckboxText()) ?></label>
46	</p>
47	</li>
48	<?php endforeach ?>

app/design/frontend/base/default/template/checkout/multishipping/billing.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	?>
	@@ -69,11 +69,11 @@
69	<?php foreach ($_methods as $_method): $_code = $_method->getCode() ?>
70	<dt>
71	<?php if ($_methodsCount > 1): ?>
72	- <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" title="<?php echo $this->~~htmlEscape~~($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
73	<?php else :?>
74	<span class="no-display"><input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" checked="checked" class="radio" /></span>
75	<?php endif;?>
76	- <label for="p_method_<?php echo $_code ?>"><?php echo $_method->getTitle() ?></label>
77	</dt>
78	<?php if($html = $this->getChildHtml('payment.method.'.$_code)) : ?>
79	<dd>


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	?>

69	<?php foreach ($_methods as $_method): $_code = $_method->getCode() ?>
70	<dt>
71	<?php if ($_methodsCount > 1): ?>
72	+ <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
73	<?php else :?>
74	<span class="no-display"><input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" checked="checked" class="radio" /></span>
75	<?php endif;?>
76	+ <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($_method->getTitle()) ?></label>
77	</dt>
78	<?php if($html = $this->getChildHtml('payment.method.'.$_code)) : ?>
79	<dd>

app/design/frontend/base/default/template/checkout/multishipping/billing/items.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/checkout/multishipping/item/default.phtml CHANGED Viewed

	@@ -20,21 +20,21 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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	- <h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->~~htmlEscape~~($this->getProductName()) ?></a></h3>
28	<?php if ($_options = $this->getOptionList()):?>
29	<dl class="item-options">
30	<?php foreach ($_options as $_option) : ?>
31	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
32	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
33	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
34	<?php if (isset($_formatedOptionValue['full_view'])): ?>
35	<div class="truncated_full_value">
36	<dl class="item-options">
37	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
38	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
39	</dl>
40	</div>


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	+ <h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h3>
28	<?php if ($_options = $this->getOptionList()):?>
29	<dl class="item-options">
30	<?php foreach ($_options as $_option) : ?>
31	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
32	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
33	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
34	<?php if (isset($_formatedOptionValue['full_view'])): ?>
35	<div class="truncated_full_value">
36	<dl class="item-options">
37	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
38	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
39	</dl>
40	</div>

app/design/frontend/base/default/template/checkout/multishipping/link.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/checkout/multishipping/overview.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/checkout/multishipping/overview/item.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/checkout/multishipping/shipping.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	?>
	@@ -70,7 +70,7 @@
70	<?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?>: <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?>
71	<?php else: ?>
72	<?php if ($_sole) : ?>
73	- <span class="no-display"><input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->~~htmlEscape~~($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" checked="checked"/></span>
74	<?php else: ?>
75	<input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
76	<?php endif; ?>


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	?>

70	<?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?>: <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?>
71	<?php else: ?>
72	<?php if ($_sole) : ?>
73	+ <span class="no-display"><input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" checked="checked"/></span>
74	<?php else: ?>
75	<input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
76	<?php endif; ?>

app/design/frontend/base/default/template/checkout/multishipping/state.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/checkout/multishipping/success.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/checkout/onepage.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/checkout/onepage/agreements.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	?>
	@@ -39,11 +39,11 @@
39	<?php if ($_a->getIsHtml()):?>
40	<?php echo $_a->getContent() ?>
41	<?php else:?>
42	- <?php echo nl2br($this->~~htmlEscape~~($_a->getContent())) ?>
43	<?php endif; ?>
44	</div>
45	<p class="agree">
46	- <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->~~htmlEscape~~($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->~~htmlEscape~~($_a->getCheckboxText()) ?></label>
47	</p>
48	</li>
49	<?php endforeach ?>


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	?>

39	<?php if ($_a->getIsHtml()):?>
40	<?php echo $_a->getContent() ?>
41	<?php else:?>
42	+ <?php echo nl2br($this->escapeHtml($_a->getContent())) ?>
43	<?php endif; ?>
44	</div>
45	<p class="agree">
46	+ <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->escapeHtml($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->escapeHtml($_a->getCheckboxText()) ?></label>
47	</p>
48	</li>
49	<?php endforeach ?>

app/design/frontend/base/default/template/checkout/onepage/billing.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/checkout/onepage/failure.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/checkout/onepage/link.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/checkout/onepage/login.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	?>
	@@ -72,7 +72,7 @@
72	<li>
73	<label for="login-email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
74	<div class="input-box">
75	- <input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->~~htmlEscape~~($this->getUsername()) ?>" />
76	</div>
77	</li>
78	<li>


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	?>

72	<li>
73	<label for="login-email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
74	<div class="input-box">
75	+ <input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
76	</div>
77	</li>
78	<li>

app/design/frontend/base/default/template/checkout/onepage/payment.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/checkout/onepage/payment/info.phtml ADDED Viewed

	@@ -0,0 +1,29 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Academic Free License (AFL 3.0)
8	+ * that is bundled with this package in the file LICENSE_AFL.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/afl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category design
22	+ * @package base_default
23	+ * @copyright Copyright (c) 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	+ <dl class="sp-methods" id="checkout-payment-method-load">
28	+ <!-- Content dynamically loaded. Content from the methods.phtml is loaded during the ajax call -->
29	+ </dl>

app/design/frontend/base/default/template/checkout/onepage/payment/methods.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	?>
	@@ -28,21 +28,25 @@
28	/**
29	* One page checkout payment methods
30	*
31	- * @~~see~~ Mage_Checkout_Block_Onepage_Payment_Methods
32	*/
33	?>
34	- ~~<dl class="sp-methods" id="checkout-payment-method-load">~~
35	<?php
36	$methods = $this->getMethods();
37	$oneMethod = count($methods) <= 1;
38	?>
39	- <?php




40	foreach ($methods as $_method):
41	$_code = $_method->getCode();
42	?>
43	<dt>
44	<?php if(!$oneMethod): ?>
45	- <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->~~htmlEscape~~($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
46	<?php else: ?>
47	<span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio" /></span>
48	<?php $oneMethod = $_code; ?>
	@@ -54,15 +58,16 @@
54	<?php echo $html; ?>
55	</dd>
56	<?php endif; ?>
57	- <?php endforeach; ?>
58	- ~~</dl>~~

59	<?php echo $this->getChildChildHtml('additional'); ?>
60	<script type="text/javascript">
61	- //<![CDATA[
62	- <?php echo $this->getChildChildHtml('scripts'); ?>
63	- payment.init();
64	- <?php if (is_string($oneMethod)): ?>
65	payment.switchMethod('<?php echo $oneMethod ?>');
66	- <?php endif; ?>
67	- //]]>
68	</script>


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	?>

28	/**
29	* One page checkout payment methods
30	*
31	+ * @var $this Mage_Checkout_Block_Onepage_Payment_Methods
32	*/
33	?>
34	+
35	<?php
36	$methods = $this->getMethods();
37	$oneMethod = count($methods) <= 1;
38	?>
39	+ <?php if (empty($methods)): ?>
40	+ <dt>
41	+ <?php echo $this->__('No Payment Methods') ?>
42	+ </dt>
43	+ <?php else:
44	foreach ($methods as $_method):
45	$_code = $_method->getCode();
46	?>
47	<dt>
48	<?php if(!$oneMethod): ?>
49	+ <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" onclick="payment.switchMethod('<?php echo $_code ?>')"<?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
50	<?php else: ?>
51	<span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio" /></span>
52	<?php $oneMethod = $_code; ?>

58	<?php echo $html; ?>
59	</dd>
60	<?php endif; ?>
61	+ <?php endforeach;
62	+ endif;
63	+ ?>
64	<?php echo $this->getChildChildHtml('additional'); ?>
65	<script type="text/javascript">
66	+ //<![CDATA[
67	+ <?php echo $this->getChildChildHtml('scripts'); ?>
68	+ payment.init();
69	+ <?php if (is_string($oneMethod)): ?>
70	payment.switchMethod('<?php echo $oneMethod ?>');
71	+ <?php endif; ?>
72	+ //]]>
73	</script>

app/design/frontend/base/default/template/checkout/onepage/progress.phtml CHANGED Viewed

@@ -20,10 +20,9 @@
+             *
              * @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)
              */
-            -
            /* @var $this Mage_Checkout_Block_Onepage_Progress */
             ?>
             <div class="block block-progress opc-block-progress">
                 <div class="block-title">
@@ -31,85 +30,30 @@
                 </div>
                 <div class="block-content">
                     <dl>
-            -
                    <?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
-            -
                    <?php if ($this->isStepComplete('billing')): ?>
-            -
                        <dt class="complete">
-            -
                            <?php echo $this->__('Billing Address') ?> <span class="separator">|</span>
-            -
                            <a href="#billing" onclick="checkout.gotoSection('billing'); return false;"><?php echo $this->__('Change') ?></a>
-            -
                        </dt>
-            -
                        <dd class="complete">
-            -
                            <address><?php echo $this->getBilling()->format('html') ?></address>
-            -
                        </dd>
-            -
                    <?php else: ?>
-            -
                        <dt>
-            -
                            <?php echo $this->__('Billing Address') ?>
-            -
                        </dt>
-            -
                    <?php endif; ?>
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
-            -
                    <?php if ($this->isStepComplete('shipping')): ?>
-            -
                        <dt class="complete">
-            -
                            <?php echo $this->__('Shipping Address') ?> <span class="separator">|</span>
-            -
                            <a href="#payment" onclick="checkout.gotoSection('shipping');return false;"><?php echo $this->__('Change') ?></a>
-            -
                        </dt>
-            -
                        <dd class="complete">
-            -
                            <address><?php echo $this->getShipping()->format('html') ?></address>
-            -
                        </dd>
-            -
                    <?php else: ?>
-            -
                        <dt>
-            -
                            <?php echo $this->__('Shipping Address') ?>
-            -
                        </dt>
-            -
                    <?php endif; ?>
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
-            -
                    <?php if ($this->isStepComplete('shipping_method')): ?>
-            -
                        <dt class="complete">
-            -
                            <?php echo $this->__('Shipping Method') ?> <span class="separator">|</span>
-            -
                            <a href="#shipping_method" onclick="checkout.gotoSection('shipping_method'); return false;"><?php echo $this->__('Change') ?></a>
-            -
                        </dt>
-            -
                        <dd class="complete">
-            -
                            <?php if ($this->getShippingMethod()): ?>
-            -
                                <?php echo $this->escapeHtml($this->getShippingDescription()) ?>
-            -
                                <?php $_excl = $this->getShippingPriceExclTax(); ?>
-            -
                                <?php $_incl = $this->getShippingPriceInclTax(); ?>
-            -
                                <?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
-            -
                                    <?php echo $_incl; ?>
-            -
                                <?php else: ?>
-            -
                                    <?php echo $_excl; ?>
-            -
                                <?php endif; ?>
-            -
                                <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
-            -
                                    (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
-            -
                                <?php endif; ?>
-            -
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->__('Shipping method has not been selected yet') ?>
-            -
                            <?php endif; ?>
-            -
                        </dd>
-            -
                    <?php else: ?>
-            -
                        <dt>
-            -
                            <?php echo $this->__('Shipping Method') ?>
-            -
                        </dt>
-            -
                    <?php endif; ?>
-            -
                    <?php endif; ?>
-            -
-            -
                    <?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
-            -
                    <?php if ($this->isStepComplete('payment')): ?>
-            -
                        <dt class="complete">
-            -
                            <?php echo $this->__('Payment Method') ?> <span class="separator">|</span>
-            -
                            <a href="#payment" onclick="checkout.gotoSection('payment'); return false;"><?php echo $this->__('Change') ?></a>
-            -
                        </dt>
-            -
                        <dd class="complete">
-            -
                            <?php echo $this->getPaymentHtml() ?>
-            -
                        </dd>
-            -
                    <?php else: ?>
-            -
                        <dt>
-            -
                            <?php echo $this->__('Payment Method') ?>
-            -
                        </dt>
-            -
                    <?php endif; ?>
-            -
                    <?php endif; ?>
                     </dl>
                 </div>
             </div>


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	<div class="block block-progress opc-block-progress">
28	<div class="block-title">

30	</div>
31	<div class="block-content">
32	<dl>
33	+ <?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
34	+ <div id="billing-progress-opcheckout">
35	+ <?php echo $this->getChildHtml('billing.progress') ?>
36	+ </div>
37	+ <?php endif; ?>










38
39	+ <?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
40	+ <div id="shipping-progress-opcheckout">
41	+ <?php echo $this->getChildHtml('shipping.progress') ?>
42	+ </div>
43	+ <?php endif; ?>










44
45	+ <?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
46	+ <div id="shipping_method-progress-opcheckout">
47	+ <?php echo $this->getChildHtml('shippingmethod.progress') ?>
48	+ </div>
49	+ <?php endif; ?>




50
51	+ <?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
52	+ <div id="payment-progress-opcheckout">
53	+ <?php echo $this->getChildHtml('payment.progress') ?>
54	+ </div>
55	+ <?php endif; ?>
































56	</dl>
57	</div>
58	</div>
59	+

app/design/frontend/base/default/template/checkout/onepage/progress/billing.phtml ADDED Viewed

	@@ -0,0 +1,40 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Academic Free License (AFL 3.0)
8	+ * that is bundled with this package in the file LICENSE_AFL.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/afl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category design
22	+ * @package base_default
23	+ * @copyright Copyright (c) 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 if ($this->getCheckout()->getStepData('billing', 'complete')): ?>
28	+ <dt class="complete">
29	+ <?php echo $this->__('Billing Address') ?><span class="changelink"> <span class="separator">\|</span> <a
30	+ href="#billing"
31	+ onclick="checkout.changeSection('opc-billing'); return false;"><?php echo $this->__('Change') ?></a></span>
32	+ </dt>
33	+ <dd class="complete">
34	+ <address><?php echo $this->getBilling()->format('html') ?></address>
35	+ </dd>
36	+ <?php else: ?>
37	+ <dt>
38	+ <?php echo $this->__('Billing Address') ?>
39	+ </dt>
40	+ <?php endif; ?>

app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml ADDED Viewed

	@@ -0,0 +1,41 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Academic Free License (AFL 3.0)
8	+ * that is bundled with this package in the file LICENSE_AFL.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/afl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category design
22	+ * @package base_default
23	+ * @copyright Copyright (c) 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 if ($this->getCheckout()->getStepData('payment', 'complete')): ?>
28	+ <dt class="complete">
29	+ <?php echo $this->__('Payment Method') ?><span class="changelink"> <span class="separator">\|</span> <a
30	+ href="#payment"
31	+ onclick="checkout.changeSection('opc-payment'); return false;"><?php echo $this->__('Change') ?></a></span>
32	+ </dt>
33	+ <dd class="complete">
34	+ <?php echo $this->getPaymentHtml() ?>
35	+ </dd>
36	+ <?php else: ?>
37	+ <dt>
38	+ <?php echo $this->__('Payment Method') ?>
39	+ </dt>
40	+ <?php endif; ?>
41	+

app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml ADDED Viewed

	@@ -0,0 +1,44 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Academic Free License (AFL 3.0)
8	+ * that is bundled with this package in the file LICENSE_AFL.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/afl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category design
22	+ * @package base_default
23	+ * @copyright Copyright (c) 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 if ($this->getCheckout()->getStepData('shipping', 'complete')): ?>
28	+ <?php $completeClass = $this->getCheckout()->getStepData('shipping', 'complete') ? 'complete' : ''; ?>
29	+ <dt class="<?php echo $completeClass ?>">
30	+ <?php echo $this->__('Shipping Address') ?> <span class="changelink"><span class="separator">\|</span> <a
31	+ href="#payment"
32	+ onclick="checkout.changeSection('opc-shipping');return false;"><?php echo $this->__('Change') ?></a></span>
33	+ </dt>
34	+ <dd class="<?php echo $completeClass ?>">
35	+ <?php if ($this->getCheckout()->getStepData('shipping', 'complete')): ?>
36	+ <address><?php echo $this->getShipping()->format('html') ?></address>
37	+ <?php endif; ?>
38	+ </dd>
39	+ <?php else: ?>
40	+ <dt>
41	+ <?php echo $this->__('Shipping Address') ?>
42	+ </dt>
43	+ <?php endif; ?>
44	+

app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml ADDED Viewed

	@@ -0,0 +1,57 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Academic Free License (AFL 3.0)
8	+ * that is bundled with this package in the file LICENSE_AFL.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/afl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category design
22	+ * @package base_default
23	+ * @copyright Copyright (c) 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 if ($this->getCheckout()->getStepData('shipping_method', 'complete')): ?>
28	+ <dt class="complete">
29	+ <?php echo $this->__('Shipping Method') ?> <span class="changelink"><span class="separator">\|</span> <a
30	+ href="#shipping_method"
31	+ onclick="checkout.changeSection('opc-shipping_method'); return false;"><?php echo $this->__('Change') ?></a></span>
32	+ </dt>
33	+ <dd class="complete">
34	+ <?php if ($this->getShippingMethod()): ?>
35	+ <?php echo $this->getShippingDescription() ?>
36	+
37	+ <?php $_excl = $this->getShippingPriceExclTax(); ?>
38	+ <?php $_incl = $this->getShippingPriceInclTax(); ?>
39	+ <?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
40	+ <?php echo $_incl; ?>
41	+ <?php else: ?>
42	+ <?php echo $_excl; ?>
43	+ <?php endif; ?>
44	+ <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
45	+ (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
46	+ <?php endif; ?>
47	+
48	+ <?php else: ?>
49	+ <?php echo $this->__('Shipping method has not been selected yet') ?>
50	+ <?php endif; ?>
51	+ </dd>
52	+ <?php else: ?>
53	+ <dt>
54	+ <?php echo $this->__('Shipping Method') ?>
55	+ </dt>
56	+ <?php endif; ?>
57	+

app/design/frontend/base/default/template/checkout/onepage/review.phtml CHANGED Viewed

	@@ -20,10 +20,10 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	<div class="order-review" id="checkout-review-load">
28	- ~~<?php~~ ~~echo~~ ~~$this->getChildHtml('info')~~ ?>
29	</div>


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	<div class="order-review" id="checkout-review-load">
28	+ <!-- Content loaded dynamically -->
29	</div>

app/design/frontend/base/default/template/checkout/onepage/review/button.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/checkout/onepage/review/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	?>
	@@ -78,7 +78,7 @@
78	</div>
79	<script type="text/javascript">
80	//<![CDATA[
81	- review = new Review('<?php echo $this->getUrl('checkout/onepage/saveOrder') ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
82	//]]>
83	</script>
84	</div>


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	?>

78	</div>
79	<script type="text/javascript">
80	//<![CDATA[
81	+ review = new Review('<?php echo $this->getUrl('checkout/onepage/saveOrder', array('form_key' => Mage::getSingleton('core/session')->getFormKey())) ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
82	//]]>
83	</script>
84	</div>

app/design/frontend/base/default/template/checkout/onepage/review/item.phtml CHANGED Viewed

	@@ -20,23 +20,23 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_item = $this->getItem()?>
28	<tr>
29	- <td><h3 class="product-name"><?php echo $this->~~htmlEscape~~($this->getProductName()) ?></h3>
30	<?php if ($_options = $this->getOptionList()):?>
31	<dl class="item-options">
32	<?php foreach ($_options as $_option) : ?>
33	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
34	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
35	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
36	<?php if (isset($_formatedOptionValue['full_view'])): ?>
37	<div class="truncated_full_value">
38	<dl class="item-options">
39	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
40	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
41	</dl>
42	</div>


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 $_item = $this->getItem()?>
28	<tr>
29	+ <td><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
30	<?php if ($_options = $this->getOptionList()):?>
31	<dl class="item-options">
32	<?php foreach ($_options as $_option) : ?>
33	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
34	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
36	<?php if (isset($_formatedOptionValue['full_view'])): ?>
37	<div class="truncated_full_value">
38	<dl class="item-options">
39	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
40	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
41	</dl>
42	</div>

app/design/frontend/base/default/template/checkout/onepage/review/totals.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/checkout/onepage/shipping.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/checkout/onepage/shipping_method.phtml CHANGED Viewed

	@@ -20,13 +20,13 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	<form id="co-shipping-method-form" action="">
28	<div id="checkout-shipping-method-load">
29	- ~~<?php~~ ~~echo~~ ~~$this->getChildHtml('available')~~ ?>
30	</div>
31	<script type="text/javascript">
32	//<![CDATA[


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	<form id="co-shipping-method-form" action="">
28	<div id="checkout-shipping-method-load">
29	+ <!-- Content loaded dynamically -->
30	</div>
31	<script type="text/javascript">
32	//<![CDATA[

app/design/frontend/base/default/template/checkout/onepage/shipping_method/additional.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/checkout/onepage/shipping_method/available.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/checkout/success.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/checkout/total/default.phtml CHANGED Viewed

	@@ -20,16 +20,16 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	<tr>
28	- <th colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
29	<?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
30	<?php echo $this->escapeHtml($this->getTotal()->getTitle()); ?>
31	<?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?></strong><?php endif; ?>
32	- </th>
33	<td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
34	<?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
35	<?php echo $this->helper('checkout')->formatPrice($this->getTotal()->getValue()) ?>


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	<tr>
28	+ <td colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
29	<?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
30	<?php echo $this->escapeHtml($this->getTotal()->getTitle()); ?>
31	<?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?></strong><?php endif; ?>
32	+ </td>
33	<td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
34	<?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
35	<?php echo $this->helper('checkout')->formatPrice($this->getTotal()->getValue()) ?>

app/design/frontend/base/default/template/checkout/total/nominal.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/checkout/total/tax.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/cms/content.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/cms/content_heading.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/cms/default/home.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/cms/default/no-route.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/cms/meta.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/cms/widget/link/link_block.phtml CHANGED Viewed

	@@ -20,8 +20,8 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	- <span class="widget widget-cms-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->~~htmlEscape~~($this->getAnchorText()) ?></span></a></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	?>
27	+ <span class="widget widget-cms-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>

app/design/frontend/base/default/template/cms/widget/link/link_inline.phtml CHANGED Viewed

	@@ -20,8 +20,8 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	- <span class="widget widget-cms-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->~~htmlEscape~~($this->getAnchorText()) ?></span></a></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	?>
27	+ <span class="widget widget-cms-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>

app/design/frontend/base/default/template/cms/widget/static_block/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	?>


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/contacts/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	?>
	@@ -36,13 +36,13 @@
36	<div class="field">
37	<label for="name" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Name') ?></label>
38	<div class="input-box">
39	- <input name="name" id="name" title="<?php echo Mage::helper('contacts')->__('Name') ?>" value="<?php echo $this->~~htmlEscape~~($this->helper('contacts')->getUserName()) ?>" class="input-text required-entry" type="text" />
40	</div>
41	</div>
42	<div class="field">
43	<label for="email" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Email') ?></label>
44	<div class="input-box">
45	- <input name="email" id="email" title="<?php echo Mage::helper('contacts')->__('Email') ?>" value="<?php echo $this->~~htmlEscape~~($this->helper('contacts')->getUserEmail()) ?>" class="input-text required-entry validate-email" type="text" />
46	</div>
47	</div>
48	</li>


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	?>

36	<div class="field">
37	<label for="name" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Name') ?></label>
38	<div class="input-box">
39	+ <input name="name" id="name" title="<?php echo Mage::helper('contacts')->__('Name') ?>" value="<?php echo $this->escapeHtml($this->helper('contacts')->getUserName()) ?>" class="input-text required-entry" type="text" />
40	</div>
41	</div>
42	<div class="field">
43	<label for="email" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Email') ?></label>
44	<div class="input-box">
45	+ <input name="email" id="email" title="<?php echo Mage::helper('contacts')->__('Email') ?>" value="<?php echo $this->escapeHtml($this->helper('contacts')->getUserEmail()) ?>" class="input-text required-entry validate-email" type="text" />
46	</div>
47	</div>
48	</li>

app/design/frontend/base/default/template/core/formkey.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/core/link.phtml CHANGED Viewed

	@@ -20,8 +20,8 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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	- <a <?php echo $this->getLinkAttributes() ?>><?php echo $this->~~htmlEscape~~($this->getAnchorText()) ?></a>


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	+ <a <?php echo $this->getLinkAttributes() ?>><?php echo $this->escapeHtml($this->getAnchorText()) ?></a>

app/design/frontend/base/default/template/core/messages.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/customer/account/dashboard.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/customer/account/dashboard/address.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/customer/account/dashboard/hello.phtml CHANGED Viewed

	@@ -20,11 +20,11 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	<div class="welcome-msg">
28	- <p class="hello"><strong><?php echo $this->__('Hello, %s!', $this->~~htmlEscape~~($this->getCustomerName())) ?></strong></p>
29	<p><?php echo $this->__('From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.') ?></p>
30	</div>


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	<div class="welcome-msg">
28	+ <p class="hello"><strong><?php echo $this->__('Hello, %s!', $this->escapeHtml($this->getCustomerName())) ?></strong></p>
29	<p><?php echo $this->__('From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.') ?></p>
30	</div>

app/design/frontend/base/default/template/customer/account/dashboard/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	?>
	@@ -33,8 +33,8 @@
33	</div>
34	<div class="box-content">
35	<p>
36	- <?php echo $this->~~htmlEscape~~($this->getCustomer()->getName()) ?><br />
37	- <?php echo $this->~~htmlEscape~~($this->getCustomer()->getEmail()) ?><br />
38	<a href="<?php echo $this->getChangePasswordUrl() ?>"><?php echo $this->__('Change Password') ?></a>
39	</p>
40	</div>


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	?>

33	</div>
34	<div class="box-content">
35	<p>
36	+ <?php echo $this->escapeHtml($this->getCustomer()->getName()) ?><br />
37	+ <?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?><br />
38	<a href="<?php echo $this->getChangePasswordUrl() ?>"><?php echo $this->__('Change Password') ?></a>
39	</p>
40	</div>

app/design/frontend/base/default/template/customer/account/dashboard/newsletter.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/customer/account/link/back.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/customer/account/navigation.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/customer/address.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/customer/address/book.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/customer/address/edit.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/customer/balance.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/customer/form/address.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/customer/form/changepassword.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/customer/form/confirmation.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	?>
	@@ -36,7 +36,7 @@
36	<li>
37	<label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
38	<div class="input-box">
39	- <input type="text" name="email" id="email_address" title="<?php echo $this->__('Email Address') ?>" class="input-text required-entry validate-email" value="<?php echo $this->~~htmlEscape~~($this->getEmail()) ?>" />
40	</div>
41	</li>
42	</ul>


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	?>

36	<li>
37	<label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
38	<div class="input-box">
39	+ <input type="text" name="email" id="email_address" title="<?php echo $this->__('Email Address') ?>" class="input-text required-entry validate-email" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" />
40	</div>
41	</li>
42	</ul>

app/design/frontend/base/default/template/customer/form/edit.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	?>
	@@ -28,7 +28,7 @@
28	<h1><?php echo $this->__('Edit Account Information') ?></h1>
29	</div>
30	<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31	- <form action="<?php echo $this->getUrl('customer/account/editPost') ?>" method="post" id="form-validate">
32	<div class="fieldset">
33	<?php echo $this->getBlockHtml('formkey')?>
34	<h2 class="legend"><?php echo $this->__('Account Information') ?></h2>
	@@ -39,7 +39,7 @@
39	<li>
40	<label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
41	<div class="input-box">
42	- <input type="text" name="email" id="email" value="<?php echo $this->~~htmlEscape~~($this->getCustomer()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text required-entry validate-email" />
43	</div>
44	</li>
45	<?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
	@@ -65,6 +65,8 @@
65	<li>
66	<label for="current_password" class="required"><em>*</em><?php echo $this->__('Current Password') ?></label>
67	<div class="input-box">


68	<input type="password" title="<?php echo $this->__('Current Password') ?>" class="input-text" name="current_password" id="current_password" />
69	</div>
70	</li>
	@@ -107,6 +109,7 @@
107	$('confirmation').removeClassName('required-entry');
108	}
109	}

110	<?php if($this->getCustomer()->getChangePassword()): ?>
111	setPasswordForm(true);
112	<?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	?>

28	<h1><?php echo $this->__('Edit Account Information') ?></h1>
29	</div>
30	<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31	+ <form action="<?php echo $this->getUrl('customer/account/editPost') ?>" method="post" id="form-validate" autocomplete="off">
32	<div class="fieldset">
33	<?php echo $this->getBlockHtml('formkey')?>
34	<h2 class="legend"><?php echo $this->__('Account Information') ?></h2>

39	<li>
40	<label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
41	<div class="input-box">
42	+ <input type="text" name="email" id="email" value="<?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text required-entry validate-email" />
43	</div>
44	</li>
45	<?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>

65	<li>
66	<label for="current_password" class="required"><em>*</em><?php echo $this->__('Current Password') ?></label>
67	<div class="input-box">
68	+ <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
69	+ <input type="text" class="input-text no-display" name="dummy" id="dummy" />
70	<input type="password" title="<?php echo $this->__('Current Password') ?>" class="input-text" name="current_password" id="current_password" />
71	</div>
72	</li>

109	$('confirmation').removeClassName('required-entry');
110	}
111	}
112	+
113	<?php if($this->getCustomer()->getChangePassword()): ?>
114	setPasswordForm(true);
115	<?php endif; ?>

app/design/frontend/base/default/template/customer/form/forgotpassword.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	?>
	@@ -36,7 +36,7 @@
36	<li>
37	<label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
38	<div class="input-box">
39	- <input type="text" name="email" alt="email" id="email_address" class="input-text required-entry validate-email" value="<?php echo $this->~~htmlEscape~~($this->getEmailValue()) ?>" />
40	</div>
41	</li>
42	<?php echo $this->getChildHtml('form.additional.info'); ?>


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	?>

36	<li>
37	<label for="email_address" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
38	<div class="input-box">
39	+ <input type="text" name="email" alt="email" id="email_address" class="input-text required-entry validate-email" value="<?php echo $this->escapeHtml($this->getEmailValue()) ?>" />
40	</div>
41	</li>
42	<?php echo $this->getChildHtml('form.additional.info'); ?>

app/design/frontend/base/default/template/customer/form/login.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	?>
	@@ -54,7 +54,7 @@
54	<li>
55	<label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
56	<div class="input-box">
57	- <input type="text" name="login[username]" value="<?php echo $this->~~htmlEscape~~($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
58	</div>
59	</li>
60	<li>


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	?>

54	<li>
55	<label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
56	<div class="input-box">
57	+ <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
58	</div>
59	</li>
60	<li>

app/design/frontend/base/default/template/customer/form/mini.login.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/customer/form/newsletter.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/customer/form/register.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/customer/form/resetforgottenpassword.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/customer/logout.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/customer/orders.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/customer/widget/dob.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/customer/widget/gender.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/customer/widget/name.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/customer/widget/taxvat.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/customer/wishlist.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
	@@ -51,7 +51,7 @@
51	<tr>
52	<td>
53	<input type="hidden" value="1" name="wishlist[<?php echo $item->getItemId() ?>]" />
54	- <a href="<?php echo $this->getUrl('catalog/product/view/id/'.$item->getProduct()->getId()) ?>"><?php echo $this->~~htmlEscape~~($item->getProduct()->getName()) ?></a>
55	</td>
56	<td><?php echo $item->getStatus() ?></td>
57	<td><input type="checkbox" value="1" name="to_cart[<?php echo $item->getItemId() ?>]" class="checkbox" /></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

51	<tr>
52	<td>
53	<input type="hidden" value="1" name="wishlist[<?php echo $item->getItemId() ?>]" />
54	+ <a href="<?php echo $this->getUrl('catalog/product/view/id/'.$item->getProduct()->getId()) ?>"><?php echo $this->escapeHtml($item->getProduct()->getName()) ?></a>
55	</td>
56	<td><?php echo $item->getStatus() ?></td>
57	<td><input type="checkbox" value="1" name="to_cart[<?php echo $item->getItemId() ?>]" class="checkbox" /></td>

app/design/frontend/base/default/template/directory/currency.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/directory/currency/switch.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/directory/js/optional_zip_countries.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/downloadable/catalog/product/links.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/downloadable/catalog/product/samples.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/downloadable/catalog/product/type.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/downloadable/checkout/cart/item/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	?>
	@@ -29,19 +29,19 @@
29	$canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM);
30	?>
31	<tr>
32	- <td><a href="<?php echo $this->getProductUrl() ?>" class="product-image" title="<?php echo $this->~~htmlEscape~~($this->getProductName()) ?>"><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" alt="<?php echo $this->~~htmlEscape~~($this->getProductName()) ?>" /></a></td>
33	<td>
34	- <h2 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->~~htmlEscape~~($this->getProductName()) ?></a></h2>
35	<?php if ($_options = $this->getOptionList()):?>
36	<dl class="item-options">
37	<?php foreach ($_options as $_option) : ?>
38	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
39	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
40	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
41	<?php if (isset($_formatedOptionValue['full_view'])): ?>
42	<div class="truncated_full_value">
43	<dl class="item-options">
44	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
45	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
46	</dl>
47	</div>


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	$canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM);
30	?>
31	<tr>
32	+ <td><a href="<?php echo $this->getProductUrl() ?>" class="product-image" title="<?php echo $this->escapeHtml($this->getProductName()) ?>"><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></a></td>
33	<td>
34	+ <h2 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h2>
35	<?php if ($_options = $this->getOptionList()):?>
36	<dl class="item-options">
37	<?php foreach ($_options as $_option) : ?>
38	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
39	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
40	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
41	<?php if (isset($_formatedOptionValue['full_view'])): ?>
42	<div class="truncated_full_value">
43	<dl class="item-options">
44	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
45	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
46	</dl>
47	</div>

app/design/frontend/base/default/template/downloadable/checkout/multishipping/item/downloadable.phtml CHANGED Viewed

	@@ -20,22 +20,22 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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	- <h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->~~htmlEscape~~($this->getProductName()) ?></a></h3>
28	<!-- item custom options -->
29	<?php if ($_options = $this->getOptionList()):?>
30	<dl class="item-options">
31	<?php foreach ($_options as $_option) : ?>
32	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
33	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
34	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
35	<?php if (isset($_formatedOptionValue['full_view'])): ?>
36	<div class="truncated_full_value">
37	<dl class="item-options">
38	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
39	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
40	</dl>
41	</div>


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	+ <h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h3>
28	<!-- item custom options -->
29	<?php if ($_options = $this->getOptionList()):?>
30	<dl class="item-options">
31	<?php foreach ($_options as $_option) : ?>
32	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
33	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
34	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
35	<?php if (isset($_formatedOptionValue['full_view'])): ?>
36	<div class="truncated_full_value">
37	<dl class="item-options">
38	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
39	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
40	</dl>
41	</div>

app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml CHANGED Viewed

	@@ -20,24 +20,24 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_item = $this->getItem()?>
28	<tr>
29	- <td><h3 class="product-name"><?php echo $this->~~htmlEscape~~($this->getProductName()) ?></h3>
30	<!-- item custom options -->
31	<?php if ($_options = $this->getOptionList()):?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
35	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
36	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
37	<?php if (isset($_formatedOptionValue['full_view'])): ?>
38	<div class="truncated_full_value">
39	<dl class="item-options">
40	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
41	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
42	</dl>
43	</div>


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 $_item = $this->getItem()?>
28	<tr>
29	+ <td><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
30	<!-- item custom options -->
31	<?php if ($_options = $this->getOptionList()):?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
35	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
36	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
37	<?php if (isset($_formatedOptionValue['full_view'])): ?>
38	<div class="truncated_full_value">
39	<dl class="item-options">
40	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
41	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
42	</dl>
43	</div>

app/design/frontend/base/default/template/downloadable/checkout/success.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/downloadable/customer/products/list.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/downloadable/email/order/items/creditmemo/downloadable.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	?>
	@@ -28,7 +28,7 @@
28	<?php $_order = $this->getItem()->getOrder(); ?>
29	<tr>
30	<td align="left" valign="top" style="padding:3px 9px">
31	- <strong><?php echo $this->~~htmlEscape~~($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>
	@@ -45,9 +45,9 @@
45	<?php endforeach; ?>
46	</dl>
47	<?php endif; ?>
48	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
49	</td>
50	- <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->~~htmlEscape~~($this->getSku($_item)) ?></td>
51	<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
52	<td align="right" valign="top" style="padding:3px 9px">
53	<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>


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	?>

28	<?php $_order = $this->getItem()->getOrder(); ?>
29	<tr>
30	<td align="left" valign="top" style="padding:3px 9px">
31	+ <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>

45	<?php endforeach; ?>
46	</dl>
47	<?php endif; ?>
48	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
49	</td>
50	+ <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
51	<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
52	<td align="right" valign="top" style="padding:3px 9px">
53	<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>

app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.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	?>
	@@ -28,7 +28,7 @@
28	<?php $_order = $this->getItem()->getOrder(); ?>
29	<tr>
30	<td align="left" valign="top" style="padding:3px 9px">
31	- <strong><?php echo $this->~~htmlEscape~~($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>
	@@ -48,9 +48,9 @@
48	<?php endforeach; ?>
49	</dl>
50	<?php endif; ?>
51	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
52	</td>
53	- <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->~~htmlEscape~~($this->getSku($_item)) ?></td>
54	<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
55	<td align="right" valign="top" style="padding:3px 9px">
56	<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>


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	?>

28	<?php $_order = $this->getItem()->getOrder(); ?>
29	<tr>
30	<td align="left" valign="top" style="padding:3px 9px">
31	+ <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>

48	<?php endforeach; ?>
49	</dl>
50	<?php endif; ?>
51	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
52	</td>
53	+ <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
54	<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
55	<td align="right" valign="top" style="padding:3px 9px">
56	<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>

app/design/frontend/base/default/template/downloadable/email/order/items/order/downloadable.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	?>
	@@ -28,7 +28,7 @@
28	<?php $_order = $this->getItem()->getOrder() ?>
29	<tr>
30	<td align="left" valign="top" style="padding:3px 9px">
31	- <strong><?php echo $this->~~htmlEscape~~($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>
	@@ -48,15 +48,15 @@
48	<?php endforeach; ?>
49	</dl>
50	<?php endif; ?>
51	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
52	<?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
53	<br /><strong><?php echo $this->__('Gift Message') ?></strong>
54	- <br /><?php echo $this->__('From:'); ?> <?php echo $this->~~htmlEscape~~($_giftMessage->getSender()) ?>
55	- <br /><?php echo $this->__('To:'); ?> <?php echo $this->~~htmlEscape~~($_giftMessage->getRecipient()) ?>
56	- <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->~~htmlEscape~~($_giftMessage->getMessage()) ?>
57	<?php endif; ?>
58	</td>
59	- <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->~~htmlEscape~~($this->getSku($_item)) ?></td>
60	<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered()*1 ?></td>
61	<td align="right" valign="top" style="padding:3px 9px">
62	<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>


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	?>

28	<?php $_order = $this->getItem()->getOrder() ?>
29	<tr>
30	<td align="left" valign="top" style="padding:3px 9px">
31	+ <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>

48	<?php endforeach; ?>
49	</dl>
50	<?php endif; ?>
51	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
52	<?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
53	<br /><strong><?php echo $this->__('Gift Message') ?></strong>
54	+ <br /><?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
55	+ <br /><?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
56	+ <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
57	<?php endif; ?>
58	</td>
59	+ <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
60	<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered()*1 ?></td>
61	<td align="right" valign="top" style="padding:3px 9px">
62	<?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>

app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml CHANGED Viewed

	@@ -20,32 +20,32 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_item = $this->getItem() ?>
28	<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30	- <td><h4 class="product-name"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></h4>
31	<?php if($_options = $this->getItemOptions()): ?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
35	<?php if (!$this->getPrintStatus()): ?>
36	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
38	<?php if (isset($_formatedOptionValue['full_view'])): ?>
39	<div class="truncated_full_value">
40	<dl class="item-options">
41	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
42	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43	</dl>
44	</div>
45	<?php endif; ?>
46	</dd>
47	<?php else: ?>
48	- <dd><?php echo $this->~~htmlEscape~~( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
49	<?php endif; ?>
50	<?php endforeach; ?>
51	</dl>
	@@ -62,12 +62,12 @@
62	<?php endif; ?>
63	<!-- EOF downloadable -->
64
65	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
66	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
67	<br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
68	<?php endif; ?>
69	</td>
70	- <td><?php echo $this->~~htmlEscape~~(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
71	<td class="a-right nowrap">
72	<?php if ($this->helper('tax')->displayCartBothPrices() \|\| $this->helper('tax')->displayCartPriceExclTax()): ?>
73	<span class="price-excl-tax">


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 $_item = $this->getItem() ?>
28	<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30	+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31	<?php if($_options = $this->getItemOptions()): ?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35	<?php if (!$this->getPrintStatus()): ?>
36	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
38	<?php if (isset($_formatedOptionValue['full_view'])): ?>
39	<div class="truncated_full_value">
40	<dl class="item-options">
41	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
42	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43	</dl>
44	</div>
45	<?php endif; ?>
46	</dd>
47	<?php else: ?>
48	+ <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
49	<?php endif; ?>
50	<?php endforeach; ?>
51	</dl>

62	<?php endif; ?>
63	<!-- EOF downloadable -->
64
65	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
66	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
67	<br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
68	<?php endif; ?>
69	</td>
70	+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
71	<td class="a-right nowrap">
72	<?php if ($this->helper('tax')->displayCartBothPrices() \|\| $this->helper('tax')->displayCartPriceExclTax()): ?>
73	<span class="price-excl-tax">

app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml CHANGED Viewed

	@@ -20,18 +20,18 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_item = $this->getItem() ?>
28	<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30	- <td><h4 class="product-name"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></h4>
31	<?php if($_options = $this->getItemOptions()): ?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
35	<?php if (!$this->getPrintStatus()): ?>
36	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
	@@ -39,14 +39,14 @@
39	<?php if (isset($_formatedOptionValue['full_view'])): ?>
40	<div class="truncated_full_value">
41	<dl class="item-options">
42	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
43	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44	</dl>
45	</div>
46	<?php endif; ?>
47	</dd>
48	<?php else: ?>
49	- <dd><?php echo $this->~~htmlEscape~~( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
50	<?php endif; ?>
51	<?php endforeach; ?>
52	</dl>
	@@ -63,12 +63,12 @@
63	<?php endif; ?>
64	<!-- EOF downloadable -->
65
66	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
67	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
68	<br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
69	<?php endif; ?>
70	</td>
71	- <td><?php echo $this->~~htmlEscape~~(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
72	<td class="a-right nowrap">
73	<?php if ($this->helper('tax')->displayCartBothPrices() \|\| $this->helper('tax')->displayCartPriceExclTax()): ?>
74	<span class="price-excl-tax">


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 $_item = $this->getItem() ?>
28	<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30	+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31	<?php if($_options = $this->getItemOptions()): ?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35	<?php if (!$this->getPrintStatus()): ?>
36	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>

39	<?php if (isset($_formatedOptionValue['full_view'])): ?>
40	<div class="truncated_full_value">
41	<dl class="item-options">
42	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
43	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44	</dl>
45	</div>
46	<?php endif; ?>
47	</dd>
48	<?php else: ?>
49	+ <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
50	<?php endif; ?>
51	<?php endforeach; ?>
52	</dl>

63	<?php endif; ?>
64	<!-- EOF downloadable -->
65
66	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
67	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
68	<br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
69	<?php endif; ?>
70	</td>
71	+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
72	<td class="a-right nowrap">
73	<?php if ($this->helper('tax')->displayCartBothPrices() \|\| $this->helper('tax')->displayCartPriceExclTax()): ?>
74	<span class="price-excl-tax">

app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml CHANGED Viewed

	@@ -20,17 +20,17 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_item = $this->getItem() ?>
28	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
29	- <td><h3 class="product-name"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></h3>
30	<?php if($_options = $this->getItemOptions()): ?>
31	<dl class="item-options">
32	<?php foreach ($_options as $_option) : ?>
33	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
34	<?php if (!$this->getPrintStatus()): ?>
35	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
36	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
	@@ -38,14 +38,14 @@
38	<?php if (isset($_formatedOptionValue['full_view'])): ?>
39	<div class="truncated_full_value">
40	<dl class="item-options">
41	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
42	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43	</dl>
44	</div>
45	<?php endif; ?>
46	</dd>
47	<?php else: ?>
48	- <dd><?php echo $this->~~htmlEscape~~( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
49	<?php endif; ?>
50	<?php endforeach; ?>
51	</dl>
	@@ -62,12 +62,12 @@
62	<?php endif; ?>
63	<!-- EOF downloadable -->
64
65	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
66	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
67	<br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
68	<?php endif; ?>
69	</td>
70	- <td><?php echo $this->~~htmlEscape~~(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
71	<td class="a-right nowrap">
72	<?php if ($this->helper('tax')->displayCartBothPrices() \|\| $this->helper('tax')->displayCartPriceExclTax()): ?>
73	<span class="price-excl-tax">


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 $_item = $this->getItem() ?>
28	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
29	+ <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
30	<?php if($_options = $this->getItemOptions()): ?>
31	<dl class="item-options">
32	<?php foreach ($_options as $_option) : ?>
33	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
34	<?php if (!$this->getPrintStatus()): ?>
35	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
36	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>

38	<?php if (isset($_formatedOptionValue['full_view'])): ?>
39	<div class="truncated_full_value">
40	<dl class="item-options">
41	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
42	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43	</dl>
44	</div>
45	<?php endif; ?>
46	</dd>
47	<?php else: ?>
48	+ <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
49	<?php endif; ?>
50	<?php endforeach; ?>
51	</dl>

62	<?php endif; ?>
63	<!-- EOF downloadable -->
64
65	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
66	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
67	<br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
68	<?php endif; ?>
69	</td>
70	+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
71	<td class="a-right nowrap">
72	<?php if ($this->helper('tax')->displayCartBothPrices() \|\| $this->helper('tax')->displayCartPriceExclTax()): ?>
73	<span class="price-excl-tax">

app/design/frontend/base/default/template/email/order/creditmemo/items.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/email/order/invoice/items.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/email/order/items.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	?>
	@@ -62,9 +62,9 @@
62
63	<tr>
64	<td colspan="4" align="left" style="padding:3px 9px">
65	- <strong><?php echo $this->__('From:'); ?></strong> <?php echo $this->~~htmlEscape~~($_giftMessage->getSender()) ?>
66	- <br /><strong><?php echo $this->__('To:'); ?></strong> <?php echo $this->~~htmlEscape~~($_giftMessage->getRecipient()) ?>
67	- <br /><strong><?php echo $this->__('Message:'); ?></strong><br /> <?php echo $this->~~htmlEscape~~($_giftMessage->getMessage()) ?>
68	</td>
69	</tr>
70	</tbody>


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	?>

62
63	<tr>
64	<td colspan="4" align="left" style="padding:3px 9px">
65	+ <strong><?php echo $this->__('From:'); ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
66	+ <br /><strong><?php echo $this->__('To:'); ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
67	+ <br /><strong><?php echo $this->__('Message:'); ?></strong><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
68	</td>
69	</tr>
70	</tbody>

app/design/frontend/base/default/template/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	?>
	@@ -28,7 +28,7 @@
28	<?php $_order = $this->getItem()->getOrder(); ?>
29	<tr>
30	<td align="left" valign="top" style="padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
31	- <strong style="font-size:11px;"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>
	@@ -41,9 +41,9 @@
41	<?php if ($addInfoBlock) :?>
42	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
43	<?php endif; ?>
44	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
45	</td>
46	- <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->~~htmlEscape~~($this->getSku($_item)) ?></td>
47	<td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQty()*1 ?></td>
48	<td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
49	<?php if ($this->helper('tax')->displaySalesPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>


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	?>

28	<?php $_order = $this->getItem()->getOrder(); ?>
29	<tr>
30	<td align="left" valign="top" style="padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
31	+ <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>

41	<?php if ($addInfoBlock) :?>
42	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
43	<?php endif; ?>
44	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
45	</td>
46	+ <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
47	<td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQty()*1 ?></td>
48	<td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
49	<?php if ($this->helper('tax')->displaySalesPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>

app/design/frontend/base/default/template/email/order/items/invoice/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	?>
	@@ -28,7 +28,7 @@
28	<?php $_order = $this->getItem()->getOrder(); ?>
29	<tr>
30	<td align="left" valign="top" style="padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
31	- <strong style="font-size:11px;"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>
	@@ -41,9 +41,9 @@
41	<?php if ($addInfoBlock) :?>
42	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
43	<?php endif; ?>
44	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
45	</td>
46	- <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->~~htmlEscape~~($this->getSku($_item)) ?></td>
47	<td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQty()*1 ?></td>
48	<td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
49	<?php if ($this->helper('tax')->displaySalesPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>


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	?>

28	<?php $_order = $this->getItem()->getOrder(); ?>
29	<tr>
30	<td align="left" valign="top" style="padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
31	+ <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>

41	<?php if ($addInfoBlock) :?>
42	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
43	<?php endif; ?>
44	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
45	</td>
46	+ <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
47	<td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQty()*1 ?></td>
48	<td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
49	<?php if ($this->helper('tax')->displaySalesPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>

app/design/frontend/base/default/template/email/order/items/order/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	?>
	@@ -28,13 +28,13 @@
28	<?php $_order = $this->getItem()->getOrder() ?>
29	<tr>
30	<td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
31	- <strong style="font-size:11px;"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>
35	<dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
36	<dd style="margin:0; padding:0 0 0 9px;">
37	- <?php echo ~~(isset($option['print_value']) ? $option['print_value'] :~~ nl2br($~~this->escapeHtml($~~option['value']))) ?>
38	</dd>
39	<?php endforeach; ?>
40	</dl>
	@@ -45,7 +45,7 @@
45	<?php endif; ?>
46	<?php echo $this->escapeHtml($_item->getDescription()) ?>
47	</td>
48	- <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->~~htmlEscape~~($this->getSku($_item)) ?></td>
49	<td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQtyOrdered()*1 ?></td>
50	<td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
51	<?php if ($this->helper('tax')->displaySalesPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>
	@@ -128,9 +128,9 @@
128	<tr>
129	<td colspan="4" style=" border-bottom:2px solid #CCCCCC; padding:3px 9px;">
130	<strong style="color:#444444; font-size:11px;"><?php echo $this->__('Gift Message') ?></strong>
131	- <?php echo $this->__('From:'); ?> <?php echo $this->~~htmlEscape~~($_giftMessage->getSender()) ?><br />
132	- <?php echo $this->__('To:'); ?> <?php echo $this->~~htmlEscape~~($_giftMessage->getRecipient()) ?><br />
133	- <strong><?php echo $this->__('Message:'); ?></strong><br /><?php echo $this->~~htmlEscape~~($_giftMessage->getMessage()) ?>
134	</td>
135	</tr>
136	<?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	?>

28	<?php $_order = $this->getItem()->getOrder() ?>
29	<tr>
30	<td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
31	+ <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
32	<?php if ($this->getItemOptions()): ?>
33	<dl style="margin:0; padding:0;">
34	<?php foreach ($this->getItemOptions() as $option): ?>
35	<dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
36	<dd style="margin:0; padding:0 0 0 9px;">
37	+ <?php echo nl2br($option['value']) ?>
38	</dd>
39	<?php endforeach; ?>
40	</dl>

45	<?php endif; ?>
46	<?php echo $this->escapeHtml($_item->getDescription()) ?>
47	</td>
48	+ <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
49	<td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQtyOrdered()*1 ?></td>
50	<td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
51	<?php if ($this->helper('tax')->displaySalesPriceExclTax($_order->getStore()) \|\| $this->helper('tax')->displaySalesBothPrices($_order->getStore())): ?>

128	<tr>
129	<td colspan="4" style=" border-bottom:2px solid #CCCCCC; padding:3px 9px;">
130	<strong style="color:#444444; font-size:11px;"><?php echo $this->__('Gift Message') ?></strong>
131	+ <?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?><br />
132	+ <?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?><br />
133	+ <strong><?php echo $this->__('Message:'); ?></strong><br /><?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
134	</td>
135	</tr>
136	<?php endif; ?>

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

	@@ -20,14 +20,14 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_item = $this->getItem() ?>
28	<tr>
29	<td align="left" valign="top" style="font-size:11px; padding:3px 9px;">
30	- <strong><?php echo $this->~~htmlEscape~~($_item->getName()) ?></strong>
31	<?php if ($this->getItemOptions()): ?>
32	<dl style="margin:0; padding:0;">
33	<?php foreach ($this->getItemOptions() as $option): ?>
	@@ -40,8 +40,8 @@
40	<?php if ($addInfoBlock) :?>
41	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
42	<?php endif; ?>
43	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
44	</td>
45	- <td align="left" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $this->~~htmlEscape~~($this->getSku($_item)) ?></td>
46	<td align="center" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $_item->getQty()*1 ?></td>
47	</tr>


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 $_item = $this->getItem() ?>
28	<tr>
29	<td align="left" valign="top" style="font-size:11px; padding:3px 9px;">
30	+ <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
31	<?php if ($this->getItemOptions()): ?>
32	<dl style="margin:0; padding:0;">
33	<?php foreach ($this->getItemOptions() as $option): ?>

40	<?php if ($addInfoBlock) :?>
41	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
42	<?php endif; ?>
43	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
44	</td>
45	+ <td align="left" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
46	<td align="center" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $_item->getQty()*1 ?></td>
47	</tr>

app/design/frontend/base/default/template/email/order/shipment/items.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/email/order/shipment/track.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	?>
	@@ -37,8 +37,8 @@
37	<tbody>
38	<?php $i=0; foreach ($_shipment->getAllTracks() as $_item): $i++ ?>
39	<tr <?php echo $i%2?'bgcolor="#F6F6F6"':'' ?>>
40	- <td align="left" valign="top" style="padding:3px 9px"><?php echo $_item->getTitle() ?></td>
41	- <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getNumber() ?></td>
42	</tr>
43	<?php endforeach ?>
44	</tbody>


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	?>

37	<tbody>
38	<?php $i=0; foreach ($_shipment->getAllTracks() as $_item): $i++ ?>
39	<tr <?php echo $i%2?'bgcolor="#F6F6F6"':'' ?>>
40	+ <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getTitle()) ?></td>
41	+ <td align="center" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getNumber()) ?></td>
42	</tr>
43	<?php endforeach ?>
44	</tbody>

app/design/frontend/base/default/template/email/productalert/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	?>
	@@ -29,10 +29,10 @@
29	<table>
30	<?php foreach ($_products as $_product): ?>
31	<tr>
32	- <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>"><img src="<?php echo $_product->getThumbnailUrl() ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>" /></a></td>
33	<td>
34	- <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->~~htmlEscape~~($_product->getName()) ?></strong></a></p>
35	- <?php if ($shortDescription = $this->~~htmlEscape~~($_product->getShortDescription())): ?>
36	<p><small><?php echo $shortDescription ?></small></p>
37	<?php endif; ?>
38	<p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>


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	<table>
30	<?php foreach ($_products as $_product): ?>
31	<tr>
32	+ <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><img src="<?php echo $_product->getThumbnailUrl() ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
33	<td>
34	+ <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
35	+ <?php if ($shortDescription = $this->escapeHtml($_product->getShortDescription())): ?>
36	<p><small><?php echo $shortDescription ?></small></p>
37	<?php endif; ?>
38	<p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>

app/design/frontend/base/default/template/email/productalert/stock.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,10 +29,10 @@
29	<table>
30	<?php foreach ($_products as $_product): ?>
31	<tr>
32	- <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'thumbnail')->resize(75, 75) ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>" /></a></td>
33	<td>
34	- <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->~~htmlEscape~~($_product->getName()) ?></strong></a></p>
35	- <?php if ($shortDescription = $this->~~htmlEscape~~($_product->getShortDescription())): ?>
36	<p><small><?php echo $shortDescription ?></small></p>
37	<?php endif; ?>
38	<p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>


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	<table>
30	<?php foreach ($_products as $_product): ?>
31	<tr>
32	+ <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'thumbnail')->resize(75, 75) ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
33	<td>
34	+ <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
35	+ <?php if ($shortDescription = $this->escapeHtml($_product->getShortDescription())): ?>
36	<p><small><?php echo $shortDescription ?></small></p>
37	<?php endif; ?>
38	<p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>

app/design/frontend/base/default/template/giftmessage/inline.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	?>
	@@ -161,13 +161,13 @@ billing.onSave = function(evt){
161	<li class="item">
162	<div class="product-img-box">
163	<p class="product-image">
164	- <img src="<?php echo $this->helper('catalog/image')->init($_product, 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>" title="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>" />
165	</p>
166	<p class="number"><?php echo $this->__('Item %d of %d', $_index+1, $this->countItems()) ?></p>
167	</div>
168	<div class="details">
169	<div class="f-fix">
170	- <h5 class="product-name"><?php echo $this->~~htmlEscape~~($_product->getName()) ?></h5>
171	<input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][type]" value="quote_item" />
172	<ul class="form-list">
173	<li class="fields">
	@@ -278,14 +278,14 @@ billing.onSave = function(evt){
278	<?php $_product=$_item->getProduct() ?>
279	<li class="item">
280	<div class="product-img-box">
281	- <p class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>" title="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>" /></p>
282	<p class="number"><?php echo $this->__('Item %d of %d', $_index+1, $this->countItems()) ?></p>
283	</div>
284	<div class="details">
285	<div class="f-fix">
286	<input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][type]" value="quote_address_item" />
287	<input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][address]" value="<?php echo $this->getEntity()->getId()?>" />
288	- <h5 class="product-name"><?php echo $this->~~htmlEscape~~($_product->getName()) ?></h5>
289	<ul class="form-list">
290	<li class="fields">
291	<div class="field">


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	?>

161	<li class="item">
162	<div class="product-img-box">
163	<p class="product-image">
164	+ <img src="<?php echo $this->helper('catalog/image')->init($_product, 'thumbnail')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" />
165	</p>
166	<p class="number"><?php echo $this->__('Item %d of %d', $_index+1, $this->countItems()) ?></p>
167	</div>
168	<div class="details">
169	<div class="f-fix">
170	+ <h5 class="product-name"><?php echo $this->escapeHtml($_product->getName()) ?></h5>
171	<input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][type]" value="quote_item" />
172	<ul class="form-list">
173	<li class="fields">

278	<?php $_product=$_item->getProduct() ?>
279	<li class="item">
280	<div class="product-img-box">
281	+ <p class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(75); ?>" width="75" height="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" /></p>
282	<p class="number"><?php echo $this->__('Item %d of %d', $_index+1, $this->countItems()) ?></p>
283	</div>
284	<div class="details">
285	<div class="f-fix">
286	<input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][type]" value="quote_address_item" />
287	<input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][address]" value="<?php echo $this->getEntity()->getId()?>" />
288	+ <h5 class="product-name"><?php echo $this->escapeHtml($_product->getName()) ?></h5>
289	<ul class="form-list">
290	<li class="fields">
291	<div class="field">

app/design/frontend/base/default/template/googleanalytics/ga.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/googlecheckout/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/googlecheckout/link.phtml CHANGED Viewed

	@@ -20,18 +20,18 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 echo $this->getBeforeHtml(); ?>
28	<?php if ($this->getIsDisabled()): ?>
29	- <img src="<?php echo $this->~~htmlEscape~~($this->getImageUrl())?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" title="<?php echo Mage::helper('googlecheckout')->__('Fast Checkout through Google');?>" />
30	<?php else: ?>
31	<form method="post" action="<?php echo $this->getCheckoutUrl();?>"<?php if ($this->getOnsubmitJs()):?> onsubmit="<?php echo $this->getOnsubmitJs() ?>"<?php endif;?>>
32	<fieldset>
33	<input type="hidden" name="analyticsdata" value="" />
34	- <input type="image" src="<?php echo $this->~~htmlEscape~~($this->getImageUrl())?>" title="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast Checkout through Google');?>" />
35	</fieldset>
36	</form>
37	<?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 echo $this->getBeforeHtml(); ?>
28	<?php if ($this->getIsDisabled()): ?>
29	+ <img src="<?php echo $this->escapeHtml($this->getImageUrl())?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" title="<?php echo Mage::helper('googlecheckout')->__('Fast Checkout through Google');?>" />
30	<?php else: ?>
31	<form method="post" action="<?php echo $this->getCheckoutUrl();?>"<?php if ($this->getOnsubmitJs()):?> onsubmit="<?php echo $this->getOnsubmitJs() ?>"<?php endif;?>>
32	<fieldset>
33	<input type="hidden" name="analyticsdata" value="" />
34	+ <input type="image" src="<?php echo $this->escapeHtml($this->getImageUrl())?>" title="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast Checkout through Google');?>" />
35	</fieldset>
36	</form>
37	<?php endif; ?>

app/design/frontend/base/default/template/newsletter/subscribe.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/oauth/authorize/button-simple.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/oauth/authorize/button.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/oauth/authorize/confirm-simple.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/oauth/authorize/confirm.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/oauth/authorize/form/login-simple.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/oauth/authorize/form/login.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/oauth/authorize/head-simple.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/oauth/authorize/reject-simple.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/oauth/authorize/reject.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/oauth/customer/token/list.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/page/1column.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/page/2columns-left.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/page/2columns-right.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/page/3columns.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/page/empty.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/page/html/breadcrumbs.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	?>
	@@ -30,11 +30,11 @@
30	<?php foreach($crumbs as $_crumbName=>$_crumbInfo): ?>
31	<li class="<?php echo $_crumbName ?>">
32	<?php if($_crumbInfo['link']): ?>
33	- <a href="<?php echo $_crumbInfo['link'] ?>" title="<?php echo $this->~~htmlEscape~~($_crumbInfo['title']) ?>"><?php echo $this->~~htmlEscape~~($_crumbInfo['label']) ?></a>
34	<?php elseif($_crumbInfo['last']): ?>
35	- <strong><?php echo $this->~~htmlEscape~~($_crumbInfo['label']) ?></strong>
36	<?php else: ?>
37	- <?php echo $this->~~htmlEscape~~($_crumbInfo['label']) ?>
38	<?php endif; ?>
39	<?php if(!$_crumbInfo['last']): ?>
40	<span>/ </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	?>

30	<?php foreach($crumbs as $_crumbName=>$_crumbInfo): ?>
31	<li class="<?php echo $_crumbName ?>">
32	<?php if($_crumbInfo['link']): ?>
33	+ <a href="<?php echo $_crumbInfo['link'] ?>" title="<?php echo $this->escapeHtml($_crumbInfo['title']) ?>"><?php echo $this->escapeHtml($_crumbInfo['label']) ?></a>
34	<?php elseif($_crumbInfo['last']): ?>
35	+ <strong><?php echo $this->escapeHtml($_crumbInfo['label']) ?></strong>
36	<?php else: ?>
37	+ <?php echo $this->escapeHtml($_crumbInfo['label']) ?>
38	<?php endif; ?>
39	<?php if(!$_crumbInfo['last']): ?>
40	<span>/ </span>

app/design/frontend/base/default/template/page/html/footer.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/page/html/head.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/page/html/header.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	/**
	@@ -36,7 +36,7 @@
36	<?php endif?>
37	<div class="quick-access">
38	<?php echo $this->getChildHtml('topSearch') ?>
39	- <p class="welcome-msg"><?php echo $this->~~getWelcome~~() ?> <?php echo $this->getAdditionalHtml() ?></p>
40	<?php echo $this->getChildHtml('topLinks') ?>
41	<?php echo $this->getChildHtml('store_language') ?>
42	</div>


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	/**

36	<?php endif?>
37	<div class="quick-access">
38	<?php echo $this->getChildHtml('topSearch') ?>
39	+ <p class="welcome-msg"><?php echo $this->getChildHtml('welcome') ?> <?php echo $this->getAdditionalHtml() ?></p>
40	<?php echo $this->getChildHtml('topLinks') ?>
41	<?php echo $this->getChildHtml('store_language') ?>
42	</div>

app/design/frontend/base/default/template/page/html/notices.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/page/html/pager.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/page/html/top.links.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/page/html/topmenu.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/page/html/wrapper.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/page/js/calendar.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/page/js/cookie.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/page/popup.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/page/print.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	?>
	@@ -39,7 +39,7 @@
39	<div class="print-head">
40	<img src="<?php echo $this->getPrintLogoUrl() ? $this->getPrintLogoUrl() : $this->getSkinUrl('images/logo_print.gif') ?>" class="logo" alt="" />
41	<?php if ($this->getPrintLogoText()):?>
42	- <address><?php echo nl2br($this->~~htmlEscape~~($this->getPrintLogoText())) ?></address>
43	<?php endif;?>
44	</div>
45	<?php echo $this->getChildHtml('content') ?>


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	?>

39	<div class="print-head">
40	<img src="<?php echo $this->getPrintLogoUrl() ? $this->getPrintLogoUrl() : $this->getSkinUrl('images/logo_print.gif') ?>" class="logo" alt="" />
41	<?php if ($this->getPrintLogoText()):?>
42	+ <address><?php echo nl2br($this->escapeHtml($this->getPrintLogoText())) ?></address>
43	<?php endif;?>
44	</div>
45	<?php echo $this->getChildHtml('content') ?>

app/design/frontend/base/default/template/page/redirect.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/page/switch/flags.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	?>
	@@ -30,7 +30,7 @@
30	<select id="select-language" title="<?php echo $this->__('Your Language') ?>" onchange="window.location.href=this.value" class="flags">
31	<?php foreach ($this->getStores() as $_lang): ?>
32	<?php $_selected = ($_lang->getId() == $this->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
33	- <option value="<?php echo $_lang->getCurrentUrl() ?>" style="background-image:url('<?php echo $this->getSkinUrl('images/flags/flag_'.$_lang->getCode().'.gif') ?>');"<?php echo $_selected ?>><?php echo $this->~~htmlEscape~~($_lang->getName()) ?></option>
34	<?php endforeach; ?>
35	</select>
36	</div>


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

30	<select id="select-language" title="<?php echo $this->__('Your Language') ?>" onchange="window.location.href=this.value" class="flags">
31	<?php foreach ($this->getStores() as $_lang): ?>
32	<?php $_selected = ($_lang->getId() == $this->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
33	+ <option value="<?php echo $_lang->getCurrentUrl() ?>" style="background-image:url('<?php echo $this->getSkinUrl('images/flags/flag_'.$_lang->getCode().'.gif') ?>');"<?php echo $_selected ?>><?php echo $this->escapeHtml($_lang->getName()) ?></option>
34	<?php endforeach; ?>
35	</select>
36	</div>

app/design/frontend/base/default/template/page/switch/languages.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	?>
	@@ -37,7 +37,7 @@
37	<select id="select-language" title="<?php echo $this->__('Your Language') ?>" onchange="window.location.href=this.value">
38	<?php foreach ($this->getStores() as $_lang): ?>
39	<?php $_selected = ($_lang->getId() == $this->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
40	- <option value="<?php echo $_lang->getCurrentUrl() ?>"<?php echo $_selected ?>><?php echo $this->~~htmlEscape~~($_lang->getName()) ?></option>
41	<?php endforeach; ?>
42	</select>
43	</div>


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	?>

37	<select id="select-language" title="<?php echo $this->__('Your Language') ?>" onchange="window.location.href=this.value">
38	<?php foreach ($this->getStores() as $_lang): ?>
39	<?php $_selected = ($_lang->getId() == $this->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
40	+ <option value="<?php echo $_lang->getCurrentUrl() ?>"<?php echo $_selected ?>><?php echo $this->escapeHtml($_lang->getName()) ?></option>
41	<?php endforeach; ?>
42	</select>
43	</div>

app/design/frontend/base/default/template/page/switch/stores.phtml CHANGED Viewed

	@@ -20,11 +20,11 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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	* Store switcher template
30	*
	@@ -40,7 +40,7 @@
40	<?php endforeach;*/ ?>
41	<?php foreach ($this->getGroups() as $_group): ?>
42	<?php $_selected = ($_group->getId()==$this->getCurrentGroupId()) ? ' selected="selected"' : '' ?>
43	- <option value="<?php echo $_group->getHomeUrl() ?>"<?php echo $_selected ?>><?php echo $this->~~htmlEscape~~($_group->getName()) ?></option>
44	<?php endforeach; ?>
45	</select>
46	</div>


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	* Store switcher template
30	*

40	<?php endforeach;*/ ?>
41	<?php foreach ($this->getGroups() as $_group): ?>
42	<?php $_selected = ($_group->getId()==$this->getCurrentGroupId()) ? ' selected="selected"' : '' ?>
43	+ <option value="<?php echo $_group->getHomeUrl() ?>"<?php echo $_selected ?>><?php echo $this->escapeHtml($_group->getName()) ?></option>
44	<?php endforeach; ?>
45	</select>
46	</div>

app/design/frontend/base/default/template/page/template/container.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/page/template/links.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/page/template/linksblock.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/pagecache/cookie.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/paygate/form/cc.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/paygate/info/cc.phtml CHANGED Viewed

	@@ -20,13 +20,13 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27
28	<?php if (!$this->getHideTitle()): ?>
29	- <p><strong><?php echo $this->~~htmlEscape~~($this->getMethod()->getTitle()) ?></strong></p>
30	<?php endif;?>
31
32	<?php


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
28	<?php if (!$this->getHideTitle()): ?>
29	+ <p><strong><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></strong></p>
30	<?php endif;?>
31
32	<?php

app/design/frontend/base/default/template/payment/catalog/product/view/profile/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/payment/catalog/product/view/profile/schedule.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/payment/form/banktransfer.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/payment/form/cashondelivery.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/payment/form/cc.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	?>
	@@ -30,7 +30,7 @@
30	<li>
31	<div class="input-box">
32	<label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('Name on Card') ?></label>
33	- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->~~htmlEscape~~($this->getInfoData('cc_owner')) ?>" />
34	</div>
35	</li>
36	*/ ?>


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

30	<li>
31	<div class="input-box">
32	<label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('Name on Card') ?></label>
33	+ <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" />
34	</div>
35	</li>
36	*/ ?>

app/design/frontend/base/default/template/payment/form/ccsave.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	<li>
30	<label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('Name on Card') ?></label>
31	<div class="input-box">
32	- <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->~~htmlEscape~~($this->getInfoData('cc_owner')) ?>" />
33	</div>
34	</li>
35	<li>


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	<li>
30	<label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo $this->__('Name on Card') ?></label>
31	<div class="input-box">
32	+ <input type="text" title="<?php echo $this->__('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" />
33	</div>
34	</li>
35	<li>

app/design/frontend/base/default/template/payment/form/checkmo.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/payment/form/purchaseorder.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	?>
	@@ -28,7 +28,7 @@
28	<li>
29	<label for="po_number" class="required"><em>*</em><?php echo $this->__('Purchase Order Number') ?></label>
30	<div class="input-box">
31	- <input type="text" id="po_number" name="payment[po_number]" title="<?php echo $this->__('Purchase Order Number') ?>" class="input-text required-entry" value="<?php echo $this->~~htmlEscape~~($this->getInfoData('po_number')) ?>" />
32	</div>
33	</li>
34	</ul>


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	?>

28	<li>
29	<label for="po_number" class="required"><em>*</em><?php echo $this->__('Purchase Order Number') ?></label>
30	<div class="input-box">
31	+ <input type="text" id="po_number" name="payment[po_number]" title="<?php echo $this->__('Purchase Order Number') ?>" class="input-text required-entry" value="<?php echo $this->escapeHtml($this->getInfoData('po_number')) ?>" />
32	</div>
33	</li>
34	</ul>

app/design/frontend/base/default/template/payment/info/banktransfer.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/payment/info/checkmo.phtml CHANGED Viewed

	@@ -20,11 +20,11 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	- <p><?php echo $this->getMethod()->getTitle() ?></p>
28	<?php if($this->getInfo()->getAdditionalData()): ?>
29	<?php if($this->getPayableTo()): ?>
30	<p><strong><?php echo $this->__('Make Check payable to:') ?></strong> <?php echo $this->escapeHtml($this->getPayableTo()) ?></p>


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	+ <p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
28	<?php if($this->getInfo()->getAdditionalData()): ?>
29	<?php if($this->getPayableTo()): ?>
30	<p><strong><?php echo $this->__('Make Check payable to:') ?></strong> <?php echo $this->escapeHtml($this->getPayableTo()) ?></p>

app/design/frontend/base/default/template/payment/info/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	?>
	@@ -29,7 +29,7 @@
29	* @see Mage_Payment_Block_Info
30	*/
31	?>
32	- <p><strong><?php echo $this->~~htmlEscape~~($this->getMethod()->getTitle()) ?></strong></p>
33
34	<?php if ($_specificInfo = $this->getSpecificInformation()):?>
35	<table>


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	* @see Mage_Payment_Block_Info
30	*/
31	?>
32	+ <p><strong><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></strong></p>
33
34	<?php if ($_specificInfo = $this->getSpecificInformation()):?>
35	<table>

app/design/frontend/base/default/template/payment/info/purchaseorder.phtml CHANGED Viewed

	@@ -20,9 +20,9 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	- <p><?php echo $this->getMethod()->getTitle() ?></p>
28	- <p><strong><?php echo $this->__('Purchase Order Number:') ?></strong> <span class="nobr"><?php echo $this->~~htmlEscape~~($this->getInfo()->getPoNumber()) ?></span></p>


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	+ <p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
28	+ <p><strong><?php echo $this->__('Purchase Order Number:') ?></strong> <span class="nobr"><?php echo $this->escapeHtml($this->getInfo()->getPoNumber()) ?></span></p>

app/design/frontend/base/default/template/paypal/express/review.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	/** @var $this Mage_Paypal_Block_Express_Review */


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

app/design/frontend/base/default/template/paypal/express/review/address.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/paypal/express/review/details.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/paypal/express/review/shipping/method.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	/** @var $this Mage_Paypal_Block_Express_Review */


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

app/design/frontend/base/default/template/paypal/express/shortcut.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/paypal/hss/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/paypal/hss/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/paypal/hss/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/paypal/hss/js.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/paypal/hss/redirect.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/paypal/hss/review/button.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/paypal/partner/logo.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/paypal/payflowadvanced/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/paypal/payflowadvanced/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	/** @var $this Mage_Paypal_Block_Payflow_Advanced_Form */


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

app/design/frontend/base/default/template/paypal/payflowadvanced/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/paypal/payflowadvanced/redirect.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/paypal/payflowlink/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/paypal/payflowlink/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	/** @var $this Mage_Paypal_Block_Payflow_Link_Form */


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

app/design/frontend/base/default/template/paypal/payflowlink/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/paypal/payflowlink/redirect.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/paypal/payment/mark.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/paypal/payment/redirect.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/paypaluk/express/review.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	/** @var $this Mage_Paypal_Block_Express_Review */


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

app/design/frontend/base/default/template/persistent/checkout/onepage/billing.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	/** @var Mage_Checkout_Block_Onepage_Billing $this */


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

app/design/frontend/base/default/template/persistent/checkout/onepage/login.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	?>
	@@ -78,7 +78,7 @@
78	<li>
79	<label for="login-email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
80	<div class="input-box">
81	- <input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->~~htmlEscape~~($this->getUsername()) ?>" />
82	</div>
83	</li>
84	<li>


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	?>

78	<li>
79	<label for="login-email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
80	<div class="input-box">
81	+ <input type="text" class="input-text required-entry validate-email" id="login-email" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
82	</div>
83	</li>
84	<li>

app/design/frontend/base/default/template/persistent/customer/form/login.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,7 +53,7 @@
53	<li>
54	<label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
55	<div class="input-box">
56	- <input type="text" name="login[username]" value="<?php echo $this->~~htmlEscape~~($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
57	</div>
58	</li>
59	<li>


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	?>

53	<li>
54	<label for="email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
55	<div class="input-box">
56	+ <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text required-entry validate-email" title="<?php echo $this->__('Email Address') ?>" />
57	</div>
58	</li>
59	<li>

app/design/frontend/base/default/template/persistent/customer/form/register.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/persistent/remember_me.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/persistent/remember_me_tooltip.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/poll/active.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	?>
	@@ -45,13 +45,13 @@
45	</div>
46	<form id="pollForm" action="<?php echo $action ?>" method="post" onsubmit="return validatePollAnswerIsSelected();">
47	<div class="block-content">
48	- <p class="block-subtitle"><?php echo $this->~~htmlEscape~~($poll->getPollTitle()); ?></p>
49	<?php if( $poll_answers ): ?>
50	<ul id="poll-answers">
51	<?php foreach( $poll_answers as $answer ): ?>
52	<li>
53	<input type="radio" name="vote" class="radio poll_vote" id="vote_<?php echo $answer->getId() ?>" value="<?php echo $answer->getAnswerId() ?>" />
54	- <span class="label"><label for="vote_<?php echo $answer->getId() ?>"><?php echo $this->~~htmlEscape~~($answer->getAnswerTitle()) ?></label></span>
55	</li>
56	<?php endforeach; ?>
57	</ul>


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	?>

45	</div>
46	<form id="pollForm" action="<?php echo $action ?>" method="post" onsubmit="return validatePollAnswerIsSelected();">
47	<div class="block-content">
48	+ <p class="block-subtitle"><?php echo $this->escapeHtml($poll->getPollTitle()); ?></p>
49	<?php if( $poll_answers ): ?>
50	<ul id="poll-answers">
51	<?php foreach( $poll_answers as $answer ): ?>
52	<li>
53	<input type="radio" name="vote" class="radio poll_vote" id="vote_<?php echo $answer->getId() ?>" value="<?php echo $answer->getAnswerId() ?>" />
54	+ <span class="label"><label for="vote_<?php echo $answer->getId() ?>"><?php echo $this->escapeHtml($answer->getAnswerTitle()) ?></label></span>
55	</li>
56	<?php endforeach; ?>
57	</ul>

app/design/frontend/base/default/template/poll/result.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	?>
	@@ -30,13 +30,13 @@
30	<strong><span><?php echo $this->__('Community Poll') ?></span></strong>
31	</div>
32	<div class="block-content">
33	- <p class="block-subtitle"><?php echo $this->~~htmlEscape~~($poll->getPollTitle()); ?></p>
34	<?php if( $poll_answers ): ?>
35	<ol id="poll-answers">
36	<?php foreach( $poll_answers as $answer ): ?>
37	<li>
38	<span class="votes"><?php echo $answer->getVotesCount() ?> (<?php echo $answer->getPercent() ?>%)</span>
39	- <span class="answer"><?php echo $this->~~htmlEscape~~($answer->getAnswerTitle()) ?>:</span>
40	</li>
41	<?php endforeach; ?>
42	</ol>


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

30	<strong><span><?php echo $this->__('Community Poll') ?></span></strong>
31	</div>
32	<div class="block-content">
33	+ <p class="block-subtitle"><?php echo $this->escapeHtml($poll->getPollTitle()); ?></p>
34	<?php if( $poll_answers ): ?>
35	<ol id="poll-answers">
36	<?php foreach( $poll_answers as $answer ): ?>
37	<li>
38	<span class="votes"><?php echo $answer->getVotesCount() ?> (<?php echo $answer->getPercent() ?>%)</span>
39	+ <span class="answer"><?php echo $this->escapeHtml($answer->getAnswerTitle()) ?>:</span>
40	</li>
41	<?php endforeach; ?>
42	</ol>

app/design/frontend/base/default/template/productalert/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/productalert/product/view.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/productalert/stock.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/rating/detailed.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/rating/empty.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/reports/home_product_compared.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	/* @var $this Mage_Reports_Block_Product_Compared */


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

app/design/frontend/base/default/template/reports/home_product_viewed.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	/* @var $this Mage_Reports_Block_Product_Viewed */


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

app/design/frontend/base/default/template/reports/product_compared.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	/* @var $this Mage_Reports_Block_Product_Compared */


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

app/design/frontend/base/default/template/reports/product_viewed.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	/* @var $this Mage_Reports_Block_Product_Viewed */


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

app/design/frontend/base/default/template/reports/widget/compared/column/compared_default_list.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/reports/widget/compared/column/compared_images_list.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/reports/widget/compared/column/compared_names_list.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/reports/widget/compared/content/compared_grid.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/reports/widget/compared/content/compared_list.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/reports/widget/viewed/column/viewed_default_list.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/reports/widget/viewed/column/viewed_images_list.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/reports/widget/viewed/column/viewed_names_list.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/reports/widget/viewed/content/viewed_grid.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/reports/widget/viewed/content/viewed_list.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/review/customer/list.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	?>
	@@ -40,7 +40,7 @@
40	<?php foreach ($this->getCollection() as $_review): ?>
41	<tr>
42	<td><span class="nobr"><?php echo $this->dateFormat($_review->getReviewCreatedAt()); ?></span></td>
43	- <td><h2 class="product-name"><a href="<?php echo $this->getProductLink() ?>id/<?php echo $_review->getEntityPkValue() ?>"><?php echo $this->~~htmlEscape~~($_review->getName()) ?></a></h2></td>
44	<td>
45	<?php if($_review->getSum()): ?>
46	<div class="rating-box">


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	?>

40	<?php foreach ($this->getCollection() as $_review): ?>
41	<tr>
42	<td><span class="nobr"><?php echo $this->dateFormat($_review->getReviewCreatedAt()); ?></span></td>
43	+ <td><h2 class="product-name"><a href="<?php echo $this->getProductLink() ?>id/<?php echo $_review->getEntityPkValue() ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></h2></td>
44	<td>
45	<?php if($_review->getSum()): ?>
46	<div class="rating-box">

app/design/frontend/base/default/template/review/customer/recent.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	?>
	@@ -36,7 +36,7 @@
36	<li class="item">
37	<span class="number"><?php echo ++$iterator ?></span>
38	<div class="details">
39	- <h3 class="product-name"><a href="<?php echo $this->getReviewUrl($_review->getReviewId()) ?>"><?php echo $this->~~htmlEscape~~($_review->getName()) ?></a></h3>
40	<?php if($_review->getSum()): ?>
41	<div class="ratings">
42	<strong><?php echo $this->__('Rating:') ?></strong>


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	?>

36	<li class="item">
37	<span class="number"><?php echo ++$iterator ?></span>
38	<div class="details">
39	+ <h3 class="product-name"><a href="<?php echo $this->getReviewUrl($_review->getReviewId()) ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></h3>
40	<?php if($_review->getSum()): ?>
41	<div class="ratings">
42	<strong><?php echo $this->__('Rating:') ?></strong>

app/design/frontend/base/default/template/review/customer/view.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	?>
	@@ -30,14 +30,14 @@
30	<h1><?php echo $this->__('Review Details') ?></h1>
31	</div>
32	<div class="product-img-box">
33	- <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getProductData(), 'small_image')->resize(125, 125); ?>" width="125" height="125" alt="<?php echo $this->~~htmlEscape~~($this->getProductData()->getName()) ?>" /></a>
34	<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
35	<p class="label"><?php echo $this->__('Average Customer Rating:') ?></p>
36	<?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
37	<?php endif; ?>
38	</div>
39	<div class="product-details">
40	- <h2 class="product-name"><?php echo $this->~~htmlEscape~~($this->getProductData()->getName()) ?></h2>
41	<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
42	<h3><?php echo ($this->isReviewOwner()) ? $this->__('Your Rating:') : $this->__('Rating:'); ?></h3>
43	<table class="ratings-table">
	@@ -64,7 +64,7 @@
64	<?php endif;?>
65	</dt>
66	<dd>
67	- <?php echo nl2br($this->~~htmlEscape~~($this->getReviewData()->getDetail())) ?>
68	</dd>
69	</dl>
70	</div>


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

30	<h1><?php echo $this->__('Review Details') ?></h1>
31	</div>
32	<div class="product-img-box">
33	+ <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getProductData(), 'small_image')->resize(125, 125); ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" /></a>
34	<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
35	<p class="label"><?php echo $this->__('Average Customer Rating:') ?></p>
36	<?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
37	<?php endif; ?>
38	</div>
39	<div class="product-details">
40	+ <h2 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
41	<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
42	<h3><?php echo ($this->isReviewOwner()) ? $this->__('Your Rating:') : $this->__('Rating:'); ?></h3>
43	<table class="ratings-table">

64	<?php endif;?>
65	</dt>
66	<dd>
67	+ <?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?>
68	</dd>
69	</dl>
70	</div>

app/design/frontend/base/default/template/review/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	?>
	@@ -30,7 +30,7 @@
30	<form action="<?php echo $this->getAction() ?>" method="post" id="review-form">
31	<fieldset>
32	<?php echo $this->getChildHtml('form_fields_before')?>
33	- <h3><?php echo $this->__("You're reviewing:"); ?> <span><?php echo $this->~~htmlEscape~~($this->getProductInfo()->getName()) ?></span></h3>
34	<?php if( $this->getRatings() && $this->getRatings()->getSize()): ?>
35	<h4><?php echo $this->__('How do you rate this product?') ?> <em class="required">*</em></h4>
36	<span id="input-message-box"></span>
	@@ -69,19 +69,19 @@
69	<li>
70	<label for="nickname_field" class="required"><em>*</em><?php echo $this->__('Nickname') ?></label>
71	<div class="input-box">
72	- <input type="text" name="nickname" id="nickname_field" class="input-text required-entry" value="<?php echo $this->~~htmlEscape~~($data->getNickname()) ?>" />
73	</div>
74	</li>
75	<li>
76	<label for="summary_field" class="required"><em>*</em><?php echo $this->__('Summary of Your Review') ?></label>
77	<div class="input-box">
78	- <input type="text" name="title" id="summary_field" class="input-text required-entry" value="<?php echo $this->~~htmlEscape~~($data->getTitle()) ?>" />
79	</div>
80	</li>
81	<li>
82	<label for="review_field" class="required"><em>*</em><?php echo $this->__('Review') ?></label>
83	<div class="input-box">
84	- <textarea name="detail" id="review_field" cols="5" rows="3" class="required-entry"><?php echo $this->~~htmlEscape~~($data->getDetail()) ?></textarea>
85	</div>
86	</li>
87	</ul>
	@@ -99,18 +99,18 @@
99	var trs = $('product-review-table').select('tr');
100	var inputs;
101	var error = 1;
102	-
103	for( var j=0; j < trs.length; j++ ) {
104	var tr = trs[j];
105	if( j > 0 ) {
106	inputs = tr.select('input');
107	-
108	for( i in inputs ) {
109	if( inputs[i].checked == true ) {
110	error = 0;
111	}
112	}
113	-
114	if( error == 1 ) {
115	return false;
116	} else {


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

30	<form action="<?php echo $this->getAction() ?>" method="post" id="review-form">
31	<fieldset>
32	<?php echo $this->getChildHtml('form_fields_before')?>
33	+ <h3><?php echo $this->__("You're reviewing:"); ?> <span><?php echo $this->escapeHtml($this->getProductInfo()->getName()) ?></span></h3>
34	<?php if( $this->getRatings() && $this->getRatings()->getSize()): ?>
35	<h4><?php echo $this->__('How do you rate this product?') ?> <em class="required">*</em></h4>
36	<span id="input-message-box"></span>

69	<li>
70	<label for="nickname_field" class="required"><em>*</em><?php echo $this->__('Nickname') ?></label>
71	<div class="input-box">
72	+ <input type="text" name="nickname" id="nickname_field" class="input-text required-entry" value="<?php echo $this->escapeHtml($data->getNickname()) ?>" />
73	</div>
74	</li>
75	<li>
76	<label for="summary_field" class="required"><em>*</em><?php echo $this->__('Summary of Your Review') ?></label>
77	<div class="input-box">
78	+ <input type="text" name="title" id="summary_field" class="input-text required-entry" value="<?php echo $this->escapeHtml($data->getTitle()) ?>" />
79	</div>
80	</li>
81	<li>
82	<label for="review_field" class="required"><em>*</em><?php echo $this->__('Review') ?></label>
83	<div class="input-box">
84	+ <textarea name="detail" id="review_field" cols="5" rows="3" class="required-entry"><?php echo $this->escapeHtml($data->getDetail()) ?></textarea>
85	</div>
86	</li>
87	</ul>

99	var trs = $('product-review-table').select('tr');
100	var inputs;
101	var error = 1;
102	+
103	for( var j=0; j < trs.length; j++ ) {
104	var tr = trs[j];
105	if( j > 0 ) {
106	inputs = tr.select('input');
107	+
108	for( i in inputs ) {
109	if( inputs[i].checked == true ) {
110	error = 0;
111	}
112	}
113	+
114	if( error == 1 ) {
115	return false;
116	} else {

app/design/frontend/base/default/template/review/helper/summary.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/review/helper/summary_short.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/review/product/view/count.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/review/product/view/list.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	?>
	@@ -33,7 +33,7 @@
33	<dl>
34	<?php foreach ($_items as $_review):?>
35	<dt>
36	- <a href="<?php echo $this->getReviewUrl($_review->getId()) ?>"><?php echo $this->~~htmlEscape~~($_review->getTitle()) ?></a> <?php echo $this->__('Review by <span>%s</span>', $this->~~htmlEscape~~($_review->getNickname())) ?>
37	</dt>
38	<dd>
39	<?php $_votes = $_review->getRatingVotes(); ?>
	@@ -55,7 +55,7 @@
55	</tbody>
56	</table>
57	<?php endif; ?>
58	- <?php echo nl2br($this->~~htmlEscape~~($_review->getDetail())) ?>
59	<small class="date"><?php echo $this->__('(Posted on %s)', $this->formatDate($_review->getCreatedAt()), 'long') ?></small>
60	</dd>
61	<?php endforeach; ?>


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	?>

33	<dl>
34	<?php foreach ($_items as $_review):?>
35	<dt>
36	+ <a href="<?php echo $this->getReviewUrl($_review->getId()) ?>"><?php echo $this->escapeHtml($_review->getTitle()) ?></a> <?php echo $this->__('Review by <span>%s</span>', $this->escapeHtml($_review->getNickname())) ?>
37	</dt>
38	<dd>
39	<?php $_votes = $_review->getRatingVotes(); ?>

55	</tbody>
56	</table>
57	<?php endif; ?>
58	+ <?php echo nl2br($this->escapeHtml($_review->getDetail())) ?>
59	<small class="date"><?php echo $this->__('(Posted on %s)', $this->formatDate($_review->getCreatedAt()), 'long') ?></small>
60	</dd>
61	<?php endforeach; ?>

app/design/frontend/base/default/template/review/product/view/other.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/review/view.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	?>
	@@ -30,14 +30,14 @@
30	<h1><?php echo $this->__('Review Details') ?></h1>
31	</div>
32	<div class="product-img-box">
33	- <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->~~htmlEscape~~($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getProductData(), 'small_image')->resize(125, 125); ?>" height="125" width="125" alt="<?php echo $this->~~htmlEscape~~($this->getProductData()->getName()) ?>" /></a>
34	<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
35	<p class="label"><?php echo $this->__('Average Customer Rating') ?>:</p>
36	<?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
37	<?php endif; ?>
38	</div>
39	<div class="product-details">
40	- <h2 class="product-name"><?php echo $this->~~htmlEscape~~($this->getProductData()->getName()) ?></h2>
41	<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
42	<h3><?php echo $this->__('Product Rating:') ?></h3>
43	<table class="ratings-table">
	@@ -61,7 +61,7 @@
61	<?php echo $this->__('Product Review (submitted on %s):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
62	</dt>
63	<dd>
64	- <?php echo nl2br($this->~~htmlEscape~~($this->getReviewData()->getDetail())) ?>
65	</dd>
66	</dl>
67	</div>


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

30	<h1><?php echo $this->__('Review Details') ?></h1>
31	</div>
32	<div class="product-img-box">
33	+ <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getProductData(), 'small_image')->resize(125, 125); ?>" height="125" width="125" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" /></a>
34	<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
35	<p class="label"><?php echo $this->__('Average Customer Rating') ?>:</p>
36	<?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
37	<?php endif; ?>
38	</div>
39	<div class="product-details">
40	+ <h2 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
41	<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
42	<h3><?php echo $this->__('Product Rating:') ?></h3>
43	<table class="ratings-table">

61	<?php echo $this->__('Product Review (submitted on %s):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
62	</dt>
63	<dd>
64	+ <?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?>
65	</dd>
66	</dl>
67	</div>

app/design/frontend/base/default/template/rss/list.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/rss/nofeed.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/rss/order/details.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	/*
	@@ -46,12 +46,12 @@ store name = $_order->getStore()->getGroup()->getName()
46	<tbody>
47	<?php $i=0; foreach ($_order->getAllItems() as $_item): $i++ ?>
48	<tr <?php echo $i%2?'bgcolor="#eeeded"':'' ?>>
49	- <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->~~htmlEscape~~($_item->getName()) ?></strong>
50	<?php if($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
51	<br /><strong><?php echo $this->__('Gift Message') ?></strong>
52	- <br /><?php echo $this->__('From:'); ?> <?php echo $this->~~htmlEscape~~($_giftMessage->getSender()) ?>
53	- <br /><?php echo $this->__('To:'); ?> <?php echo $this->~~htmlEscape~~($_giftMessage->getRecipient()) ?>
54	- <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->~~htmlEscape~~($_giftMessage->getMessage()) ?>
55	<?php endif; ?>
56	</td>
57	<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered()*1 ?></td>
	@@ -65,9 +65,9 @@ store name = $_order->getStore()->getGroup()->getName()
65	<tr>
66	<td colspan="3" align="left" style="padding:3px 9px">
67	<strong><?php echo $this->__('Gift Message') ?></strong>
68	- <br /><?php echo $this->__('From:'); ?> <?php echo $this->~~htmlEscape~~($_giftMessage->getSender()) ?>
69	- <br /><?php echo $this->__('To:'); ?> <?php echo $this->~~htmlEscape~~($_giftMessage->getRecipient()) ?>
70	- <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->~~htmlEscape~~($_giftMessage->getMessage()) ?>
71	</td>
72	</tr>
73	<?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	/*

46	<tbody>
47	<?php $i=0; foreach ($_order->getAllItems() as $_item): $i++ ?>
48	<tr <?php echo $i%2?'bgcolor="#eeeded"':'' ?>>
49	+ <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
50	<?php if($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
51	<br /><strong><?php echo $this->__('Gift Message') ?></strong>
52	+ <br /><?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
53	+ <br /><?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
54	+ <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
55	<?php endif; ?>
56	</td>
57	<td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered()*1 ?></td>

65	<tr>
66	<td colspan="3" align="left" style="padding:3px 9px">
67	<strong><?php echo $this->__('Gift Message') ?></strong>
68	+ <br /><?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
69	+ <br /><?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
70	+ <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
71	</td>
72	</tr>
73	<?php endif; ?>

app/design/frontend/base/default/template/sales/billing/agreement/view.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/sales/billing/agreements.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/sales/guest/form.phtml CHANGED Viewed

	@@ -1,65 +1,69 @@
1	<div class="page-title">
2	- <h1><?php echo Mage::helper('sales')->__('Returns') ?></h1>
3	</div>
4	- ~~<div class="block-content">~~
5	- ~~<form id="oar_widget_orders_and_returns_form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">~~
6	- <ul class="form~~-alt~~">
7	- <li ~~style~~="~~clear:both;~~">
8	- <~~div~~ class="~~input-box~~" ~~style="float:left;width:150px;"~~>




9	<label for="oar_order_id" class="required"><?php echo Mage::helper('sales')->__('Order ID') ?> <em>*</em></label>
10	</div>
11	- <div class="input-box" ~~style="float:left;width:305px;"~~>
12	<input type="text" class="input-text required-entry" id="oar_order_id" name="oar_order_id" style="width:300px;"/>
13	</div>
14	</li>
15	- <li ~~style~~="~~clear:both;~~">
16	<div class="input-box">
17	<?php echo Mage::helper('sales')->__('Enter the billing last name and email/ZIP as in the order billing address') ?>.
18	</div>
19	</li>
20	- <li ~~style="clear:both;"~~>
21	- <div class="input-box" ~~style="float:left;width:150px;"~~>
22	<label for="oar_billing_lastname" class="required"><?php echo Mage::helper('sales')->__('Billing Last Name') ?> <em>*</em></label>
23	</div>
24	- <div class="input-box" ~~style="float:left;width:305px;"~~>
25	<input type="text" class="input-text required-entry" id="oar_billing_lastname" name="oar_billing_lastname" style="width:300px;"/>
26	</div>
27	</li>
28	- <li ~~style="clear:both;"~~>
29	- <div class="input-box" ~~style="float:left;width:150px;"~~>
30	<label class="required"><?php echo Mage::helper('sales')->__('Find Order By:') ?></label>
31	</div>
32	- <div class="input-box" ~~style="float:left;width:305px;"~~>
33	<select name="oar_type" id="quick_search_type_id" class="select guest-select" title="" onchange="showIdentifyBlock(this.value);">
34	<option value="email">Email Address</option>
35	<option value="zip">ZIP Code</option>
36	</select>
37	</div>
38	</li>
39	- <li id="oar-email" ~~style="clear:both;"~~>
40	- <div class="input-box" ~~style="float:left;width:150px;"~~>
41	<label for="oar_email" class="required"><?php echo Mage::helper('sales')->__('Email Address') ?> <em>*</em></label>
42	</div>
43	- <div class="input-box" ~~style="float:left;width:305px;"~~>
44	<input type="text" class="input-text validate-email required-entry" id="oar_email" name="oar_email" style="width:300px;"/>
45	</div>
46	</li>
47	- <li id="oar-zip" style="display:none;~~clear:both;~~">
48	- <div class="input-box" ~~style="float:left;width:150px;"~~>
49	<label for="oar_zip" class="required"><?php echo Mage::helper('sales')->__('Billing ZIP Code') ?> <em>*</em></label>
50	</div>
51	- <div class="input-box" ~~style="float:left;width:305px;"~~>
52	<input type="text" class="input-text required-entry" id="oar_zip" name="oar_zip" style="width:300px;"/>
53	</div>
54	</li>
55	- <li style="clear:both;">
56	- <div class="input-box" style="float:left;text-align:right;width:455px">
57	- <button type="submit" title="Continue" class="button"><span><span><?php echo Mage::helper('sales')->__('Continue') ?></span></span></button>
58	- </div>
59	- </li>
60	</ul>
61	- </~~form~~>
62	- </div>





63	<script type="text/javascript">
64	//<![CDATA[
65	if ($('quick_search_type_id').value == 'zip') {


1	<div class="page-title">
2	+ <h1><?php echo Mage::helper('sales')->__('Orders and Returns') ?></h1>
3	</div>
4	+
5	+
6	+ <form id="oar_widget_orders_and_returns_form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
7	+ <div class="fieldset">
8	+ <h2 class="legend"><?php echo Mage::helper('sales')->__('Order Information') ?></h2>
9	+
10	+ <ul class="form-list">
11	+ <li>
12	+ <div class="input-box">
13	<label for="oar_order_id" class="required"><?php echo Mage::helper('sales')->__('Order ID') ?> <em>*</em></label>
14	</div>
15	+ <div class="input-box">
16	<input type="text" class="input-text required-entry" id="oar_order_id" name="oar_order_id" style="width:300px;"/>
17	</div>
18	</li>
19	+ <li class="wide">
20	<div class="input-box">
21	<?php echo Mage::helper('sales')->__('Enter the billing last name and email/ZIP as in the order billing address') ?>.
22	</div>
23	</li>
24	+ <li>
25	+ <div class="input-box">
26	<label for="oar_billing_lastname" class="required"><?php echo Mage::helper('sales')->__('Billing Last Name') ?> <em>*</em></label>
27	</div>
28	+ <div class="input-box">
29	<input type="text" class="input-text required-entry" id="oar_billing_lastname" name="oar_billing_lastname" style="width:300px;"/>
30	</div>
31	</li>
32	+ <li>
33	+ <div class="input-box">
34	<label class="required"><?php echo Mage::helper('sales')->__('Find Order By:') ?></label>
35	</div>
36	+ <div class="input-box">
37	<select name="oar_type" id="quick_search_type_id" class="select guest-select" title="" onchange="showIdentifyBlock(this.value);">
38	<option value="email">Email Address</option>
39	<option value="zip">ZIP Code</option>
40	</select>
41	</div>
42	</li>
43	+ <li id="oar-email">
44	+ <div class="input-box">
45	<label for="oar_email" class="required"><?php echo Mage::helper('sales')->__('Email Address') ?> <em>*</em></label>
46	</div>
47	+ <div class="input-box">
48	<input type="text" class="input-text validate-email required-entry" id="oar_email" name="oar_email" style="width:300px;"/>
49	</div>
50	</li>
51	+ <li id="oar-zip" style="display:none;">
52	+ <div class="input-box">
53	<label for="oar_zip" class="required"><?php echo Mage::helper('sales')->__('Billing ZIP Code') ?> <em>*</em></label>
54	</div>
55	+ <div class="input-box">
56	<input type="text" class="input-text required-entry" id="oar_zip" name="oar_zip" style="width:300px;"/>
57	</div>
58	</li>





59	</ul>
60	+ </div>
61	+ <div class="buttons-set">
62	+ <p class="required"><?php echo Mage::helper('sales')->__('* Required Fields') ?></p>
63	+ <button type="submit" title="<?php echo Mage::helper('sales')->__('Continue') ?>" class="button"><span><span><?php echo Mage::helper('sales')->__('Continue') ?></span></span></button>
64	+ </div>
65	+ </form>
66	+
67	<script type="text/javascript">
68	//<![CDATA[
69	if ($('quick_search_type_id').value == 'zip') {

app/design/frontend/base/default/template/sales/order/comments.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/sales/order/creditmemo.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/sales/order/creditmemo/items.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/sales/order/creditmemo/items/renderer/default.phtml CHANGED Viewed

	@@ -20,32 +20,32 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_item = $this->getItem() ?>
28	<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30	- <td><h4 class="product-name"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></h4>
31	<?php if($_options = $this->getItemOptions()): ?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
35	<?php if (!$this->getPrintStatus()): ?>
36	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
38	<?php if (isset($_formatedOptionValue['full_view'])): ?>
39	<div class="truncated_full_value">
40	<dl class="item-options">
41	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
42	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43	</dl>
44	</div>
45	<?php endif; ?>
46	</dd>
47	<?php else: ?>
48	- <dd><?php echo $this->~~htmlEscape~~( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
49	<?php endif; ?>
50	<?php endforeach; ?>
51	</dl>
	@@ -54,12 +54,12 @@
54	<?php if ($addInfoBlock) :?>
55	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
56	<?php endif; ?>
57	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
58	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
59	<a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
60	<?php endif; ?>
61	</td>
62	- <td><?php echo $this->~~htmlEscape~~(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
63	<td class="a-right">
64	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
65	<span class="price-excl-tax">


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 $_item = $this->getItem() ?>
28	<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30	+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31	<?php if($_options = $this->getItemOptions()): ?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35	<?php if (!$this->getPrintStatus()): ?>
36	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
38	<?php if (isset($_formatedOptionValue['full_view'])): ?>
39	<div class="truncated_full_value">
40	<dl class="item-options">
41	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
42	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43	</dl>
44	</div>
45	<?php endif; ?>
46	</dd>
47	<?php else: ?>
48	+ <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
49	<?php endif; ?>
50	<?php endforeach; ?>
51	</dl>

54	<?php if ($addInfoBlock) :?>
55	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
56	<?php endif; ?>
57	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
58	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
59	<a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
60	<?php endif; ?>
61	</td>
62	+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
63	<td class="a-right">
64	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
65	<span class="price-excl-tax">

app/design/frontend/base/default/template/sales/order/details.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
	@@ -97,7 +97,7 @@
97	<?php $_index = 0; ?>
98	<?php foreach ($_items as $_item): ?>
99	<tr<?php echo ($_index++ > $_count ? ' class="last"' : '') ?>>
100	- <td><?php echo $this->~~htmlEscape~~($_item->getProductName()) ?></td>
101	<td class="a-right"><?php echo $_order->formatPrice($_item->getPrice()*1) ?></td>
102	<td class="a-center"><?php echo $_item->getQty()*1 ?></td>
103	<td class="a-center"><?php echo $_item->getQty()*1 ?></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

97	<?php $_index = 0; ?>
98	<?php foreach ($_items as $_item): ?>
99	<tr<?php echo ($_index++ > $_count ? ' class="last"' : '') ?>>
100	+ <td><?php echo $this->escapeHtml($_item->getProductName()) ?></td>
101	<td class="a-right"><?php echo $_order->formatPrice($_item->getPrice()*1) ?></td>
102	<td class="a-center"><?php echo $_item->getQty()*1 ?></td>
103	<td class="a-center"><?php echo $_item->getQty()*1 ?></td>

app/design/frontend/base/default/template/sales/order/history.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	?>
	@@ -54,7 +54,7 @@
54	<tr>
55	<td><?php echo $_order->getRealOrderId() ?></td>
56	<td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
57	- <td><?php echo $_order->getShippingAddress() ? $this->~~htmlEscape~~($_order->getShippingAddress()->getName()) : ' ' ?></td>
58	<td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
59	<td><em><?php echo $_order->getStatusLabel() ?></em></td>
60	<td class="a-center">


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	?>

54	<tr>
55	<td><?php echo $_order->getRealOrderId() ?></td>
56	<td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
57	+ <td><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : ' ' ?></td>
58	<td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
59	<td><em><?php echo $_order->getStatusLabel() ?></em></td>
60	<td class="a-center">

app/design/frontend/base/default/template/sales/order/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/sales/order/info/buttons.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/sales/order/invoice.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/sales/order/invoice/items.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/sales/order/invoice/items/renderer/default.phtml CHANGED Viewed

	@@ -20,18 +20,18 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_item = $this->getItem() ?>
28	<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30	- <td><h4 class="product-name"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></h4>
31	<?php if($_options = $this->getItemOptions()): ?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
35	<?php if (!$this->getPrintStatus()): ?>
36	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
	@@ -39,14 +39,14 @@
39	<?php if (isset($_formatedOptionValue['full_view'])): ?>
40	<div class="truncated_full_value">
41	<dl class="item-options">
42	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
43	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44	</dl>
45	</div>
46	<?php endif; ?>
47	</dd>
48	<?php else: ?>
49	- <dd><?php echo $this->~~htmlEscape~~( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
50	<?php endif; ?>
51	<?php endforeach; ?>
52	</dl>
	@@ -55,12 +55,12 @@
55	<?php if ($addInfoBlock) :?>
56	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
57	<?php endif; ?>
58	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
59	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
60	<a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
61	<?php endif; ?>
62	</td>
63	- <td><?php echo $this->~~htmlEscape~~(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
64	<td class="a-right">
65	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
66	<span class="price-excl-tax">


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 $_item = $this->getItem() ?>
28	<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30	+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31	<?php if($_options = $this->getItemOptions()): ?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35	<?php if (!$this->getPrintStatus()): ?>
36	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>

39	<?php if (isset($_formatedOptionValue['full_view'])): ?>
40	<div class="truncated_full_value">
41	<dl class="item-options">
42	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
43	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44	</dl>
45	</div>
46	<?php endif; ?>
47	</dd>
48	<?php else: ?>
49	+ <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
50	<?php endif; ?>
51	<?php endforeach; ?>
52	</dl>

55	<?php if ($addInfoBlock) :?>
56	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
57	<?php endif; ?>
58	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
59	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
60	<a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
61	<?php endif; ?>
62	</td>
63	+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
64	<td class="a-right">
65	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
66	<span class="price-excl-tax">

app/design/frontend/base/default/template/sales/order/items.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	?>
	@@ -56,8 +56,8 @@
56	<td class="gift-message-row" colspan="7">
57	<a href="#" title="<?php echo $this->__('Close') ?>" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>');" class="btn-close"><?php echo $this->__('Close') ?></a>
58	<dl class="gift-message">
59	- <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->~~htmlEscape~~($_giftMessage->getRecipient()) ?></dt>
60	- <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->~~htmlEscape~~($_giftMessage->getSender()) ?></dt>
61	<dd><?php echo $this->helper('giftmessage/message')->getEscapedGiftMessage($_item) ?></dd>
62	</dl>
63	</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	?>

56	<td class="gift-message-row" colspan="7">
57	<a href="#" title="<?php echo $this->__('Close') ?>" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>');" class="btn-close"><?php echo $this->__('Close') ?></a>
58	<dl class="gift-message">
59	+ <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
60	+ <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
61	<dd><?php echo $this->helper('giftmessage/message')->getEscapedGiftMessage($_item) ?></dd>
62	</dl>
63	</td>

app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml CHANGED Viewed

	@@ -20,17 +20,17 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_item = $this->getItem() ?>
28	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
29	- <td><h3 class="product-name"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></h3>
30	<?php if($_options = $this->getItemOptions()): ?>
31	<dl class="item-options">
32	<?php foreach ($_options as $_option) : ?>
33	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
34	<?php if (!$this->getPrintStatus()): ?>
35	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
36	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
	@@ -46,7 +46,7 @@
46	</dd>
47	<?php else: ?>
48	<dd>
49	- <?php echo nl2br($this->~~htmlEscape~~( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
50	</dd>
51	<?php endif; ?>
52	<?php endforeach; ?>
	@@ -56,12 +56,12 @@
56	<?php if ($addtInfoBlock) :?>
57	<?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
58	<?php endif; ?>
59	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
60	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
61	<a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
62	<?php endif; ?>
63	</td>
64	- <td><?php echo $this->~~htmlEscape~~(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
65	<td class="a-right">
66	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
67	<span class="price-excl-tax">


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 $_item = $this->getItem() ?>
28	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
29	+ <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
30	<?php if($_options = $this->getItemOptions()): ?>
31	<dl class="item-options">
32	<?php foreach ($_options as $_option) : ?>
33	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
34	<?php if (!$this->getPrintStatus()): ?>
35	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
36	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>

46	</dd>
47	<?php else: ?>
48	<dd>
49	+ <?php echo nl2br($this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
50	</dd>
51	<?php endif; ?>
52	<?php endforeach; ?>

56	<?php if ($addtInfoBlock) :?>
57	<?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
58	<?php endif; ?>
59	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
60	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
61	<a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
62	<?php endif; ?>
63	</td>
64	+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
65	<td class="a-right">
66	<?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
67	<span class="price-excl-tax">

app/design/frontend/base/default/template/sales/order/print.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/sales/order/print/creditmemo.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/sales/order/print/invoice.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/sales/order/print/shipment.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/sales/order/recent.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,7 +53,7 @@
53	<tr>
54	<td><?php echo $_order->getRealOrderId() ?></td>
55	<td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
56	- <td><?php echo $_order->getShippingAddress() ? $this->~~htmlEscape~~($_order->getShippingAddress()->getName()) : ' ' ?></td>
57	<td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
58	<td><em><?php echo $_order->getStatusLabel() ?></em></td>
59	<td class="a-center">


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	?>

53	<tr>
54	<td><?php echo $_order->getRealOrderId() ?></td>
55	<td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
56	+ <td><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : ' ' ?></td>
57	<td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
58	<td><em><?php echo $_order->getStatusLabel() ?></em></td>
59	<td class="a-center">

app/design/frontend/base/default/template/sales/order/shipment.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/sales/order/shipment/items.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/sales/order/shipment/items/renderer/default.phtml CHANGED Viewed

	@@ -20,18 +20,18 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ 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 $_item = $this->getItem() ?>
28	<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30	- <td><h4 class="product-name"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></h4>
31	<?php if($_options = $this->getItemOptions()): ?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
35	<?php if (!$this->getPrintStatus()): ?>
36	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
	@@ -39,14 +39,14 @@
39	<?php if (isset($_formatedOptionValue['full_view'])): ?>
40	<div class="truncated_full_value">
41	<dl class="item-options">
42	- <dt><?php echo $this->~~htmlEscape~~($_option['label']) ?></dt>
43	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44	</dl>
45	</div>
46	<?php endif; ?>
47	</dd>
48	<?php else: ?>
49	- <dd><?php echo $this->~~htmlEscape~~( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
50	<?php endif; ?>
51	<?php endforeach; ?>
52	</dl>
	@@ -55,11 +55,11 @@
55	<?php if ($addInfoBlock) :?>
56	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
57	<?php endif; ?>
58	- <?php echo $this->~~htmlEscape~~($_item->getDescription()) ?>
59	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
60	<a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
61	<?php endif; ?>
62	</td>
63	- <td><?php echo $this->~~htmlEscape~~(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
64	<td class="a-center"><?php echo $_item->getQty()*1 ?></td>
65	</tr>


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 $_item = $this->getItem() ?>
28	<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29	<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30	+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31	<?php if($_options = $this->getItemOptions()): ?>
32	<dl class="item-options">
33	<?php foreach ($_options as $_option) : ?>
34	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35	<?php if (!$this->getPrintStatus()): ?>
36	<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37	<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>

39	<?php if (isset($_formatedOptionValue['full_view'])): ?>
40	<div class="truncated_full_value">
41	<dl class="item-options">
42	+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
43	<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44	</dl>
45	</div>
46	<?php endif; ?>
47	</dd>
48	<?php else: ?>
49	+ <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
50	<?php endif; ?>
51	<?php endforeach; ?>
52	</dl>

55	<?php if ($addInfoBlock) :?>
56	<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
57	<?php endif; ?>
58	+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
59	<?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
60	<a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
61	<?php endif; ?>
62	</td>
63	+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
64	<td class="a-center"><?php echo $_item->getQty()*1 ?></td>
65	</tr>

app/design/frontend/base/default/template/sales/order/totals.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/sales/order/trackinginfo.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/sales/order/view.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	?>
	@@ -68,8 +68,8 @@
68	<h2 class="sub-title"><?php echo $this->__('Gift Message for This Order') ?></h2>
69	<?php $_giftMessage=$this->helper('giftmessage/message')->getGiftMessageForEntity($_order); ?>
70	<dl class="gift-message">
71	- <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->~~htmlEscape~~($_giftMessage->getSender()) ?></dt>
72	- <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->~~htmlEscape~~($_giftMessage->getRecipient()) ?></dt>
73	<dd><?php echo $this->helper('giftmessage/message')->getEscapedGiftMessage($_order) ?></dd>
74	</dl>
75	</div>


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	?>

68	<h2 class="sub-title"><?php echo $this->__('Gift Message for This Order') ?></h2>
69	<?php $_giftMessage=$this->helper('giftmessage/message')->getGiftMessageForEntity($_order); ?>
70	<dl class="gift-message">
71	+ <dt><strong><?php echo $this->__('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
72	+ <dt><strong><?php echo $this->__('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
73	<dd><?php echo $this->helper('giftmessage/message')->getEscapedGiftMessage($_order) ?></dd>
74	</dl>
75	</div>

app/design/frontend/base/default/template/sales/payment/form/billing/agreement.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/sales/recurring/grid.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/sales/recurring/profile/view.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/sales/recurring/profile/view/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/sales/recurring/profiles.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/sales/reorder/sidebar.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	?>
	@@ -38,6 +38,7 @@
38	<strong><span><?php echo $this->__('My Orders') ?></span></strong>
39	</div>
40	<form method="post" action="<?php echo $this->getFormActionUrl() ?>" id="reorder-validate-detail">

41	<div class="block-content">
42	<p class="block-subtitle"><?php echo $this->__('Last Ordered Items') ?></p>
43	<ol id="cart-sidebar-reorder">
	@@ -53,7 +54,7 @@
53	//]]>
54	</script>
55	<?php endif; ?>
56	- <p class="product-name"><a href="<?php echo $_item->getProduct()->getProductUrl() ?>"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></a></p>
57	</li>
58	<?php endforeach; ?>
59	</ol>


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	?>

38	<strong><span><?php echo $this->__('My Orders') ?></span></strong>
39	</div>
40	<form method="post" action="<?php echo $this->getFormActionUrl() ?>" id="reorder-validate-detail">
41	+ <?php echo $this->getBlockHtml('formkey'); ?>
42	<div class="block-content">
43	<p class="block-subtitle"><?php echo $this->__('Last Ordered Items') ?></p>
44	<ol id="cart-sidebar-reorder">

54	//]]>
55	</script>
56	<?php endif; ?>
57	+ <p class="product-name"><a href="<?php echo $_item->getProduct()->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></p>
58	</li>
59	<?php endforeach; ?>
60	</ol>

app/design/frontend/base/default/template/sales/widget/guest/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	/** @var $this Mage_Sales_Block_Widget_Guest_Form */
	@@ -29,7 +29,9 @@
29	<div class="widget">
30	<div class="block block-gr-search">
31	<div class="block-title">
32	- <~~h2><?php echo $this->__('Orders and Returns') ?></h2~~>


33	</div>
34	<div class="block-content">
35	<form id="oar_widget_orders_and_returns_form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">


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

29	<div class="widget">
30	<div class="block block-gr-search">
31	<div class="block-title">
32	+ <strong>
33	+ <span><?php echo $this->__('Orders and Returns') ?></span>
34	+ </strong>
35	</div>
36	<div class="block-content">
37	<form id="oar_widget_orders_and_returns_form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">

app/design/frontend/base/default/template/sendfriend/send.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	/* @var $this Mage_Sendfriend_Block_Send */
	@@ -49,9 +49,9 @@
49	ul = $('recipients_options');
50	var li_mail = Element.extend(document.createElement("LI"));
51	li_mail.addClassName('fields additional-row');
52	- li_mail.innerHTML = '<p><a href="delete_email" title="<?php echo $this->__('Remove Email') ?>" onclick="remove_recipient('+i+'); return false" class="btn-remove"><?php echo $this->__('Remove Email') ?>"<\/a><\/p>'
53	- li_mail.innerHTML += '<div class="field"><label for="recipients_name'+i+'" class="required"><em>*<\/em><?php echo $this->__('Name:') ?><\/label><div class="input-box"><input name="recipients[name][]" type="text" class="input-text required-entry" id="recipients_name'+i+'" /><\/div>';
54	- li_mail.innerHTML += '<div class="field"><label for="recipients_email'+i+'" class="required"><em>*<\/em><?php echo $this->__('Email Address:') ?><\/label><div class="input-box"><input name="recipients[email][]" value="" title="<?php echo $this->__('Email Address') ?>" id="recipients_email'+i+'" type="text" class="input-text required-entry validate-email" /><\/div><\/div>';
55	i++;
56	recipCount++;
57	if(recipCount>=maxRecip && maxRecip != 0) {
	@@ -78,20 +78,20 @@
78	<div class="field">
79	<label for="sender_name" class="required"><em>*</em><?php echo $this->__('Name:') ?></label>
80	<div class="input-box">
81	- <input name="sender[name]" value="<?php echo $this->~~htmlEscape~~($this->getUserName()) ?>" title="<?php echo $this->__('Name') ?>" id="sender_name" type="text" class="input-text required-entry" />
82	</div>
83	</div>
84	<div class="field">
85	<label for="sender_email" class="required"><em>*</em><?php echo $this->__('Email:') ?></label>
86	<div class="input-box">
87	- <input name="sender[email]" value="<?php echo $this->~~htmlEscape~~($this->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" id="sender_email" type="text" class="input-text required-entry validate-email" />
88	</div>
89	</div>
90	</li>
91	<li class="wide">
92	<label for="sender_message" class="required"><em>*</em><?php echo $this->__('Message:') ?></label>
93	<div class="input-box">
94	- <textarea name="sender[message]" class="input-text required-entry" id="sender_message" cols="3" rows="3"><?php echo $this->~~htmlEscape~~($this->getMessage())?></textarea>
95	</div>
96	</li>
97	</ul>


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

49	ul = $('recipients_options');
50	var li_mail = Element.extend(document.createElement("LI"));
51	li_mail.addClassName('fields additional-row');
52	+ li_mail.innerHTML = '<p><a href="delete_email" title="<?php echo $this->jsQuoteEscape($this->__('Remove Email')) ?>" onclick="remove_recipient('+i+'); return false" class="btn-remove"><?php echo $this->jsQuoteEscape($this->__('Remove Email')) ?>"<\/a><\/p>'
53	+ li_mail.innerHTML += '<div class="field"><label for="recipients_name'+i+'" class="required"><em>*<\/em><?php echo $this->jsQuoteEscape($this->__('Name:')) ?><\/label><div class="input-box"><input name="recipients[name][]" type="text" class="input-text required-entry" id="recipients_name'+i+'" /><\/div>';
54	+ li_mail.innerHTML += '<div class="field"><label for="recipients_email'+i+'" class="required"><em>*<\/em><?php echo $this->jsQuoteEscape($this->__('Email Address:')) ?><\/label><div class="input-box"><input name="recipients[email][]" value="" title="<?php echo $this->jsQuoteEscape($this->__('Email Address')) ?>" id="recipients_email'+i+'" type="text" class="input-text required-entry validate-email" /><\/div><\/div>';
55	i++;
56	recipCount++;
57	if(recipCount>=maxRecip && maxRecip != 0) {

78	<div class="field">
79	<label for="sender_name" class="required"><em>*</em><?php echo $this->__('Name:') ?></label>
80	<div class="input-box">
81	+ <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>" title="<?php echo $this->__('Name') ?>" id="sender_name" type="text" class="input-text required-entry" />
82	</div>
83	</div>
84	<div class="field">
85	<label for="sender_email" class="required"><em>*</em><?php echo $this->__('Email:') ?></label>
86	<div class="input-box">
87	+ <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" id="sender_email" type="text" class="input-text required-entry validate-email" />
88	</div>
89	</div>
90	</li>
91	<li class="wide">
92	<label for="sender_message" class="required"><em>*</em><?php echo $this->__('Message:') ?></label>
93	<div class="input-box">
94	+ <textarea name="sender[message]" class="input-text required-entry" id="sender_message" cols="3" rows="3"><?php echo $this->escapeHtml($this->getMessage())?></textarea>
95	</div>
96	</li>
97	</ul>

app/design/frontend/base/default/template/shipping/tracking/ajax.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/shipping/tracking/popup.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/tag/cloud.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	?>
	@@ -30,7 +30,7 @@
30	<?php if( sizeof($this->getTags()) > 0 ): ?>
31	<ul class="tags-list">
32	<?php foreach ($this->getTags() as $_tag): ?>
33	- <li><a href="<?php echo $_tag->getTaggedProductsUrl() ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->~~htmlEscape~~($_tag->getName()) ?></a></li>
34	<?php endforeach; ?>
35	</ul>
36	<?php else: ?>


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

30	<?php if( sizeof($this->getTags()) > 0 ): ?>
31	<ul class="tags-list">
32	<?php foreach ($this->getTags() as $_tag): ?>
33	+ <li><a href="<?php echo $_tag->getTaggedProductsUrl() ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_tag->getName()) ?></a></li>
34	<?php endforeach; ?>
35	</ul>
36	<?php else: ?>

app/design/frontend/base/default/template/tag/customer/recent.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,13 +35,13 @@
35	<li class="item">
36	<span class="number"><?php echo ++$iterator ?></span>
37	<div class="details">
38	- <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->~~htmlEscape~~($_item->getName()) ?></a></h3>
39	<div class="tags">
40	<strong><?php echo $this->__('Tags:') ?></strong>
41	<?php $_i = 0; ?>
42	<ul>
43	<?php foreach( $_item->getProductTags() as $_tag ): ?>
44	- <li><a href="<?php echo $_tag->getViewTagUrl() ?>"><?php echo $this->~~htmlEscape~~($_tag->getName()) ?></a><?php if(++$_i != sizeof($_item->getProductTags()->getItems())): ?>,<?php endif; ?></li>
45	<?php endforeach; ?>
46	</ul>
47	</div>


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	<li class="item">
36	<span class="number"><?php echo ++$iterator ?></span>
37	<div class="details">
38	+ <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></h3>
39	<div class="tags">
40	<strong><?php echo $this->__('Tags:') ?></strong>
41	<?php $_i = 0; ?>
42	<ul>
43	<?php foreach( $_item->getProductTags() as $_tag ): ?>
44	+ <li><a href="<?php echo $_tag->getViewTagUrl() ?>"><?php echo $this->escapeHtml($_tag->getName()) ?></a><?php if(++$_i != sizeof($_item->getProductTags()->getItems())): ?>,<?php endif; ?></li>
45	<?php endforeach; ?>
46	</ul>
47	</div>

app/design/frontend/base/default/template/tag/customer/tags.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	?>
	@@ -32,7 +32,7 @@
32	<p><?php echo $this->__('Click on a tag to view your corresponding products.') ?></p>
33	<ul class="tags-list">
34	<?php foreach ($this->getTags() as $_tag): ?>
35	- <li><a href="<?php echo $this->getUrl('tag/customer/view', array('tagId' => $_tag->getTagId())) ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->~~htmlEscape~~($_tag->getName()) ?></a></li>
36	<?php endforeach; ?>
37	</ul>
38	<?php else: ?>


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	?>

32	<p><?php echo $this->__('Click on a tag to view your corresponding products.') ?></p>
33	<ul class="tags-list">
34	<?php foreach ($this->getTags() as $_tag): ?>
35	+ <li><a href="<?php echo $this->getUrl('tag/customer/view', array('tagId' => $_tag->getTagId())) ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_tag->getName()) ?></a></li>
36	<?php endforeach; ?>
37	</ul>
38	<?php else: ?>

app/design/frontend/base/default/template/tag/customer/view.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	?>
	@@ -30,7 +30,7 @@
30	<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31	<p class="my-tag-edit">
32	<a href="#" title="<?php echo $this->__('Delete') ?>" onclick="if(confirm('<?php echo $this->__('Are you sure you want to delete this tag?') ?>')) window.location='<?php echo $this->getTagInfo()->getRemoveTagUrl(); ?>'; return false;" class="button btn-remove"><span><?php echo $this->__('Delete') ?></span></a>
33	- <?php echo $this->__('<strong>Tag Name:</strong> %s', $this->~~htmlEscape~~($this->getTagInfo()->getName())) ?>
34	</p>
35	<div class="clearer"></div>
36	<?php echo $this->getToolbarHtml() ?>
	@@ -43,16 +43,18 @@
43	<?php $iterator = 0 ?>
44	<?php foreach($this->getMyProducts() as $_product): ?>
45	<tr<?php if($iterator % 2 == 0): ?> class="odd"<?php $iterator++;endif; ?>>
46	- <td><a href="<?php echo $_product->getProductUrl(); ?>" title="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(100, 100); ?>" width="100" height="100" alt="<?php echo $this->~~htmlEscape~~($_product->getName()) ?>" /></a></td>
47	<td>
48	- <h2 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->~~htmlEscape~~($_product->getName()) ?></a></h2>
49	<?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
50	<?php echo $this->getPriceHtml($_product) ?>
51	- <?php echo $this->~~htmlEscape~~($_product->getDescription()) ?>
52	</td>
53	<td>
54	<?php if($_product->isSaleable()): ?>
55	- ~~<button type="button" title="~~<?php ~~echo~~ $~~this->__('Add~~ ~~to Cart') ?>" class~~=~~"button~~ ~~btn-cart" onclick="setLocation~~('~~<?php echo $this->getUrl('checkout~~/~~cart/add~~'~~,array('product'=>$_product~~->~~getId~~())) ?>~~')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>~~


56	<?php endif; ?>
57	<?php if ($this->helper('wishlist')->isAllow()) : ?>
58	<ul class="add-to-links">
	@@ -69,7 +71,7 @@
69	<tbody>
70	<tr>
71	<td>
72	- <?php echo $this->__("Unable to find any products tagged with '%s' in the current store", $this->~~htmlEscape~~($this->getTagInfo()->getName()) ) ?>
73	</td>
74	</tr>
75	</tbody>


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

30	<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31	<p class="my-tag-edit">
32	<a href="#" title="<?php echo $this->__('Delete') ?>" onclick="if(confirm('<?php echo $this->__('Are you sure you want to delete this tag?') ?>')) window.location='<?php echo $this->getTagInfo()->getRemoveTagUrl(); ?>'; return false;" class="button btn-remove"><span><?php echo $this->__('Delete') ?></span></a>
33	+ <?php echo $this->__('<strong>Tag Name:</strong> %s', $this->escapeHtml($this->getTagInfo()->getName())) ?>
34	</p>
35	<div class="clearer"></div>
36	<?php echo $this->getToolbarHtml() ?>

43	<?php $iterator = 0 ?>
44	<?php foreach($this->getMyProducts() as $_product): ?>
45	<tr<?php if($iterator % 2 == 0): ?> class="odd"<?php $iterator++;endif; ?>>
46	+ <td><a href="<?php echo $_product->getProductUrl(); ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(100, 100); ?>" width="100" height="100" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
47	<td>
48	+ <h2 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->escapeHtml($_product->getName()) ?></a></h2>
49	<?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
50	<?php echo $this->getPriceHtml($_product) ?>
51	+ <?php echo $this->escapeHtml($_product->getDescription()) ?>
52	</td>
53	<td>
54	<?php if($_product->isSaleable()): ?>
55	+ <?php $params[Mage_Core_Model_Url::FORM_KEY] = Mage::getSingleton('core/session')->getFormKey() ?>
56	+ <?php $params['product'] = $_product->getId(); ?>
57	+ <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getUrl('checkout/cart/add', $params) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
58	<?php endif; ?>
59	<?php if ($this->helper('wishlist')->isAllow()) : ?>
60	<ul class="add-to-links">

71	<tbody>
72	<tr>
73	<td>
74	+ <?php echo $this->__("Unable to find any products tagged with '%s' in the current store", $this->escapeHtml($this->getTagInfo()->getName()) ) ?>
75	</td>
76	</tr>
77	</tbody>

app/design/frontend/base/default/template/tag/list.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/tag/popular.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,7 +31,7 @@
31	<div class="block-content">
32	<ul class="tags-list">
33	<?php foreach ($this->getTags() as $_tag): ?>
34	- <li><a href="<?php echo $_tag->getTaggedProductsUrl() ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->~~htmlEscape~~($_tag->getName()) ?></a></li>
35	<?php endforeach; ?>
36	</ul>
37	<div class="actions">


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	<div class="block-content">
32	<ul class="tags-list">
33	<?php foreach ($this->getTags() as $_tag): ?>
34	+ <li><a href="<?php echo $_tag->getTaggedProductsUrl() ?>" style="font-size:<?php echo $_tag->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_tag->getName()) ?></a></li>
35	<?php endforeach; ?>
36	</ul>
37	<div class="actions">

app/design/frontend/base/default/template/tax/checkout/discount.phtml CHANGED Viewed

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


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

app/design/frontend/base/default/template/tax/checkout/grandtotal.phtml CHANGED 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/tax/checkout/shipping.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/tax/checkout/subtotal.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/tax/checkout/tax.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	/**
	@@ -61,6 +61,18 @@
61	<?php $isTop = 0; ?>
62	<?php endforeach; ?>
63	<?php endforeach; ?>












64	<?php endif;?>
65	<tr <?php if ($this->helper('tax')->displayFullSummary() && $_value!=0): ?> class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')"<?php endif; ?>>
66	<td style="<?php echo $_style ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">


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	/**

61	<?php $isTop = 0; ?>
62	<?php endforeach; ?>
63	<?php endforeach; ?>
64	+ <?php $weees = $this->getAllWeee(); ?>
65	+ <?php foreach ($weees as $weeeTitle => $weeeAmount): ?>
66	+ <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
67	+ <td class="a-right" style="<?php echo $_style ?>" colspan="1">
68	+ <?php echo $this->escapeHtml($weeeTitle); ?>
69	+ <br />
70	+ </td>
71	+ <td style="<?php echo $_style ?>" class="a-right" rowspan="1">
72	+ <?php echo $this->helper('checkout')->formatPrice($weeeAmount); ?>
73	+ </td>
74	+ </tr>
75	+ <?php endforeach; ?>
76	<?php endif;?>
77	<tr <?php if ($this->helper('tax')->displayFullSummary() && $_value!=0): ?> class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')"<?php endif; ?>>
78	<td style="<?php echo $_style ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">

app/design/frontend/base/default/template/tax/order/tax.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/wishlist/button/share.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/wishlist/button/tocart.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/wishlist/button/update.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/wishlist/email/items.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	/* @var $this Mage_Wishlist_Block_Share_Email_Items */


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

app/design/frontend/base/default/template/wishlist/email/rss.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/wishlist/item/column/cart.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
	@@ -28,9 +28,12 @@
28	/* @var Mage_Wishlist_Model_Item $item */
29	$item = $this->getItem();
30	$product = $item->getProduct();



31	?>
32	<div class="cart-cell">
33	- <?php echo $this->getPriceHtml($product);?>
34	<div class="add-to-cart-alt">
35	<?php if ($item->canHaveQty() && $item->getProduct()->isVisibleInSiteVisibility()): ?>
36	<input type="text" class="input-text qty validate-not-negative-number" name="qty[<?php echo $item->getId() ?>]" value="<?php echo $this->getAddToCartQty($item) * 1 ?>" />


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

28	/* @var Mage_Wishlist_Model_Item $item */
29	$item = $this->getItem();
30	$product = $item->getProduct();
31	+ $options = $this->getChild('customer.wishlist.item.options')
32	+ ->setItem($item)
33	+ ->getConfiguredOptions();
34	?>
35	<div class="cart-cell">
36	+ <?php echo $this->getPriceHtml($product, empty($options));?>
37	<div class="add-to-cart-alt">
38	<?php if ($item->canHaveQty() && $item->getProduct()->isVisibleInSiteVisibility()): ?>
39	<input type="text" class="input-text qty validate-not-negative-number" name="qty[<?php echo $item->getId() ?>]" value="<?php echo $this->getAddToCartQty($item) * 1 ?>" />

app/design/frontend/base/default/template/wishlist/item/column/image.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/wishlist/item/column/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
	@@ -30,7 +30,7 @@ $product = $item->getProduct();
30	?>
31	<h3 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></h3>
32	<div class="description std"><div class="inner"><?php echo $this->escapeHtml($this->stripTags($product->getShortDescription()));?></div></div>
33	- <textarea name="description[<?php echo $item->getWishlistItemId() ?>]" rows="3" cols="5" onfocus="focusComment(this)" onblur="focusComment(this)" title="<?php echo $this->__('Comment') ?>"><?php echo ($this->escapeHtml($item->getDescription())) ?></textarea>
34	<?php if($this->getSortedChildren()): ?>
35	<div class="item-manage">
36	<?php foreach($this->getSortedChildren() as $childName):?>


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

30	?>
31	<h3 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></h3>
32	<div class="description std"><div class="inner"><?php echo $this->escapeHtml($this->stripTags($product->getShortDescription()));?></div></div>
33	+ <textarea name="description[<?php echo $item->getWishlistItemId() ?>]" rows="3" cols="5" onfocus="focusComment(this)" onblur="focusComment(this)" title="<?php echo $this->__('Comment') ?>"><?php echo ($this->escapeHtml($item->getDescription() ? $item->getDescription() : $this->helper('wishlist')->defaultCommentString())) ?></textarea>
34	<?php if($this->getSortedChildren()): ?>
35	<div class="item-manage">
36	<?php foreach($this->getSortedChildren() as $childName):?>

app/design/frontend/base/default/template/wishlist/item/column/remove.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/wishlist/item/configure/addto.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/wishlist/item/list.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/wishlist/options_list.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	/* @var $this Mage_Wishlist_Block_Customer_Wishlist_Item_Options */


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

app/design/frontend/base/default/template/wishlist/render/item/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	/* @var $this Mage_Wishlist_Block_Customer_Wishlist_Render_Item_Price */


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

app/design/frontend/base/default/template/wishlist/render/item/price_msrp_item.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/wishlist/render/item/price_msrp_rss.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/wishlist/shared.phtml CHANGED Viewed

	@@ -20,14 +20,14 @@
20	*
21	* @category design
22	* @package base_default
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	/* @var $this Mage_Wishlist_Block_Share_Wishlist */
27	?>
28	<div class="my-wishlist">
29	<div class="page-title">
30	- <h1><?php echo $this->~~htmlEscape~~($this->getHeader()) ?></h1>
31	</div>
32	<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33	<?php if ($this->hasWishlistItems()): ?>


20	*
21	* @category design
22	* @package base_default
23	+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	/* @var $this Mage_Wishlist_Block_Share_Wishlist */
27	?>
28	<div class="my-wishlist">
29	<div class="page-title">
30	+ <h1><?php echo $this->escapeHtml($this->getHeader()) ?></h1>
31	</div>
32	<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33	<?php if ($this->hasWishlistItems()): ?>

app/design/frontend/base/default/template/wishlist/sharing.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/wishlist/sidebar.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	/* @var $this Mage_Wishlist_Block_Customer_Sidebar */


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

app/design/frontend/base/default/template/wishlist/view.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	/* @var $this Mage_Wishlist_Block_Customer_Wishlist */


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

package.xml CHANGED Viewed

	@@ -1,18 +1,18 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>Interface_Frontend_Base_Default</name>
4	- <version>1.7.0.1</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7	<channel>community</channel>
8	<extends/>
9	<summary>This is a Magento themes base</summary>
10	<description>This is a Magento themes base</description>
11	- <notes>1.7.0.1</notes>
12	<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13	- <date>~~2012~~-06-20</date>
14	- <time>11:26:36</time>
15	- <contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="etc"><file name="widget.xml" hash="8bb4cd4228dbb0678cff05ded6e906f8"/></dir><dir name="layout"><file name="authorizenet.xml" hash="382b48785fd8471d4104d29c9fb5bc30"/><file name="bundle.xml" hash="912ccb3f79ee1f1484a4bb22f8706b32"/><file name="captcha.xml" hash="e054ab224725a475a11483567d1ac33c"/><file name="cataloginventory.xml" hash="7d757d2ebb5e18e4ba074c021ff3dc1d"/><file name="catalog_msrp.xml" hash="ced82c7cfa1bfe0fd73e0042eab284e7"/><file name="catalogsearch.xml" hash="83a9dc1912d7c1e122fcc0962905416e"/><file name="catalog.xml" hash="1948f0455c7a1787aedb0ec4a14492f0"/><file name="checkout.xml" hash="da474b0e224007de06505179692d8294"/><file name="cms.xml" hash="2107c8d95284efe920df846ae6b05a51"/><file name="contacts.xml" hash="42b47430b91cc41a1402ccb58c1ae56f"/><file name="core.xml" hash="db5f968694167adea202407b94dfecf2"/><file name="customer.xml" hash="6de76267c935d2276da72515f0aa389b"/><file name="directory.xml" hash="ee728b76cc1589bf7d7749792997596d"/><file name="downloadable.xml" hash="ece8513d07ff059f35ed9b13c408a2b1"/><file name="googleanalytics.xml" hash="92ff19fc36b3619a6f9a7b0d91a03e9b"/><file name="googlecheckout.xml" hash="1b694e4382ee60e2910d4b47b46ac57d"/><file name="newsletter.xml" hash="2ab782768a49ada4e05cc6c7542fc00d"/><file name="oauth.xml" hash="2a3a76eb9ef65db3f8e1fd4e8e2086ae"/><file name="pagecache.xml" hash="01839c117639d66be0e1a6932a58bc01"/><file name="page.xml" hash="29b5b167153d4e58c52e8ed49c1301cf"/><file name="payment.xml" hash="5f4b4727537cbf2c38281dcd2814c484"/><file name="paypaluk.xml" hash="b466ae8e6a28265e46ce452cfd728059"/><file name="paypal.xml" hash="da34589b9bfe35f8a7600574fc6d7141"/><file name="persistent.xml" hash="83860c509d7b481b9ecac6f36cb9356f"/><file name="poll.xml" hash="459b35221eb517f4fd541359f29f3d28"/><file name="productalert.xml" hash="880c4ed9e69f504396bc67c470b29af3"/><file name="reports.xml" hash="88153735ace2ba09096a124e8de9ac9a"/><file name="review.xml" hash="3f60db0a5b70e462915a530d3a811bac"/><file name="rss.xml" hash="8f61b4a7526599641407a76e37628f1f"/><dir name="sales"><file name="billing_agreement.xml" hash="207cae60878b779002345e64db76840e"/><file name="recurring_profile.xml" hash="f68cbd08486cb5b31c827542204b0822"/></dir><file name="sales.xml" hash="1e584bf96f256837362e7fd8169c3329"/><file name="sendfriend.xml" hash="c3efd8bd90a80688f659416cff8b3bfd"/><file name="shipping.xml" hash="f8b14e9c560efe9ff23c6ee702305572"/><file name="tag.xml" hash="b5ffd23d329a852eb4d1392d6d3e3de1"/><file name="weee.xml" hash="45a2a548b41855d6238aa59d66d01b08"/><file name="wishlist.xml" hash="0322b7c504370c1709c2f93345c44fcb"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="6c0fb3c0c0009b2468c659307978e654"/><file name="iframe.phtml" hash="157f2053610bb6d850bd9edcdc141ed5"/><file name="info.phtml" hash="5164a83e12a9e9cc85012075a04c3762"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="58cf333f770349a390cddb9297ed50c5"/></dir><file name="price.phtml" hash="a27319faa35be81adf094b6770c4cd08"/><dir name="view"><dir name="options"><file name="notice.phtml" hash="978b70e8e92b5e6e2768398ce3d87d94"/></dir><file name="price.phtml" hash="d3039cad9edaf329ad7c549f0e3c1219"/><file name="tierprices.phtml" hash="c2e6b26ada821243c2d885671a71675e"/><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="3b45414324a8f88a82e6773ba6ee5ead"/><file name="multi.phtml" hash="21c14762b36b8152168cba3b3b76f84f"/><file name="radio.phtml" hash="9754f3df89d0bc35650594cb38acf9d2"/><file name="select.phtml" hash="2ca4e34d6b69eea0ae32812281e67136"/></dir><file name="options.phtml" hash="6151ce89ac185d2d202cde8c65ebd1b7"/></dir><file name="bundle.phtml" hash="2bd34d4c5c64f649e17dff72629074fa"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="c110d8c68f019c50bfad1ce1fbf60d56"/></dir><dir name="invoice"><file name="default.phtml" hash="57fb66c16909ad4119ba47f30f4b25c0"/></dir><dir name="order"><file name="default.phtml" hash="87438e1f8a20558584b1a4c50d33e2c5"/></dir><dir name="shipment"><file name="default.phtml" hash="957b6e798f7058a032e96ee8a8312494"/></dir></dir></dir></dir><dir name="rss"><dir name="catalog"><dir name="product"><file name="price.phtml" hash="75395433d7bcfea831f26d2e3dd6d1e5"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="da5f3be65ee868a262638caffb84aac6"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="08c3751f922753197429e5682cf92a2d"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="923110ca684a8351bba5fc9c40877d00"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="553e81dc06e27ffba4ba47c08ebae6ef"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="2329a764c68674c946ec8ecd346f2eda"/><file name="right_col.phtml" hash="2329a764c68674c946ec8ecd346f2eda"/></dir><dir name="captcha"><file name="zend.phtml" hash="2bf6634e517f8acd7cfe364dbf48f851"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="be09d324903e74d8ab256d823b9136f4"/><file name="view.phtml" hash="030152e419ec78f7dddc7423ae3bcbe2"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="154d923655194660f3c6b040b7b8fcea"/><file name="link_inline.phtml" hash="1e0d919d42534acdaa61121829273f3c"/></dir></dir></dir><dir name="layer"><file name="filter.phtml" hash="18df31d346756388c2f1009c4fd39ca4"/><file name="state.phtml" hash="0291dab90fce001ca017e32e74f00411"/><file name="view.phtml" hash="cec3350b62a989406bd158e5b372805a"/></dir><dir name="msrp"><file name="popup.phtml" hash="70d9a11d560b13c1a1430a163a671e80"/></dir><dir name="navigation"><file name="left.phtml" hash="e287afeb46a84aa5c8c1e685f51bffaa"/><file name="top.phtml" hash="8ddede3b4fd84a27d2ec3ca7dbdede25"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="4aac8eb1b1cd3caf55ff8bc3ca27084e"/><file name="sidebar.phtml" hash="46c987a848fa3bf0765bdfd11dc8c7df"/></dir><file name="gallery.phtml" hash="721ccac6c1617cb895a67e6c336738d7"/><dir name="list"><file name="related.phtml" hash="9aaed05c3353ae98a7483a620168cc49"/><file name="toolbar.phtml" hash="1d882353db63e1de4f745adceb5c418c"/><file name="upsell.phtml" hash="d2a4059f4947351afa6034a0078a1cff"/></dir><file name="list.phtml" hash="32852981bb949074ab05adfa52a2baec"/><file name="new.phtml" hash="2736170efe05a3915e99e0fc55b06c32"/><file name="price_msrp_item.phtml" hash="1a05db808b9e33b50ccac7fa88d14bc8"/><file name="price_msrp_noform.phtml" hash="e2728b9dfa6f0df5adf08ee3aa9531bb"/><file name="price_msrp.phtml" hash="e1ef8f9193047af8e2749b4e795ced5a"/><file name="price_msrp_rss.phtml" hash="8a904953f8b74b4faf58902f9a46d43d"/><file name="price.phtml" hash="a6cca01b0a72f6f65d46df7eefcbe5e0"/><dir name="view"><file name="additional.phtml" hash="7bab9dbcc43d46b0aa057dd92547e49e"/><file name="addtocart.phtml" hash="d6b9ff292fb9e482184e909200c8138d"/><file name="addto.phtml" hash="b20f2d46fb5c64d47eca5a08c04f92bc"/><file name="attributes.phtml" hash="a234143e664549fbca1d49c1e950efc5"/><file name="description.phtml" hash="a9ee13db96558372435034562dbdaa7a"/><file name="media.phtml" hash="385cb80abc228301060ffafa147c9783"/><dir name="options"><file name="js.phtml" hash="9d5c5c4786c5b9fb7125f6f3cc8c7309"/><dir name="type"><file name="date.phtml" hash="5bdfd7dc4817a500095e076a21a2c467"/><file name="default.phtml" hash="f1acbd98563c6640c4a0b6cf5abc994f"/><file name="file.phtml" hash="b72f9363f049dd486ff0a3c8b667cbc9"/><file name="select.phtml" hash="5dbbe91d0581ccb291737992c5188121"/><file name="text.phtml" hash="1aaef71a9e81521aab601aa281fa0b8e"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="6a612992021e3e65ca7b5f6e897821d5"/></dir><file name="wrapper.phtml" hash="472e04ad6c1a35dfeaa54b3012884ed6"/></dir><file name="options.phtml" hash="c1227dcadb83af6708d78a032ffd8d6c"/><file name="price_clone.phtml" hash="732daf46245f4ee7068d5ae26defc750"/><file name="price.phtml" hash="f2ae6daff42b8ee7074d27c8bf5f1e6c"/><file name="tierprices.phtml" hash="0b7f122253b505c45772eff069203a5d"/><dir name="type"><file name="configurable.phtml" hash="1a0a77285960b4227f000855e8194ed7"/><file name="default.phtml" hash="dd5d4b8859956d79ec7d42522b4f42a8"/><file name="grouped.phtml" hash="f5d7db323383b19a80ab3c55a1736dd5"/><dir name="options"><file name="configurable.phtml" hash="c37919561a3cde0d9b92fd34d44c69c1"/></dir><file name="simple.phtml" hash="1a0a77285960b4227f000855e8194ed7"/><file name="virtual.phtml" hash="1a0a77285960b4227f000855e8194ed7"/></dir></dir><file name="view.phtml" hash="92dfce1c6c3a7215dac6fda2c981d1e1"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="d48d079cdbc11c340e527b27a5956434"/><file name="link_inline.phtml" hash="80a9c2cad3491605eebbe84f73ed6a81"/></dir><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="e3bfe025786c3ad06ea7ab282c54004a"/><file name="new_images_list.phtml" hash="30299cf21fd0f2d203640875a68d3ea6"/><file name="new_names_list.phtml" hash="ea1d4cb042f6319b798d587bae7eff07"/></dir><dir name="content"><file name="new_grid.phtml" hash="b734ae1ca010b96179274741c653dd2d"/><file name="new_list.phtml" hash="427b323b0cbfc26aa4092343df5fa125"/></dir></dir></dir></dir><dir name="rss"><dir name="product"><file name="price.phtml" hash="b1b71983d3d8616116922d3b91dbcaba"/></dir></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="ed20c43980bb321548837b821e400dd8"/></dir><file name="sitemap.phtml" hash="3572cdf4d9d3389d4fde1232bb027a0f"/><file name="tree.phtml" hash="de625774b149902edf5d451101491b52"/></dir></dir><dir name="cataloginventory"><file name="qtyincrements.phtml" hash="7a605b98918c6bbbbb9694912426353e"/><dir name="stockqty"><file name="composite.phtml" hash="042b95def39d8868866297490f2e4c21"/><file name="default.phtml" hash="eec176c91060288f70cf7e9d0e656ce5"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="d5a3b4cf51f3ffcc256eb451c32725ef"/><file name="result.phtml" hash="b1e4ce41e5e31f0e9295030aab77f2f1"/></dir><file name="form.mini.phtml" hash="d1043f91cd0d8b59f15abf6da1c0c721"/><file name="result.phtml" hash="c2bdfc4b0599094a83456dd6f17d4c77"/><file name="term.phtml" hash="d5d0883f5f685228ad5e87ce294b5821"/></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="8316bd585e077c92af8b3490ec6692f0"/><file name="crosssell.phtml" hash="67a18840b776cdecc87e06f9f7e00db3"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="e403cd7b8eb8209d54ebdc13f9c6b02f"/></dir><file name="default.phtml" hash="33049442e2d15f4a729d8054ed26b507"/></dir><file name="noItems.phtml" hash="85dd62d3046bf22ec8eb3e45989c6f0b"/><dir name="render"><file name="default.phtml" hash="51e2aea1c10d6db04d9b6ee880476c1a"/><file name="simple.phtml" hash="dc0f40db32a1b349ec3037f700cced7f"/></dir><file name="shipping.phtml" hash="a495f5acc9e7e871607e810f758b0724"/><dir name="sidebar"><file name="default.phtml" hash="7aac4b7a72774e75b49197971f1f6b84"/></dir><file name="sidebar.phtml" hash="7645eb7704a606c6044a31f440a7ff6f"/><file name="totals.phtml" hash="c942cacb712272bccd142bc1217d479a"/></dir><file name="cart.phtml" hash="9dec7d807898f5d8a9e82629dd9b7e38"/><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="ab791c9b73074ae657deb56d7512c4e5"/></dir><file name="addresses.phtml" hash="35b220a8a8facbf7c458ada90f9b7dd7"/><file name="agreements.phtml" hash="26fd8740318e401add70128eaef68713"/><dir name="billing"><file name="items.phtml" hash="01e23f2f062fde7e38f14ccbd9feb526"/></dir><file name="billing.phtml" hash="dab59ccf7a0aff5e0070e8d0db892523"/><dir name="item"><file name="default.phtml" hash="d2c489f8f9ff090a9ce981d839703484"/></dir><file name="link.phtml" hash="1d52dee73ca493a7a4a89cecb28af3c9"/><dir name="overview"><file name="item.phtml" hash="3e0c7b57157458f5cb9b66f8c0ef778a"/></dir><file name="overview.phtml" hash="db9c1332c9c3bd86226554ba5d20ac88"/><file name="shipping.phtml" hash="97cbb043a3e59133743a5f843d805bc8"/><file name="state.phtml" hash="2160e6489d9a3dd42e613f2e0a185025"/><file name="success.phtml" hash="73503e4ac5789769f25ef35e34d5354f"/></dir><dir name="onepage"><file name="agreements.phtml" hash="15dbb2fb7c979e65b7abd9c7aa7cfbca"/><file name="billing.phtml" hash="82ead3fe6a2e73947eb6d2d7aa31c031"/><file name="failure.phtml" hash="715a874b056c0f5f80fb8eddda247170"/><file name="link.phtml" hash="b3f6bfdd6d75ee71b43ad9e948118888"/><file name="login.phtml" hash="0ba508df7d4921348b776b0f962d9894"/><dir name="payment"><file name="methods.phtml" hash="b3fac3fec44bec7f7feaa6c1118391d2"/></dir><file name="payment.phtml" hash="4b2283a884b0a3a7b1bb374cf3a01417"/><file name="progress.phtml" hash="9bd6c7bfff18e01ef44c509b4e906c93"/><dir name="review"><file name="button.phtml" hash="4d5c7c5a2d70f85ec324e79c7e81946b"/><file name="info.phtml" hash="02af6242925c9d28f2fe5f4518e5a677"/><file name="item.phtml" hash="c53b269b2ea75656a3fd954aff903af9"/><file name="totals.phtml" hash="6e857d144768ed8faa0be977b547b32f"/></dir><file name="review.phtml" hash="652b5fce417cb50a0158dd5d49f64778"/><dir name="shipping_method"><file name="additional.phtml" hash="e13cd269e9feb9f0be1c10005bc19801"/><file name="available.phtml" hash="cd1e4a35c2aa344945f3cf2075122393"/></dir><file name="shipping_method.phtml" hash="f912002c2cf6872a0d9bdc689b80163d"/><file name="shipping.phtml" hash="9e787acc3888ff1620ab295af3ab9078"/></dir><file name="onepage.phtml" hash="0039fbf105fe77431be0de4cb71dae51"/><file name="success.phtml" hash="008a40eebcb4d7d2fbfc10987da0d17a"/><dir name="total"><file name="default.phtml" hash="f1010ec3fd3dcb503d81f7e8d3ebb206"/><file name="nominal.phtml" hash="8df39c86e037a915d082fa61da9bb1c8"/><file name="tax.phtml" hash="7fe5f21f35b2cb2b0642ddf418917405"/></dir></dir><dir name="cms"><file name="content_heading.phtml" hash="9f7652c66d978f6c2946ba7bf419374e"/><file name="content.phtml" hash="21fba66ee197b4e83c9f8292b98970e4"/><dir name="default"><file name="home.phtml" hash="18d93ac152e47351b0039d8b3a67d59d"/><file name="no-route.phtml" hash="52106ead9e9ce41f82122f875caecfd7"/></dir><file name="meta.phtml" hash="2204e889eef9af73ca7ee62ac816b4e3"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="e02f9737283af0cf69e1e55440a0f996"/><file name="link_inline.phtml" hash="3237d384dd1603cddb3b4630b36e4908"/></dir><dir name="static_block"><file name="default.phtml" hash="0459a49fe46fcbcf6454959627be6cbf"/></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="7f1c48a5f758d40e8203fb815d13e88f"/></dir><dir name="core"><file name="formkey.phtml" hash="a490a62b731574ea6417a852bfad8d9b"/><file name="link.phtml" hash="727625ecaddeb25725fb10456e5360ec"/><file name="messages.phtml" hash="5ff72b8ec510727963f985145af5b7d7"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="ab51913386d0521441eb7704267a5224"/><file name="hello.phtml" hash="cbba873a754af5f89253d2fcbada6d3b"/><file name="info.phtml" hash="bacbc93891545a2a313bc35e4b094351"/><file name="newsletter.phtml" hash="ec6fbed4b2919fa72034e0863bb905fa"/></dir><file name="dashboard.phtml" hash="5590325dde5a68897bf19b8951bfe003"/><dir name="link"><file name="back.phtml" hash="b5c39deaa70abb1f959b066e2458783e"/></dir><file name="navigation.phtml" hash="0ccf435e39502d6f97d39dcd4050b17d"/></dir><dir name="address"><file name="book.phtml" hash="07747e72a21de6cc5ba6afa9ccc3aed1"/><file name="edit.phtml" hash="8459c2c7d85cc87d91617cc8c2ae8b9b"/></dir><file name="address.phtml" hash="1f38ef9977dead75e97cefce2d54744f"/><file name="balance.phtml" hash="7a7bed35437abcddd6430e399e8e1705"/><dir name="form"><file name="address.phtml" hash="9864ad56cde8ca90feb880e386639091"/><file name="changepassword.phtml" hash="3613bceb919a3b65b10bd6188cffc49c"/><file name="confirmation.phtml" hash="9b0556202d3b92669be0d2da5a79030d"/><file name="edit.phtml" hash="7f88a46447291262a5343cb206674c6d"/><file name="forgotpassword.phtml" hash="5ea0fa8976e6c7c4a06c3c2cd8381137"/><file name="login.phtml" hash="925493e8f89c6659123eed2957153dfe"/><file name="mini.login.phtml" hash="90a6ebf8b5d7937aef437907053fe368"/><file name="newsletter.phtml" hash="3a9d1ee4b2d703fd6031fef6316d4dd3"/><file name="register.phtml" hash="b9d48be60b0e1deab4df288aa672ac59"/><file name="resetforgottenpassword.phtml" hash="63cd00c9cea8ded57ad0e97d60b8dc88"/></dir><file name="logout.phtml" hash="0c5855ea603f53b9da95b196644d4567"/><file name="orders.phtml" hash="c7613667dc51203a2d3d0432d4ddc756"/><dir name="widget"><file name="dob.phtml" hash="8bb0c2cc4f7d203d3a48bdaa90ec4c7d"/><file name="gender.phtml" hash="4beeda46d0a8c7f37a260d569c4e74dc"/><file name="name.phtml" hash="04ade7281f3022979437ebbab9a99023"/><file name="taxvat.phtml" hash="d7f79cf8816c36e599db793b5bcea9c5"/></dir><file name="wishlist.phtml" hash="60da933d81f4951a7c4017f70bd6fb7c"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="07616da8833be0ce83ae0b4e830bd557"/></dir><file name="currency.phtml" hash="5928788713ac909b4fb026ba29bb8e30"/><dir name="js"><file name="optional_zip_countries.phtml" hash="020d75754f4dce6268fb66ef2574ea74"/></dir></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="d925d3eb9ce179af37d12f04f575a6d6"/><file name="samples.phtml" hash="d727f41614e0652592224edf189d6890"/><file name="type.phtml" hash="bf575dfcc10524abda9085022b2ece1c"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="2b513267d1402bc736f9c546bd44902e"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="02147612ab317f5db3cc81b29c119688"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="136f6fc2c807adff70630b96946fab79"/></dir></dir><file name="success.phtml" hash="69b57e8a809d32b90844f92483b39431"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="74607bfe107a369f025fb34a7c8be9c1"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="1db0fc11361b2999f616e8e874523adc"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="6a8c7a8059ae4242cc6dbc39da27a71c"/></dir><dir name="order"><file name="downloadable.phtml" hash="72c0341763d204fa79ddb292ba6da76d"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="8ec5594e5845eea204011f0aeabe73b5"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="eafe739791763e32da9b56c2fadd9c22"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="2bfabf174f1de8968513b8fc918a3d91"/></dir></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="b915fa9bf7e46c417da167a05bbbc31e"/></dir><dir name="invoice"><file name="items.phtml" hash="2c783340c75fb6b094ee927373ee3c7f"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="906763a69c5eec9736e72fb5f04f61d2"/></dir><dir name="invoice"><file name="default.phtml" hash="906763a69c5eec9736e72fb5f04f61d2"/></dir><dir name="order"><file name="default.phtml" hash="c9a37c05a9438291f6d5ceca712b22a8"/></dir><dir name="shipment"><file name="default.phtml" hash="933237ea42871008053f7f9638e429ba"/></dir></dir><file name="items.phtml" hash="55833fe30e75da39dc56e3e419922b9d"/><dir name="shipment"><file name="items.phtml" hash="eff5711a95ce4edc5d2dff5436ff919c"/><file name="track.phtml" hash="d3e57a816bea202a3ad52ac23bf824c3"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="9e46a32b215a19998acac40939797e68"/><file name="stock.phtml" hash="2f8d0482ac898f403f08e61471a77917"/></dir></dir><dir name="giftmessage"><file name="inline.phtml" hash="988db300d7680dba20da48f12c5e6b09"/></dir><dir name="googleanalytics"><file name="ga.phtml" hash="c11f860c6a5bc7215cdc74c789eea568"/></dir><dir name="googlecheckout"><file name="form.phtml" hash="dae69f2b9b5a2044c3f21633167a37c6"/><file name="link.phtml" hash="c411cd1950339b582535dec30971af4d"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="5ee3e01a6688f725cf0caa75681f0938"/></dir><dir name="oauth"><dir name="authorize"><file name="button.phtml" hash="dabdb89d5aebc87d81c4db81623f9dc7"/><file name="button-simple.phtml" hash="ace5caf62efbfbfef573c355a9dfbe32"/><file name="confirm.phtml" hash="a585c9e6ae3c0d0924f92cc96741a0b6"/><file name="confirm-simple.phtml" hash="9f0dc4fb329c9c7ab06b22ee7493ce57"/><dir name="form"><file name="login.phtml" hash="552ef68c240f28e898c386cab9b536b1"/><file name="login-simple.phtml" hash="af8ea937c2ced2926e1d4f5db2e742ac"/></dir><file name="head-simple.phtml" hash="79b7879a3404965d6dfe03a4244ee2cd"/><file name="reject.phtml" hash="a03ca7426946d9d7696d5554bb1978d9"/><file name="reject-simple.phtml" hash="765e1891ecf23f2b32cc1880934e61f1"/></dir><dir name="customer"><dir name="token"><file name="list.phtml" hash="b737547b086b60e317b24e4d6c58b83e"/></dir></dir></dir><dir name="page"><file name="1column.phtml" hash="8baf2606d5a89ead3432083920ec6eba"/><file name="2columns-left.phtml" hash="a697639e634bf256ec70eb8e5ba53fdd"/><file name="2columns-right.phtml" hash="89933fea0923c88825935409f343562d"/><file name="3columns.phtml" hash="df817532bf389200833e8497359aae3a"/><file name="empty.phtml" hash="7fde585927f37e76338ae967da54df70"/><dir name="html"><file name="breadcrumbs.phtml" hash="0407c497e9027ed264365fcb45bc6db4"/><file name="footer.phtml" hash="a28ddf35fa3dd1c2b7bbdeab5f5aceb6"/><file name="header.phtml" hash="266ef86528350f338e24eeabd42e1619"/><file name="head.phtml" hash="618cd2ce6e789c3d622db270458ca764"/><file name="notices.phtml" hash="727736b58612fac30cef87552368f057"/><file name="pager.phtml" hash="bb14f7c7fe337f98c5a50453ac933f31"/><file name="top.links.phtml" hash="156bf2c82e02940a392398b81df00d73"/><file name="topmenu.phtml" hash="3967cc1a585c91d7fe6ef81b3b9914a5"/><file name="wrapper.phtml" hash="c7f2c8566d851246535a80f108c865e6"/></dir><dir name="js"><file name="calendar.phtml" hash="96f726bb09b2c29177cb1c0d10997b1e"/><file name="cookie.phtml" hash="b6584923913a80e459124f73d0383779"/></dir><file name="popup.phtml" hash="fae1be35fbf71175f5394864792d2f12"/><file name="print.phtml" hash="208ada6325841aec23c08c29a1c60ea6"/><file name="redirect.phtml" hash="26f1c196a8cdf5d939434acf3886bc9b"/><dir name="switch"><file name="flags.phtml" hash="9c65d3837dfd3c7bb7ea81cad1177a20"/><file name="languages.phtml" hash="d67cb29ce01372828cbaa17d7415d3ad"/><file name="stores.phtml" hash="17cc715b034711f18982fd15c7a49285"/></dir><dir name="template"><file name="container.phtml" hash="5ddcc4abda0f7d063e6b60bdb9a46008"/><file name="linksblock.phtml" hash="ca9e3d358dce2158f8bcf3fc53e87bcd"/><file name="links.phtml" hash="8ac82b00dd7537826a45285556981dd1"/></dir></dir><dir name="pagecache"><file name="cookie.phtml" hash="b25d1e3f827b2f4443a834c68faa83ef"/></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="967d5d42de1fbc0b6ef629d2b35458df"/></dir><dir name="info"><file name="cc.phtml" hash="5825f0b82bf22027f09f7d44ec0354ea"/></dir></dir><dir name="payment"><dir name="catalog"><dir name="product"><dir name="view"><dir name="profile"><file name="options.phtml" hash="01dd240999cbbb2a86551c716eaf5a5c"/><file name="schedule.phtml" hash="22b416c82f1d9d0f8e7551ce081f0721"/></dir></dir></dir></dir><dir name="form"><file name="banktransfer.phtml" hash="afc452f8085f4fea63eab41475fe8c8a"/><file name="cashondelivery.phtml" hash="2d39ed0766ccf5b053898546f59c867c"/><file name="cc.phtml" hash="ea4c1b0cac282ac4f52e11751d2ba75c"/><file name="ccsave.phtml" hash="4a9cb73496d7e7b7fb8c9624439612d3"/><file name="checkmo.phtml" hash="ce79ab0d3665ca8b4d0a36ff2a4e1a58"/><file name="purchaseorder.phtml" hash="db052a891a7bf3340a8fe8e0c3e0a875"/></dir><dir name="info"><file name="banktransfer.phtml" hash="56fe0d318f1476590827da9f27432c05"/><file name="checkmo.phtml" hash="bb691b6a092d53059f1b446ac5167603"/><file name="default.phtml" hash="5f1a263e3941ad33a5f108c013446c48"/><file name="purchaseorder.phtml" hash="b6fe1e366ce9ca47d1f9ab1e6e80205a"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="address.phtml" hash="f274e591956f2277608bebf62fa2b6b9"/><file name="details.phtml" hash="f3a7b01960a0a1ffbce627de81ddbaa5"/><dir name="shipping"><file name="method.phtml" hash="b3d255b8567f88996b2ed7cc36895a6e"/></dir></dir><file name="review.phtml" hash="bc513c65ccb3d52798af9158e9bfad4f"/><file name="shortcut.phtml" hash="e9fbce886a042a262eb689cebdb1ee73"/></dir><dir name="hss"><file name="form.phtml" hash="7988a2afc2f851631223b2db66e1b064"/><file name="iframe.phtml" hash="dbb2b3fbf4ffa17b9e7fac30d996bf3f"/><file name="info.phtml" hash="0422558db314c49361ffa4e1486673b4"/><file name="js.phtml" hash="7810505ae3dc5caa48626edd367d869f"/><file name="redirect.phtml" hash="92aa527ff49a49557f991f417ba2e3f6"/><dir name="review"><file name="button.phtml" hash="d5c300ad6bd5149ae148424232cc431c"/></dir></dir><dir name="partner"><file name="logo.phtml" hash="ba195494f7c48add5ae3d60c444b5de7"/></dir><dir name="payflowadvanced"><file name="form.phtml" hash="0cef01090768f89bb2dfaab4201750e4"/><file name="iframe.phtml" hash="a0a93a9784d09df119315e7f5947d11d"/><file name="info.phtml" hash="3c3d3115a34158ee1045924ad06fa5f6"/><file name="redirect.phtml" hash="2d22773588722699eb4b0943e496bbf0"/></dir><dir name="payflowlink"><file name="form.phtml" hash="7988a2afc2f851631223b2db66e1b064"/><file name="iframe.phtml" hash="990fd582d1a47def3453299a6abc8fc3"/><file name="info.phtml" hash="ef8a052347e035d9fdc3d8bea9859807"/><file name="redirect.phtml" hash="87b87bcb189c2e49f1f129086eea55ec"/></dir><dir name="payment"><file name="mark.phtml" hash="b56c11b565e9d0d889c276ae831bd2da"/><file name="redirect.phtml" hash="ef28a668d9aa843024eb9df15f4972e9"/></dir></dir><dir name="paypaluk"><dir name="express"><file name="review.phtml" hash="be6b0194d35a767e6039b6a2a6dacb82"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="4777001edc771b44e954502d71065010"/><file name="login.phtml" hash="ab849108f56631c2cef8710e73ae1a7d"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="acaeb4244b825d9e0b05692ba7199294"/><file name="register.phtml" hash="538ac6fb46e121786f654b395e714fd0"/></dir></dir><file name="remember_me.phtml" hash="49971d7037f260ea813dda47c602d816"/><file name="remember_me_tooltip.phtml" hash="7f1904fa70e1cb1f7f41a70887e913dc"/></dir><dir name="poll"><file name="active.phtml" hash="e7d7449f96b615e419c80c8397b01ca3"/><file name="result.phtml" hash="a34507d828dfd33bb0e46033a4433de0"/></dir><dir name="productalert"><file name="price.phtml" hash="cc19841da48aefc77dabcb98b0fd79f5"/><dir name="product"><file name="view.phtml" hash="2916821490ca8c89085abe46a2a2cc82"/></dir><file name="stock.phtml" hash="cc19841da48aefc77dabcb98b0fd79f5"/></dir><dir name="rating"><file name="detailed.phtml" hash="a1a8ff834909479df637e74048ae4987"/><file name="empty.phtml" hash="b5012dbc20a2aa680e9f9abad53a4844"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="da4bd834b7403046f21731b91a32c433"/><file name="home_product_viewed.phtml" hash="539160dbd855cf9d75e1a8ab0687d0fa"/><file name="product_compared.phtml" hash="c48cf6cde6ccdd7e6ff3bbefb502fc3c"/><file name="product_viewed.phtml" hash="b544fe0b5d65429d7d00983b666b5147"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="49c115fbf9c0b7ab577ec2f769fc9c66"/><file name="compared_images_list.phtml" hash="f495da64e8403fc39ae5cef5536fd799"/><file name="compared_names_list.phtml" hash="06d95bb36fdb1dc71488d41ab53da12f"/></dir><dir name="content"><file name="compared_grid.phtml" hash="fd91fd41f99841c062fa61f4f2488f9a"/><file name="compared_list.phtml" hash="63e1d17df47234ee896469e4d3c009e6"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="d8c556f26075c6bd37b7f4dcfaebf727"/><file name="viewed_images_list.phtml" hash="65e4f71aa7107de9eb66a7c078903429"/><file name="viewed_names_list.phtml" hash="b1c80805ae43fad28a910cdd1b7d3ef1"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="d7867e726774a3fdec66d662ee05d4ab"/><file name="viewed_list.phtml" hash="c1898eb1c4310bb6a26d3cc48b8923ef"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="5b39341d3d5f22c8a7f5c5c4c73b5686"/><file name="recent.phtml" hash="1f8543b904c9f8fd9d380d30d80b073a"/><file name="view.phtml" hash="52356e17b4e28d099880b7a2a0b81bf1"/></dir><file name="form.phtml" hash="3e5393dfc87ea2aa5d90f2436d0c5d25"/><dir name="helper"><file name="summary.phtml" hash="bf0128650fc24e1bf5db3b9d760db549"/><file name="summary_short.phtml" hash="54cd7f0e8a2661a3092f85370ae07292"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="073f247a61af63122c0313e102212c5d"/><file name="list.phtml" hash="8b8d26823bcf84c009d4b6b33fca8f8a"/><file name="other.phtml" hash="b5891324f64bb56d2539a2f25afda646"/></dir></dir><file name="view.phtml" hash="d1bac61b064e3ac8fb0d1d1303dd03fc"/></dir><dir name="rss"><file name="list.phtml" hash="5ff603a05468a698cbcfb1f6e96ceb43"/><file name="nofeed.phtml" hash="9ee79166da49a6d4974130d639fade32"/><dir name="order"><file name="details.phtml" hash="557a7ac9c1cf44c19036ecf7e6071099"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="0d6dded290c70941cef640f88e501157"/></dir><file name="agreements.phtml" hash="3cd6811c25cb4fb931585053d414230f"/></dir><dir name="guest"><file name="form.phtml" hash="67640729a8bde8ff2d9bf773b261e3a4"/></dir><dir name="order"><file name="comments.phtml" hash="c09175353f1c484ada1c446e0dd613e1"/><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="8959f7a6243e22ee9344183a15cd2daa"/></dir></dir><file name="items.phtml" hash="3e9ae246b578e69d58425c035e2c12ba"/></dir><file name="creditmemo.phtml" hash="0fceb4d5c33c881d8c7ef5dc15e8ff9e"/><file name="details.phtml" hash="e82dcd3d04cf2ab2da8e3b57ecc5ed44"/><file name="history.phtml" hash="5f0800e3d74de17a591a1c5ff48cfb38"/><dir name="info"><file name="buttons.phtml" hash="198facf2c29e64dfc37f9866b4560dfc"/></dir><file name="info.phtml" hash="2a9f46c911c991675c3645f0508f305f"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="ca6a4e78a8465e38c5981f9665a8ef92"/></dir></dir><file name="items.phtml" hash="b3e2d86b1f6e6798149ca9a32a2a6776"/></dir><file name="invoice.phtml" hash="d4bb81b31d057d840de9fb540052206b"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="5ec4f885fe61920552eb73ae15c0425d"/></dir></dir><file name="items.phtml" hash="7c1aac06f97f224762c3c46211d67b6a"/><dir name="print"><file name="creditmemo.phtml" hash="9de481f4fec7e3358a659b749cb3016d"/><file name="invoice.phtml" hash="70cebf1937d203dde0b377edef06be24"/><file name="shipment.phtml" hash="a5a5df6cd81f68fe7bb20a7b76328bbc"/></dir><file name="print.phtml" hash="efc77c82dcf49ef570d8d92ca8f6bed3"/><file name="recent.phtml" hash="a35cc2efbb7ef61f77dd32eb08407bc4"/><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="70d73e236263c5609baeda9123bf75e6"/></dir></dir><file name="items.phtml" hash="e45de99649b2ad8180402c1686d8a52c"/></dir><file name="shipment.phtml" hash="d7abf116a276b3ba99c712e67ca5673b"/><file name="totals.phtml" hash="5a78aa3fe60d4b13bf8451f23bb9edd9"/><file name="trackinginfo.phtml" hash="b3426ac69738b37f989739db2aafc1a0"/><file name="view.phtml" hash="fb2848ab3b63fd94a7bb52ed2a85f0be"/></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="0190a89f5aec91828fd48648054bee63"/></dir></dir></dir><dir name="recurring"><file name="grid.phtml" hash="5e0e8b0d095dcafdf4bd3815dc22bebc"/><dir name="profile"><dir name="view"><file name="info.phtml" hash="eaa2fe32350fa406853f4cf18c27c3f4"/></dir><file name="view.phtml" hash="124fcc6e1d47d8594be2c417f5f88c26"/></dir><file name="profiles.phtml" hash="8d2df9dda323013d83929e2d973b95e3"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="7d2a2b96922f0adf82fa2f2d5c7bae81"/></dir><dir name="widget"><dir name="guest"><file name="form.phtml" hash="330bf9c3c6fe0b889cb6130ae03a6f96"/></dir></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="4c674bea176212993c0509cbdada7ce6"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="49706bb11880fdf1207bc7b14862e9c4"/><file name="popup.phtml" hash="524b80e8298556e7b1138b992a48cc37"/></dir></dir><dir name="tag"><file name="cloud.phtml" hash="c43e7720cabe7eed43cdadb73272f708"/><dir name="customer"><file name="recent.phtml" hash="5a0e8df1c878a4af48851f4195b8b963"/><file name="tags.phtml" hash="d89db268db068c59176954a8e4a31320"/><file name="view.phtml" hash="9f2ded5cb70ee9110550418e72074b38"/></dir><file name="list.phtml" hash="295239afaff72eae47790cfdaf93bd1d"/><file name="popular.phtml" hash="97e200f2a189c5902de455d1d62eeeab"/></dir><dir name="tax"><dir name="checkout"><file name="discount.phtml" hash="da5eaff99799dd1de458fbfcdda65cec"/><file name="grandtotal.phtml" hash="1be9046e0b62b2271931f7a25abe9779"/><file name="shipping.phtml" hash="f01a47e00690900ee79f0b74055248f1"/><file name="subtotal.phtml" hash="ecdfe07dd328e5391612b5a9feaffc88"/><file name="tax.phtml" hash="998710737c0c0d00d5e33326ec45670f"/></dir><dir name="order"><file name="tax.phtml" hash="99e3f714f5e5c08c9e7f5063547afc48"/></dir></dir><dir name="wishlist"><dir name="button"><file name="share.phtml" hash="bf67012b25d9078cc1bdc3a971e0fa42"/><file name="tocart.phtml" hash="4ed121b0d0ddc27ec8341f9b43b55ea4"/><file name="update.phtml" hash="db71a11edc6569aa3157928f8a8f5e5f"/></dir><dir name="email"><file name="items.phtml" hash="dfd15c562df1ad10a03c7d9f445b8ec2"/><file name="rss.phtml" hash="0093593ffc7f73507afe9dce8a94d04b"/></dir><dir name="item"><dir name="column"><file name="cart.phtml" hash="30b31a6ba6d568f25a828410104f7d6e"/><file name="image.phtml" hash="599c0a0af8133a3da8332b83506cdb7e"/><file name="info.phtml" hash="601c06d57c55a3693dedf1db00cb71ae"/><file name="remove.phtml" hash="54328860de6dc52fb2e4dea2142d4a8b"/></dir><dir name="configure"><file name="addto.phtml" hash="9897e62a637904f305ca2fb1803bbf2c"/></dir><file name="list.phtml" hash="b19e0d0a8c4f672d8db3f359b9a47993"/></dir><file name="options_list.phtml" hash="e7444188a84136672d79b8130e533971"/><dir name="render"><dir name="item"><file name="price_msrp_item.phtml" hash="2b6303fd121b88763e2bb52ae19e9de4"/><file name="price_msrp_rss.phtml" hash="1e19860fbaf7a0e228ba41b5e7997312"/><file name="price.phtml" hash="b42da15a8aa285317900d0c5cbc78e97"/></dir></dir><file name="shared.phtml" hash="49eeb9d575c91815124c1d7c73845909"/><file name="sharing.phtml" hash="1981bc96ac9fb3a2ba87e13d1cda7451"/><file name="sidebar.phtml" hash="f4ddbacf6132078b0241aa1747feda5e"/><file name="view.phtml" hash="ae07051b2ce4111c186797d8be062720"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="widgets.css" hash="49d489c9cc589a27782d4bd40ce92299"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="cookies"><file name="firefox.png" hash="425e1b2ddc38c0bba431fb54357c66a4"/><file name="ie6-1.gif" hash="5c27700e245762bc89ed8c3ee7183f21"/><file name="ie6-2.gif" hash="d8c55e15e1f711e5c259300a9c19551b"/><file name="ie7-1.gif" hash="d61edcc8a514a3c81ea116b7d38ddcb6"/><file name="ie7-2.gif" hash="0526a654e94c54866cad977c0a47d3e5"/><file name="ie7-3.gif" hash="4fb142def3f6cfd8d8d23e1315528a1e"/><file name="ie7-4.gif" hash="575c276231c6a91e28935ec98215e146"/><file name="ie7-5.gif" hash="3ae5fcc11fe89da91674d183872337c1"/><file name="ie7-6.gif" hash="95a4981a41785a8cde273c9b2edbfbc7"/><file name="opera.png" hash="34070d92180d4ee0e37b1dd8bb731cd7"/></dir><file name="cvv.gif" hash="83cdd38bf110b0f9c52fe84b56f45298"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="reload.png" hash="84cc4883f78ef850814ea9b53989b2a7"/><dir name="widgets"><file name="i_block-list.gif" hash="fe8424127ecbe4b0d893bcf6f253dc1a"/><file name="i_widget-link.gif" hash="1bf753578171f147f0203e7b13bdd0c4"/><file name="i_widget-new.gif" hash="a75377ffed51b711cbc608ffaa1a2e7d"/></dir></dir><dir name="js"><file name="bundle.js" hash="1bb059cc3cfe067e9868df86e95f4da0"/><dir name="checkout"><file name="review.js" hash="3a9f485e377f6e3e004a713b7e76fdd4"/></dir><file name="giftmessage.js" hash="f87d68a8133674c0b7e0ec4aea674b61"/><file name="ie6.js" hash="93ec1d1e2a9d0a45f4ff472cc046a478"/><file name="msrp.js" hash="dd068c70b272f527adb8a87ad7c72eea"/><file name="opcheckout.js" hash="aed94eb37b332d2e3f81cc2c318a8012"/></dir><dir name="lib"><dir name="prototype"><dir name="windows"><dir name="themes"><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="b69d765373769ce7e64b7f220bb2629c"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
16	<compatible/>
17	- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.7.0.1</min><max>1.8.0.0</max></package></required></dependencies>
18	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>Interface_Frontend_Base_Default</name>
4	+ <version>1.8.0.0</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7	<channel>community</channel>
8	<extends/>
9	<summary>This is a Magento themes base</summary>
10	<description>This is a Magento themes base</description>
11	+ <notes>1.8.0.0</notes>
12	<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13	+ <date>2013-09-24</date>
14	+ <time>09:09:40</time>
15	+ <contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="etc"><file name="widget.xml" hash="7841e91642c07d049f6031c0a8b29968"/></dir><dir name="layout"><file name="authorizenet.xml" hash="ff4ae194cd550829d615f6626dfcacb3"/><file name="bundle.xml" hash="0990d5fb3da9521028ea1d507ac11ca7"/><file name="captcha.xml" hash="dbfae489e384e5f4509f91e7ce81be75"/><file name="cataloginventory.xml" hash="6cb9b9a4c99681b769e1ff439b55a0ce"/><file name="catalog_msrp.xml" hash="add0145199068eb0c16b3e03e7936b95"/><file name="catalogsearch.xml" hash="bd12d18c200b51e4f7fb4966fc467f38"/><file name="catalog.xml" hash="c12a09da3508982c50132a3fa6891739"/><file name="checkout.xml" hash="fe3715bb895566376aaf61c318fa848f"/><file name="cms.xml" hash="48e50d6294f859fa528278a7899d8c30"/><file name="contacts.xml" hash="c7c81f13d7deba797ede47e730278649"/><file name="core.xml" hash="b39a8c4b82a5a1fb34830e2763516efc"/><file name="customer.xml" hash="5bdf1625ffcdadf4d4f62600a566a15d"/><file name="directory.xml" hash="d30e05f8e4fe1eb024db1dbdcdd32414"/><file name="downloadable.xml" hash="41b9c74a3e787f07536e7ae24e5c8e80"/><file name="googleanalytics.xml" hash="7a34c27c3a4ec5f65aafe317d4e82f9a"/><file name="googlecheckout.xml" hash="fa4577aecbe0f36bce87e06bc652a062"/><file name="newsletter.xml" hash="c0043b6a9f5e6effe8ad9791c1d1c28a"/><file name="oauth.xml" hash="bfaded1209520e85687e4855114be425"/><file name="pagecache.xml" hash="ffa2ab2f6d87db688402cbefaf0bef19"/><file name="page.xml" hash="51344a8115e9c9b892e65be9a5de9b94"/><file name="payment.xml" hash="2d90077e1b2f846063a89c8aeb4d5fdb"/><file name="paypaluk.xml" hash="3fe895d16b62ad96476798a2e6077aab"/><file name="paypal.xml" hash="9aacf061f6056c66dcdb579a82660113"/><file name="persistent.xml" hash="55e430a56de4a4e62f94f045c4673bdc"/><file name="poll.xml" hash="ed6f016af222db0db3b17117977e87ac"/><file name="productalert.xml" hash="c83056d65e32214d23ae3b849ce849a4"/><file name="reports.xml" hash="0ed016155a3cf6bd366d482d92f41249"/><file name="review.xml" hash="435119eb74e4928c099e4b48ebfccf8a"/><file name="rss.xml" hash="16c16c677087920d3698e4e60b44b2b9"/><dir name="sales"><file name="billing_agreement.xml" hash="d510d75db1ce7fc999462e50be600497"/><file name="recurring_profile.xml" hash="052592ffb00251a440307c4e5a140ff7"/></dir><file name="sales.xml" hash="98042160869202debcf88e2b2c281b56"/><file name="sendfriend.xml" hash="12b612b48cda35223e36595179aefac1"/><file name="shipping.xml" hash="a2f266abff8dca19d01dc2d00e383a79"/><file name="tag.xml" hash="ffc5a935cb0713614fdfc9efc395fcfc"/><file name="weee.xml" hash="a4fc63dc72939c5180d288994d8da72b"/><file name="wishlist.xml" hash="cbbf15f8511ff6942be5a9a08225d787"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="4d3c5051c0d2c3c3c88dc516946947cd"/><file name="iframe.phtml" hash="6a628174882ee3db2bea73d72be15a2b"/><file name="info.phtml" hash="80267017d18a69690ffa2012bf16ea60"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="ccce44c73d5841fb4a220166e1a53776"/></dir><file name="price.phtml" hash="7a300519728802570c4918c7846f6bd6"/><dir name="view"><dir name="options"><file name="notice.phtml" hash="cac90dc8b9a94c42d710e5bbc8e39f61"/></dir><file name="price.phtml" hash="e19a7489377de3fe934f2ad8a8b4e40f"/><file name="tierprices.phtml" hash="156c0fb91c4293e798145896ba7954c8"/><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="60f522edfadba0412a2abdd7090e6da2"/><file name="multi.phtml" hash="84f0a9c4ce3bfa7b3196921e0e67e83b"/><file name="radio.phtml" hash="a7708d52e39e6e2361c0d868b50ac247"/><file name="select.phtml" hash="376be44e6e793aeae1104543e9eda969"/></dir><file name="options.phtml" hash="d015eefd779fa786b934c3c630c805fc"/></dir><file name="bundle.phtml" hash="bef57a41d87a39442be57a7c8b219b8c"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="459ee036059c16dd5c3af203d07b1264"/></dir><dir name="invoice"><file name="default.phtml" hash="a680f24fa94bfdad117e4aa350ec71ff"/></dir><dir name="order"><file name="default.phtml" hash="68613900f0e092ee5506d03c70b6f144"/></dir><dir name="shipment"><file name="default.phtml" hash="05585c1ccbee57dab08a358d31906c68"/></dir></dir></dir></dir><dir name="rss"><dir name="catalog"><dir name="product"><file name="price.phtml" hash="d9d4b6e1d4268459bb9112a4c2fd9e30"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="82137b4b7e19b3c8166703a9a9fcf44b"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="d35a83c2899d417c8837657ef9bd87e8"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="113506ee795061805ef490b747927230"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="6307c71651e7a91d3e6dfdfd64c25079"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="2e560ea0fdde22566d59179b7b15b8e6"/><file name="right_col.phtml" hash="2e560ea0fdde22566d59179b7b15b8e6"/></dir><dir name="captcha"><file name="zend.phtml" hash="5480e8c35dd6124195fc71d85e86e2d9"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="514593d873876e3225a4b1ae3643abff"/><file name="view.phtml" hash="a07e819e74bbe444a6f1131dc3ccd142"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="e5ebf3a71e72ad751a5415d75e89ece4"/><file name="link_inline.phtml" hash="16609d7a742e10e72da22449f92054bf"/></dir></dir></dir><dir name="layer"><file name="filter.phtml" hash="eac743dbcd2d881c42b6f18ec704eae9"/><file name="state.phtml" hash="ed374b6ffb814b13e2eba6ef02e99efc"/><file name="view.phtml" hash="561f244e27b6f6017d1d5bc365242b27"/></dir><dir name="msrp"><file name="popup.phtml" hash="c08375903f3f11f2af8f3a5a007f0c92"/></dir><dir name="navigation"><file name="left.phtml" hash="39bedcb075360fdc2a399535a6e792ae"/><file name="top.phtml" hash="72623b9b9c6b58a7df91284862be17ff"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="19383cc23c8f6c9fe556cceebfc34c07"/><file name="sidebar.phtml" hash="2e6a4a82e082d235a9329959381c4414"/></dir><file name="gallery.phtml" hash="f1f89fa5e982cddbd506e80630a57d99"/><dir name="list"><file name="related.phtml" hash="9e1dfd894fa6f0ce6a88c4e0ef79e2a2"/><file name="toolbar.phtml" hash="197911bc8235bc39f5b5c87882724ecd"/><file name="upsell.phtml" hash="8dd3aab7ebd869c8d4f40099f4716506"/></dir><file name="list.phtml" hash="7d7da624243ec149c96a41df9132bdce"/><file name="new.phtml" hash="f2c93ef5f556ba94229eed83f58abb57"/><file name="price_msrp_item.phtml" hash="6bbc7f3e3c3b73e009bc0ab8838d3d40"/><file name="price_msrp_noform.phtml" hash="1692b20a230588ca548f1459c285cc74"/><file name="price_msrp.phtml" hash="283e07fdb0701feb006bc02edd3f23a9"/><file name="price_msrp_rss.phtml" hash="6ee30cbc86da3aeea4187810da10a9e9"/><file name="price.phtml" hash="111aedf46fee15d709028a3d0d47672e"/><dir name="view"><file name="additional.phtml" hash="5d113b63135e535c5b6fe5695dc94ded"/><file name="addtocart.phtml" hash="d8b6b397a4a04c3266c0c82391aa4acb"/><file name="addto.phtml" hash="a430465fcac701cb788916da08c52b90"/><file name="attributes.phtml" hash="c184b99a88f08fa50704c399a37fcfbc"/><file name="description.phtml" hash="4e920e324b0a0d366127a3ad99e2328d"/><file name="media.phtml" hash="1be8f4ea6e54f9a97e220f28931c4f50"/><dir name="options"><file name="js.phtml" hash="160fcd9f5eade825dfa8f4121aac9778"/><dir name="type"><file name="date.phtml" hash="78a303ab99f3361028053bf0b977b976"/><file name="default.phtml" hash="4c599ba00a9e7ab0e39768f0c49d52c3"/><file name="file.phtml" hash="3a7fe05c434ec81f68229ba5365095cc"/><file name="select.phtml" hash="4385f417292667d74616d113de034d4c"/><file name="text.phtml" hash="c041996450010583ae8759480f87d317"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="85655fc307d163ec6bffc07bef7f8924"/></dir><file name="wrapper.phtml" hash="a797d8924b27b63652255a8331bf8d44"/></dir><file name="options.phtml" hash="81a5b17ed13aabbca729c61b3f9b9111"/><file name="price_clone.phtml" hash="24e53a27dc39aa31afd2cdac7ab1656d"/><file name="price.phtml" hash="a6ab4e3bff155c7f2424568f60be1b89"/><file name="tierprices.phtml" hash="9eab82fafca8880c619276489bf99649"/><dir name="type"><file name="configurable.phtml" hash="e67c05bee0fa75df518c39929aa10187"/><file name="default.phtml" hash="cfab2e65accf5808fe352b52a00840de"/><file name="grouped.phtml" hash="a2cf1b972121dbee6a6159e0d13c180e"/><dir name="options"><file name="configurable.phtml" hash="08236b6638dc11992ab8da5385977271"/></dir><file name="simple.phtml" hash="e67c05bee0fa75df518c39929aa10187"/><file name="virtual.phtml" hash="e67c05bee0fa75df518c39929aa10187"/></dir></dir><file name="view.phtml" hash="de4d79d9f647634e02496a23f3ee7fbb"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="a6506809feaf1777e007864fc62ce26f"/><file name="link_inline.phtml" hash="351d332bd78df5f47bf6b66cb89a8297"/></dir><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="f908f845e582dea293d4526ef729e396"/><file name="new_images_list.phtml" hash="3f263b467a58c306286e32332fbaab43"/><file name="new_names_list.phtml" hash="b09275eec939d91f6d20397c9d184691"/></dir><dir name="content"><file name="new_grid.phtml" hash="41602b4011288669a196e5c35309251c"/><file name="new_list.phtml" hash="6073d9562d08044588c8406a81890a39"/></dir></dir></dir></dir><dir name="rss"><dir name="product"><file name="price.phtml" hash="1a1c258cb9a2561df2531a9a6d13d19f"/></dir></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="9e809f0c7520508e73f22058ea127b3f"/></dir><file name="sitemap.phtml" hash="7e26f673c65ea756b09d7d2797bbaff9"/><file name="tree.phtml" hash="413ef1fa8c5e9943b1a44dd23ab9d69d"/></dir></dir><dir name="cataloginventory"><file name="qtyincrements.phtml" hash="3b48f42619900ad7b7cbf191d55f0ee1"/><dir name="stockqty"><file name="composite.phtml" hash="825737ef425d3911dd663e8586b4f68c"/><file name="default.phtml" hash="c4646015a5d2203ce5bf422c1fc31485"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="d2f471111db7270891466b47ebef1ff7"/><file name="result.phtml" hash="5513b4ad4914f2b06c13983975e70faa"/></dir><file name="form.mini.phtml" hash="c6139cd74a134cb0d4364a4b0b53708f"/><file name="result.phtml" hash="fde05cf4fe8e540c5437820ec5edbbcf"/><file name="term.phtml" hash="32bf5a3d5960180b1c1603da350afa12"/></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="8a3f239d1f8afa5dfa3d45a1ca28baae"/><file name="crosssell.phtml" hash="186f8405ec7a86f7e48bfcb01adf7b2e"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="0fc6cc809c88704da74a915cf7e20918"/></dir><file name="default.phtml" hash="ef843033ce7057091a5eca85723f40be"/></dir><file name="noItems.phtml" hash="001f7d25b1c9468f532a13940fc8c7bb"/><dir name="render"><file name="default.phtml" hash="f5b6d21f8a80455daab898ea0f3f7c97"/><file name="simple.phtml" hash="15fb630f32aadbd48a892e8d90af3073"/></dir><file name="shipping.phtml" hash="6b774a841fc54c29a1f5d3a2af6a0944"/><dir name="sidebar"><file name="default.phtml" hash="b508e1e2007554fdd72570e9b1efbc92"/></dir><file name="sidebar.phtml" hash="8344c09dde70abe4e3b9c8861a1bb741"/><file name="totals.phtml" hash="5b69442fec9380e0e6d2afc6f95fd04a"/></dir><file name="cart.phtml" hash="34d41f366e05314baf7cbee9a37ad6bd"/><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="5298b1c3f448f03685fb8bd0df88d97b"/></dir><file name="addresses.phtml" hash="234be7957d9cdf739c06c714ba04c372"/><file name="agreements.phtml" hash="ff0beb153b284b2e3c58b4370a4b8401"/><dir name="billing"><file name="items.phtml" hash="cabfbfb5d33255a4750ccc3d55c358d6"/></dir><file name="billing.phtml" hash="281597e3e36ba83a13cdb4fb6bdbc3f8"/><dir name="item"><file name="default.phtml" hash="0ff34fc5d79d1bbe12fcf297b8280f08"/></dir><file name="link.phtml" hash="70249f4132c971ec5888690ffd092403"/><dir name="overview"><file name="item.phtml" hash="e83def5645dc64adef382b849c8fbdbb"/></dir><file name="overview.phtml" hash="bcdab97360c0938600c5a08249d81d17"/><file name="shipping.phtml" hash="568b9a00ba97c7db001cd894bae675a1"/><file name="state.phtml" hash="070912c23e8ff11f007e22306217f6d5"/><file name="success.phtml" hash="ae7f8dda179230945ace59db76f8b017"/></dir><dir name="onepage"><file name="agreements.phtml" hash="a8f762dd61914b2d9eab9fe9ada1945a"/><file name="billing.phtml" hash="3627f62972b124c21cbb08fd67458552"/><file name="failure.phtml" hash="0b95128399f2521bf12837aceaa31836"/><file name="link.phtml" hash="323dcf7f1acb91a186595b618592be86"/><file name="login.phtml" hash="ea2fbe290afcefdc0077ac42835899e7"/><dir name="payment"><file name="info.phtml" hash="e3d23f5d3e0b135ca38ec7ab5b41f851"/><file name="methods.phtml" hash="b88d2e4a2f375b5fb4a3983539b2e81e"/></dir><file name="payment.phtml" hash="0f2094bb3da954aa9405c1af7b66ae2a"/><dir name="progress"><file name="billing.phtml" hash="e0c20674a6831364b055424dac493acb"/><file name="payment.phtml" hash="2c5af1d7ea230faa3963781f85e9f610"/><file name="shipping_method.phtml" hash="1fbb3446280be2b2ce831e6b0b26fd80"/><file name="shipping.phtml" hash="b26f2b46e5c12cda8de4ecb37f98c355"/></dir><file name="progress.phtml" hash="3eab47ed120f6efd05f85294da825544"/><dir name="review"><file name="button.phtml" hash="d7a54917e7d0ceec6875760a3910452f"/><file name="info.phtml" hash="60c527a672dc8ed0afbe180c1105f65b"/><file name="item.phtml" hash="4ff6deeabbe76339f9914075e49cf798"/><file name="totals.phtml" hash="0acb66397e2d390de49dbdfca15d9804"/></dir><file name="review.phtml" hash="5ffdd3cc23815519462e3dcb1fc6b81a"/><dir name="shipping_method"><file name="additional.phtml" hash="7f8751c51089c14316694e2aa6c5357d"/><file name="available.phtml" hash="779142c301923119db60c08ad90d4e06"/></dir><file name="shipping_method.phtml" hash="ca5074b35e9a6167298a4a4433ecf98b"/><file name="shipping.phtml" hash="0dd2ceb18da2763395701c6379cb9a77"/></dir><file name="onepage.phtml" hash="b9c5a5a822652a0890be7e3e4f05d6b1"/><file name="success.phtml" hash="2e15bd609848f9da5edcece36b75ee45"/><dir name="total"><file name="default.phtml" hash="0ee253b9c15115a9db2cf53a67eeadf2"/><file name="nominal.phtml" hash="d377962c59bffbf7d21ced50f23c6d16"/><file name="tax.phtml" hash="df7b9274149d74ff7d6cc7fa356be35c"/></dir></dir><dir name="cms"><file name="content_heading.phtml" hash="a2b29b501b3a02f95bd98ad43bc53b42"/><file name="content.phtml" hash="1b278f7d9d4d4b2c4ba8294521a260a3"/><dir name="default"><file name="home.phtml" hash="4644ecd59a71f6233fddd4192acd9353"/><file name="no-route.phtml" hash="f168035d93340896f94b242c1f194dfe"/></dir><file name="meta.phtml" hash="5190e68694de60ffe0c2a01085dec99e"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="0d724d6e82b951b747ba6a871086f8fc"/><file name="link_inline.phtml" hash="37afb408b4a92d42f202dee6d9eb9fac"/></dir><dir name="static_block"><file name="default.phtml" hash="57690772a8cf7edad4ae7cc23ba8c2cc"/></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="e6466daa2d07ccb502ec163cf44ec2aa"/></dir><dir name="core"><file name="formkey.phtml" hash="eaa615a1b1e1095f104d4399d5c3c137"/><file name="link.phtml" hash="4bea6e43805d53027ee3a7528bb589a7"/><file name="messages.phtml" hash="da5cb19c11803db955f7b67d7b15eabc"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="0224cfb6bc389cae9d8e755d5ae91f81"/><file name="hello.phtml" hash="51393d123a78e7f6461aa0b4b3ee3691"/><file name="info.phtml" hash="27a57f2b321f63889c81aa0d75fabeb2"/><file name="newsletter.phtml" hash="689e47eeceff34400dd816449483a52e"/></dir><file name="dashboard.phtml" hash="07ce59e897cbadbab75d2cb5e69ee783"/><dir name="link"><file name="back.phtml" hash="966e18d09225d5ff1ee88139a0099455"/></dir><file name="navigation.phtml" hash="4fef6b277463f6cf1423b78016ff254a"/></dir><dir name="address"><file name="book.phtml" hash="f543dfa554dc389d8e0d9afce4574548"/><file name="edit.phtml" hash="4b853cf6b29231eb6add1a36ac73ffd8"/></dir><file name="address.phtml" hash="5e50f7e47656d3444c7e9069e4a1b902"/><file name="balance.phtml" hash="53aef61ff7baee49d1fb98861d424f33"/><dir name="form"><file name="address.phtml" hash="c284983647ff88bc457520c4acd5eb73"/><file name="changepassword.phtml" hash="29c707818823865b8bda3650ca5db11d"/><file name="confirmation.phtml" hash="2f1ce837f117b92cdec1b6d5cc48bb7f"/><file name="edit.phtml" hash="be4c7e278e89c04da9644386fa28696d"/><file name="forgotpassword.phtml" hash="4bda59c98f4e4e15b5a0e50b000800b1"/><file name="login.phtml" hash="57674faaf7006e1394e6f93bcc725519"/><file name="mini.login.phtml" hash="4c8bd38cd60f0de82f9e7c3450daac96"/><file name="newsletter.phtml" hash="33fd42a293e1f5e77d6d2cb2fb28b43d"/><file name="register.phtml" hash="2c5c3f29fb871006e0e54d14848bb3bd"/><file name="resetforgottenpassword.phtml" hash="462bf691601ec16fdda473db7a1ec1cd"/></dir><file name="logout.phtml" hash="4229e8c56b3abc016508579fa7a52c58"/><file name="orders.phtml" hash="13dec0788ff69f76f4a22bb42cff9004"/><dir name="widget"><file name="dob.phtml" hash="06d96d0861b9d6108a1a9f9a3a170fe6"/><file name="gender.phtml" hash="0e9a12d1cbe0a95c3539eb44395a62a1"/><file name="name.phtml" hash="f131bfd60b490899b025fe57663fe69c"/><file name="taxvat.phtml" hash="3bdbc005510b72cdd019624c971fa856"/></dir><file name="wishlist.phtml" hash="fdc628e68f98fb9fe09239c4d02eab31"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="6972ec9db0f291af6152876b0569e96a"/></dir><file name="currency.phtml" hash="e09f79b1fe19a3b0cc7bb1f93cd9df78"/><dir name="js"><file name="optional_zip_countries.phtml" hash="8298aa27f9789c72889abe31e89a0486"/></dir></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="3c8cdd1ef8ea1e180de3c312545c61c5"/><file name="samples.phtml" hash="10a878cae989863fc18dab5d03a0cc94"/><file name="type.phtml" hash="e9cfafc367a9717d523269c40b9c9189"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="ca0b3b8a8b41dc94a6e067b11c60e2c4"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="a54c79fadd74281c5587ec6f5f05f357"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="14c6b556be54f187fa88e23eb73b1ad1"/></dir></dir><file name="success.phtml" hash="e80c2fd04c41c3d91c9269a960c7dcde"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="7eb6d898559355673e16e6a67994b03f"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="5308947330e4c8a5ea31a5f478117764"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="7f3d48155dc4034868099d8b64cafd56"/></dir><dir name="order"><file name="downloadable.phtml" hash="17e3f7933de13891e2a8512c872eea86"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="8534822f30d12582304bf178bf1f3a41"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="bc6351f6937774b9fb038b6372170d64"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="b23b662e74345e8d059518f5edb2e736"/></dir></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="b47aec2b2a04f851e011861858f666d6"/></dir><dir name="invoice"><file name="items.phtml" hash="9df2db8a77da02023105df3537c88fda"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="4bf5d0461d82a4c08a8f4f8f05b84712"/></dir><dir name="invoice"><file name="default.phtml" hash="4bf5d0461d82a4c08a8f4f8f05b84712"/></dir><dir name="order"><file name="default.phtml" hash="4dbe3dc7374114ce8daace23f22aa14b"/></dir><dir name="shipment"><file name="default.phtml" hash="9fb9140adb3fd720c9ee824646fd81ef"/></dir></dir><file name="items.phtml" hash="82514c6dd6cf89a9fe4dcc5915f8a0f8"/><dir name="shipment"><file name="items.phtml" hash="790ac5faaec91f570504804048e19be0"/><file name="track.phtml" hash="092417894365f0bd0dd1de8f5418bf75"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="a06c3ff9a1407a2a700c640463b1c656"/><file name="stock.phtml" hash="d4f84e74595e86744dbd1591f724f061"/></dir></dir><dir name="giftmessage"><file name="inline.phtml" hash="64693c0a3e708784446c58bdf3fd2bad"/></dir><dir name="googleanalytics"><file name="ga.phtml" hash="c3f24c1411dd96ec0cb6da8cd4e5b54d"/></dir><dir name="googlecheckout"><file name="form.phtml" hash="903b67370a02be2b5363324f9e7e9c41"/><file name="link.phtml" hash="1421dc98e10f043f9148b392b8084016"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="b6d89597fe6ab55f24f1db71928659ca"/></dir><dir name="oauth"><dir name="authorize"><file name="button.phtml" hash="ab630b4316878e341c0611cfa51650aa"/><file name="button-simple.phtml" hash="b4106ed8604d849314aecdea831ca6fa"/><file name="confirm.phtml" hash="563d76e574a1a6c43945479c63ae711e"/><file name="confirm-simple.phtml" hash="80423693a0a07b13a9dbc5507fe74847"/><dir name="form"><file name="login.phtml" hash="98743d533dea9a5dca05f3474bd6dc3c"/><file name="login-simple.phtml" hash="7b80dd4355187f7fbbfcfd6c05e8ae41"/></dir><file name="head-simple.phtml" hash="bfd2884d2c8af4315dd919ced20235cc"/><file name="reject.phtml" hash="51593eb4eba331894dffb67c4ca2bce2"/><file name="reject-simple.phtml" hash="b5b7d2623b16e56ddc95fef5a5e7a2ac"/></dir><dir name="customer"><dir name="token"><file name="list.phtml" hash="0ed2ae29b0489f2dec0a6af03010fff5"/></dir></dir></dir><dir name="page"><file name="1column.phtml" hash="2ea1a339be90ced29b095ca4ceddcba4"/><file name="2columns-left.phtml" hash="b491cac040becb6be61d32d4ceadee79"/><file name="2columns-right.phtml" hash="c1767fa0eee114712a1ca8411795a3aa"/><file name="3columns.phtml" hash="207dff942b8b91987d19155f7a8a7009"/><file name="empty.phtml" hash="11d6841d6dfa2ad0c366fb11c26068af"/><dir name="html"><file name="breadcrumbs.phtml" hash="c034a339ee600b805c6271c83225944a"/><file name="footer.phtml" hash="4561fac2fb6e8c722a3f5be2825de65b"/><file name="header.phtml" hash="8dcf15fb7a3ef937b0ffeb2efcb7b4f3"/><file name="head.phtml" hash="8414479731562425a7dc6641486e74c5"/><file name="notices.phtml" hash="c3bf7f3cef2471eed531a3f35c98527f"/><file name="pager.phtml" hash="46cf49b484921cdacc6284bd8d1ff048"/><file name="top.links.phtml" hash="c5c2f18a6e5184206a2150dc58c01d04"/><file name="topmenu.phtml" hash="c7393f747b618c4668d5b5f39157232a"/><file name="wrapper.phtml" hash="99122df71779b8bf5146a6b0c40593d5"/></dir><dir name="js"><file name="calendar.phtml" hash="9461fd7deda2495b743ce17d405ecb28"/><file name="cookie.phtml" hash="ad57ca0a6409b2ce90448ae7c548e83f"/></dir><file name="popup.phtml" hash="97e855dcb940403ba9d3bcd64aa548de"/><file name="print.phtml" hash="e64d12aab7f325867fbaa303b8517307"/><file name="redirect.phtml" hash="8c3df16330cc29e52af3e13f32362e0c"/><dir name="switch"><file name="flags.phtml" hash="3d6dc469f573506ff0ed3b7258b23dbc"/><file name="languages.phtml" hash="f6c946bedc1e648efd462a8d7c029df4"/><file name="stores.phtml" hash="8d267ab0070362e52e37e5673bddf2c2"/></dir><dir name="template"><file name="container.phtml" hash="78db3f910f9f854d543cc803d72ca46c"/><file name="linksblock.phtml" hash="162aa23949d5aafa5b97ee383a59a102"/><file name="links.phtml" hash="1d4ec456ca6dbdc096e83ac2301f6fa5"/></dir></dir><dir name="pagecache"><file name="cookie.phtml" hash="5da6fe493e3e79ccd5a2fd8d9bd85f0f"/></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="a09ab0c7cd31ed6ee0baedb13dbae9ac"/></dir><dir name="info"><file name="cc.phtml" hash="c8e65d6b2aa010bbe9b204ab107f6157"/></dir></dir><dir name="payment"><dir name="catalog"><dir name="product"><dir name="view"><dir name="profile"><file name="options.phtml" hash="8fc392586cb4c66764382ffbc20a9393"/><file name="schedule.phtml" hash="fd48d09a03580f4a4f2f98f86de8b54a"/></dir></dir></dir></dir><dir name="form"><file name="banktransfer.phtml" hash="01644d6cf993bc5cfe2632e5a5bfdcc2"/><file name="cashondelivery.phtml" hash="9e55096120edfec835e07482bc483096"/><file name="cc.phtml" hash="23ec898742ca57a628437f21bd6101ea"/><file name="ccsave.phtml" hash="b52e20c18cf71c8200e46193cb51e58f"/><file name="checkmo.phtml" hash="9e0b5fe468c281f82f4ec1351f084e02"/><file name="purchaseorder.phtml" hash="ff79af2ed766da3a9e412b4b438b0377"/></dir><dir name="info"><file name="banktransfer.phtml" hash="e2403ade862ab927944c0d67982bed40"/><file name="checkmo.phtml" hash="df97b19db1e1c0bfc991f3d230bf00a2"/><file name="default.phtml" hash="41c1d133402c8274dd78bad60a89fbc8"/><file name="purchaseorder.phtml" hash="11574613b69778e02e20a7b1767512c4"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="address.phtml" hash="0ceee8f979be1d6a44ed6919af122016"/><file name="details.phtml" hash="d9cfdaa646d2d6693002bf6f00064201"/><dir name="shipping"><file name="method.phtml" hash="f71cbdfc5a8fe543eb03c8475a1818d3"/></dir></dir><file name="review.phtml" hash="0ee4d1c4e2055ca9050ef964b4ac0a94"/><file name="shortcut.phtml" hash="227924ef1ed156953734d44c0a0cfda0"/></dir><dir name="hss"><file name="form.phtml" hash="f25fda88eae3556b410e4c86e3754785"/><file name="iframe.phtml" hash="700aa309bc3e2cb15fc5969204df470d"/><file name="info.phtml" hash="6ae7f528f71dc914365a9c638b61520d"/><file name="js.phtml" hash="4e57e37572a7c69e1e6c8e479a6950c1"/><file name="redirect.phtml" hash="c89c02eae033723d9fd5f8a8db70f80a"/><dir name="review"><file name="button.phtml" hash="359132746414e4ae696ba6047e2d3e98"/></dir></dir><dir name="partner"><file name="logo.phtml" hash="831fa2f4041657c5c2f3eb4acf14f788"/></dir><dir name="payflowadvanced"><file name="form.phtml" hash="991804f0ad7a6871df9bed2529746c8a"/><file name="iframe.phtml" hash="f72cbcfa9e63a56ab8b78a0e4a403706"/><file name="info.phtml" hash="4bb273041a60c52e5428b453598886c2"/><file name="redirect.phtml" hash="6c2037bdfd6603e1cd9b911da70e75dd"/></dir><dir name="payflowlink"><file name="form.phtml" hash="f25fda88eae3556b410e4c86e3754785"/><file name="iframe.phtml" hash="98df72e2f3a9bdc44c97d28bf02eef29"/><file name="info.phtml" hash="d2a18e1bfc3d3716f060962c198ec61a"/><file name="redirect.phtml" hash="e756182507ca509d1e2a396cf38ba639"/></dir><dir name="payment"><file name="mark.phtml" hash="0442986e7a40f3c2b9e7861edd206b3e"/><file name="redirect.phtml" hash="7de0a6668e72671ab6d10d08fc8e0070"/></dir></dir><dir name="paypaluk"><dir name="express"><file name="review.phtml" hash="7510838614cdbd9e15e0d26b958427c8"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="fc58c50dba0ecbd0c3caac7eeb43fbff"/><file name="login.phtml" hash="34b965fabb7762ac9e2c2738344c184f"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="ed3e797256dd9f9c06fa63c8cb315cca"/><file name="register.phtml" hash="ed544c1d7e80463bd8d03cfb8b3a934e"/></dir></dir><file name="remember_me.phtml" hash="3c2c3fd5313a71d4503b5bdd70cd9ff5"/><file name="remember_me_tooltip.phtml" hash="da09485dab530b5ebce8235e655329ec"/></dir><dir name="poll"><file name="active.phtml" hash="28ba7a63284f6b6fcc4c5be76e46e238"/><file name="result.phtml" hash="215fc6adbc8c4bb647723021576b3545"/></dir><dir name="productalert"><file name="price.phtml" hash="48125dd56110e5168a1693e5fba801c5"/><dir name="product"><file name="view.phtml" hash="7d502c7725566089a9ec824783cb4ace"/></dir><file name="stock.phtml" hash="48125dd56110e5168a1693e5fba801c5"/></dir><dir name="rating"><file name="detailed.phtml" hash="fd0413a654744d23ce6eea412221a2e4"/><file name="empty.phtml" hash="2b5189dccbaa36740993f45bd6f11214"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="3246ad747921cf31aece83e6ce55f759"/><file name="home_product_viewed.phtml" hash="a284ecdbfc6964004b0e4658620ae2dd"/><file name="product_compared.phtml" hash="afc280da1526d6f2badb14671b5997db"/><file name="product_viewed.phtml" hash="865b89ca10602feaefca198b309b8d88"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="bd898d390260c74fa678b4b24c2e86a6"/><file name="compared_images_list.phtml" hash="1d109a4aa32b86a7e5569657c950fcd4"/><file name="compared_names_list.phtml" hash="d403f06d34f8bfda35fbbfec6a3dff13"/></dir><dir name="content"><file name="compared_grid.phtml" hash="e6b8367c27c67df49196836bd225d086"/><file name="compared_list.phtml" hash="822896f074525b39ab7eb6cfd392c16f"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="27b595aa16fabb2972a20f8b1e5743c5"/><file name="viewed_images_list.phtml" hash="af17684fe97e1ca6240d6e8320994aba"/><file name="viewed_names_list.phtml" hash="e27a188a161cfb6a6774545274c0698e"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="762882c24518862005f76bcb1eb31e01"/><file name="viewed_list.phtml" hash="6946d8b2c6bf6acbe5fa726270bc12e4"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="aa6b0ddc97f52f74d7309c508758c1a6"/><file name="recent.phtml" hash="db2da0952d12c186927fa0e5de73ef92"/><file name="view.phtml" hash="f829a98a214c59676589063ef427aadf"/></dir><file name="form.phtml" hash="00345bebc1480d567bf229ec31e89891"/><dir name="helper"><file name="summary.phtml" hash="7c15b7078c848df9d2346ccd1d13cad5"/><file name="summary_short.phtml" hash="3235ad0cf2262197433a415c30fcadc2"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="4330b226b0de0c1e151ea0e8cfc60bec"/><file name="list.phtml" hash="c45ef4b227ce16adeac9a66cc41b236e"/><file name="other.phtml" hash="0f7a97276b6b495e1b3dedf488018625"/></dir></dir><file name="view.phtml" hash="0aeb91cca40ccadffc2cde36918af5d6"/></dir><dir name="rss"><file name="list.phtml" hash="639a0c032698bdf5078cfa3110f0919d"/><file name="nofeed.phtml" hash="6f6fc72b022ef05a3799070ba3677aeb"/><dir name="order"><file name="details.phtml" hash="2861b91f790d93c3fbe8981e2802adc9"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="15901f66f3d2cb13cc6cb48eb3878ca7"/></dir><file name="agreements.phtml" hash="4f3fbdec473f49180470e036042a19cd"/></dir><dir name="guest"><file name="form.phtml" hash="96cd89fe53104f88439d6825ec8196a9"/></dir><dir name="order"><file name="comments.phtml" hash="77f3e95650ad0f6a90f4cb6d163b6349"/><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="14ed3f65d83349b62f0becf2f018ae5a"/></dir></dir><file name="items.phtml" hash="986605cb8f6d86ecadb1bba6eef911ef"/></dir><file name="creditmemo.phtml" hash="dc24a51ef84241ec9a35b556311e70b7"/><file name="details.phtml" hash="7c34b1bff0d8de0276818dacc1b66d5f"/><file name="history.phtml" hash="3f3a7a713ce72e2e4060a70ee0c7c426"/><dir name="info"><file name="buttons.phtml" hash="cbb5bdeb8d78eb95b699b8c92b7404a0"/></dir><file name="info.phtml" hash="333fe60a5570c41928186065ef71b42c"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="da6c6fcb460db8fa518c78d1dbb48136"/></dir></dir><file name="items.phtml" hash="229ff219a495ae5ef2e56d8ce3b5d1f9"/></dir><file name="invoice.phtml" hash="373113354854d0ef46e044ff30254b5d"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="0808ea2e55731cf4dff9588c2913618d"/></dir></dir><file name="items.phtml" hash="94914e5aef876233b3f42f37e20d044c"/><dir name="print"><file name="creditmemo.phtml" hash="533dfad8bc9e4b8a93306bab2c91b53f"/><file name="invoice.phtml" hash="0a5dbf9447b2d78f2c73ca5941053cb8"/><file name="shipment.phtml" hash="679c12ad01f721514926cdf476d4567d"/></dir><file name="print.phtml" hash="8cd264b3b7a9adee78385a059d1b402b"/><file name="recent.phtml" hash="60e7a7e36a960f6a8380042a1880dacd"/><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="f6edf268e181e3213120d50a617ce56e"/></dir></dir><file name="items.phtml" hash="46e6bcda7059d1de070723b362e3ee2c"/></dir><file name="shipment.phtml" hash="91d67ce7e9014e7ac3414561dbe1a776"/><file name="totals.phtml" hash="3c18ba1dc8367621c8edca23b7bc7adf"/><file name="trackinginfo.phtml" hash="0132a39a5c29091406ac6e2ff5823ae3"/><file name="view.phtml" hash="514ca6354adfffc674a45863de4267b1"/></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="55e695e1f2a2e2a0a304be27c3feda0a"/></dir></dir></dir><dir name="recurring"><file name="grid.phtml" hash="5dd2a80bdc5b6f821d92c05395a15ff6"/><dir name="profile"><dir name="view"><file name="info.phtml" hash="5b6aa541b1a9f7c71ec0bbc4490264cc"/></dir><file name="view.phtml" hash="61f0a32de037e052e9d9cfe9d1c26371"/></dir><file name="profiles.phtml" hash="e1dbb7ff1be0313200119a133ca3b6ca"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="b598ad2c6dd06ce9fdd85bd0edc3e43c"/></dir><dir name="widget"><dir name="guest"><file name="form.phtml" hash="4bd5afecd985f239e9b5e4a34d3f9083"/></dir></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="7babde26ad2c6cce943d37da7a2d0b66"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="64ef10c5b304a1dc4ecb81ab7cab8f17"/><file name="popup.phtml" hash="f60fed812f2b7583cf523a9b9771134a"/></dir></dir><dir name="tag"><file name="cloud.phtml" hash="71b12c0baf6c2051e1352c8728decd1d"/><dir name="customer"><file name="recent.phtml" hash="06c5c4ea55dd8c4fdc21c084d2f4fc15"/><file name="tags.phtml" hash="1f9189426b1f55843aa6d7626a436661"/><file name="view.phtml" hash="f69f606ae1b530c8621d129570ff3f1a"/></dir><file name="list.phtml" hash="bdc85e7907f29b7d882629b1f1fe9c4a"/><file name="popular.phtml" hash="5acb50261292e223a1c2c2315c280e29"/></dir><dir name="tax"><dir name="checkout"><file name="discount.phtml" hash="c3232e4e0e91d1e3d58fd5ccb0286d15"/><file name="grandtotal.phtml" hash="eb53b2a888da032176e3500feab7dac3"/><file name="shipping.phtml" hash="1a65fd85d96b84ec1f68930c53194fc6"/><file name="subtotal.phtml" hash="10c31870d3d53b269e431360e0e91963"/><file name="tax.phtml" hash="9bd7d2d16b3df413aff4da9c4cd14e2b"/></dir><dir name="order"><file name="tax.phtml" hash="b9f66bc0554932c2408d64b475537bdc"/></dir></dir><dir name="wishlist"><dir name="button"><file name="share.phtml" hash="46fd019f2f64613834bc27588e6e0983"/><file name="tocart.phtml" hash="4b53bf90afa812a4ba1a31518cc174ee"/><file name="update.phtml" hash="b6d940e368b875082132220e8257e4c9"/></dir><dir name="email"><file name="items.phtml" hash="80006df1da4246533f72982231cbdced"/><file name="rss.phtml" hash="edfe5c16de2121d0526837966cda3da9"/></dir><dir name="item"><dir name="column"><file name="cart.phtml" hash="1f858cc0b01637cdc912a37ec72c2d77"/><file name="image.phtml" hash="db17bcd781abcd6d5ed353a71088105e"/><file name="info.phtml" hash="97c60f354ce7cfb3a1b5160673ae1e9b"/><file name="remove.phtml" hash="e6b9ea47c1fb9a1ed703e767fa62376f"/></dir><dir name="configure"><file name="addto.phtml" hash="2785e846cfc4f3f2ac670c6e7b75d4e7"/></dir><file name="list.phtml" hash="826c654a2414a4961f9e08e72e232fdc"/></dir><file name="options_list.phtml" hash="82edb5ed56d3bd797056aa7a2e07ff28"/><dir name="render"><dir name="item"><file name="price_msrp_item.phtml" hash="7a3c31fbf52d1f74b7ffb9ca25f79cb4"/><file name="price_msrp_rss.phtml" hash="288d268cce8b3c8a055ba19d5270f4e8"/><file name="price.phtml" hash="f47600f3dba84c055840a9ae2ea1934e"/></dir></dir><file name="shared.phtml" hash="07be81c4eb489e6c178b1659039a6de6"/><file name="sharing.phtml" hash="ac8d3b2f1752a7c6aa279faf96022363"/><file name="sidebar.phtml" hash="4fb9cfd8a5dddd98141374d9b1a04478"/><file name="view.phtml" hash="9bf78d4c0948784507f4a5c8bd33236f"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="widgets.css" hash="4732f4eb6427aff580ed48ed524c9ccd"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="cookies"><file name="firefox.png" hash="425e1b2ddc38c0bba431fb54357c66a4"/><file name="ie6-1.gif" hash="5c27700e245762bc89ed8c3ee7183f21"/><file name="ie6-2.gif" hash="d8c55e15e1f711e5c259300a9c19551b"/><file name="ie7-1.gif" hash="d61edcc8a514a3c81ea116b7d38ddcb6"/><file name="ie7-2.gif" hash="0526a654e94c54866cad977c0a47d3e5"/><file name="ie7-3.gif" hash="4fb142def3f6cfd8d8d23e1315528a1e"/><file name="ie7-4.gif" hash="575c276231c6a91e28935ec98215e146"/><file name="ie7-5.gif" hash="3ae5fcc11fe89da91674d183872337c1"/><file name="ie7-6.gif" hash="95a4981a41785a8cde273c9b2edbfbc7"/><file name="opera.png" hash="34070d92180d4ee0e37b1dd8bb731cd7"/></dir><file name="cvv.gif" hash="83cdd38bf110b0f9c52fe84b56f45298"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="reload.png" hash="84cc4883f78ef850814ea9b53989b2a7"/><dir name="widgets"><file name="i_block-list.gif" hash="fe8424127ecbe4b0d893bcf6f253dc1a"/><file name="i_widget-link.gif" hash="1bf753578171f147f0203e7b13bdd0c4"/><file name="i_widget-new.gif" hash="a75377ffed51b711cbc608ffaa1a2e7d"/></dir></dir><dir name="js"><file name="bundle.js" hash="758eba2fa873bcd77d4bf60d5bddfc08"/><dir name="checkout"><file name="review.js" hash="689b8d6d30484eaca413d5303360ec81"/></dir><file name="giftmessage.js" hash="6e0d23b1b4c0f0a59abec709eb6b5dc4"/><file name="ie6.js" hash="46173fb9f7c45fd107ba4df4df397ffb"/><file name="msrp.js" hash="c22fa5f0f4bb239bfa44276fe674be72"/><file name="opcheckout.js" hash="c39c87c8f78abf7d0ab7fad3726de7d6"/></dir><dir name="lib"><dir name="prototype"><dir name="windows"><dir name="themes"><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="25386a0f30a2a185e728251733431f96"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
16	<compatible/>
17	+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
18	</package>

skin/frontend/base/default/css/widgets.css CHANGED Viewed

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


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

skin/frontend/base/default/js/bundle.js CHANGED Viewed

	@@ -19,7 +19,7 @@
19	*
20	* @category design
21	* @package base_default
22	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
23	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24	*/
25	if(typeof Product=='undefined') {
	@@ -75,6 +75,12 @@ Product.Bundle.prototype = {
75	this.config.selected[parts[2]] = new Array();
76	}
77	this.populateQty(parts[2], selection.value);






78	}
79	this.reloadPrice();
80	},
	@@ -116,6 +122,7 @@ Product.Bundle.prototype = {
116	return 0;
117	}
118	var qty = null;

119	if (this.config.options[optionId].selections[selectionId].customQty == 1 && !this.config['options'][optionId].isMulti) {
120	if ($('bundle-option-' + optionId + '-qty-input')) {
121	qty = $('bundle-option-' + optionId + '-qty-input').value;
	@@ -125,7 +132,6 @@ Product.Bundle.prototype = {
125	} else {
126	qty = this.config.options[optionId].selections[selectionId].qty;
127	}
128	-
129	if (this.config.priceType == '0') {
130	price = this.config.options[optionId].selections[selectionId].price;
131	tierPrice = this.config.options[optionId].selections[selectionId].tierPrice;
	@@ -133,6 +139,8 @@ Product.Bundle.prototype = {
133	for (var i=0; i < tierPrice.length; i++) {
134	if (Number(tierPrice[i].price_qty) <= qty && Number(tierPrice[i].price) <= price) {
135	price = tierPrice[i].price;


136	}
137	}
138	} else {
	@@ -156,7 +164,10 @@ Product.Bundle.prototype = {
156	}
157
158	selection = this.config.options[optionId].selections[selectionId];
159	- if (~~selection.priceInclTax~~ !== undefined) {



160	priceInclTax = selection.priceInclTax;
161	price = selection.priceExclTax !== undefined ? selection.priceExclTax : selection.price;
162	} else {


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

75	this.config.selected[parts[2]] = new Array();
76	}
77	this.populateQty(parts[2], selection.value);
78	+ var tierPriceElement = $('bundle-option-' + parts[2] + '-tier-prices'),
79	+ tierPriceHtml = '';
80	+ if (selection.value != '' && this.config.options[parts[2]].selections[selection.value].customQty == 1) {
81	+ tierPriceHtml = this.config.options[parts[2]].selections[selection.value].tierPriceHtml;
82	+ }
83	+ tierPriceElement.update(tierPriceHtml);
84	}
85	this.reloadPrice();
86	},

122	return 0;
123	}
124	var qty = null;
125	+ var tierPriceInclTax, tierPriceExclTax;
126	if (this.config.options[optionId].selections[selectionId].customQty == 1 && !this.config['options'][optionId].isMulti) {
127	if ($('bundle-option-' + optionId + '-qty-input')) {
128	qty = $('bundle-option-' + optionId + '-qty-input').value;

132	} else {
133	qty = this.config.options[optionId].selections[selectionId].qty;
134	}

135	if (this.config.priceType == '0') {
136	price = this.config.options[optionId].selections[selectionId].price;
137	tierPrice = this.config.options[optionId].selections[selectionId].tierPrice;

139	for (var i=0; i < tierPrice.length; i++) {
140	if (Number(tierPrice[i].price_qty) <= qty && Number(tierPrice[i].price) <= price) {
141	price = tierPrice[i].price;
142	+ tierPriceInclTax = tierPrice[i].priceInclTax;
143	+ tierPriceExclTax = tierPrice[i].priceExclTax;
144	}
145	}
146	} else {

164	}
165
166	selection = this.config.options[optionId].selections[selectionId];
167	+ if (tierPriceInclTax !== undefined && tierPriceExclTax !== undefined) {
168	+ priceInclTax = tierPriceInclTax;
169	+ price = tierPriceExclTax;
170	+ } else if (selection.priceInclTax !== undefined) {
171	priceInclTax = selection.priceInclTax;
172	price = selection.priceExclTax !== undefined ? selection.priceExclTax : selection.price;
173	} else {

skin/frontend/base/default/js/checkout/review.js CHANGED Viewed

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


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

skin/frontend/base/default/js/giftmessage.js CHANGED Viewed

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


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

skin/frontend/base/default/js/ie6.js CHANGED Viewed

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


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

skin/frontend/base/default/js/msrp.js CHANGED Viewed

	@@ -19,7 +19,7 @@
19	*
20	* @category design
21	* @package base_default
22	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
23	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24	*/
25	if (!window.Catalog) {
	@@ -262,11 +262,12 @@ Catalog.Map = {
262	productAddToCartFormOld = productAddToCartForm;
263	productAddToCartForm = new VarienForm('product_addtocart_form_from_popup');
264	productAddToCartForm.submitLight = productAddToCartFormOld.submitLight;
265	- }else if(!$('product_addtocart_form_from_popup')) {
266	return false;
267	} else if ('undefined' == typeof productAddToCartForm) {
268	productAddToCartForm = new VarienForm('product_addtocart_form_from_popup');
269	}

270	productAddToCartForm.submit = function(button, url) {
271	if (('undefined' != typeof productAddToCartFormOld) && productAddToCartFormOld) {
272	if (Catalog.Map.active) {
	@@ -314,7 +315,7 @@ Catalog.Map = {
314	button.disabled = true;
315	}
316	}
317	- }~~.bind(productAddToCartForm)~~;
318	}
319	};
320


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

262	productAddToCartFormOld = productAddToCartForm;
263	productAddToCartForm = new VarienForm('product_addtocart_form_from_popup');
264	productAddToCartForm.submitLight = productAddToCartFormOld.submitLight;
265	+ } else if(!$('product_addtocart_form_from_popup')) {
266	return false;
267	} else if ('undefined' == typeof productAddToCartForm) {
268	productAddToCartForm = new VarienForm('product_addtocart_form_from_popup');
269	}
270	+
271	productAddToCartForm.submit = function(button, url) {
272	if (('undefined' != typeof productAddToCartFormOld) && productAddToCartFormOld) {
273	if (Catalog.Map.active) {

315	button.disabled = true;
316	}
317	}
318	+ };
319	}
320	};
321

skin/frontend/base/default/js/opcheckout.js CHANGED Viewed

	@@ -19,7 +19,7 @@
19	*
20	* @category design
21	* @package base_default
22	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
23	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24	*/
25	var Checkout = Class.create();
	@@ -37,6 +37,8 @@ Checkout.prototype = {
37	this.payment = '';
38	this.loadWaiting = false;
39	this.steps = ['login', 'billing', 'shipping', 'shipping_method', 'payment', 'review'];


40
41	this.accordion.sections.each(function(section) {
42	Event.observe($(section).down('.step-title'), 'click', this._onSectionClick.bindAsEventListener(this));
	@@ -54,7 +56,7 @@ Checkout.prototype = {
54	var section = $(Event.element(event).up().up());
55	if (section.hasClassName('allow')) {
56	Event.stop(event);
57	- this.gotoSection(section.readAttribute('id').replace('opc-', ''));
58	return false;
59	}
60	},
	@@ -64,10 +66,21 @@ Checkout.prototype = {
64	},
65
66	reloadProgressBlock: function(toStep) {
67	- ~~var updater = new Ajax~~.~~Updater~~(~~'checkout-progress-wrapper', this.progressUrl, {~~
68	- ~~method:~~ ~~'get',~~
69	- ~~onFailure:~~ this.~~ajaxFailure.bind(this),~~
70	- ~~parameters: toStep ? {toStep: toStep} : null~~











71	});
72	},
73
	@@ -108,12 +121,46 @@ Checkout.prototype = {
108	this.loadWaiting = step;
109	},
110
111	- gotoSection: function(section)
112	- {
113	- ~~var~~ ~~sectionElement = $~~(~~'opc-'+section~~);




114	sectionElement.addClassName('allow');
115	- this.accordion.openSection('opc-'+section);
116	- ~~this.~~reloadProgressBlock~~(section~~);






























117	},
118
119	setMethod: function(){
	@@ -124,7 +171,7 @@ Checkout.prototype = {
124	{method: 'post', onFailure: this.ajaxFailure.bind(this), parameters: {method:'guest'}}
125	);
126	Element.hide('register-customer-password');
127	- this.gotoSection('billing');
128	}
129	else if($('login:register') && ($('login:register').checked \|\| $('login:register').type == 'hidden')) {
130	this.method = 'register';
	@@ -133,7 +180,7 @@ Checkout.prototype = {
133	{method: 'post', onFailure: this.ajaxFailure.bind(this), parameters: {method:'register'}}
134	);
135	Element.show('register-customer-password');
136	- this.gotoSection('billing');
137	}
138	else{
139	alert(Translator.translate('Please choose to register or to checkout as a guest').stripTags());
	@@ -146,13 +193,13 @@ Checkout.prototype = {
146	if (($('billing:use_for_shipping_yes')) && ($('billing:use_for_shipping_yes').checked)) {
147	shipping.syncWithBilling();
148	$('opc-shipping').addClassName('allow');
149	- this.gotoSection('shipping_method');
150	} else if (($('billing:use_for_shipping_no')) && ($('billing:use_for_shipping_no').checked)) {
151	$('shipping:same_as_billing').checked = false;
152	- this.gotoSection('shipping');
153	} else {
154	$('shipping:same_as_billing').checked = true;
155	- this.gotoSection('shipping');
156	}
157
158	// this refreshes the checkout progress column
	@@ -173,19 +220,19 @@ Checkout.prototype = {
173
174	setShipping: function() {
175	//this.nextStep();
176	- this.gotoSection('shipping_method');
177	//this.accordion.openNextSection(true);
178	},
179
180	setShippingMethod: function() {
181	//this.nextStep();
182	- this.gotoSection('payment');
183	//this.accordion.openNextSection(true);
184	},
185
186	setPayment: function() {
187	//this.nextStep();
188	- this.gotoSection('review');
189	//this.accordion.openNextSection(true);
190	},
191
	@@ -197,7 +244,18 @@ Checkout.prototype = {
197
198	back: function(){
199	if (this.loadWaiting) return;
200	- ~~this.accordion.openPrevSection(true);~~











201	},
202
203	setStepResponse: function(response){
	@@ -212,11 +270,12 @@ Checkout.prototype = {
212
213	if(response.duplicateBillingInfo)
214	{

215	shipping.setSameAsBilling(true);
216	}
217
218	if (response.goto_section) {
219	- this.gotoSection(response.goto_section);
220	return true;
221	}
222	if (response.redirect) {
	@@ -329,9 +388,9 @@ Billing.prototype = {
329	},
330
331	/**
332	- This method recieves the AJAX response on success.
333	- There are 3 options: error, redirect or html with shipping options.
334	- */
335	nextStep: function(transport){
336	if (transport && transport.responseText){
337	try{
	@@ -518,12 +577,12 @@ Shipping.prototype = {
518	checkout.setStepResponse(response);
519
520	/*
521	- var updater = new Ajax.Updater(
522	- 'checkout-shipping-method-load',
523	- this.methodsUrl,
524	- {method:'get', onSuccess: checkout.setShipping.bind(checkout)}
525	- );
526	- */
527	//checkout.setShipping();
528	}
529	}
	@@ -606,7 +665,7 @@ ShippingMethod.prototype = {
606	payment.initWhatIsCvvListeners();
607
608	if (response.goto_section) {
609	- checkout.gotoSection(response.goto_section);
610	checkout.reloadProgressBlock();
611	return;
612	}
	@@ -640,7 +699,7 @@ Payment.prototype = {
640
641	beforeInit : function() {
642	(this.beforeInitFunc).each(function(init){
643	- (init.value)();;
644	});
645	},
646
	@@ -799,8 +858,8 @@ Payment.prototype = {
799	}
800	}
801	/*
802	- * if there is an error in payment, need to show error message
803	- */
804	if (response.error) {
805	if (response.fields) {
806	var fields = response.fields.split(',');
	@@ -894,7 +953,7 @@ Review.prototype = {
894	}
895
896	if (response.goto_section) {
897	- checkout.gotoSection(response.goto_section);
898	}
899	}
900	},


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

37	this.payment = '';
38	this.loadWaiting = false;
39	this.steps = ['login', 'billing', 'shipping', 'shipping_method', 'payment', 'review'];
40	+ //We use billing as beginning step since progress bar tracks from billing
41	+ this.currentStep = 'billing';
42
43	this.accordion.sections.each(function(section) {
44	Event.observe($(section).down('.step-title'), 'click', this._onSectionClick.bindAsEventListener(this));

56	var section = $(Event.element(event).up().up());
57	if (section.hasClassName('allow')) {
58	Event.stop(event);
59	+ this.gotoSection(section.readAttribute('id').replace('opc-', ''), false);
60	return false;
61	}
62	},

66	},
67
68	reloadProgressBlock: function(toStep) {
69	+ this.reloadStep(toStep);
70	+ if (this.syncBillingShipping) {
71	+ this.syncBillingShipping = false;
72	+ this.reloadStep('shipping');
73	+ }
74	+ },
75	+
76	+ reloadStep: function(prevStep) {
77	+ var updater = new Ajax.Updater(prevStep + '-progress-opcheckout', this.progressUrl, {
78	+ method:'get',
79	+ onFailure:this.ajaxFailure.bind(this),
80	+ onComplete: function(){
81	+ this.checkout.resetPreviousSteps();
82	+ },
83	+ parameters:prevStep ? { prevStep:prevStep } : null
84	});
85	},
86

121	this.loadWaiting = step;
122	},
123
124	+ gotoSection: function (section, reloadProgressBlock) {
125	+
126	+ if (reloadProgressBlock) {
127	+ this.reloadProgressBlock(this.currentStep);
128	+ }
129	+ this.currentStep = section;
130	+ var sectionElement = $('opc-' + section);
131	sectionElement.addClassName('allow');
132	+ this.accordion.openSection('opc-' + section);
133	+ if(!reloadProgressBlock) {
134	+ this.resetPreviousSteps();
135	+ }
136	+ },
137	+
138	+ resetPreviousSteps: function () {
139	+ var stepIndex = this.steps.indexOf(this.currentStep);
140	+
141	+ //Clear other steps if already populated through javascript
142	+ for (var i = stepIndex; i < this.steps.length; i++) {
143	+ var nextStep = this.steps[i];
144	+ var progressDiv = nextStep + '-progress-opcheckout';
145	+ if ($(progressDiv)) {
146	+ //Remove the link
147	+ $(progressDiv).select('.changelink').each(function (item) {
148	+ item.remove();
149	+ });
150	+ $(progressDiv).select('dt').each(function (item) {
151	+ item.removeClassName('complete');
152	+ });
153	+ //Remove the content
154	+ $(progressDiv).select('dd.complete').each(function (item) {
155	+ item.remove();
156	+ });
157	+ }
158	+ }
159	+ },
160	+
161	+ changeSection: function (section) {
162	+ var changeStep = section.replace('opc-', '');
163	+ this.gotoSection(changeStep, false);
164	},
165
166	setMethod: function(){

171	{method: 'post', onFailure: this.ajaxFailure.bind(this), parameters: {method:'guest'}}
172	);
173	Element.hide('register-customer-password');
174	+ this.gotoSection('billing', true);
175	}
176	else if($('login:register') && ($('login:register').checked \|\| $('login:register').type == 'hidden')) {
177	this.method = 'register';

180	{method: 'post', onFailure: this.ajaxFailure.bind(this), parameters: {method:'register'}}
181	);
182	Element.show('register-customer-password');
183	+ this.gotoSection('billing', true);
184	}
185	else{
186	alert(Translator.translate('Please choose to register or to checkout as a guest').stripTags());

193	if (($('billing:use_for_shipping_yes')) && ($('billing:use_for_shipping_yes').checked)) {
194	shipping.syncWithBilling();
195	$('opc-shipping').addClassName('allow');
196	+ this.gotoSection('shipping_method', true);
197	} else if (($('billing:use_for_shipping_no')) && ($('billing:use_for_shipping_no').checked)) {
198	$('shipping:same_as_billing').checked = false;
199	+ this.gotoSection('shipping', true);
200	} else {
201	$('shipping:same_as_billing').checked = true;
202	+ this.gotoSection('shipping', true);
203	}
204
205	// this refreshes the checkout progress column

220
221	setShipping: function() {
222	//this.nextStep();
223	+ this.gotoSection('shipping_method', true);
224	//this.accordion.openNextSection(true);
225	},
226
227	setShippingMethod: function() {
228	//this.nextStep();
229	+ this.gotoSection('payment', true);
230	//this.accordion.openNextSection(true);
231	},
232
233	setPayment: function() {
234	//this.nextStep();
235	+ this.gotoSection('review', true);
236	//this.accordion.openNextSection(true);
237	},
238

244
245	back: function(){
246	if (this.loadWaiting) return;
247	+ //Navigate back to the previous available step
248	+ var stepIndex = this.steps.indexOf(this.currentStep);
249	+ var section = this.steps[--stepIndex];
250	+ var sectionElement = $('opc-' + section);
251	+
252	+ //Traverse back to find the available section. Ex Virtual product does not have shipping section
253	+ while (sectionElement === null && stepIndex > 0) {
254	+ --stepIndex;
255	+ section = this.steps[stepIndex];
256	+ sectionElement = $('opc-' + section);
257	+ }
258	+ this.changeSection('opc-' + section);
259	},
260
261	setStepResponse: function(response){

270
271	if(response.duplicateBillingInfo)
272	{
273	+ this.syncBillingShipping = true;
274	shipping.setSameAsBilling(true);
275	}
276
277	if (response.goto_section) {
278	+ this.gotoSection(response.goto_section, true);
279	return true;
280	}
281	if (response.redirect) {

388	},
389
390	/**
391	+ This method recieves the AJAX response on success.
392	+ There are 3 options: error, redirect or html with shipping options.
393	+ */
394	nextStep: function(transport){
395	if (transport && transport.responseText){
396	try{

577	checkout.setStepResponse(response);
578
579	/*
580	+ var updater = new Ajax.Updater(
581	+ 'checkout-shipping-method-load',
582	+ this.methodsUrl,
583	+ {method:'get', onSuccess: checkout.setShipping.bind(checkout)}
584	+ );
585	+ */
586	//checkout.setShipping();
587	}
588	}

665	payment.initWhatIsCvvListeners();
666
667	if (response.goto_section) {
668	+ checkout.gotoSection(response.goto_section, true);
669	checkout.reloadProgressBlock();
670	return;
671	}

699
700	beforeInit : function() {
701	(this.beforeInitFunc).each(function(init){
702	+ (init.value)();;
703	});
704	},
705

858	}
859	}
860	/*
861	+ * if there is an error in payment, need to show error message
862	+ */
863	if (response.error) {
864	if (response.fields) {
865	var fields = response.fields.split(',');

953	}
954
955	if (response.goto_section) {
956	+ checkout.gotoSection(response.goto_section, true);
957	}
958	}
959	},

skin/frontend/base/default/lib/prototype/windows/themes/magento.css CHANGED Viewed

	@@ -19,7 +19,7 @@
19	*
20	* @category design
21	* @package base_default
22	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
23	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24	*/
25	.dialog { border:1px solid #555; }


19	*
20	* @category design
21	* @package base_default
22	+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24	*/
25	.dialog { border:1px solid #555; }

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