Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: pendabl/bootstrapped
base: master
...
head fork: JeffreyHyer/bootstrapped
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 9 commits
  • 172 files changed
  • 0 commit comments
  • 2 contributors
Commits on Jan 01, 2013
@JeffreyHyer JeffreyHyer Reset styles to original bootstrap styles. Upgraded to Bootstrap v2.2…
….2. Misc house cleaning, removing old/unnecessary files, etc.
b419f86
Commits on Jan 12, 2013
@JeffreyHyer JeffreyHyer Misc changes and updates. See individual file diffs for more details.…
… Biggest change is no 'well' classes on sidebar boxes! Yay!
4ecd190
@JeffreyHyer JeffreyHyer Update change.log 86d13c4
Commits on Jan 17, 2013
@JeffreyHyer JeffreyHyer Misc changes to the layout, styles, structure, etc. of the theme. Mov…
…ed the individual theme styles (style.css) to styles.less and incorporated with 'bootstrap.less' so they are compiled together and it reduces the number of stylesheets that get included on page load.
004ba66
Commits on Jan 18, 2013
@JeffreyHyer JeffreyHyer All changes specific to Krumpets 1432d17
@JeffreyHyer JeffreyHyer Remove debug files... 9d5208f
Commits on Jan 24, 2013
@JeffreyHyer JeffreyHyer A TON of changes (thanks to KrumpetsHomeDecor.com). May need to be si…
…fted through and perhaps undone to restore base functionality, look, and feel.
8b19a04
@JeffreyHyer JeffreyHyer More misc changes. Consolidated CSS files, added responsive styles (o…
…verriding bootstrap defaults), etc.
965f171
Commits on Jan 31, 2013
@JeffreyHyer JeffreyHyer Misc changes. Most notably the cart layout/design. 2800b3b
Showing with 9,542 additions and 19,443 deletions.
  1. +11 −1 .gitignore
  2. +1 −52 README.md
  3. +9 −19 app/design/frontend/bootstrapped/default/layout/local.xml
  4. +6 −20 app/design/frontend/bootstrapped/default/layout/page.xml
  5. +135 −0 app/design/frontend/bootstrapped/default/layout/tag.xml
  6. +1 −1  app/design/frontend/bootstrapped/default/template/callouts/left_col.phtml
  7. +1 −1  app/design/frontend/bootstrapped/default/template/callouts/right_col.phtml
  8. +13 −10 app/design/frontend/bootstrapped/default/template/catalog/category/view.phtml
  9. +5 −19 app/design/frontend/bootstrapped/default/template/catalog/layer/filter.phtml
  10. +6 −29 app/design/frontend/bootstrapped/default/template/catalog/layer/state.phtml
  11. +27 −28 app/design/frontend/bootstrapped/default/template/catalog/layer/view.phtml
  12. +32 −0 app/design/frontend/bootstrapped/default/template/catalog/navigation/left_home.phtml
  13. +13 −19 app/design/frontend/bootstrapped/default/template/catalog/navigation/top.phtml
  14. +19 −12 app/design/frontend/bootstrapped/default/template/catalog/product/compare/sidebar.phtml
  15. +10 −7 app/design/frontend/bootstrapped/default/template/catalog/product/list.phtml
  16. +30 −30 app/design/frontend/bootstrapped/default/template/catalog/product/list/related.phtml
  17. +1 −1  app/design/frontend/bootstrapped/default/template/catalog/product/list/toolbar.phtml
  18. +26 −25 app/design/frontend/bootstrapped/default/template/catalog/product/list/upsell.phtml
  19. +125 −66 app/design/frontend/bootstrapped/default/template/catalog/product/view.phtml
  20. +2 −2 app/design/frontend/bootstrapped/default/template/catalog/product/view/addto.phtml
  21. +6 −3 app/design/frontend/bootstrapped/default/template/catalog/product/view/addtocart.phtml
  22. +3 −3 app/design/frontend/bootstrapped/default/template/catalog/product/view/attributes.phtml
  23. +39 −0 app/design/frontend/bootstrapped/default/template/catalog/product/view/description.phtml
  24. +4 −5 app/design/frontend/bootstrapped/default/template/catalog/product/view/media.phtml
  25. +7 −5 app/design/frontend/bootstrapped/default/template/catalogsearch/form.mini.phtml
  26. +2 −2 app/design/frontend/bootstrapped/default/template/checkout/cart.phtml
  27. +9 −17 app/design/frontend/bootstrapped/default/template/checkout/cart/sidebar.phtml
  28. +135 −122 app/design/frontend/bootstrapped/default/template/checkout/cart/sidebar/default.phtml
  29. +9 −5 app/design/frontend/bootstrapped/default/template/checkout/onepage.phtml
  30. +32 −30 app/design/frontend/bootstrapped/default/template/checkout/onepage/billing.phtml
  31. +9 −6 app/design/frontend/bootstrapped/default/template/checkout/onepage/payment.phtml
  32. +0 −11 app/design/frontend/bootstrapped/default/template/checkout/onepage/payment/methods.phtml
  33. +43 −29 app/design/frontend/bootstrapped/default/template/checkout/onepage/progress.phtml
  34. +1 −1  app/design/frontend/bootstrapped/default/template/checkout/onepage/review/button.phtml
  35. +2 −2 app/design/frontend/bootstrapped/default/template/checkout/onepage/review/info.phtml
  36. +1 −1  app/design/frontend/bootstrapped/default/template/checkout/onepage/review/item.phtml
  37. +9 −6 app/design/frontend/bootstrapped/default/template/checkout/onepage/shipping.phtml
  38. +9 −6 app/design/frontend/bootstrapped/default/template/checkout/onepage/shipping_method.phtml
  39. +1 −1  app/design/frontend/bootstrapped/default/template/checkout/onepage/shipping_method/available.phtml
  40. +3 −3 app/design/frontend/bootstrapped/default/template/checkout/success.phtml
  41. +2 −2 app/design/frontend/bootstrapped/default/template/customer/account/dashboard.phtml
  42. +2 −2 app/design/frontend/bootstrapped/default/template/customer/logout.phtml
  43. +4 −4 app/design/frontend/bootstrapped/default/template/customer/widget/name.phtml
  44. +0 −21 app/design/frontend/bootstrapped/default/template/jquery/noconflict.phtml
  45. +21 −19 app/design/frontend/bootstrapped/default/template/newsletter/subscribe.phtml
  46. +27 −61 app/design/frontend/bootstrapped/default/template/page/1column.phtml
  47. +42 −70 app/design/frontend/bootstrapped/default/template/page/2columns-left.phtml
  48. +32 −75 app/design/frontend/bootstrapped/default/template/page/2columns-right.phtml
  49. +30 −71 app/design/frontend/bootstrapped/default/template/page/3columns.phtml
  50. +4 −3 app/design/frontend/bootstrapped/default/template/page/html/breadcrumbs.phtml
  51. +19 −21 app/design/frontend/bootstrapped/default/template/page/html/footer.phtml
  52. +12 −16 app/design/frontend/bootstrapped/default/template/page/html/head.phtml
  53. +38 −34 app/design/frontend/bootstrapped/default/template/page/html/header.phtml
  54. +3 −4 app/design/frontend/bootstrapped/default/template/page/template/links.phtml
  55. +1 −1  app/design/frontend/bootstrapped/default/template/persistent/checkout/onepage/billing.phtml
  56. +44 −41 app/design/frontend/bootstrapped/default/template/persistent/customer/form/login.phtml
  57. +122 −180 app/design/frontend/bootstrapped/default/template/persistent/customer/form/register.phtml
  58. +21 −19 app/design/frontend/bootstrapped/default/template/poll/active.phtml
  59. +2 −2 app/design/frontend/bootstrapped/default/template/poll/result.phtml
  60. +18 −3 app/design/frontend/bootstrapped/default/template/rating/detailed.phtml
  61. +1 −1  app/design/frontend/bootstrapped/default/template/reports/product_compared.phtml
  62. +1 −1  app/design/frontend/bootstrapped/default/template/reports/product_viewed.phtml
  63. +62 −0 app/design/frontend/bootstrapped/default/template/review/helper/summary.phtml
  64. +31 −0 app/design/frontend/bootstrapped/default/template/review/helper/summary_short.phtml
  65. +1 −1  app/design/frontend/bootstrapped/default/template/rss/list.phtml
  66. +1 −1  app/design/frontend/bootstrapped/default/template/sales/reorder/sidebar.phtml
  67. +57 −32 app/design/frontend/bootstrapped/default/template/tag/list.phtml
  68. +1 −1  app/design/frontend/bootstrapped/default/template/wishlist/sidebar.phtml
  69. +19 −52 change.log
  70. +0 −686 skin/frontend/bootstrapped/default/css/bootstrap-responsive.css
  71. +9 −12 skin/frontend/bootstrapped/default/css/bootstrap-responsive.min.css
  72. +0 −3,990 skin/frontend/bootstrapped/default/css/bootstrap.css
  73. +11 −689 skin/frontend/bootstrapped/default/css/bootstrap.min.css
  74. +0 −223 skin/frontend/bootstrapped/default/css/diff.css
  75. +0 −845 skin/frontend/bootstrapped/default/css/docs.css
  76. BIN  skin/frontend/bootstrapped/default/fonts/fontawesome-webfont.eot
  77. +255 −0 skin/frontend/bootstrapped/default/fonts/fontawesome-webfont.svg
  78. BIN  skin/frontend/bootstrapped/default/fonts/fontawesome-webfont.ttf
  79. BIN  skin/frontend/bootstrapped/default/fonts/fontawesome-webfont.woff
  80. BIN  skin/frontend/bootstrapped/default/images/background.png
  81. BIN  skin/frontend/bootstrapped/default/images/category_banner_bg.png
  82. BIN  skin/frontend/bootstrapped/default/images/facebook.png
  83. BIN  skin/frontend/bootstrapped/default/images/favicon.ico
  84. BIN  skin/frontend/bootstrapped/default/images/favicon.png
  85. BIN  skin/frontend/bootstrapped/default/images/footer_bg.png
  86. BIN  skin/frontend/bootstrapped/default/images/footer_left.png
  87. BIN  skin/frontend/bootstrapped/default/images/footer_line.png
  88. BIN  skin/frontend/bootstrapped/default/images/index-banner.jpg
  89. BIN  skin/frontend/bootstrapped/default/images/logo.png
  90. BIN  skin/frontend/bootstrapped/default/images/media/col_left_callout.jpg
  91. BIN  skin/frontend/bootstrapped/default/images/media/col_right_callout.jpg
  92. BIN  skin/frontend/bootstrapped/default/images/media/electronics_cellphones.jpg
  93. BIN  skin/frontend/bootstrapped/default/images/media/electronics_digitalcameras.jpg
  94. BIN  skin/frontend/bootstrapped/default/images/media/electronics_laptops.jpg
  95. BIN  skin/frontend/bootstrapped/default/images/media/head_electronics_cellphones.gif
  96. BIN  skin/frontend/bootstrapped/default/images/media/head_electronics_digicamera.gif
  97. BIN  skin/frontend/bootstrapped/default/images/media/head_electronics_laptops.gif
  98. BIN  skin/frontend/bootstrapped/default/images/media/laptop_callout_mid1.jpg
  99. BIN  skin/frontend/bootstrapped/default/images/media/laptop_callout_mid2.jpg
  100. BIN  skin/frontend/bootstrapped/default/images/media/laptop_callout_mid3.jpg
  101. BIN  skin/frontend/bootstrapped/default/images/media/laptop_callout_spot.jpg
  102. BIN  skin/frontend/bootstrapped/default/images/navbar_bg.png
  103. BIN  skin/frontend/bootstrapped/default/images/rss.png
  104. BIN  skin/frontend/bootstrapped/default/images/sidebar.png
  105. BIN  skin/frontend/bootstrapped/default/images/twitter.png
  106. BIN  skin/frontend/bootstrapped/default/img/glyphicons-halflings-white.png
  107. BIN  skin/frontend/bootstrapped/default/img/glyphicons-halflings.png
  108. BIN  skin/frontend/bootstrapped/default/img/grid-18px-masked.png
  109. +0 −180 skin/frontend/bootstrapped/default/js/application.js
  110. +0 −94 skin/frontend/bootstrapped/default/js/bootstrap-alert.js
  111. +0 −100 skin/frontend/bootstrapped/default/js/bootstrap-button.js
  112. +0 −161 skin/frontend/bootstrapped/default/js/bootstrap-carousel.js
  113. +0 −138 skin/frontend/bootstrapped/default/js/bootstrap-collapse.js
  114. +0 −92 skin/frontend/bootstrapped/default/js/bootstrap-dropdown.js
  115. +0 −210 skin/frontend/bootstrapped/default/js/bootstrap-modal.js
  116. +0 −95 skin/frontend/bootstrapped/default/js/bootstrap-popover.js
  117. +0 −125 skin/frontend/bootstrapped/default/js/bootstrap-scrollspy.js
  118. +0 −130 skin/frontend/bootstrapped/default/js/bootstrap-tab.js
  119. +0 −270 skin/frontend/bootstrapped/default/js/bootstrap-tooltip.js
  120. +0 −51 skin/frontend/bootstrapped/default/js/bootstrap-transition.js
  121. +0 −271 skin/frontend/bootstrapped/default/js/bootstrap-typeahead.js
  122. +860 −427 skin/frontend/bootstrapped/default/js/bootstrap.js
  123. +1 −6 skin/frontend/bootstrapped/default/js/bootstrap.min.js
  124. +0 −30 skin/frontend/bootstrapped/default/js/google-code-prettify/prettify.css
  125. +0 −28 skin/frontend/bootstrapped/default/js/google-code-prettify/prettify.js
  126. +0 −9,252 skin/frontend/bootstrapped/default/js/jquery.js
  127. +3 −0  skin/frontend/bootstrapped/default/js/jquery.min.js
  128. +34 −0 skin/frontend/bootstrapped/default/less/accordion.less
  129. +79 −0 skin/frontend/bootstrapped/default/less/alerts.less
  130. +66 −0 skin/frontend/bootstrapped/default/less/bootstrap.less
  131. +28 −0 skin/frontend/bootstrapped/default/less/breadcrumbs.less
  132. +227 −0 skin/frontend/bootstrapped/default/less/button-groups.less
  133. +230 −0 skin/frontend/bootstrapped/default/less/buttons.less
  134. +131 −0 skin/frontend/bootstrapped/default/less/carousel.less
  135. +31 −0 skin/frontend/bootstrapped/default/less/close.less
  136. +61 −0 skin/frontend/bootstrapped/default/less/code.less
  137. +22 −0 skin/frontend/bootstrapped/default/less/component-animations.less
  138. +234 −0 skin/frontend/bootstrapped/default/less/dropdowns.less
  139. +245 −0 skin/frontend/bootstrapped/default/less/font-awesome-ie7.less
  140. +329 −0 skin/frontend/bootstrapped/default/less/font-awesome.less
  141. +688 −0 skin/frontend/bootstrapped/default/less/forms.less
  142. +21 −0 skin/frontend/bootstrapped/default/less/grid.less
  143. +25 −0 skin/frontend/bootstrapped/default/less/hero-unit.less
  144. +82 −0 skin/frontend/bootstrapped/default/less/labels-badges.less
  145. +16 −0 skin/frontend/bootstrapped/default/less/layouts.less
  146. +55 −0 skin/frontend/bootstrapped/default/less/media.less
  147. +686 −0 skin/frontend/bootstrapped/default/less/mixins.less
  148. +95 −0 skin/frontend/bootstrapped/default/less/modals.less
  149. +493 −0 skin/frontend/bootstrapped/default/less/navbar.less
  150. +391 −0 skin/frontend/bootstrapped/default/less/navs.less
  151. +41 −0 skin/frontend/bootstrapped/default/less/pager.less
  152. +121 −0 skin/frontend/bootstrapped/default/less/pagination.less
  153. +129 −0 skin/frontend/bootstrapped/default/less/popovers.less
  154. +122 −0 skin/frontend/bootstrapped/default/less/progress-bars.less
  155. +216 −0 skin/frontend/bootstrapped/default/less/reset.less
  156. +28 −0 skin/frontend/bootstrapped/default/less/responsive-1200px-min.less
  157. +193 −0 skin/frontend/bootstrapped/default/less/responsive-767px-max.less
  158. +19 −0 skin/frontend/bootstrapped/default/less/responsive-768px-979px.less
  159. +185 −0 skin/frontend/bootstrapped/default/less/responsive-navbar.less
  160. +43 −0 skin/frontend/bootstrapped/default/less/responsive-utilities.less
  161. +59 −0 skin/frontend/bootstrapped/default/less/responsive.less
  162. +52 −0 skin/frontend/bootstrapped/default/less/scaffolding.less
  163. +193 −0 skin/frontend/bootstrapped/default/less/sprites.less
  164. +55 −0 skin/frontend/bootstrapped/default/less/styles-responsive.less
  165. +300 −0 skin/frontend/bootstrapped/default/less/styles.less
  166. +237 −0 skin/frontend/bootstrapped/default/less/tables.less
  167. +54 −0 skin/frontend/bootstrapped/default/less/thumbnails.less
  168. +70 −0 skin/frontend/bootstrapped/default/less/tooltip.less
  169. +235 −0 skin/frontend/bootstrapped/default/less/type.less
  170. +30 −0 skin/frontend/bootstrapped/default/less/utilities.less
  171. +308 −0 skin/frontend/bootstrapped/default/less/variables.less
  172. +29 −0 skin/frontend/bootstrapped/default/less/wells.less
View
12 .gitignore
@@ -35,4 +35,14 @@ errors/404.php
errors/503.php
errors/local.xml.sample
errors/processor.php
-errors/report.php
+errors/report.php
+/*.bat
+/.htaccess.sample
+/api.php
+/cron.php
+/cron.sh
+/favicon.ico
+/get.php
+/index.php.sample
+/install.php
+/php.ini.sample
View
53 README.md
@@ -1,52 +1 @@
-[Magento Responsive theme aka BOOTSTRAPPED](http://bootstrapped.magenthon.com)
-=================
-
-is implementation of code from [twitter brothers](http://twitter.github.com/bootstrap) and [Magento e-Commerce platform](http://www.magentocommerce.com).
-
-When you connect, merge, mix or play with those 2 products, you get [Magento Responsive theme aka BOOTSTRAPPED](http://bootstrapped.magenthon.com).
-
-
-
-Demo Magento Store
-------------
-
-Check out some action, do not hesitate to make test orders
-
-http://bootstrapped.magenthon.com
-
-or
-
-You can preview how [responsive is](http://responsive.is/bootstrapped.magenthon.com).
-
-
-
-Setup Bootstrapped Theme in Magento Store
-------------
-
-Download whole content and put in your public_html folder of Magento installation.
-
-Navigate to design configuration in Magento admin panel and for theme package type "bootstrapped".
-
-
-
-Twitter account
----------------
-
-Keep up to date by following Magento Marathon, [@magenthon](http://twitter.com/magenthon).
-
-
-
-Blog
-----
-
-Read more detailed on [Magento Marathon Blog](http://magenthon.com).
-
-
-
-Author
--------
-
-**Vedran Subotic**
-
-+ http://twitter.com/vsubotic
-+ http://github.com/vsubotic
+A Magento theme based on Bootstrap (v2.2.2)
View
28 app/design/frontend/bootstrapped/default/layout/local.xml
@@ -1,34 +1,20 @@
<?xml version="1.0"?>
-<!--
-/**
- * Magento responsive theme
- *
- * @category design
- * @package bootstrapped_default
- * @copyright Copyright (c) 2012 Magenthon (http://magenthon.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- * @author Vedran Subotic <vedran@magenthon.com>
- */
-
--->
<layout version="0.1.0">
<!--
Default layout, loads most of the pages
-->
-
<default>
<reference name="left">
- <block type="catalog/navigation" name="catalog.leftnav.custom" before="wordpress_sidebar_left" template="catalog/navigation/left.custom.phtml"/>
<action method="unsetChild"><name>left.permanent.callout</name></action>
</reference>
<reference name="right">
- <action method="unsetChild"><name>right.permanent.callout</name></action>
+ <action method="unsetChild"><name>right.permanent.callout</name></action>
<remove name="paypal.partner.right.logo"/>
</reference>
<reference name="root">
- <remove name="global_messages" />
+ <remove name="global_messages" />
</reference>
<reference name="content">
<block type="core/template" name="alert_global_messages" template="core/messages.phtml" before="-" />
@@ -39,21 +25,25 @@ Default layout, loads most of the pages
</default>
<customer_account>
- <remove name="catalog.leftnav.custom" />
+ <!--<remove name="catalog.leftnav.custom" />-->
</customer_account>
<catalog_category_default translate="label">
- <remove name="catalog.leftnav" />
+ <!--<remove name="catalog.leftnav" />-->
+ <!--
<reference name="breadcrumbs">
<block type="catalog/layer_view" name="catalog.leftnav.breadcrumbs" after="currency" template="catalog/layer/view.phtml"/>
</reference>
+ -->
</catalog_category_default>
<catalog_category_layered translate="label">
- <remove name="catalog.leftnav" />
+ <!--<remove name="catalog.leftnav" />-->
+ <!--
<reference name="breadcrumbs">
<block type="catalog/layer_view" name="catalog.leftnav.breadcrumbs" after="currency" template="catalog/layer/view.phtml"/>
</reference>
+ -->
</catalog_category_layered>
<tag_list_index translate="label">
View
26 app/design/frontend/bootstrapped/default/layout/page.xml
@@ -1,16 +1,4 @@
<?xml version="1.0"?>
-<!--
-/**
- * Magento responsive theme
- *
- * @category design
- * @package bootstrapped_default
- * @copyright Copyright (c) 2012 Magenthon (http://magenthon.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- * @author Vedran Subotic <vedran@magenthon.com>
- */
-
--->
<layout version="0.1.0">
<!--
Default layout, loads most of the pages
@@ -45,13 +33,9 @@ Default layout, loads most of the pages
<action method="addItem"><type>js</type><name>lib/ds-sleight.js</name><params/><if>lt IE 7</if></action>
<action method="addItem"><type>skin_js</type><name>js/ie6.js</name><params/><if>lt IE 7</if></action-->
- <action method="addCss"><stylesheet>css/bootstrap.css</stylesheet></action>
- <action method="addCss"><stylesheet>css/bootstrap-responsive.css</stylesheet></action>
-
- <action method="addCss"><stylesheet>css/docs.css</stylesheet></action>
- <action method="addCss"><stylesheet>js/google-code-prettify/prettify.css</stylesheet></action>
- <action method="addCss"><stylesheet>css/diff.css</stylesheet></action>
-
+ <action method="addCss"><stylesheet>css/bootstrap.min.css</stylesheet></action>
+ <action method="addCss"><stylesheet>css/bootstrap-responsive.min.css</stylesheet></action>
+ <!--<action method="addCss"><stylesheet>css/styles.css</stylesheet></action>-->
</block>
<block type="core/text_list" name="after_body_start" as="after_body_start" translate="label">
@@ -62,10 +46,11 @@ Default layout, loads most of the pages
<block type="page/html_header" name="header" as="header">
<block type="page/template_links" name="top.links" as="topLinks">
- <block type="page/switch" name="store_language" as="store_language" template="page/switch/languages.phtml"/>
+ <block type="page/switch" name="store_language" as="store_language" template="page/switch/languages.phtml" />
</block>
<block type="core/text_list" name="top.menu" as="topMenu" translate="label">
<label>Navigation Bar</label>
+ <block type="catalog/navigation" name="topCategories" as="topCategories" template="catalog/navigation/top.phtml" />
</block>
<block type="page/html_wrapper" name="top.container" as="topContainer" translate="label">
<label>Page Header</label>
@@ -77,6 +62,7 @@ Default layout, loads most of the pages
<block type="core/text_list" name="left" as="left" translate="label">
<label>Left Column</label>
+ <block type="catalog/navigation" name="leftCategories" as="leftCategories" before="catalog.leftnav" template="catalog/navigation/left_home.phtml" />
</block>
<block type="core/messages" name="global_messages" as="global_messages"/>
View
135 app/design/frontend/bootstrapped/default/layout/tag.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @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)
+ */
+
+-->
+<layout version="0.1.0">
+
+<!--
+Default layout, loads most of the pages
+-->
+
+ <default>
+ <!-- Mage_Tag -->
+ <!--
+ <reference name="left">
+ <block type="tag/popular" name="tags_popular" template="tag/popular.phtml"/>
+ </reference>
+ -->
+ </default>
+
+<!--
+Customer account pages, rendered for all tabs in dashboard
+-->
+
+ <customer_account>
+ <!-- Mage_Tag -->
+ <reference name="customer_account_navigation">
+ <action method="addLink" translate="label" module="tag"><name>tags</name><path>tag/customer/</path><label>My Tags</label></action>
+ </reference>
+ </customer_account>
+
+<!--
+Customer account home dashboard layout
+-->
+
+ <customer_account_index>
+ <!-- Mage_Tag -->
+ <reference name="customer_account_dashboard">
+ <action method="unsetChild"><name>customer_account_dashboard_info2</name></action>
+ <block type="tag/customer_recent" name="customer_account_dashboard_info2" as="info2" template="tag/customer/recent.phtml"/>
+ </reference>
+ </customer_account_index>
+
+ <catalog_product_view translate="label">
+ <label>Catalog Product View</label>
+ <!-- Mage_Tag -->
+ <reference name="product.info.additional">
+ <block type="tag/product_list" name="product_tag_list" before="-" template="tag/list.phtml">
+ <block type="page/html_wrapper" name="product.tag.list.list.before" as="list_before" translate="label">
+ <label>Tags List Before</label>
+ <action method="setMayBeInvisible"><value>1</value></action>
+ </block>
+ </block>
+ </reference>
+ </catalog_product_view>
+
+<!--
+All tags page
+-->
+
+ <tag_list_index translate="label">
+ <label>Tags List (All Available)</label>
+ <!-- Mage_Tag -->
+ <reference name="root">
+ <action method="setTemplate"><template>page/2columns-right.phtml</template></action>
+ </reference>
+ <reference name="content">
+ <block type="tag/all" name="tags_all" template="tag/cloud.phtml"/>
+ </reference>
+ </tag_list_index>
+
+ <tag_product_list translate="label">
+ <label>Tagged Products List</label>
+ <!-- Mage_Tag -->
+ <reference name="content">
+ <block type="tag/product_result" name="tag_products" template="catalogsearch/result.phtml">
+ <block type="catalog/product_list" name="search_result_list" template="catalog/product/list.phtml">
+ <block type="catalog/product_list_toolbar" name="product_list_toolbar" template="catalog/product/list/toolbar.phtml">
+ <block type="page/html_pager" name="product_list_toolbar_pager"/>
+ </block>
+ <action method="setToolbarBlockName"><name>product_list_toolbar</name></action>
+ </block>
+ <action method="setListOrders"/>
+ <action method="setListModes"/>
+ <action method="setListCollection"/>
+ </block>
+ </reference>
+ </tag_product_list>
+
+ <tag_customer_index translate="label">
+ <label>Customer My Account My Tags List</label>
+ <update handle="customer_account"/>
+ <reference name="root">
+ <action method="setHeaderTitle" translate="title" module="customer"><title>My Account</title></action>
+ </reference>
+ <reference name="my.account.wrapper">
+ <block type="tag/customer_tags" name="customer_tags" template="tag/customer/tags.phtml"/>
+ </reference>
+ </tag_customer_index>
+
+ <tag_customer_view translate="label">
+ <label>Customer My Account Tag View</label>
+ <update handle="customer_account"/>
+ <reference name="root">
+ <action method="setHeaderTitle" translate="title" module="customer"><title>My Account</title></action>
+ </reference>
+ <reference name="my.account.wrapper">
+ <block type="tag/customer_view" name="customer_view" template="tag/customer/view.phtml"/>
+ </reference>
+ </tag_customer_view>
+
+</layout>
View
2  app/design/frontend/bootstrapped/default/template/callouts/left_col.phtml
@@ -9,7 +9,7 @@
* @author Vedran Subotic <vedran@magenthon.com>
*/
?>
-<div class="block block-banner well">
+<div class="block block-banner">
<div class="block-content">
<?php if(strtolower(substr($this->getLinkUrl(),0,4))==='http'): ?>
<a href="<?php echo $this->getLinkUrl() ?>" title="<?php echo $this->__($this->getImgAlt()) ?>">
View
2  app/design/frontend/bootstrapped/default/template/callouts/right_col.phtml
@@ -9,7 +9,7 @@
* @author Vedran Subotic <vedran@magenthon.com>
*/
?>
-<div class="block block-banner well">
+<div class="block block-banner">
<div class="block-content">
<?php if(strtolower(substr($this->getLinkUrl(),0,4))==='http'): ?>
<a href="<?php echo $this->getLinkUrl() ?>" title="<?php echo $this->__($this->getImgAlt()) ?>">
View
23 app/design/frontend/bootstrapped/default/template/catalog/category/view.phtml
@@ -20,27 +20,30 @@
<?php
$_helper = $this->helper('catalog/output');
$_category = $this->getCurrentCategory();
- $_imgHtml = '';
- if ($_imgUrl = $_category->getImageUrl()) {
- $_imgHtml = '<p class="category-image"><img src="'.$_imgUrl.'" alt="'.$this->htmlEscape($_category->getName()).'" title="'.$this->htmlEscape($_category->getName()).'" /></p>';
- $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
- }
+// $_imgHtml = '';
+// if ($_imgUrl = $_category->getImageUrl()) {
+// $_imgHtml = '<p class="category-image"><img src="'.$_imgUrl.'" alt="'.$this->htmlEscape($_category->getName()).'" title="'.$this->htmlEscape($_category->getName()).'" /></p>';
+// $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
+// }
?>
<?php
$_items = Mage::getBlockSingleton('catalog/product_list')->getLoadedProductCollection();
?>
-<div class="page-title category-title well page-header">
- <?php if($this->IsRssCatalogEnable() && $this->IsTopCategory()): ?>
+<div class="page-title category-title page-header">
+ <h2><?php echo $_helper->categoryAttribute($_category, $_category->getName(), 'name')?></h2>
+
+ <?php if($this->IsRssCatalogEnable() && $this->IsTopCategory()): ?>
<a href="<?php echo $this->getRssLink() ?>" class="pull-right"><?php echo $this->__('Subscribe to RSS Feed') ?></a>
<?php endif; ?>
- <h1><?php echo $_helper->categoryAttribute($_category, $_category->getName(), 'name')?> <small>(<?php echo $_items->getSize()?>)</small></h1>
</div>
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<?php if($_imgUrl): ?>
- <?php echo $_imgHtml ?>
+<?php if ($_category->getImageUrl()) : ?>
+ <div class="khd_category_banner">
+ <img src="<?php Print $_category->getImageUrl(); ?>" alt="<?php Print $this->htmlEscape($_category->getName()); ?>" title="<?php Print $this->htmlEscape($_category->getName()); ?>" />
+ </div>
<?php endif; ?>
<?php if($_description=$this->getCurrentCategory()->getDescription()): ?>
View
24 app/design/frontend/bootstrapped/default/template/catalog/layer/filter.phtml
@@ -1,29 +1,15 @@
<?php
/**
- * Magento responsive theme
- *
- * @category design
- * @package bootstrapped_default
- * @copyright Copyright (c) 2012 Magenthon (http://magenthon.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- * @author Vedran Subotic <vedran@magenthon.com>
- */
-?>
-<?php
-/**
* Template for filter items block
*
* @see Mage_Catalog_Block_Layer_Filter
*/
?>
-<ol class="dropdown-menu">
<?php foreach ($this->getItems() as $_item): ?>
- <li>
- <?php if ($_item->getCount() > 0): ?>
- <a href="<?php echo $this->urlEscape($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?> (<?php echo $_item->getCount() ?>)</a>
- <?php else: echo $_item->getLabel() ?>
- <?php endif; ?>
- </li>
+ <?php if ($_item->getCount() > 0): ?>
+ <li>
+ <a href="<?php echo $this->urlEscape($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?> (<?php echo $_item->getCount() ?>)</a>
+ </li>
+ <?php endif; ?>
<?php endforeach ?>
-</ol>
View
35 app/design/frontend/bootstrapped/default/template/catalog/layer/state.phtml
@@ -1,16 +1,5 @@
<?php
/**
- * Magento responsive theme
- *
- * @category design
- * @package bootstrapped_default
- * @copyright Copyright (c) 2012 Magenthon (http://magenthon.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- * @author Vedran Subotic <vedran@magenthon.com>
- */
-?>
-<?php
-/**
* Category layered navigation state
*
* @see Mage_Catalog_Block_Layer_State
@@ -18,22 +7,10 @@
?>
<?php $_filters = $this->getActiveFilters() ?>
<?php if(!empty($_filters)): ?>
-
+ <ul class="active">
+ <lh>Active Filters</lh>
<?php foreach ($_filters as $_filter): ?>
-<li class="dropdown">
- <a href="#" data-toggle="dropdown" class="dropdown-toggle"><span class="label label-warning"><span class="icon-remove"></span> <?php echo $this->__($_filter->getName()) ?></span><b class="caret"></b></a>
- <ol class="dropdown-menu">
- <li>
- <a href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo $this->__('Remove This Item') ?>" class="btn-remove">
- <span class="label"><?php echo $this->__($_filter->getName()) ?>:</span> <?php echo $this->stripTags($_filter->getLabel()) ?>
- </a>
-
- </li>
- </ol>
- </li>
- <?php endforeach; ?>
-
- <li class="actions"><a href="<?php echo $this->getClearUrl() ?>" title="<?php echo $this->__('Clear All') ?>"><span class="icon-remove"></span></a></li>
-<?php endif; ?>
-
-
+ <li><a style="display: block; text-decoration: none;" href="<?php Print $_filter->getRemoveUrl(); ?>" title="<?php Print $this->__('Remove Filter'); ?>" class="btn-remove"><strong><?php Print $this->__($_filter->getName()); ?>:</strong><span class="pull-right"><?php Print $this->stripTags($_filter->getLabel()); ?> <i class="icon-remove"></i></span></a></li>
+ <?php endforeach; ?>
+ </ul>
+<?php endif; ?>
View
55 app/design/frontend/bootstrapped/default/template/catalog/layer/view.phtml
@@ -1,37 +1,36 @@
<?php
/**
- * Magento responsive theme
- *
- * @category design
- * @package bootstrapped_default
- * @copyright Copyright (c) 2012 Magenthon (http://magenthon.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- * @author Vedran Subotic <vedran@magenthon.com>
- */
-?>
-<?php
-/**
* Category layered navigation
*
* @see Mage_Catalog_Block_Layer_View
*/
?>
<?php if($this->canShowBlock()): ?>
-<!-- <div class="breadcrumbs subnav"> -->
- <?php if($this->canShowOptions()): ?>
-<!-- <ul class="nav nav-pills pull-right"> -->
-<!-- <li class="active offset1"><a title="" href="#">--><?php //echo $this->__('Shopping Options') ?><!--<span class="icon-chevron-right"></span></a></li>-->
- <?php $_filters = $this->getFilters() ?>
- <?php foreach ($_filters as $_filter): ?>
- <?php if($_filter->getItemsCount()): ?>
- <li class="dropdown">
- <a href="#" data-toggle="dropdown" class="dropdown-toggle"><span class="label label-info"><?php echo $this->__($_filter->getName()) ?></span><b class="caret"></b></a>
- <?php echo $_filter->getHtml() ?>
- </li>
- <?php endif; ?>
- <?php endforeach; ?>
- <?php echo $this->getStateHtml() ?>
-<!-- </ul> -->
- <?php endif; ?>
-<!-- </div> -->
+<div class="block block-layered-nav">
+ <?php if($this->canShowOptions()): ?>
+ <div class="block-title">Filters</div>
+ <div class="block-content">
+ <?php echo $this->getStateHtml() ?>
+
+ <?php
+ $_filters = $this->getFilters();
+ foreach ($_filters as $_filter) :
+ if ($_filter->getItemsCount()) :
+ $_filter_id = strtolower(str_replace(" ", "_", $_filter->getName()));
+ ?>
+ <ul>
+ <lh data-toggle="collapse" data-target="#filters_<?php Print $_filter_id; ?>"><?php Print $_filter->getName(); ?> <span class="pull-right"><i class="icon-plus"></i></span></lh>
+ <div id="filters_<?php Print $_filter_id; ?>" class="collapse">
+ <?php Print $_filter->getHtml(); ?>
+ </div>
+ </ul>
+ <?php
+ endif;
+ endforeach;
+ ?>
+ </div>
+ <?php else : ?>
+ <span><em>-- No Filters Available --</em></span>
+ <?php endif; ?>
+</div>
<?php endif; ?>
View
32 app/design/frontend/bootstrapped/default/template/catalog/navigation/left_home.phtml
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @see Mage_Catalog_Block_Navigation
+ */
+?>
+
+<?php $_categories = $this->getStoreCategories(); ?>
+<?php if($_categories): ?>
+ <div class="block block-navigation">
+ <div class="block-title">
+ <span>Categories</span>
+ </div>
+ <div class="block-content">
+ <ul>
+ <?php foreach ($_categories as $root_cat) : ?>
+ <?php if ($root_cat->hasChildren()) : ?>
+ <li class="dropdown-submenu">
+ <a href="<?php Print $this->getCategoryUrl($root_cat); ?>"><?php Print $root_cat->getName(); ?></a>
+ <ul class="dropdown-menu">
+ <?php foreach ($root_cat->getChildren() as $sub_cat) : ?>
+ <li><a href="<?php Print $this->getCategoryUrl($sub_cat); ?>"><?php Print $sub_cat->getName(); ?></a></li>
+ <?php endforeach; ?>
+ </ul>
+ </li>
+ <?php else : ?>
+ <li><a href="<?php Print $this->getCategoryUrl($root_cat); ?>"><?php Print $root_cat->getName(); ?></a></li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </ul>
+ </div>
+ </div>
+<?php endif ?>
View
32 app/design/frontend/bootstrapped/default/template/catalog/navigation/top.phtml
@@ -1,16 +1,5 @@
<?php
/**
- * Magento responsive theme
- *
- * @category design
- * @package bootstrapped_default
- * @copyright Copyright (c) 2012 Magenthon (http://magenthon.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- * @author Vedran Subotic <vedran@magenthon.com>
- */
-?>
-<?php
-/**
* Top menu for store
*
* @see Mage_Catalog_Block_Navigation
@@ -24,11 +13,16 @@
* string If specified wraps children list in div with this class
*/
?>
-<?php $_menu = $this->renderCategoriesMenuHtml(0,'level-top') ?>
-<?php if($_menu): ?>
-<div class="nav-container">
- <ul id="nav">
- <?php echo $_menu ?>
- </ul>
-</div>
-<?php endif ?>
+<?php $_menu = $this->getStoreCategories(); ?>
+<?php if ($_menu) : ?>
+ <ul class="nav">
+ <li><a href="">Home</a></li>
+ <?php //foreach ($_menu as $cat) : ?>
+ <!--<a href="<?php //Print $cat->getRequestPath(); ?>"><?php //Print $cat->getName(); ?></a></li>-->
+ <li><a href="">Browse Categories</a></li>
+ <?php //endforeach; ?>
+ <li><a href="">About Us</a></li>
+ <li><a href="">Contact Us</a></li>
+ <li><a href="">FAQ</a></li>
+ </ul>
+<?php endif; ?>
View
31 app/design/frontend/bootstrapped/default/template/catalog/product/compare/sidebar.phtml
@@ -15,11 +15,11 @@
$_helper = $this->helper('catalog/product_compare');
$_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
?>
-<div class="block block-list block-compare well">
+<div class="block block-list block-compare">
<div class="block-title">
<strong><span><?php echo $this->__('Compare Products') ?>
<?php if($_helper->getItemCount() > 0): ?>
- <small><?php echo $this->__('(%d)', $_helper->getItemCount()) ?></small>
+ <?php echo $this->__('(%d)', $_helper->getItemCount()) ?>
<?php endif; ?>
</span></strong>
</div>
@@ -28,29 +28,36 @@ $_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
<?php foreach($_items as $_index => $_item): ?>
<div class="item">
<input type="hidden" class="compare-item-id" value="<?php echo $_item->getId() ?>" />
-
<div class="modal hide fade" id="compare_<?php echo $this->escapeHtml($_item->getId())?>" style="display: none;">
<div class="modal-header">
- <a class="close" data-dismiss="modal">×</a>
- <h3><?php echo $this->__('Are you sure you would like to remove this item from the compare products?') ?></h3>
+ <a class="close" data-dismiss="modal">&times;</a>
+ <h3><?php echo $this->__('Are You Sure?') ?></h3>
</div>
<div class="modal-body">
- <h6 class="label label-info"><?php echo $this->helper('catalog/output')->productAttribute($_item, $_item->getName(), 'name') ?></h6>
- </div>
- <div class="modal-footer">
- <a href="#" class="btn close" data-dismiss="modal"><?php echo $this->__('Cancel') ?></a>
+ Are you sure you want to remove this item from the comparison?<br /><br />
+ <div class="row-fluid">
+ <div class="span12">
+ <strong><?php Print $this->helper('catalog/output')->productAttribute($_item, $_item->getName(), 'name') ?></strong>
+ </div>
+ </div>
+ </div>
+ <div class="modal-footer">
<a href="<?php echo $_helper->getRemoveUrl($_item) ?>" class="btn btn-warning"><?php echo $this->__('Remove This Item') ?></a>
+ <a href="#" class="btn" data-dismiss="modal"><?php echo $this->__('Cancel') ?></a>
</div>
</div>
- <a class="pull-right" data-toggle="modal" href="#compare_<?php echo $this->escapeHtml($_item->getId())?>" title="<?php echo $this->__('Remove This Item') ?>" ><span class="icon-remove-sign"></span></a>
+ <a class="pull-right" data-toggle="modal" style="text-decoration: none;" href="#compare_<?php echo $this->escapeHtml($_item->getId())?>" title="<?php echo $this->__('Remove This Item') ?>" ><span class="icon-remove"></span></a>
<p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('catalog/output')->productAttribute($_item, $_item->getName(), 'name') ?></a></p>
</div>
<?php endforeach; ?>
+
+ <hr style="margin: 0px 0px 15px 0px; padding: 0px" />
+
<div class="actions">
- <a class="label label-important" href="<?php echo $_helper->getClearListUrl() ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove all products from your comparison?') ?>');"><?php echo $this->__('Clear All') ?></a>
- <button type="button" title="<?php echo $this->__('Compare') ?>" class="btn btn-mini btn-info pull-right" onclick="popWin('<?php echo $_helper->getListUrl() ?>','compare','top:0,left:0,width=820,height=600,resizable=yes,scrollbars=yes')"><span><span><?php echo $this->__('Compare') ?></span></span></button>
+ <a class="btn btn-danger btn-small" href="<?php echo $_helper->getClearListUrl() ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove all products from your comparison?') ?>');"><?php echo $this->__('Clear All') ?></a>
+ <button type="button" title="<?php echo $this->__('Compare') ?>" class="btn btn-small btn-info pull-right" onclick="popWin('<?php echo $_helper->getListUrl() ?>','compare','top:0,left:0,width=820,height=600,resizable=yes,scrollbars=yes')"><span><span><?php echo $this->__('Compare') ?></span></span></button>
</div>
<?php else: ?>
<p class="empty"><?php echo $this->__('You have no items to compare.') ?></p>
View
17 app/design/frontend/bootstrapped/default/template/catalog/product/list.phtml
@@ -77,7 +77,11 @@
<?php else: ?>
- <?php // Grid Mode ?>
+
+
+ <?php // --------------------Grid Mode-------------------------- ?>
+
+
<?php $_collectionSize = $_productCollection->count() ?>
<?php $_columnCount = $this->getColumnCount(); ?>
@@ -90,24 +94,23 @@
<a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true) ?>" class="product-image thumbnail"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'small_image')->resize(225); ?>" alt="<?php echo $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true) ?>" /></a>
<div class="caption">
- <h2 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $_helper->productAttribute($_product, $_product->getName(), 'name') ?></a></h2>
+ <h4 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $_helper->productAttribute($_product, $_product->getName(), 'name') ?></a></h4>
<?php if($_product->getRatingSummary()): ?>
- <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
+ <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
<?php endif; ?>
<?php echo $this->getPriceHtml($_product, true) ?>
<?php if($_product->isSaleable()): ?>
- <button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="btn btn-danger btn-mini" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
+ <br /><button type="button" title="<?php echo $this->__('Add to Cart') ?>" class="btn btn-success" style="margin-bottom: 5px;" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><?php echo $this->__('Add to Cart') ?></button><br />
<?php else: ?>
<p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
<?php endif; ?>
<p class="add-to-links unstyled">
<?php if($_compareUrl=$this->getAddToCompareUrl($_product)): ?>
- <a href="<?php echo $_compareUrl ?>" class="link-compare label label-info pull-right"><?php echo $this->__('Add to Compare') ?></a>
+ <a href="<?php echo $_compareUrl ?>" class="link-compare btn btn-small pull-right"><?php echo $this->__('Add to Compare') ?></a>
<?php endif; ?>
<?php if ($this->helper('wishlist')->isAllow()) : ?>
- <a href="<?php echo $this->helper('wishlist')->getAddUrl($_product) ?>" class="link-wishlist label label-info"><?php echo $this->__('Add to Wishlist') ?></a>
+ <a href="<?php echo $this->helper('wishlist')->getAddUrl($_product) ?>" class="link-wishlist btn btn-small"><?php echo $this->__('Add to Wishlist') ?></a>
<?php endif; ?>
-
</p>
</div>
</div>
View
60 app/design/frontend/bootstrapped/default/template/catalog/product/list/related.phtml
@@ -9,40 +9,40 @@
* @author Vedran Subotic <vedran@magenthon.com>
*/
?>
+
<?php if($this->getItems()->getSize()): ?>
-<div class="block block-related well">
+<div class="block block-related">
<div class="block-title">
<strong><span><?php echo $this->__('Related Products') ?></span></strong>
</div>
<div class="block-content">
- <p class="block-subtitle"><?php echo $this->__('Check items to add to the cart or') ?>&nbsp;<br /><a href="#" onclick="selectAllRelated(this); return false;"><?php echo $this->__('select all') ?></a></p>
- <div class="form-horizontal">
- <?php foreach($this->getItems() as $_item): ?>
-
- <div class="control-group">
- <label for="related-checkbox<?php echo $_item->getId() ?>" class="control-label">
- <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>
- </label>
- <div class="controls">
- <label class="checkbox">
- <?php if(!$_item->isComposite() && $_item->isSaleable()): ?>
- <?php if (!$_item->getRequiredOptions()): ?>
- <input type="checkbox" class="checkbox related-checkbox" id="related-checkbox<?php echo $_item->getId() ?>" name="related_products[]" value="<?php echo $_item->getId() ?>" />
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('wishlist')->isAllow()) : ?>
- <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="pull-right" title="<?php echo $this->__('Add to Wishlist') ?>" rel="tooltip"><span class="icon-check"></span></a>
- <?php endif; ?>
- <?php echo $this->getPriceHtml($_item, true, '-related') ?>
- <a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->htmlEscape($_item->getName()) ?></a>
-
-
- </label>
- </div>
- </div>
- <?php endforeach ?>
+ <p class="block-subtitle"><?php echo $this->__('Check items to add to the cart') ?></p>
+ <div class="form">
+ <table width="100%">
+ <tr>
+ <td><a href="#" style="text-decoration: none;" onclick="selectAllRelated(this); return false;"><i title="Select All" class="icon-check icon-large"></i></a></td>
+ <td colspan="2">(un)select all</td>
+ </tr>
+ <?php foreach($this->getItems() as $_item): ?>
+ <tr>
+ <td width="25px">
+ <?php if(!$_item->isComposite() && $_item->isSaleable()): ?>
+ <?php if (!$_item->getRequiredOptions()): ?>
+ <input type="checkbox" class="checkbox related-checkbox" id="related-checkbox<?php echo $_item->getId() ?>" name="related_products[]" value="<?php echo $_item->getId() ?>" />
+ <?php endif; ?>
+ <?php endif; ?>
+ </td>
+ <td width="60px"><a href="<?php Print $_item->getProductUrl(); ?>" title="<?php Print $this->htmlEscape($_item->getName()); ?>"><img src="<?php Print $_item->getThumbnailUrl(50, 50); ?>" alt="<?php Print $this->htmlEscape($_item->getName()); ?>" /></a></td>
+ <td>
+ <a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->htmlEscape($_item->getName()) ?></a><br />
+ <strong><?php echo $this->getPriceHtml($_item, true, '-related') ?></strong>
+ </td>
+ </tr>
+ <?php endforeach ?>
+ </table>
</div>
</div>
+
<script type="text/javascript">
//<![CDATA[
$$('.related-checkbox').each(function(elem){
@@ -56,13 +56,13 @@
elem.checked = true;
});
relatedProductsCheckFlag = true;
- txt.innerHTML="<?php echo $this->__('unselect all') ?>";
+ txt.innerHTML = '<i class="icon-check-empty icon-large"></i>';
} else {
$$('.related-checkbox').each(function(elem){
elem.checked = false;
});
relatedProductsCheckFlag = false;
- txt.innerHTML="<?php echo $this->__('select all') ?>";
+ txt.innerHTML = '<i class="icon-check icon-large"></i>';
}
addRelatedToProduct();
}
@@ -78,6 +78,6 @@
}
}
//]]>
- </script>
+ </script>
</div>
<?php endif ?>
View
2  app/design/frontend/bootstrapped/default/template/catalog/product/list/toolbar.phtml
@@ -31,7 +31,7 @@
<?php if($_modes && count($_modes)>1): ?>
<?php foreach ($this->getModes() as $_code=>$_label): ?>
<?php if($this->isModeActive($_code)): ?>
- <a href="#" title="<?php echo $_label ?>" class="<?php echo strtolower($_code); ?> btn btn-inverse active"><span class="icon-<?php echo strtolower($_code); ?> icon-white"></span></a>
+ <a href="#" title="<?php echo $_label ?>" class="<?php echo strtolower($_code); ?> btn active"><span class="icon-<?php echo strtolower($_code); ?> icon-white"></span></a>
<?php else: ?>
<a href="<?php echo $this->getModeUrl($_code) ?>" title="<?php echo $_label ?>" class="<?php echo strtolower($_code); ?> btn"><span class="icon-<?php echo strtolower($_code); ?>"></span></a>
<?php endif; ?>
View
51 app/design/frontend/bootstrapped/default/template/catalog/product/list/upsell.phtml
@@ -1,35 +1,36 @@
<?php
/**
- * Magento responsive theme
- *
* @category design
- * @package bootstrapped_default
- * @copyright Copyright (c) 2012 Magenthon (http://magenthon.com)
+ * @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)
- * @author Vedran Subotic <vedran@magenthon.com>
*/
?>
<?php if(count($this->getItemCollection()->getItems())): ?>
+
+<?php $this->setColumnCount(3); ?>
+
<div class="box-collateral box-up-sell">
- <h2><?php echo $this->__('You may also be interested in the following product(s)') ?></h2>
- <table class="table" id="upsell-product-table">
- <?php // $this->setColumnCount(5); // uncomment this line if you want to have another number of columns. also can be changed in layout ?>
- <?php $this->resetItemsIterator() ?>
- <?php for($_i=0;$_i<$this->getRowCount();$_i++): ?>
- <tr>
- <?php for($_j=0;$_j<$this->getColumnCount();$_j++): ?>
- <?php if($_link=$this->getIterableItem()): ?>
- <td>
- <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>
- <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>
- <?php echo $this->getPriceHtml($_link, true, '-upsell') ?>
- <?php echo $this->getReviewsSummaryHtml($_link) ?>
- </td>
- <?php else: ?>
- <?php endif; ?>
- <?php endfor; ?>
- </tr>
- <?php endfor; ?>
- </table>
+ <h3><?php Print $this->__('Similar Products'); ?></h3>
+ <?php $this->resetItemsIterator(); for ($i = 0; $i < $this->getRowCount(); $i++) : ?>
+ <div class="row-fluid">
+ <?php for ($j = 0; $j < $this->getColumnCount(); $j++) : ?>
+ <div class="span<?php Print (12 / $this->getColumnCount()); ?>">
+ <?php if ($_item = $this->getIterableItem()) : ?>
+ <a href="<?php Print $_item->getProductUrl(); ?>" title="<?php Print $this->htmlEscape($_item->getName()); ?>"><img src="<?php Print $_item->getThumbnailUrl(225, 225); ?>" /></a>
+ <br /><br />
+ <a href="<?php Print $_item->getProductUrl(); ?>" title="<?php Print $this->htmlEscape($_item->getName()); ?>"><span class="upsell-name"><?php Print $_item->getName(); ?></span></a><br />
+
+ <div class="row-fluid">
+ <div class="span12">
+ <span class="upsell-price"><?php Print $this->getPriceHtml($_item, true, '-upsell') ?></span><br />
+ <a href="<?php Print $_item->getProductUrl(); ?>" class="btn">View Item</a>
+ </div>
+ </div>
+ <?php endif; ?>
+ </div>
+ <?php endfor; ?>
+ </div>
+ <?php endfor; ?>
</div>
<?php endif ?>
View
191 app/design/frontend/bootstrapped/default/template/catalog/product/view.phtml
@@ -26,72 +26,131 @@
<div class="product-essential">
<form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post" id="product_addtocart_form"<?php if($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?> class="form">
<div class="no-display">
- <input type="hidden" name="product" value="<?php echo $_product->getId() ?>" />
+ <input type="hidden" name="product" value="<?php Print $_product->getId(); ?>" />
<input type="hidden" name="related_product" id="related-products-field" value="" />
</div>
-
- <div class="product-name well">
- <h1><?php echo $_helper->productAttribute($_product, $_product->getName(), 'name') ?></h1>
- </div>
-
- <div class="row-fluid">
- <div class="span12">
- <div class="row-fluid">
- <div class="span6">
- <div class="product-img-box">
- <?php echo $this->getChildHtml('media') ?>
- </div>
- </div>
- <div class="product-shop span4">
- <?php if ($this->canEmailToFriend()): ?>
- <p class="email-friend"><a href="<?php echo $this->helper('catalog/product')->getEmailToFriendUrl($_product) ?>"><?php echo $this->__('Email to a Friend') ?></a></p>
- <?php endif; ?>
-
- <?php echo $this->getReviewsSummaryHtml($_product, false, true)?>
- <?php echo $this->getChildHtml('alert_urls') ?>
- <?php echo $this->getChildHtml('product_type_data') ?>
- <?php echo $this->getTierPriceHtml() ?>
- <?php echo $this->getChildHtml('extrahint') ?>
-
- <?php if (!$this->hasOptions()):?>
- <div class="add-to-box">
- <?php if($_product->isSaleable()): ?>
- <?php echo $this->getChildHtml('addtocart') ?>
- <?php if( $this->helper('wishlist')->isAllow() || $_compareUrl=$this->helper('catalog/product_compare')->getAddUrl($_product)): ?>
- <span class="or"><?php echo $this->__('OR') ?></span>
- <?php endif; ?>
- <?php endif; ?>
- <?php echo $this->getChildHtml('addto') ?>
- </div>
- <?php echo $this->getChildHtml('extra_buttons') ?>
- <?php elseif (!$_product->isSaleable()): ?>
- <div class="add-to-box">
- <?php echo $this->getChildHtml('addto') ?>
- </div>
- <?php endif; ?>
-
- <?php if ($_product->getShortDescription()):?>
- <div class="short-description">
- <h2><?php echo $this->__('Quick Overview') ?></h2>
- <div class="std"><?php echo $_helper->productAttribute($_product, nl2br($_product->getShortDescription()), 'short_description') ?></div>
- </div>
- <?php endif;?>
-
- <?php echo $this->getChildHtml('other');?>
-
- <?php if ($_product->isSaleable() && $this->hasOptions()):?>
- <?php echo $this->getChildChildHtml('container1', '', true, true) ?>
- <?php endif;?>
- </div>
+ <div class="row-fluid">
+ <div class="span6">
+ <div class="product-img-box">
+ <?php Print $this->getChildHtml('media'); ?>
+ </div>
+ </div>
+ <div class="product-shop span6">
+ <div class="product-name">
+ <h2><?php Print $_helper->productAttribute($_product, $_product->getName(), 'name'); ?></h2>
+ </div>
+
+ <div class="product-shortdescription">
+ <p style="text-align: justify;"><?php Print $_product->getShortDescription(); ?></p>
+ </div>
+
+ <br />
+
+ <div class="row-fluid">
+ <div class="span6">
+ <?php if ($_product->isInStock()) : ?>
+ <div class="product-availability"><span class="label label-success">In Stock</span></div>
+ <?php else : ?>
+ <div class="product-availability"><span class="label">Out of Stock</span></div>
+ <?php endif; ?>
+ </div>
+ <div class="span6">
+ <?php if ($_product->getSku()) : ?>
+ <div class="product-sku pull-right">
+ <span><strong>SKU:</strong> <?php Print $_helper->productAttribute($_product, $_product->getSku(), 'sku'); ?></span>
+ </div><br />
+ <?php endif; ?>
</div>
</div>
- </div>
-
-
-
-
-
- <div class="clearer"></div>
+
+ <br />
+
+ <?php // TODO: Add logic here to check for tiered pricing, or other pricing options... ?>
+ <div class="row-fluid">
+ <div class="span4">
+ <span class="product-price"><?php Print $this->getPriceHtml($_product); ?></span>
+ </div>
+ <div class="span8">
+ <?php if ($_product->isSaleable()) : ?>
+ <span class="product-add-to-cart pull-right"><?php Print $this->getChildHtml('addtocart'); ?></span>
+ <?php endif; ?>
+ </div>
+ </div>
+ <div class="row-fluid">
+ <div class="span12">
+ <br />
+ <div class="pull-right">
+ <?php echo $this->getChildHtml('addto') ?>
+ </div>
+ </div>
+ </div>
+
+ <br />
+
+ <div class="row-fluid">
+ <div class="span12">
+ <?php echo $this->getReviewsSummaryHtml($_product, false, false)?>
+ </div>
+ </div>
+
+ <br />
+
+ <div class="row-fluid">
+ <div class="span5">
+ <a href="<?php Print $this->helper('catalog/product')->getEmailToFriendUrl($_product); ?>"><span class="icon-envelope"></span> Email To A Friend</a>
+ </div>
+ <div class="span3">
+ <iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.google.com%2F&amp;send=false&amp;layout=button_count&amp;width=450&amp;show_faces=false&amp;font&amp;colorscheme=light&amp;action=like&amp;height=21&amp;appId=311668735519263" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:21px;" allowTransparency="true"></iframe>
+ </div>
+ <div class="span4">
+ <div class="g-plusone"></div>
+ </div>
+ </div>
+
+
+
+
+ <?php /*
+ <?php echo $this->getChildHtml('alert_urls') ?>
+ <?php echo $this->getChildHtml('product_type_data') ?>
+ <?php echo $this->getTierPriceHtml() ?>
+ <?php echo $this->getChildHtml('extrahint') ?>
+
+ <?php if (!$this->hasOptions()):?>
+ <div class="add-to-box">
+ <?php if($_product->isSaleable()): ?>
+ <?php echo $this->getChildHtml('addtocart'); ?>
+ <br />
+ <?php endif; ?>
+ <?php echo $this->getChildHtml('addto') ?>
+ </div>
+ <?php echo $this->getChildHtml('extra_buttons') ?>
+ <?php elseif (!$_product->isSaleable()): ?>
+ <div class="add-to-box">
+ <?php echo $this->getChildHtml('addto') ?>
+ </div>
+ <?php endif; ?>
+
+ <?php if ($_product->getShortDescription()):?>
+ <br />
+ <div class="short-description">
+ <div class="std"><?php echo $_helper->productAttribute($_product, nl2br($_product->getShortDescription()), 'short_description') ?></div>
+ </div>
+ <?php endif;?>
+
+
+ <?php if ($this->canEmailToFriend()): ?>
+ <p class="email-friend"><a href="<?php echo $this->helper('catalog/product')->getEmailToFriendUrl($_product) ?>"><?php echo $this->__('Email to a Friend') ?></a></p>
+ <?php endif; ?>
+
+ */ ?>
+
+ <?php if ($_product->isSaleable() && $this->hasOptions()):?>
+ <?php echo $this->getChildChildHtml('container1', '', true, true) ?>
+ <?php endif;?>
+ </div>
+ </div>
+
<?php if ($_product->isSaleable() && $this->hasOptions()):?>
<?php echo $this->getChildChildHtml('container2', '', true, true) ?>
<?php endif;?>
@@ -146,12 +205,12 @@
<?php foreach ($this->getChildGroup('detailed_info', 'getChildHtml') as $alias => $html):?>
<div class="box-collateral <?php echo "box-{$alias}"?>">
<?php if ($title = $this->getChildData($alias, 'title')):?>
- <h2><?php echo $this->escapeHtml($title); ?></h2>
+ <h3><?php echo $this->escapeHtml($title); ?></h3>
<?php endif;?>
<?php echo $html; ?>
</div>
<?php endforeach;?>
- <?php echo $this->getChildHtml('upsell_products') ?>
- <?php echo $this->getChildHtml('product_additional_data') ?>
+ <?php echo $this->getChildHtml('upsell_products') ?> <!-- "You May Also Be Interested In..." -->
+ <?php echo $this->getChildHtml('product_additional_data') ?> <!-- Product Tags -->
</div>
-</div>
+</div>
View
4 app/design/frontend/bootstrapped/default/template/catalog/product/view/addto.phtml
@@ -15,12 +15,12 @@
<div class="add-to-links">
<?php if ($this->helper('wishlist')->isAllow()) : ?>
- <a href="<?php echo $_wishlistSubmitUrl ?>" onclick="productAddToCartForm.submitLight(this, '<?php echo $_wishlistSubmitUrl ?>'); return false;" class="label label-info"><?php echo $this->__('Add to Wishlist') ?></a>
+ <a href="<?php echo $_wishlistSubmitUrl ?>" onclick="productAddToCartForm.submitLight(this, '<?php echo $_wishlistSubmitUrl ?>'); return false;" class="btn btn-mini"><?php echo $this->__('Add to Wishlist') ?></a>
<?php endif; ?>
<?php
$_compareUrl = $this->helper('catalog/product_compare')->getAddUrl($_product);
?>
<?php if($_compareUrl) : ?>
- <span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="label label-info"><?php echo $this->__('Add to Compare') ?></a>
+ <a href="<?php echo $_compareUrl ?>" class="btn btn-mini"><?php echo $this->__('Add to Compare') ?></a>
<?php endif; ?>
</div>
View
9 app/design/frontend/bootstrapped/default/template/catalog/product/view/addtocart.phtml
@@ -9,15 +9,18 @@
* @author Vedran Subotic <vedran@magenthon.com>
*/
?>
+
<?php $_product = $this->getProduct(); ?>
<?php $buttonTitle = $this->__('Add to Cart'); ?>
<?php if($_product->isSaleable()): ?>
<div class="form-inline">
<?php if(!$_product->isGrouped()): ?>
- <label for="qty"><strong><?php echo $this->__('Qty:') ?></strong></label>
- <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo $this->__('Qty') ?>" class="span1 input-text qty" />
+ <div class="input-prepend">
+ <label for="qty" class="add-on"><strong><?php echo $this->__('Qty:') ?></strong></label>
+ <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo $this->__('Qty') ?>" class="input-text qty input-micro" />
+ </div>
<?php endif; ?>
- <button type="button" title="<?php echo $buttonTitle ?>" class="btn btn-primary" onclick="productAddToCartForm.submit(this)"><span><span><?php echo $buttonTitle ?></span></span></button>
+ <button type="button" style="margin-top: -5px;" title="<?php echo $buttonTitle ?>" class="btn btn-success" onclick="productAddToCartForm.submit(this)"><?php echo $buttonTitle ?></button>
<?php echo $this->getChildHtml('', true, true) ?>
</div>
<?php endif; ?>
View
6 app/design/frontend/bootstrapped/default/template/catalog/product/view/attributes.phtml
@@ -17,11 +17,11 @@
?>
<?php
$_helper = $this->helper('catalog/output');
- $_product = $this->getProduct()
+ $_product = $this->getProduct();
?>
<?php if($_additional = $this->getAdditionalData()): ?>
- <h2><?php echo $this->__('Additional Information') ?></h2>
- <table class="table table-striped table-bordered table-condensed" id="product-attribute-specs-table">
+ <h3><?php echo $this->__('Additional Information') ?></h3>
+ <table class="table table-striped table-bordered" id="product-attribute-specs-table">
<col class="span3" />
<col class=""/>
<tbody>
View
39 app/design/frontend/bootstrapped/default/template/catalog/product/view/description.phtml
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @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)
+ */
+
+/**
+ * Product description template
+ *
+ * @see Mage_Catalog_Block_Product_View_Description
+ */
+?>
+<?php $_description = $this->getProduct()->getDescription(); ?>
+<?php if ($_description): ?>
+ <h3><?php echo $this->__('Product Details') ?></h3>
+ <div class="std">
+ <?php echo $this->helper('catalog/output')->productAttribute($this->getProduct(), $_description, 'description') ?>
+ </div>
+<?php endif; ?>
View
9 app/design/frontend/bootstrapped/default/template/catalog/product/view/media.phtml
@@ -32,16 +32,16 @@
<h3><?php echo $_product->getName()?></h3>
</div>
<div class="modal-body">
- <?php //echo $this->getLayout()->createBlock('catalog/product_gallery')->setTemplate('catalog/product/gallery.phtml')->toHtml()?>
+ <?php //echo $this->getLayout()->createBlock('catalog/product_gallery')->setTemplate('catalog/product/gallery.phtml')->toHtml(); ?>
<img src="<?php echo $this->helper('catalog/image')->init($_product, 'image')->resize(600)?>" alt="<?php echo $this->htmlEscape($this->getImageLabel())?>" title="<?php echo $this->htmlEscape($this->getImageLabel())?>" />
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal">Close</a>
</div>
</div>
- <a class="" data-toggle="modal" href="#myGallery_<?php echo $_product->getId()?>">
- <?php echo $_helper->productAttribute($_product, $_img, 'image'); ?>
- </a>
+ <a class="" data-toggle="modal" href="#myGallery_<?php echo $_product->getId(); ?>">
+ <?php echo $_helper->productAttribute($_product, $_img, 'image'); ?>
+ </a>
</div>
<?php else: ?>
<p class="product-image">
@@ -53,7 +53,6 @@
<?php endif; ?>
<?php if (count($this->getGalleryImages()) > 0): ?>
<div class="more-views">
- <h2><?php echo $this->__('More Views') ?></h2>
<?php foreach ($this->getGalleryImages() as $_image): ?>
<a href="#" onclick="popWin('<?php echo $this->getGalleryUrl($_image) ?>', 'gallery', 'width=600,height=600,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(100); ?>" width="100" height="100" alt="<?php echo $this->htmlEscape($_image->getLabel()) ?>" /></a>
<?php endforeach; ?>
View
12 app/design/frontend/bootstrapped/default/template/catalogsearch/form.mini.phtml
@@ -9,16 +9,18 @@
* @author Vedran Subotic <vedran@magenthon.com>
*/
?>
-<form id="search_mini_form" action="<?php echo $this->helper('catalogsearch')->getResultUrl() ?>" method="get" class="navbar-search pull-right">
+<form id="search_mini_form" action="<?php echo $this->helper('catalogsearch')->getResultUrl() ?>" method="get" class="pull-right">
<div class="form-search">
<?php /*?><label for="search"><?php echo $this->__('Search:') ?></label><?php */?>
- <input id="search" type="text" name="<?php echo $this->helper('catalogsearch')->getQueryParamName() ?>" value="<?php echo $this->helper('catalogsearch')->getEscapedQueryText() ?>" class="search-query span2" />
- <?php /*?><button type="submit" title="<?php echo $this->__('Search') ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button><?php */?>
+ <div class="input-append">
+ <input id="search" type="text" name="<?php echo $this->helper('catalogsearch')->getQueryParamName() ?>" value="<?php echo $this->helper('catalogsearch')->getEscapedQueryText() ?>" class="search-query span2" />
+ <button class="btn" type="submit"><i class="icon-search icon-large"></i></button>
+ </div>
<div id="search_autocomplete" class="search-autocomplete"></div>
<script type="text/javascript">
//<![CDATA[
- var searchForm = new Varien.searchForm('search_mini_form', 'search', '<?php echo $this->__('Search entire store here...') ?>');
- searchForm.initAutocomplete('<?php echo $this->helper('catalogsearch')->getSuggestUrl() ?>', 'search_autocomplete');
+ var searchForm = new Varien.searchForm('search_mini_form', 'search', '<?php echo $this->__('Search...') ?>');
+ //searchForm.initAutocomplete('<?php echo $this->helper('catalogsearch')->getSuggestUrl() ?>', 'search_autocomplete');
//]]>
</script>
</div>
View
4 app/design/frontend/bootstrapped/default/template/checkout/cart.phtml
@@ -19,7 +19,7 @@
<div class="cart">
<div class="row">
<div class="span12">
- <div class="page-title title-buttons well">
+ <div class="page-title title-buttons">
<?php if(!$this->hasError()): ?>
<?php foreach ($this->getMethods('top_methods') as $method): ?>
<?php if ($methodHtml = $this->getMethodHtml($method)): ?>
@@ -27,7 +27,7 @@
<?php endif; ?>
<?php endforeach; ?>
<?php endif; ?>
- <h1><?php echo $this->__('Shopping Cart') ?></h1>
+ <h2><?php echo $this->__('Shopping Cart') ?></h2>
</div>
</div>
View
26 app/design/frontend/bootstrapped/default/template/checkout/cart/sidebar.phtml
@@ -17,31 +17,22 @@
?>
<?php if ($this->getIsNeedToDisplaySideBar()):?>
-<div class="block block-cart well">
+<div class="block block-cart">
<?php $_cartQty = $this->getSummaryCount() ?>
<div class="block-title">
- <strong><span class="icon-shopping-cart"></span><span><?php echo $this->__('My Cart') ?></span></strong>
+ <strong><span><?php echo $this->__('My Cart') ?></span></strong> <?php if ($_cartQty > 0) : Print "(" . $_cartQty . ")"; endif; ?>
+ <?php if ($_cartQty > 0) : ?><button type="button" title="<?php echo $this->__('Proceed to Checkout') ?>" class="btn btn-small btn-success pull-right" onclick="setLocation('<?php echo $this->getCheckoutUrl() ?>')"><?php echo $this->__('Checkout') ?></button><?php endif; ?>
</div>
<div class="block-content">
<?php if ($_cartQty>0): ?>
<div class="summary">
- <?php if ($_cartQty==1): ?>
- <p class="amount"><?php echo $this->__('There is <a href="%s">1 item</a> in your cart.', $this->getUrl('checkout/cart')) ?></p>
- <?php else: ?>
- <p class="amount"><?php echo $this->__('There are <a href="%s">%s items</a> in your cart.', $this->getUrl('checkout/cart'), $_cartQty) ?></p>
- <?php endif ?>
-
<p class="subtotal">
<?php if($_cartQty && $this->isPossibleOnepageCheckout()): ?>
- <div class="actions pull-right">
- <?php echo $this->getChildHtml('extra_actions') ?>
- <button type="button" title="<?php echo $this->__('Checkout') ?>" class="btn btn-mini btn-danger" onclick="setLocation('<?php echo $this->getCheckoutUrl() ?>')"><span><span><?php echo $this->__('Checkout') ?></span></span></button>
- </div>
<?php endif ?>
<?php if ($this->canApplyMsrp()): ?>
<span class="map-cart-sidebar-total"><?php echo $this->__('ORDER TOTAL WILL BE DISPLAYED BEFORE YOU SUBMIT THE ORDER'); ?></span>
<?php else: ?>
- <span class="label"><?php echo $this->__('Cart Subtotal:') ?></span> <?php echo Mage::helper('checkout')->formatPrice($this->getSubtotal()) ?>
+ <span style="font-weight: bold;"><?php echo $this->__('Cart Subtotal:') ?></span> <?php echo Mage::helper('checkout')->formatPrice($this->getSubtotal()) ?>
<?php if ($_subtotalInclTax = $this->getSubtotalInclTax()): ?>
<br />(<?php echo Mage::helper('checkout')->formatPrice($_subtotalInclTax) ?> <?php echo Mage::helper('tax')->getIncExcText(true) ?>)
<?php endif; ?>
@@ -52,11 +43,12 @@
<?php $_items = $this->getRecentItems() ?>
<?php if(count($_items)): ?>
- <p class="block-subtitle"><?php echo $this->__('Recently added item(s)') ?></p>
<div id="cart-sidebar" class="mini-products-list form-horizontal">
- <?php