From c8f7ce6c2d138cac8161d4d185e51aff7141bd90 Mon Sep 17 00:00:00 2001 From: Gareth Joyce Date: Tue, 15 Nov 2016 10:33:13 +0000 Subject: [PATCH] Update theme from tonu --- .gitignore | 44 ++ errors/custom/404.phtml | 9 + errors/custom/503.phtml | 11 + errors/custom/page.phtml | 51 ++ errors/local.xml | 7 + etc/theme.xml | 14 + layout/cc.xml | 20 +- layout/local.xml | 515 ++++++++++++++---- layout/tag.xml | 0 locale/en_GB/translate.csv | 139 +++++ modman | 12 + skin/.gitignore | 44 ++ template/.DS_Store | Bin 6148 -> 0 bytes template/catalog/.DS_Store | Bin 6148 -> 0 bytes template/catalog/category/view.phtml | 37 +- template/catalog/layer/filter.phtml | 28 - template/catalog/layer/state.phtml | 43 -- template/catalog/layer/view.phtml | 36 -- template/catalog/product/.DS_Store | Bin 6148 -> 0 bytes template/catalog/product/list.phtml | 223 ++++---- template/catalog/product/list/related.phtml | 45 -- template/catalog/product/list/toolbar.phtml | 77 --- template/catalog/product/price.phtml | 451 +++++++++++++++ template/catalog/product/view.phtml | 273 +++++----- template/catalog/product/view/addto.phtml | 12 - template/catalog/product/view/addtocart.phtml | 35 +- .../catalog/product/view/description.phtml | 15 + .../product/view/options/scpwrapper.phtml | 20 + template/catalog/product/view/tabs.phtml | 33 ++ .../product/view/tabs/directions.phtml | 6 + .../catalog/product/view/tabs/nutrition.phtml | 1 + .../catalog/product/view/tabs/reviews.phtml | 8 + .../catalog/product/view/type/default.phtml | 11 + .../view/type/options/configurable.phtml | 25 + template/catalogsearch/form.mini.phtml | 33 +- template/cc/drawer/header.phtml | 6 + template/cc/drawer/left.phtml | 2 +- template/cc/drawer/left/customer-links.phtml | 15 + template/cc/drawer/left/links.phtml | 11 + template/cc/drawer/loader.phtml | 1 + template/cc/drawer/loader/loader.phtml | 16 + template/cc/drawer/modal.phtml | 26 +- template/cc/drawer/modal/container.phtml | 15 + template/cc/drawer/right.phtml | 2 +- template/checkout/.DS_Store | Bin 6148 -> 0 bytes template/checkout/cart.phtml | 208 ++++--- template/checkout/cart/.DS_Store | Bin 6148 -> 0 bytes template/checkout/cart/coupon.phtml | 38 +- template/checkout/cart/item/default.phtml | 197 +++---- template/checkout/cart/noItems.phtml | 12 + template/checkout/cart/summary.phtml | 17 - template/checkout/cart/totals.phtml | 10 +- template/checkout/onepage.phtml | 31 -- template/checkout/onepage/confidence.phtml | 8 - template/checkout/onepage/link.phtml | 2 +- template/checkout/onepage/payment.phtml | 49 -- .../checkout/onepage/payment/methods.phtml | 51 -- template/checkout/onepage/progress.phtml | 31 -- .../checkout/onepage/progress/billing.phtml | 11 - .../checkout/onepage/progress/payment.phtml | 11 - .../checkout/onepage/progress/shipping.phtml | 14 - .../onepage/progress/shipping_method.phtml | 27 - template/checkout/onepage/review/button.phtml | 1 - template/checkout/onepage/review/info.phtml | 59 -- template/checkout/onepage/review/item.phtml | 214 -------- template/checkout/onepage/shipping.phtml | 145 ----- .../checkout/onepage/shipping_method.phtml | 23 - .../onepage/shipping_method/available.phtml | 79 --- template/checkout/onepage/title.phtml | 10 - template/checkout/success.phtml | 18 - template/checkout/success/info.phtml | 39 -- template/cms/content_heading.phtml | 5 - template/cms/links.phtml | 18 +- template/cms/wrapper.phtml | 5 + template/contacts/form.phtml | 90 ++- template/contacts/wrapper.phtml | 26 +- template/customer/account/dashboard.phtml | 52 +- .../customer/account/dashboard/address.phtml | 49 +- .../customer/account/dashboard/info.phtml | 58 +- template/customer/account/navigation.phtml | 36 +- template/customer/address/book.phtml | 124 ++--- template/customer/address/edit.phtml | 159 ------ template/customer/form/edit.phtml | 108 ---- template/customer/form/forgotpassword.phtml | 69 +-- template/customer/form/newsletter.phtml | 40 -- template/customer/widget/name.phtml | 82 --- template/home/bundle.phtml | 33 ++ template/home/featured-products.phtml | 38 ++ template/home/hero.phtml | 16 + .../core/page/html/topmenu/renderer.phtml | 71 +++ template/iweb/faqs/list.phtml | 29 + template/iweb/media/gallery-slider.phtml | 62 +++ template/newsletter/subscribe.phtml | 13 + template/page/.DS_Store | Bin 6148 -> 0 bytes template/page/1column.phtml | 6 +- template/page/2columns-left.phtml | 24 +- template/page/2columns-right.phtml | 18 +- template/page/3columns.phtml | 14 +- template/page/html/.DS_Store | Bin 6148 -> 0 bytes template/page/html/breadcrumbs.phtml | 38 +- template/page/html/footer.phtml | 72 ++- template/page/html/header.phtml | 254 +++++++-- template/page/html/header/carousel.phtml | 62 +++ template/page/html/pager.phtml | 97 ---- template/page/html/payment-icons.phtml | 9 + template/page/html/social-links.phtml | 22 + template/page/html/topmenu.phtml | 11 +- template/page/template/links.phtml | 17 - template/paypal/express/review.phtml | 197 ------- template/paypal/express/shortcut.phtml | 58 -- .../persistent/checkout/onepage/billing.phtml | 225 -------- .../persistent/checkout/onepage/login.phtml | 152 ------ template/persistent/customer/form/login.phtml | 72 ++- .../persistent/customer/form/register.phtml | 325 ++++++----- template/review/customer/list.phtml | 36 ++ template/review/helper/summary.phtml | 23 + template/review/product/form.phtml | 108 ++++ template/review/product/view/list.phtml | 48 ++ template/sales/order/history.phtml | 59 -- template/sales/order/info.phtml | 119 ++-- template/sales/order/info/buttons.phtml | 9 - template/sales/order/items.phtml | 38 -- .../sales/order/items/renderer/default.phtml | 297 ---------- template/sales/order/view.phtml | 69 --- template/wishlist/button/share.phtml | 3 - template/wishlist/button/tocart.phtml | 3 - template/wishlist/button/update.phtml | 3 - template/wishlist/item/column/cart.phtml | 50 -- template/wishlist/item/column/image.phtml | 10 - template/wishlist/item/column/info.phtml | 18 - template/wishlist/item/column/remove.phtml | 3 - template/wishlist/item/list.phtml | 37 -- template/wishlist/link.phtml | 8 - template/wishlist/sharing.phtml | 68 --- template/wishlist/view.phtml | 71 --- 135 files changed, 3324 insertions(+), 4289 deletions(-) create mode 100644 .gitignore create mode 100644 errors/custom/404.phtml create mode 100644 errors/custom/503.phtml create mode 100644 errors/custom/page.phtml create mode 100644 errors/local.xml create mode 100644 etc/theme.xml create mode 100644 layout/tag.xml create mode 100644 locale/en_GB/translate.csv create mode 100644 modman create mode 100644 skin/.gitignore delete mode 100644 template/.DS_Store delete mode 100644 template/catalog/.DS_Store delete mode 100644 template/catalog/layer/filter.phtml delete mode 100644 template/catalog/layer/state.phtml delete mode 100644 template/catalog/layer/view.phtml delete mode 100644 template/catalog/product/.DS_Store delete mode 100644 template/catalog/product/list/related.phtml delete mode 100644 template/catalog/product/list/toolbar.phtml create mode 100644 template/catalog/product/price.phtml delete mode 100644 template/catalog/product/view/addto.phtml create mode 100644 template/catalog/product/view/description.phtml create mode 100644 template/catalog/product/view/options/scpwrapper.phtml create mode 100644 template/catalog/product/view/tabs.phtml create mode 100644 template/catalog/product/view/tabs/directions.phtml create mode 100644 template/catalog/product/view/tabs/nutrition.phtml create mode 100644 template/catalog/product/view/tabs/reviews.phtml create mode 100644 template/catalog/product/view/type/default.phtml create mode 100644 template/catalog/product/view/type/options/configurable.phtml create mode 100644 template/cc/drawer/header.phtml create mode 100644 template/cc/drawer/left/customer-links.phtml create mode 100644 template/cc/drawer/left/links.phtml create mode 100644 template/cc/drawer/loader.phtml create mode 100644 template/cc/drawer/loader/loader.phtml create mode 100644 template/cc/drawer/modal/container.phtml delete mode 100644 template/checkout/.DS_Store delete mode 100644 template/checkout/cart/.DS_Store create mode 100644 template/checkout/cart/noItems.phtml delete mode 100644 template/checkout/cart/summary.phtml delete mode 100644 template/checkout/onepage.phtml delete mode 100644 template/checkout/onepage/confidence.phtml delete mode 100644 template/checkout/onepage/payment.phtml delete mode 100644 template/checkout/onepage/payment/methods.phtml delete mode 100644 template/checkout/onepage/progress.phtml delete mode 100644 template/checkout/onepage/progress/billing.phtml delete mode 100644 template/checkout/onepage/progress/payment.phtml delete mode 100644 template/checkout/onepage/progress/shipping.phtml delete mode 100644 template/checkout/onepage/progress/shipping_method.phtml delete mode 100644 template/checkout/onepage/review/button.phtml delete mode 100644 template/checkout/onepage/review/info.phtml delete mode 100644 template/checkout/onepage/review/item.phtml delete mode 100644 template/checkout/onepage/shipping.phtml delete mode 100644 template/checkout/onepage/shipping_method.phtml delete mode 100644 template/checkout/onepage/shipping_method/available.phtml delete mode 100644 template/checkout/onepage/title.phtml delete mode 100644 template/checkout/success.phtml delete mode 100644 template/checkout/success/info.phtml delete mode 100644 template/cms/content_heading.phtml create mode 100644 template/cms/wrapper.phtml delete mode 100644 template/customer/address/edit.phtml delete mode 100644 template/customer/form/edit.phtml delete mode 100644 template/customer/form/newsletter.phtml delete mode 100644 template/customer/widget/name.phtml create mode 100644 template/home/bundle.phtml create mode 100644 template/home/featured-products.phtml create mode 100644 template/home/hero.phtml create mode 100644 template/iweb/core/page/html/topmenu/renderer.phtml create mode 100644 template/iweb/faqs/list.phtml create mode 100755 template/iweb/media/gallery-slider.phtml create mode 100644 template/newsletter/subscribe.phtml delete mode 100644 template/page/.DS_Store delete mode 100644 template/page/html/.DS_Store create mode 100644 template/page/html/header/carousel.phtml delete mode 100644 template/page/html/pager.phtml create mode 100644 template/page/html/payment-icons.phtml create mode 100644 template/page/html/social-links.phtml delete mode 100644 template/page/template/links.phtml delete mode 100644 template/paypal/express/review.phtml delete mode 100644 template/paypal/express/shortcut.phtml delete mode 100644 template/persistent/checkout/onepage/billing.phtml delete mode 100644 template/persistent/checkout/onepage/login.phtml create mode 100644 template/review/customer/list.phtml create mode 100644 template/review/helper/summary.phtml create mode 100644 template/review/product/form.phtml create mode 100644 template/review/product/view/list.phtml delete mode 100644 template/sales/order/history.phtml delete mode 100644 template/sales/order/info/buttons.phtml delete mode 100644 template/sales/order/items.phtml delete mode 100644 template/sales/order/items/renderer/default.phtml delete mode 100644 template/sales/order/view.phtml delete mode 100644 template/wishlist/button/share.phtml delete mode 100644 template/wishlist/button/tocart.phtml delete mode 100644 template/wishlist/button/update.phtml delete mode 100644 template/wishlist/item/column/cart.phtml delete mode 100644 template/wishlist/item/column/image.phtml delete mode 100644 template/wishlist/item/column/info.phtml delete mode 100644 template/wishlist/item/column/remove.phtml delete mode 100644 template/wishlist/item/list.phtml delete mode 100644 template/wishlist/link.phtml delete mode 100644 template/wishlist/sharing.phtml delete mode 100644 template/wishlist/view.phtml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a9d25b1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,44 @@ +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk +.vscode + +# Gulp +node_modules +.sass-cache +npm-debug.log + +# Server stuff +.bash_history +.bash_logout +.bashrc +.cache +.profile +.ssh +log + + +# Temp files +build \ No newline at end of file diff --git a/errors/custom/404.phtml b/errors/custom/404.phtml new file mode 100644 index 0000000..6c1b587 --- /dev/null +++ b/errors/custom/404.phtml @@ -0,0 +1,9 @@ +
+ +
+

404 error

+

Page not found

+
+

The page you requested was not found. Please try again later.

+ +
diff --git a/errors/custom/503.phtml b/errors/custom/503.phtml new file mode 100644 index 0000000..bbaa581 --- /dev/null +++ b/errors/custom/503.phtml @@ -0,0 +1,11 @@ + +
+ +
+

503 error

+

Service Temporarily Unavailable

+
+

The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.

+ +
+ diff --git a/errors/custom/page.phtml b/errors/custom/page.phtml new file mode 100644 index 0000000..1849b98 --- /dev/null +++ b/errors/custom/page.phtml @@ -0,0 +1,51 @@ + + + +<?php echo $this->pageTitle?> + + + + + + + + + + + + + + + +
+
+
+ + + +
+
+
+ +
+
+ +
+
+ +
+
+

Copyright © 2016 Tonu. All Rights Reserved.

+
+
+ + + diff --git a/errors/local.xml b/errors/local.xml new file mode 100644 index 0000000..0047d62 --- /dev/null +++ b/errors/local.xml @@ -0,0 +1,7 @@ + + + custom + + print + + diff --git a/etc/theme.xml b/etc/theme.xml new file mode 100644 index 0000000..86e205a --- /dev/null +++ b/etc/theme.xml @@ -0,0 +1,14 @@ + + + + + + + + cc.xml + + + + + + \ No newline at end of file diff --git a/layout/cc.xml b/layout/cc.xml index a56654c..bff22e2 100644 --- a/layout/cc.xml +++ b/layout/cc.xml @@ -35,7 +35,7 @@ + ]]> @@ -49,18 +49,32 @@ skin_csscss/print.css - skin_cssaw_blog/css/style.css skin_csscss/iwebelasticsearch/autocomplete.css skin_cssbuild/vendor/normalize.css/normalize.css skin_cssbuild/css/styles.css - skin_cssbuild/vendor/fontello/css/fontello.css + skin_jsbuild/vendor/picturefill/picturefill.js + skin_jsbuild/vendor/enquire/enquire.js + skin_jsbuild/vendor/svgxuse/svgxuse.js + skin_jsbuild/vendor/svg4everybody/svg4everybody.jslt IE 9 + + + + + + ]]> + + skin_jsbuild/js/chopchop.lib.js + skin_jsbuild/js/breakpoints.js skin_jsbuild/js/script.js + + skin_jsbuild/vendor/iweb/Iweb_QtyWidget.js diff --git a/layout/local.xml b/layout/local.xml index 20e6690..66b7f1b 100644 --- a/layout/local.xml +++ b/layout/local.xml @@ -1,8 +1,7 @@ - + - @@ -13,157 +12,297 @@ - skin_jsbuild/vendor/element-queries/ResizeSensor.js - skin_jsbuild/vendor/element-queries/ElementQueries.js - skin_jsjs/Iweb_QtyWidget.js + + + + + +]]> + + + - - - simple - checkout/cart_item_renderer - - - - grouped - checkout/cart_item_renderer_grouped - - - - configurable - checkout/cart_item_renderer_configurable - - + topLinks + store_language + welcome + + header_tel + + + + header_promo - - footer_links_privacy - - - footer_links_support + footer_links + cms_footer_links + store_switcher + + + footer_links + + footer_links_company - - payment_icons + + footer_links_info + - + + + + 0 + overlay overlay--menu js-menu-overlay u-toggle + + + + + + Menu + drawer-left + + + 0 + js-menu-drawer + + + - - u-container - - cms_content_wrapper - - banner_hero - + + + + accountcustomer/account/create + logincustomer/account/login/ - - - - - page/2columns-left.phtml + + + + + + accountcustomer/account/ + account_editcustomer/account/edit/ + address_bookcustomer/address/ + orderssales/order/history/ + wishlistwishlist/ + saved_cardscustomer/savedcards + newsletternewsletter/manage/ + logoutcustomer/account/logout/ + + + + + page/1column.phtml - + + + + + + + + + - + + + + + + + + + + + - - - - - + - - page/1column.phtml - u-container u-container--md + + + + + page/1column.phtml + + + prices + product.info.addto + - + description + certificates - - + + + + + + + + + 0 + + + + 600 + + + + 600 + + + - page/1column.phtml - + + + skin_jsbuild/js/views/cart.js + + + + + Home + + + Home + / + + + + My Cart + + + My Cart + + + + shipping + crosssell + - + + - - - - + + + + + + + + + + + + + header--stripped + - - - footer.payment.icons - + + + page/2columns-right.phtml + g-col-lg-3 u-fill-grey + g-col-lg-9 - header--stripped + - page/3columns.phtml - - - - - checkout.cart.sidebar - - - - checkout.cart.sidebar - + + + + skin_jsbuild/js/views/checkout.js + + - page/2columns-right.phtml + + + + - u-container u-container--sm + u-container-sm - - - customer.wishlist.item.remove - - + page/2columns-left.phtml + cms.wrapper + + Tonu cms_links @@ -171,28 +310,32 @@ - + + + - page_content_heading - cms.wrapper + + u-container + + + h1 + u-text-center + - - card card--bordered - - card__header - page_content_heading - - - card__body - cms.wrapper - + + u-section-bottom + cms.wrapper - + + + + + u-container @@ -216,19 +359,171 @@ contactForm - - contact_page_top + + contact_page_info contactForm - - contact_page_mid - - - contact_page_bottom - + + + + + + + + Home + + + Home + / + + + + Page not found + + + Page not found + + + + + + + + + + + + + Customer Services + + cms_links + + + + + + + Home + + + Home + / + + + + Sitemap + + + Sitemap + + + + + + + + + + cms.wrapper + page_content_heading + + + + + our-products + 300 + 300 + 4 + + + + grid g-stretch + + + g-col-sm-6 + + tsb + 1 + + + + + g-col-sm-6 + + tsb + + + + + + u-fill-grey-light u-text-center u-clearfix + + + u-container u-container--sm u-section-lg + cms.wrapper + + + + + wp_latest_posts + + + + + + + + + modal--sm + + + persistent.remember.me.tooltip + + + + + + u-container + + + + + + + + + + + + persistent.remember.me.tooltip + + + + + + persistent.remember.me.tooltip + + + + + + persistent.remember.me.tooltip + + + + + + + + + u-container + wordpress.breadcrumb + wordpress.breadcrumb + + \ No newline at end of file diff --git a/layout/tag.xml b/layout/tag.xml new file mode 100644 index 0000000..e69de29 diff --git a/locale/en_GB/translate.csv b/locale/en_GB/translate.csv new file mode 100644 index 0000000..159a62f --- /dev/null +++ b/locale/en_GB/translate.csv @@ -0,0 +1,139 @@ +# Wishlist +"My Wishlist","Favourites" +"My Wishlist (%d item)","Favourites" +"My Wishlist (%d items)","Favourites" +"Update Wishlist","Update favourites" +"Share Wishlist","Share favourites" +"Share Your Wishlist","Share Your favourites" +"%1$s was successfully added to your wishlist. Click here to continue shopping","%1$s was successfully added to your favourites. Click here to continue shopping" +"%s's Wishlist","%s's Favourites" +"Add to Wishlist","Add to favourites" +"Manage your Wishlist","Manage favourites" +"Are you sure you want to remove this product from your wishlist?","Are you sure you want to remove this product from your favourites?" +"Are you sure you would like to remove this item from the wishlist?","Are you sure you would like to remove this item from your favourites?" +"Cannot create wishlist","Cannot create favourites" +"Check this checkbox if you want to add a link to an rss feed to your wishlist.","Check this checkbox if you want to add a link to an RSS feed to your favourites." +"Go to Wishlist","Go to favourites" +"RSS link to %s's wishlist","RSS link to %s's favourites" +"There was an error while adding item to wishlist.","There was an error while adding item to your favourites." +"There was an error while adding item to wishlist: %s","There was an error while adding item to your favourites: %s" +"There was an error while deleting item from wishlist.","There was an error while deleting item from your favourites." +"There was an error while deleting item from wishlist: %s","There was an error while deleting item from your favourites: %s" +"Wishlist Section","Favourites section" +"Wishlist Sharing","Favourites sharing" +"Wishlist is empty now.","Favourites is empty now." +"You have no items in your wishlist.","You have no items in your favourites." +"Your Wishlist was successfully shared","Your favourites were successfully shared" +"My Wishlist - %d Item(s)","My favourites - %d Item(s)" +"Are you sure you want to remove this product from your wishlist?","Are you sure you want to remove this product from your favourites?" +"Product Details and Comment","Product Details" +"%1$s has been added to your wishlist. Click here to continue shopping.","%1$s has been added to your favourites. Click here to continue shopping." + +# Pricing +"Regular Price:","Was" +"Qty:","Qty" +"Starting at:","FROM:" +"Tier Price:","You Pay" + +# VAT +"Ex. VAT","Excluding VAT" +"Inc. VAT","Including VAT" +"Incl. Tax:","Inc. VAT" +"Excl. Tax:","Ex. VAT" +"Incl. VAT","Inc. VAT" +"Excl. VAT","Ex. VAT" +"Show Prices","Show Prices:" +"Grand Total Incl. Tax", "Total Inc. VAT" +"Grand Total Excl. Tax", "Total Ex. VAT" + +# Cart/Checkout +"Shopping Cart","My Bag" +"My Cart","My bag" +"Add to Cart","Add to bag" +"Clear Shopping Cart","Empty Shopping Bag" +"Update Shopping Cart","Update Shopping Bag" +"Add All to Cart","Add All to Shopping Bag" +"Shipping & Handling", "Delivery" +"Shopping Cart is Empty","Your Shopping Bag is Empty" +"Apply Coupon","Apply" +"Spend %s more to get free delivery!","Spend %s more for FREE DELIVERY" +"You have qualified for free delivery","You have qualified for FREE DELIVERY" +"Remove item","Delete" +"Forgot an Item?","Did you forget something?" +"Edit Your Cart","Edit your bag" +"Submitting order information...","Submitting your order..." +"Billing Information","Billing" +"Shipping Information","Delivery Address" +"Shipping Method","Delivery Method" +"Payment Information","Payment" +"Order Review","Review" +"Edit Shopping Cart","Edit Your Bag" +"Edit Payment Information","Edit Payment Info" + +"Click here to continue shopping.","Its time you went shopping" +"You have no items in your shopping cart.","You have no items in your shopping bag." + +# Discount Coupon +"Discount Codes","Discount Code" +"Apply Coupon","Apply Code" +"Cancel Coupon","Cancel Code" +"Enter your coupon code if you have one.","Enter a discount code if you have one." + + +# Global +"-OR-","-or-" + +# Product +"Related Products","Designs you might like" +"Related Products Sub","Fantastic gifts for specific occasions" +"Upsell Products","Products you may also like" +"Upsell Products Sub","Super gifts for any occasion" + +"Currently Shopping by:","Now Filtering" +"Items %s to %s of %s total","%s to %s of %s" + +# Validation +"* Required Fields","Required" +"This is a required field.","Required Field" +"Please enter a valid email address. For example johndoe@domain.com.","Enter valid email" + +# Customer +"Reset a Password","Reset Password" +"Default Shipping Address","Delivery Address" +"You have not set a default shipping address.","You have not set a default delivery address." +"Use as my default shipping address","Use as my default delivery address" +"Default Billing Address","Billing Address" +"Account Dashboard","Dashboard" +"Account Information","Account Details" +"Address Book","Addresses" +"My Orders","Orders" +"Edit Account Information","Edit Account Details" + +# Reviews +"My Product Reviews","My Reviews" + +"Order Date: %s","Ordered on: %s" + +# Delivery +"Ship To","Send To" +"Ship To:","Deliver To" +"State/Province","County" +"Shipping:","Delivery" +"Shipping","Delivery" +"Shipping Address","Delivery Address" +"Shipping Information","Delivery Information" + +# Newsletter +"Newsletters","Mailing Lists" +"Sign Up for Our Newsletter:","Join our exclusive mailing list to be first to hear about our latest news and offers." +"You are currently not subscribed to any newsletter.","You are currently not subscribed to a mailing list." +"Newsletter Subscription","Mailing Lists" +"Newsletter Subscriptions","Mailing Lists" +"Email Newsletters","Mailing List Subscriptions" +"Manage your newsletters","You control what we send to you" + +# Contacts +"Contact Form Title","Prefer to send a message?" + +# Search +"Search entire store here...","" \ No newline at end of file diff --git a/modman b/modman new file mode 100644 index 0000000..5d85c7d --- /dev/null +++ b/modman @@ -0,0 +1,12 @@ +etc/ app/design/frontend/package/default/etc/ +layout/ app/design/frontend/package/default/layout/ +locale/ app/design/frontend/package/default/locale/ +locale/en_GB/* app/locale/en_GB/ +template/ app/design/frontend/package/default/template/ +skin/* skin/frontend/package/default/ + +# Magento Error Pages +errors/custom/page.phtml errors/custom/page.phtml +errors/custom/503.phtml errors/custom/503.phtml +errors/custom/404.phtml errors/custom/404.phtml +errors/local.xml errors/local.xml \ No newline at end of file diff --git a/skin/.gitignore b/skin/.gitignore new file mode 100644 index 0000000..a9d25b1 --- /dev/null +++ b/skin/.gitignore @@ -0,0 +1,44 @@ +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk +.vscode + +# Gulp +node_modules +.sass-cache +npm-debug.log + +# Server stuff +.bash_history +.bash_logout +.bashrc +.cache +.profile +.ssh +log + + +# Temp files +build \ No newline at end of file diff --git a/template/.DS_Store b/template/.DS_Store deleted file mode 100644 index b0f085147294f731002e922820e9b26eb5665496..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%T9wp6uqM)Hg(gbOMaoz41F`gvJ<+k$Qs1xpm^qdbl{q96QQsy<1P`i@d}34tKyE z_-zjGw|hYgdZZGq@%?5+L+TMD%hPmOl?$S`>-VkjI*jEvjAFy9MC&Od=-AK-d5d+V zqEc6q)0~EuoBO?J>CBVm2Q`D70X-GHz?qyf=-LnHX>po*?p_aijyPX>hB!TX##FEh zD0&iAD|+trsF&B$^&z?jcnxhQcs=@LQcr)z0qofvqf154?tnYs4jdfd^&v)MObly9 zSvrv92mp-GErDzPrQn*_FfptZF@gwM3e?hIM~tB5=#Pz;7}knfPQeZz!JZuKgc9WG zm_HUeg+$S_JKzqq9XQw93Ge^6!{`5Yk>9xk?!dotAVldro#B;iZ|%Gs@3k@70~!bO mYDFnQvh7$dcq_g_lfYQa7r?}@RzwfNe+0w^Pwv2vI`9c~k%(>p diff --git a/template/catalog/.DS_Store b/template/catalog/.DS_Store deleted file mode 100644 index 5b96878c7f82dbc924f5069f909deb963cbc8915..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKL2AP=5ZrA84djwzkNQIB2SjjRkPifGXb%lGCGJ^&Ed5VswA*4ghMrnV*#&7< z(ySy8Skj7!?#FH?vK5gv3Q_4S7`qpTuAICAYMo=0R?bfkyF=SAO!ODKxc3_wKPhV|$`RZ{>UpV8IeGnZgYa?Fm!5F;?PP@sjXrxXWzMLqdYU-=_>(YiY3Pn9m34WkYPLV>vg*Vf$f{=dgBvzX-1L!uQ5gaZFe0bMnR zW{;2ZyY=Gpc-JPBBMObYLI(za_6R_O=g4gxwDCkAyzE#EISc!1I4~XpRgkDcfnQMI E9fFoB=l}o! diff --git a/template/catalog/category/view.phtml b/template/catalog/category/view.phtml index 42c8544..185685a 100644 --- a/template/catalog/category/view.phtml +++ b/template/catalog/category/view.phtml @@ -6,40 +6,17 @@ */ ?> helper('catalog/output'); $_category = $this->getCurrentCategory(); - $_imgHtml = ''; - if ($_imgUrl = $_category->getImageUrl()) { - $_imgHtml = ''.$this->escapeHtml($_category->getName()).''; - $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image'); - } - if($_imgUrl) { - $_modifierClass = " o-category-masthead--split"; - } ?> + getMessagesBlock()->toHtml() ?> -
- -
- - - -
- -
-
-

categoryAttribute($_category, $_category->getName(), 'name') ?>

-
- __('Refine'); ?> -
-
- getCurrentCategory()->getDescription()): ?> -
- categoryAttribute($_category, $_description, 'description') ?> -
- +
+
+
+

categoryAttribute($_category, $_category->getName(), 'name') ?>

+
@@ -52,4 +29,4 @@ getProductListHtml() ?> - \ No newline at end of file + diff --git a/template/catalog/layer/filter.phtml b/template/catalog/layer/filter.phtml deleted file mode 100644 index 9012926..0000000 --- a/template/catalog/layer/filter.phtml +++ /dev/null @@ -1,28 +0,0 @@ -getItems(); -usort($items, (function($a, $b) { - return strcmp($a->getLabel(), $b->getLabel()); -})); -?> - -
    - -
  1. - getCount() > 0): ?> - - getLabel() ?> - shouldDisplayProductCount()): ?> - (getCount() ?>) - - - getLabel() ?> - -
    2. - -
diff --git a/template/catalog/layer/state.phtml b/template/catalog/layer/state.phtml deleted file mode 100644 index bc261a8..0000000 --- a/template/catalog/layer/state.phtml +++ /dev/null @@ -1,43 +0,0 @@ - -getActiveFilters() ?> - -
-
-

__('Currently Shopping by:') ?>

-
-
-
    - -
  1. - getClearLinkUrl(); - if ($clearLinkUrl): - ?> - - escapeHtml($_filter->getFilter()->getClearLinkText()) ?> - - - - __('Remove This Item') ?> - __($_filter->getName()) ?>: - stripTags($_filter->getLabel()) ?> - - -
    2. - -
-
- - getLayer()->getState()->getFilters()): ?> -
- __('Clear All') ?> -
- -
- \ No newline at end of file diff --git a/template/catalog/layer/view.phtml b/template/catalog/layer/view.phtml deleted file mode 100644 index d08680c..0000000 --- a/template/catalog/layer/view.phtml +++ /dev/null @@ -1,36 +0,0 @@ - -canShowBlock()): ?> -
-
- __('Shop By') ?> -
-
- getStateHtml() ?> - canShowOptions()): ?> -
- getFilters() ?> - -
- getItemsCount()): ?> - getName())); ?> -
-

__($_filter->getName()) ?>

- -
-
- getHtml() ?> -
- -
- -
- -
-
- \ No newline at end of file diff --git a/template/catalog/product/.DS_Store b/template/catalog/product/.DS_Store deleted file mode 100644 index 135989573fa98bcc0535a55a30069cd1e93b0c20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ8Hu~5S>X>7}B^*xmPf`z+#jW_yPe75`&EmvAY!NazNwzMp5A=knjd( z-tK&MrB`S)BBJv{HxrqP$OLLApJs+)anpg^rKbU^ow0tMEtcEOZjd?du-Zn}vXXb% z|4@I9ZMJRO9rjC+|$N(AmR}5&=F4{R>DSPYS x<*e5h=nM2)kn8C%-im?Vim|a){CJU9Y>jwL>;t_VelG{|N5FWYkb&P|;0pu?CE@@8 diff --git a/template/catalog/product/list.phtml b/template/catalog/product/list.phtml index c517db3..fd07a65 100644 --- a/template/catalog/product/list.phtml +++ b/template/catalog/product/list.phtml @@ -12,113 +12,138 @@ count()): ?>

__('There are no products matching the selection.') ?>

+
-
- getToolbarHtml() ?> -
- -getMode()!='grid'): ?> - -
- -
-
- -
- <?php echo $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true) ?> -
- -
-
-
- stripTags($_product->getName(), null, true); ?> -

productAttribute($_product, $_product->getName() , 'name'); ?>

-
+ + + + stripTags($_product->getName(), null, true); + ?> +
+
+
+ getBestseller()) : ?> + __('Best Seller'); ?> + +
+

productAttribute($_product, $_product->getName() , 'name'); ?>

+

productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>

getRatingSummary()): ?> - getReviewsSummaryHtml($_product) ?> + getReviewsSummaryHtml($_product) ?> - - productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
-
- getPriceHtml($_product, true) ?> - - __('Learn More') ?> - - isSaleable()): ?> -

- -

__('Out of stock') ?>

- - - - +
+
+ getChildHtml('suitability'); ?> +
+
+
    +
  • + <?php echo $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true) ?> +
    • +
+
+
+
+
+
+ getBestseller()) : ?> + __('Best Seller'); ?> + +
+

productAttribute($_product, $_product->getName() , 'name'); ?>

+

productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>

+ getRatingSummary()): ?> + getReviewsSummaryHtml($_product) ?> + +
+
+
+ getTickList(); ?> + __('More information'); ?>

+
+

Buy one get one free

+
+
+

Buy one get one free

+ getPriceHtml($_product, true) ?> + isSaleable()): // something for sale ?> +
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+ + + + + Decrease quantity + + + + + + + Increase quantity + +
+
+

Earn 50 TONU® Rewards Points

+ +
+ __('More information'); ?> +
+ +
+ __('Out of stock') ?> +
+ __('More information'); ?> +
+ Subscribe to back in-stock notification +
+ +
+
+
-
-
- -
- - - - + -count() ?> -getColumnCount(); ?> - - -
- -
-
- -
- <?php echo $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true) ?> -
-
-

productAttribute($_product, $_product->getName(), 'name') ?>

- getRatingSummary()): ?> - getReviewsSummaryHtml($_product, 'short') ?> - -
-
- getPriceHtml($_product, true) ?> -
- isSaleable()): ?> - - -

__('Out of stock') ?>

- - -
-
- -
-
- -
- - - -
- getToolbarHtml() ?>
- diff --git a/template/catalog/product/list/related.phtml b/template/catalog/product/list/related.phtml deleted file mode 100644 index 6148c29..0000000 --- a/template/catalog/product/list/related.phtml +++ /dev/null @@ -1,45 +0,0 @@ -getProduct(); ?> -quoteEscape($this->__('Add to Cart')); ?> - -getItems()->getSize()): ?> -
- -
-

__('Related Products') ?>

-
- -
- - -
- -
- \ No newline at end of file diff --git a/template/catalog/product/list/toolbar.phtml b/template/catalog/product/list/toolbar.phtml deleted file mode 100644 index 5368f68..0000000 --- a/template/catalog/product/list/toolbar.phtml +++ /dev/null @@ -1,77 +0,0 @@ - -getCollection()->getSize()): ?> - - isExpanded() ): ?> - - isEnabledViewSwitcher() ): ?> -
- getModes(); ?> - 1): ?> - - getModes() as $_code=>$_label): ?> - isModeActive($_code)): ?> - - - - - - -
- - -
- - - - getCurrentDirection() == 'desc'): ?> - - - - - - - - - -
- - -
- getLastPageNum()>1): ?> - __('Items %s to %s of %s total', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?> - - __('%s Item(s)', $this->getTotalNum()) ?> - -
- -
- - - __('per page') ?> -
- - getPagerHtml() ?> - - diff --git a/template/catalog/product/price.phtml b/template/catalog/product/price.phtml new file mode 100644 index 0000000..06d8bba --- /dev/null +++ b/template/catalog/product/price.phtml @@ -0,0 +1,451 @@ + +helper('core'); +$_weeeHelper = $this->helper('weee'); +$_taxHelper = $this->helper('tax'); +/* @var $_coreHelper Mage_Core_Helper_Data */ +/* @var $_weeeHelper Mage_Weee_Helper_Data */ +/* @var $_taxHelper Mage_Tax_Helper_Data */ + +$_product = $this->getProduct(); +$_storeId = $_product->getStoreId(); +$_store = $_product->getStore(); +$_id = $_product->getId(); +$_weeeSeparator = ''; +$_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() || $_taxHelper->displayBothPrices()); +$_minimalPriceValue = $_product->getMinimalPrice(); +$_minimalPriceValue = $_store->roundPrice($_store->convertPrice($_minimalPriceValue)); +$_minimalPrice = $_taxHelper->getPrice($_product, $_minimalPriceValue, $_simplePricesTax); +$_convertedFinalPrice = $_store->roundPrice($_store->convertPrice($_product->getFinalPrice())); +$_specialPriceStoreLabel = $this->getProductAttribute('special_price')->getStoreLabel(); +?> + +isGrouped()): ?> + getAmountForDisplay($_product); ?> + getProductWeeeAttributesForRenderer($_product, null, null, null, true); ?> + + isTaxable()): ?> + getAmountInclTaxes($_weeeTaxAttributes); ?> + + roundPrice($_store->convertPrice($_weeeTaxAmount)); ?> + roundPrice($_store->convertPrice($_weeeTaxAmountInclTaxes)); ?> + +
+ roundPrice($_store->convertPrice($_product->getPrice())); ?> + getPrice($_product, $_convertedPrice); ?> + getPrice($_product, $_convertedPrice, $_simplePricesTax); ?> + getPrice($_product, $_convertedFinalPrice) ?> + getPrice($_product, $_convertedFinalPrice, true) ?> + getPriceDisplayType(); ?> + = $_price): ?> + displayBothPrices()): ?> + typeOfDisplay($_product, 0)): // including ?> + + helper('tax')->__('Excl. Tax:') ?> + + formatPrice($_price + $_weeeTaxAmount, false) ?> + + + + helper('tax')->__('Incl. Tax:') ?> + + formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?> + + + typeOfDisplay($_product, 1)): // incl. + weee ?> + + helper('tax')->__('Excl. Tax:') ?> + + formatPrice($_price + $_weeeTaxAmount, false) ?> + + + ( + + + getName(); ?>: currency($_weeeTaxAttribute->getAmount(), true, true); ?> + + + ) + + helper('tax')->__('Incl. Tax:') ?> + + formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?> + + + typeOfDisplay($_product, 4)): // incl. + weee ?> + + helper('tax')->__('Excl. Tax:') ?> + + formatPrice($_price + $_weeeTaxAmount, false) ?> + + + + helper('tax')->__('Incl. Tax:') ?> + + formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?> + + ( + + + getName(); ?>: currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?> + + + ) + + typeOfDisplay($_product, 2)): // excl. + weee + final ?> + + helper('tax')->__('Excl. Tax:') ?> + + formatPrice($_price, false) ?> + + + + + getName(); ?> + : currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?> + + + + helper('tax')->__('Incl. Tax:') ?> + + formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?> + + + + + helper('tax')->__('Excl. Tax:') ?> + + + formatPrice($_price, false) ?> + + formatPrice($_finalPrice, false) ?> + + + + + helper('tax')->__('Incl. Tax:') ?> + + formatPrice($_finalPriceInclTax, false) ?> + + + + + typeOfDisplay($_product, array(0, 1))): // including ?> + displayPriceIncludingTax() ? $_weeeTaxAmountInclTaxes : $_weeeTaxAmount ?> + + currency($_price + $weeeAmountToDisplay, true, true) ?> + + + typeOfDisplay($_product, 1)): // show description ?> + ( + + + getName(); ?> + : currency($_weeeTaxAttribute->getAmount() + ($_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAttribute->getTaxAmount() : 0), true, true); ?> + + + ) + + typeOfDisplay($_product, 4)): // incl. + weee ?> + + formatPrice($_price + $_weeeTaxAmount, true) ?> + + ( + + + getName(); ?>: currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?> + + + ) + typeOfDisplay($_product, 2)): // excl. + weee + final ?> + formatPrice($_price, true) ?>
+ displayPriceIncludingTax() ? $_weeeTaxAmountInclTaxes : $_weeeTaxAmount ?> + + + getName(); ?> + : currency($_weeeTaxAttribute->getAmount() + ($_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAttribute->getTaxAmount() : 0), true, true); ?> + + + + currency($_price + $weeeAmountToDisplay, true, true) ?> + + + + + formatPrice($_price, true) ?> + + formatPrice($_finalPrice, true) ?> + + + + + + getOriginalAmount($_product); ?> + roundPrice($_store->convertPrice($_originalWeeeTaxAmount)) ?> + + typeOfDisplay($_product, 0)): // including ?> +

+ __('Regular Price:') ?> + + formatPrice($_regularPrice + $_originalWeeeTaxAmount, false) ?> + +

+ + displayBothPrices()): ?> +

+ + + helper('tax')->__('Excl. Tax:') ?> + + formatPrice($_finalPrice + $_weeeTaxAmount, false) ?> + + + + helper('tax')->__('Incl. Tax:') ?> + + formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?> + + +

+ +

+ + + formatPrice($_finalPrice + $_weeeTaxAmountInclTaxes, false) ?> + +

+ + + typeOfDisplay($_product, 1)): // incl. + weee ?> +

+ __('Regular Price:') ?> + + formatPrice($_regularPrice + $_originalWeeeTaxAmount, false) ?> + +

+ + + + + + +

+ displayBothPrices()): ?> + + + helper('tax')->__('Excl. Tax:') ?> + + formatPrice($_finalPrice + $_weeeTaxAmount, false) ?> + + + ( + + + getName(); ?> + : currency($_weeeTaxAttribute->getAmount(), true, true); ?> + + + ) + + helper('tax')->__('Incl. Tax:') ?> + + formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?> + + + +

+ __('Special Price:') ?> + + formatPrice($_finalPrice + $_weeeTaxAmountInclTaxes, false) ?> + +

+ ( + + + getName(); ?> + : currency($_weeeTaxAttribute->getAmount(), true, true); ?> + + + ) + +

+ typeOfDisplay($_product, 4)): // incl. + weee ?> +

+ __('Regular Price:') ?> + + formatPrice($_regularPrice + $_originalWeeeTaxAmount, false) ?> + +

+ +

+ + + helper('tax')->__('Excl. Tax:') ?> + + formatPrice($_finalPrice + $_weeeTaxAmount, false) ?> + + + ( + + + getName(); ?>: currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?> + + + ) + + helper('tax')->__('Incl. Tax:') ?> + + formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?> + + +

+ typeOfDisplay($_product, 2)): // excl. + weee + final ?> +

+ __('Regular Price:') ?> + + formatPrice($_regularPrice, false) ?> + +

+ +

+ + + helper('tax')->__('Excl. Tax:') ?> + + formatPrice($_finalPrice, false) ?> + + + + + getName(); ?> + : currency($_weeeTaxAttribute->getAmount(), true, true); ?> + + + + helper('tax')->__('Incl. Tax:') ?> + + formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?> + + +

+ +

+ __('Regular Price:') ?> + + formatPrice($_regularPrice, false) ?> + +

+ + displayBothPrices()): ?> +

+ + + helper('tax')->__('Excl. Tax:') ?> + + formatPrice($_finalPrice, false) ?> + + + + helper('tax')->__('Incl. Tax:') ?> + + formatPrice($_finalPriceInclTax, false) ?> + + +

+ + + +

+ + + formatPrice($_finalPrice, false) ?> + +

+ + + + + + getDisplayMinimalPrice() && $_minimalPriceValue && $_minimalPriceValue < $_convertedFinalPrice): ?> + + + typeOfDisplay($_product, array(0, 1, 4))): ?> + + + + getUseLinkForAsLowAs()): ?> + + + + + __('As low as:') ?> + + formatPrice($_minimalPriceDisplayValue, false) ?> + + getUseLinkForAsLowAs()): ?> + + + + + getDisplayMinimalPrice() && $_minimalPrice && $_minimalPrice < $_finalPrice): */ ?> +
+ +isGrouped()): */ ?> + getDisplayMinimalPrice(); + if ($showMinPrice && $_minimalPriceValue) { + $_exclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue); + $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, true); + $price = $showMinPrice ? $_minimalPriceValue : 0; + } else { + $price = $_convertedFinalPrice; + $_exclTax = $_taxHelper->getPrice($_product, $price); + $_inclTax = $_taxHelper->getPrice($_product, $price, true); + } + ?> + +
+ class="minimal-price"> + + __('Starting at:') ?> + + displayBothPrices()): ?> + + helper('tax')->__('Excl. Tax:') ?> + + formatPrice($_exclTax, false) ?> + + + + helper('tax')->__('Incl. Tax:') ?> + + formatPrice($_inclTax, false) ?> + + + + displayPriceIncludingTax()) { + $_showPrice = $_exclTax; + } + ?> + + formatPrice($_showPrice, false) ?> + + +

+
+ getDisplayMinimalPrice() && $_minimalPrice): */ ?> +isGrouped()): */ ?> diff --git a/template/catalog/product/view.phtml b/template/catalog/product/view.phtml index a667992..1447915 100644 --- a/template/catalog/product/view.phtml +++ b/template/catalog/product/view.phtml @@ -11,142 +11,167 @@ -
getMessagesBlock()->toHtml() ?>
-
- -
-
- getChildHtml('media') ?> + + + (getTotalReviews($_product->getId(), true); ?>) + + +
+
+
getMessagesBlock()->toHtml() ?>
+ +
+ getBestseller()) : ?> + __('Best Seller'); ?> + +
+

productAttribute($_product, $_product->getName(), 'name') ?>

+ getShortDescription()):?> +

productAttribute($_product, nl2br($_product->getShortDescription()), 'short_description') ?>

+ +
- getChildHtml('related') ?> -
- -
- -
- -
getOptions()): ?> enctype="multipart/form-data"> - getBlockHtml('formkey') ?> -
- - -
-
-
-

productAttribute($_product, $_product->getName(), 'name') ?>

+ +
+
+ getChildHtml('suitability') ?> +
+
+ getChildHtml('media') ?> +
+
+ +
+ getBestseller()) : ?> + __('Best Seller'); ?> + +
+

productAttribute($_product, $_product->getName(), 'name') ?>

+ getShortDescription()):?> +

productAttribute($_product, nl2br($_product->getShortDescription()), 'short_description') ?>

+ +
+ getChildHtml('extrahint') ?> + getReviewsSummaryHtml($_product, false, true)?> + getChildHtml('other');?> +
-
+
- getReviewsSummaryHtml($_product, false, true)?> - getChildHtml('alert_urls') ?> +

Buy one get one free

getChildHtml('product_type_data') ?> getTierPriceHtml() ?> - getChildHtml('extrahint') ?> - - hasOptions()):?> - isSaleable()): ?> - getChildHtml('addtocart') ?> + getOptions()): ?> enctype="multipart/form-data"> + getBlockHtml('formkey') ?> +
+ + +
+ hasOptions()):?> +
+ isSaleable()): ?> + getChildHtml('addtocart') ?> + +
+ getChildHtml('extra_buttons') ?> - getChildHtml('addto') ?> - getChildHtml('extra_buttons') ?> - isSaleable()): ?> - getChildHtml('addto') ?> - - - canEmailToFriend()): ?> - - __('Email to a Friend') ?> - - - - getChildHtml('other');?> - isSaleable() && $this->hasOptions()):?> - getChildChildHtml('container1', '', true, true) ?> - - - isSaleable() && $this->hasOptions()):?> - getChildChildHtml('container2', '', true, true) ?> - - - -
+ isSaleable() && $this->hasOptions()):?> + getChildChildHtml('container1', '', true, true) ?> + + isSaleable() && $this->hasOptions()):?> + getChildChildHtml('container2', '', true, true) ?> + + + +
+
+
+
+
+ getOverviewHeading()) :?> +
+
__('Overview'); ?>
+

+
+ +
+
+ getOverviewText()) :?> + + +
+
+ getOverviewList()) :?> + + +

Informed Choice

+
    +
  • Informed Choice
    • +
  • Informed Sport
    • +
+
+
+
+
-getChildHtml('upsell_products') ?> -getChildHtml('product_additional_data') ?> - - \ No newline at end of file +
+ getChildHtml('tabs') ?> + getChildHtml('product_additional_data') ?> +
\ No newline at end of file diff --git a/template/catalog/product/view/addto.phtml b/template/catalog/product/view/addto.phtml deleted file mode 100644 index 3a4e87f..0000000 --- a/template/catalog/product/view/addto.phtml +++ /dev/null @@ -1,12 +0,0 @@ -getProduct(); ?> -helper('wishlist')->getAddUrl($_product); ?> - -helper('wishlist')->isAllow()) : ?> - __('Add to Wishlist') ?> - -helper('catalog/product_compare')->getAddUrl($_product); -?> - - __('Add to Compare') ?> - \ No newline at end of file diff --git a/template/catalog/product/view/addtocart.phtml b/template/catalog/product/view/addtocart.phtml index 64d89fe..87ea214 100644 --- a/template/catalog/product/view/addtocart.phtml +++ b/template/catalog/product/view/addtocart.phtml @@ -1,38 +1,37 @@ getProduct(); ?> - -quoteEscape($this->__('Add to Cart')); ?> +__('Add to Cart'); ?> isSaleable()): ?>
isGrouped()): ?> -
- +
+
- - + + getSvg('custom--minus'); ?> __('Decrease quantity'); ?> - - - + + + getSvg('custom--plus'); ?> __('Increase quantity'); ?>
+ -

+ -
- - getChildHtml('', true, true) ?> -
+

Earn 10 TONU™ Reward Points

+ +

+ getChildHtml('', true, true) ?>
- \ No newline at end of file + diff --git a/template/catalog/product/view/description.phtml b/template/catalog/product/view/description.phtml new file mode 100644 index 0000000..54b134d --- /dev/null +++ b/template/catalog/product/view/description.phtml @@ -0,0 +1,15 @@ + +getProduct()->getDescription(); ?> + +
+
+ helper('catalog/output')->productAttribute($this->getProduct(), $_description, 'description') ?> +
+
+ \ No newline at end of file diff --git a/template/catalog/product/view/options/scpwrapper.phtml b/template/catalog/product/view/options/scpwrapper.phtml new file mode 100644 index 0000000..1430df0 --- /dev/null +++ b/template/catalog/product/view/options/scpwrapper.phtml @@ -0,0 +1,20 @@ +
+ getChildHtml('', true, true);?> + + + + +
+ hasRequiredOptions()):?> +

__('* Required Fields') ?>

+ +
+ + \ No newline at end of file diff --git a/template/catalog/product/view/tabs.phtml b/template/catalog/product/view/tabs.phtml new file mode 100644 index 0000000..970735b --- /dev/null +++ b/template/catalog/product/view/tabs.phtml @@ -0,0 +1,33 @@ +
+
+
    + getChildGroup('detailed_info', 'getChildHtml') as $alias => $html):?> + getChildData($alias, 'title')):?> + +
  • ">escapeHtml($title); ?>
    • + + +
+
+
+ +
+
+ getChildGroup('detailed_info', 'getChildHtml') as $alias => $html):?> + +
+
+ getChildData($alias, 'title')):?> + +
+

escapeHtml($title); ?>

+
+ +
+ +
+
+
+ +
+
\ No newline at end of file diff --git a/template/catalog/product/view/tabs/directions.phtml b/template/catalog/product/view/tabs/directions.phtml new file mode 100644 index 0000000..70a06a8 --- /dev/null +++ b/template/catalog/product/view/tabs/directions.phtml @@ -0,0 +1,6 @@ +getProduct()->getDirections(); ?> + +
+ helper('catalog/output')->productAttribute($this->getProduct(), $_directions, 'description') ?> +
+ \ No newline at end of file diff --git a/template/catalog/product/view/tabs/nutrition.phtml b/template/catalog/product/view/tabs/nutrition.phtml new file mode 100644 index 0000000..67b0341 --- /dev/null +++ b/template/catalog/product/view/tabs/nutrition.phtml @@ -0,0 +1 @@ +Add nutrition info \ No newline at end of file diff --git a/template/catalog/product/view/tabs/reviews.phtml b/template/catalog/product/view/tabs/reviews.phtml new file mode 100644 index 0000000..f412660 --- /dev/null +++ b/template/catalog/product/view/tabs/reviews.phtml @@ -0,0 +1,8 @@ +
+
+ getChildHtml('reviews'); ?> +
+
+ getChildHtml('form'); ?> +
+
\ No newline at end of file diff --git a/template/catalog/product/view/type/default.phtml b/template/catalog/product/view/type/default.phtml new file mode 100644 index 0000000..5268a80 --- /dev/null +++ b/template/catalog/product/view/type/default.phtml @@ -0,0 +1,11 @@ + +getProduct() ?> + +getPriceHtml($_product) ?> +displayProductStockStatus()): ?> + isAvailable()): ?> + __('Out of stock') ?> + + +getChildHtml('product_type_data_extra') ?> + diff --git a/template/catalog/product/view/type/options/configurable.phtml b/template/catalog/product/view/type/options/configurable.phtml new file mode 100644 index 0000000..c455af8 --- /dev/null +++ b/template/catalog/product/view/type/options/configurable.phtml @@ -0,0 +1,25 @@ +getProduct(); +$_attributes = Mage::helper('core')->decorateArray($this->getAllowAttributes()); +?> +isSaleable() && count($_attributes)):?> +
+
+ +
+ +
+
+ +
+
+
+ +
+
+ + diff --git a/template/catalogsearch/form.mini.phtml b/template/catalogsearch/form.mini.phtml index 5640200..70b1eeb 100644 --- a/template/catalogsearch/form.mini.phtml +++ b/template/catalogsearch/form.mini.phtml @@ -1,25 +1,16 @@ helper('catalogsearch'); ?> - -
- -
- - - -
- - -
+ + + +
+
\ No newline at end of file diff --git a/template/cc/drawer/header.phtml b/template/cc/drawer/header.phtml new file mode 100644 index 0000000..a8ccf98 --- /dev/null +++ b/template/cc/drawer/header.phtml @@ -0,0 +1,6 @@ +getTitle() || $this->getDeactivateTarget()) : ?> +
+

getTitle(); ?>

+ getSvg('custom--close'); ?> +
+ \ No newline at end of file diff --git a/template/cc/drawer/left.phtml b/template/cc/drawer/left.phtml index 6def0ff..a171e98 100644 --- a/template/cc/drawer/left.phtml +++ b/template/cc/drawer/left.phtml @@ -1,4 +1,4 @@ -
+
getChildHtml('drawer_left'); ?>
diff --git a/template/cc/drawer/left/customer-links.phtml b/template/cc/drawer/left/customer-links.phtml new file mode 100644 index 0000000..77e96b3 --- /dev/null +++ b/template/cc/drawer/left/customer-links.phtml @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/template/cc/drawer/left/links.phtml b/template/cc/drawer/left/links.phtml new file mode 100644 index 0000000..69138d4 --- /dev/null +++ b/template/cc/drawer/left/links.phtml @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/template/cc/drawer/loader.phtml b/template/cc/drawer/loader.phtml new file mode 100644 index 0000000..0e57f44 --- /dev/null +++ b/template/cc/drawer/loader.phtml @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/template/cc/drawer/loader/loader.phtml b/template/cc/drawer/loader/loader.phtml new file mode 100644 index 0000000..cf6187c --- /dev/null +++ b/template/cc/drawer/loader/loader.phtml @@ -0,0 +1,16 @@ +
+ +
+ +
+
+ + + Please Wait + +
+
+ +
+ +
\ No newline at end of file diff --git a/template/cc/drawer/modal.phtml b/template/cc/drawer/modal.phtml index 30e698e..940daa3 100644 --- a/template/cc/drawer/modal.phtml +++ b/template/cc/drawer/modal.phtml @@ -1,21 +1,11 @@ -getModalSize(); -$_fromReg = Mage::registry('modalSize'); - -if(!empty($_fromReg)) { - $_modalSize = $_fromReg; -} else if(!empty($_fromXml)) { - $_modelSize = $_fromXml; -} - -?> -