add content blocks and product extras

lemonstand · Mar 19, 2015 · 19a6b4b · 19a6b4b
1 parent 4fca87a
commit 19a6b4b
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 8 deletions.
diff --git a/content/about-left.htm b/content/about-left.htm
@@ -0,0 +1,8 @@
+---
+name: about-left
+type: html
+---
+
+
+<h3>This is the Coastal theme for LemonStand.</h3>
+<p>LemonStand is an eCommerce platform made for online retailers that take growth seriously. The Coastal theme is a free, responsive eCommerce theme for LemonStand.</p>
diff --git a/content/about-right.htm b/content/about-right.htm
@@ -0,0 +1,7 @@
+---
+name: about-right
+type: html
+---
+
+<h3>Customize this content!</h3>
+	    <p>Go ahead and customize this content. Use this page to tell your company's story, and connect with your customer.</p>
diff --git a/content/home-bottom-block.htm b/content/home-bottom-block.htm
@@ -0,0 +1,8 @@
+---
+name: home-bottom-block
+type: html
+---
+
+<h3>More about our store.</h3>
+<h4 class="text-muted">This is some subtext for this section.</h4>
+<p class="mb1">Imperdiet congue habitant vestibulum nostra. Vehicula tellus montes erat parturient turpis integer. Interdum phasellus mollis habitasse sagittis malesuada. Augue Mauris integer feugiat. Parturient aliquet nisl.</p>
diff --git a/pages/about/page-about.htm b/pages/about/page-about.htm
@@ -8,12 +8,10 @@
 <div class="container buffer-bottom">
 	<div class="row">
 	  <div class="content col-sm-6">
-	    <h3>This is the Coastal theme for LemonStand.</h3>
-	    <p>LemonStand is an eCommerce platform made for online retailers that take growth seriously. The Coastal theme is a free, responsive eCommerce theme for LemonStand.</p>
+	  	{{ content_block('about-left') }}
 	  </div>
 	  <div class="content col-sm-6">
-	    <h3>Customize this content!</h3>
-	    <p>Go ahead and customize this content. Use this page to tell your company's story, and connect with your customer.</p>
+	    {{ content_block('about-right') }}
 	  </div>
 	</div>
 </div>
diff --git a/pages/home/page-home.htm b/pages/home/page-home.htm
@@ -22,9 +22,7 @@
 <div class="container-fluid bg-muted buffer-top buffer-bottom">
     <div class="row">
         <div class="center-block text-center">
-            <h3>More about our store.</h3>
-            <h4 class="text-muted">This is some subtext for this section.</h4>
-            <p class="mb1">Imperdiet congue habitant vestibulum nostra. Vehicula tellus montes erat parturient turpis integer. Interdum phasellus mollis habitasse sagittis malesuada. Augue Mauris integer feugiat. Parturient aliquet nisl.</p>
+            {{ content_block('home-bottom-block') }}
             <p><a class="btn btn-bright" href="#">Learn more</a></p>
         </div>
     </div>

diff --git a/partials/shop-product-extras.htm b/partials/shop-product-extras.htm
@@ -0,0 +1,15 @@
+{% if product.extras.count %}
+<h5>Product Extras</h5>
+  <div class="clearfix">
+    {% for index, extra in product.extras %}
+        <div class="extra">
+            <label class="title" for="{{ 'extra-'~index }}">{{ extra.name }} ({{ extra.price|currency }})</label>
+            {% if extra.enabled %}
+                <input type="checkbox" id="{{ 'extra-'~index }}" {{ checkbox_state(postedExtras[extra.id], extra.id) }} name="extras[{{ extra.id }}]" data-ajax-handler="shop:product" data-ajax-update="#product-page=shop-product">
+            {% else %}
+                <input type="checkbox" disabled="disabled">
+            {% endif %}
+        </div>
+    {% endfor %}
+  </div>
+{% endif %}
diff --git a/partials/shop-product.htm b/partials/shop-product.htm
@@ -38,6 +38,7 @@ <h1 class="PRD__name">{{ product.name }}</h1>
 
             {{ partial('shop-product-attributes') }}
             {{ partial('shop-product-options') }}
+            {{ partial('shop-product-extras') }}
 
     {% if product.enabled %}
         {% if not product.isOutOfStock() %}

diff --git a/resources/styles/main.css b/resources/styles/main.css
@@ -5865,7 +5865,8 @@ Products
     display: block;
     margin-bottom: 15px; }
     .item__img a {
-      display: block; }
+      display: block;
+      max-height:220px; }
     .item__img img {
       display: inline-block;
       height: auto;