<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -36,7 +36,7 @@
         &lt;form action=&quot;/search&quot; method=&quot;get&quot;&gt;
           &lt;fieldset&gt;
             &lt;div class=&quot;wrap&quot;&gt;
-              &lt;input input id=&quot;search-input&quot; type=&quot;text&quot; name=&quot;q&quot; type=&quot;text&quot; class=&quot;text&quot; value=&quot;Enter Search Terms&quot;/&gt;
+              &lt;input input id=&quot;search-input&quot; type=&quot;text&quot; name=&quot;q&quot; type=&quot;text&quot; class=&quot;text&quot; value=&quot;&quot;/&gt;
             &lt;/div&gt;
             &lt;input type=&quot;image&quot; class=&quot;btn&quot; src=&quot;{{ 'search.gif' | asset_url }}&quot; alt=&quot;Search&quot;/&gt;
             &lt;a href=&quot;/cart&quot; class=&quot;cart&quot;&gt;Your Cart&lt;/a&gt;
@@ -44,29 +44,22 @@
         &lt;/form&gt;
       &lt;/div&gt;
       &lt;ul&gt;
-        {% for link in linklists.main-menu.links %}
-           &lt;li&gt;{{ link.title | link_to: link.url }}&lt;/li&gt;
+        {% for collection in collections %}
+           &lt;li&gt;{{ collection.title | link_to: collection.url }}&lt;/li&gt;
         {% endfor %}
       &lt;/ul&gt;
     &lt;/div&gt;
     &lt;div id=&quot;main&quot;&gt;
-      &lt;div id=&quot;content&quot;&gt;
         {{ content_for_layout }}
-      &lt;/div&gt;
     &lt;/div&gt;
-  &lt;/div&gt;
-  &lt;div id=&quot;footer&quot;&gt;
-    &lt;ul&gt;
-      
-      &lt;li&gt;&lt;a href=&quot;#&quot;&gt;About&lt;/a&gt;&lt;/li&gt;
-      &lt;li&gt;&lt;a href=&quot;#&quot;&gt;Press&lt;/a&gt;&lt;/li&gt;
-      &lt;li&gt;&lt;a href=&quot;#&quot;&gt;Shipping&lt;/a&gt;&lt;/li&gt;
-      &lt;li&gt;&lt;a href=&quot;#&quot;&gt;Privacy&lt;/a&gt;&lt;/li&gt;
-      &lt;li&gt;&lt;a href=&quot;#&quot;&gt;Contact&lt;/a&gt;&lt;/li&gt;
-      &lt;li&gt;&lt;a href=&quot;#&quot;&gt;Store Locator&lt;/a&gt;&lt;/li&gt;
-      &lt;li&gt;&lt;a href=&quot;#&quot;&gt;Friends of Niven&lt;/a&gt;&lt;/li&gt;
-    &lt;/ul&gt;
-    &lt;p&gt;&amp;copy; 2009 Niven Morgan All Rights Reserved.&lt;/p&gt;
+    &lt;div id=&quot;footer&quot;&gt;
+      &lt;ul&gt;
+        {% for link in linklists.footer.links %}
+          &lt;li&gt;{{ link.title | link_to: link.url }}&lt;/li&gt;
+        {% endfor %} 
+      &lt;/ul&gt;
+      &lt;p&gt;&amp;copy; 2009 Niven Morgan All Rights Reserved.&lt;/p&gt;
+    &lt;/div&gt;
   &lt;/div&gt;
 &lt;/div&gt;
 </diff>
      <filename>layout/theme.liquid</filename>
    </modified>
    <modified>
      <diff></diff>
      <filename>preview.gif</filename>
    </modified>
    <modified>
      <diff>@@ -1,3 +1,4 @@
+&lt;div id=&quot;content&quot;&gt;
 &lt;div id=&quot;page&quot;&gt;
   &lt;h2&gt;{{page.title}}&lt;/h2&gt;
 
@@ -30,4 +31,5 @@
 
   {% endpaginate %}
   
+&lt;/div&gt;
 &lt;/div&gt;
\ No newline at end of file</diff>
      <filename>templates/blog.liquid</filename>
    </modified>
    <modified>
      <diff>@@ -1,3 +1,4 @@
+&lt;div id=&quot;content&quot;&gt;
 &lt;script type=&quot;text/javascript&quot;&gt;
   function remove_item(id) {
       document.getElementById('updates_'+id).value = 0;
@@ -69,4 +70,5 @@
     &lt;/form&gt;
   {% endif %}
 
+&lt;/div&gt;
 &lt;/div&gt;
\ No newline at end of file</diff>
      <filename>templates/cart.liquid</filename>
    </modified>
    <modified>
      <diff>@@ -1,26 +1,19 @@
-&lt;div id=&quot;collectionpage&quot;&gt;
-  {% paginate collection.products by 20 %}
-  
-  &lt;div id=&quot;pagination&quot;&gt;
-    {{ paginate | default_pagination }}
+  &lt;div id=&quot;content&quot;&gt;
+      {% for product in collection.products %}
+      {% if forloop.first %}
+        &lt;ul class=&quot;product&quot;&gt;
+      {% endif %}
+        &lt;li&gt;
+          &lt;a href=&quot;{{product.url | within: collection }}&quot;&gt;&lt;img src=&quot;{{ product.featured_image | product_img_url: 'original' }}&quot; /&gt;&lt;strong&gt;{{ product.title }}&lt;span&gt;{{ product.variants.first.price | money }}&lt;/span&gt;&lt;/strong&gt;&lt;/a&gt;
+        &lt;/li&gt;
+      {% if forloop.last %}
+        &lt;/ul&gt;
+      {% endif %}
+      {% endfor %}
+  &lt;/div&gt;
+  &lt;div id=&quot;sidebar&quot;&gt;
+    &lt;div class=&quot;title&quot;&gt;
+      &lt;h2&gt;{{ collection.title}}&lt;/h2&gt;
+    &lt;/div&gt;
+    &lt;p&gt;{{ collection.description }}&lt;/p&gt;
   &lt;/div&gt;
-  
-  &lt;h2&gt;{{ collection.title }}&lt;/h2&gt;
-  
-  &lt;ul id=&quot;product-collection&quot;&gt;
-    {% for product in collection.products %}
-    &lt;li class=&quot;singleproduct clearfix&quot;&gt;
-      &lt;div class=&quot;small&quot;&gt;
-      &lt;div class=&quot;prodimage&quot;&gt;&lt;a href=&quot;{{product.url}}&quot;&gt;&lt;img src=&quot;{{ product.featured_image | product_img_url: 'small' }}&quot; /&gt;&lt;/a&gt;&lt;/div&gt;
-      &lt;/div&gt;
-      &lt;div class=&quot;productdetails&quot;&gt;
-      &lt;h3&gt;&lt;a href=&quot;{{product.url}}&quot;&gt;{{product.title}}&lt;/a&gt;&lt;/h3&gt;
-      &lt;div class=&quot;description&quot;&gt;{{ product.description | strip_html | truncatewords: 35 }}&lt;/div&gt;
-      &lt;p class=&quot;money&quot;&gt;{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}&lt;/p&gt;
-     &lt;/div&gt;
-    &lt;/li&gt;
-    {% endfor %}
-  &lt;/ul&gt;
-    
-  {% endpaginate %}
-&lt;/div&gt;
\ No newline at end of file</diff>
      <filename>templates/collection.liquid</filename>
    </modified>
    <modified>
      <diff>@@ -1,28 +1,5 @@
+&lt;div id=&quot;content&quot;&gt;
 &lt;div id=&quot;frontarticles&quot;&gt;
-  {% assign article = pages.frontpage %}
-
-  {% if article.content != &quot;&quot; %}
-    &lt;h2&gt;{{ article.title }}&lt;/h2&gt;
-    &lt;div class=&quot;article textile&quot;&gt;
-      {{ article.content }}
-    &lt;/div&gt;
-  {% else %}
-    &lt;div class=&quot;article textile&quot;&gt;
-    In &lt;em&gt;Admin &amp;gt; Blogs &amp;amp; Pages&lt;/em&gt;, create a page with the handle &lt;strong&gt;&lt;code&gt;frontpage&lt;/code&gt;&lt;/strong&gt; and it will show up here.&lt;br /&gt;
-    {{ &quot;Learn more about handles&quot; | link_to &quot;http://wiki.shopify.com/Handle&quot; }}
-    &lt;/div&gt;
-  {% endif %}
-
+{{ pages.frontpage.content }}
 &lt;/div&gt;
-
-&lt;div id=&quot;frontproducts&quot;&gt;
-  {% for product in collections.frontpage.products %}
-    &lt;div class=&quot;productmain&quot;&gt;
-     &lt;a href=&quot;{{ product.url }}&quot;&gt;&lt;img src=&quot;{{ product.featured_image | product_img_url: 'small' }}&quot; alt=&quot;{{ product.title | escape }}&quot; /&gt;&lt;/a&gt;
-     &lt;h3&gt;&lt;a href=&quot;{{ product.url }}&quot;&gt;{{ product.title }}&lt;/a&gt;&lt;/h3&gt;
-     &lt;div class=&quot;description&quot;&gt;{{ product.description | truncatewords: 10 }}&lt;/div&gt;
-    &lt;p class=&quot;money&quot;&gt;{{ product.price_min | money }}&lt;/p&gt;
-    &lt;/div&gt;
-  {% endfor %}
-&lt;/div&gt;
-
+&lt;/div&gt;
\ No newline at end of file</diff>
      <filename>templates/index.liquid</filename>
    </modified>
    <modified>
      <diff>@@ -1,3 +1,4 @@
+&lt;div id=&quot;content&quot;&gt;
 &lt;div id=&quot;page&quot;&gt;
   &lt;h2&gt;{{page.title}}&lt;/h2&gt;
 
@@ -5,4 +6,5 @@
     {{page.content}}
   &lt;/div&gt;
 
+&lt;/div&gt;
 &lt;/div&gt;
\ No newline at end of file</diff>
      <filename>templates/page.liquid</filename>
    </modified>
    <modified>
      <diff>@@ -1,55 +1,57 @@
-&lt;div id=&quot;productpage&quot;&gt;
-
-  &lt;div id=&quot;productimages&quot;&gt;&lt;div id=&quot;productimages-top&quot;&gt;&lt;div id=&quot;productimages-bottom&quot;&gt;
-    {% for image in product.images %}
-      {% if forloop.first %}
-        &lt;a href=&quot;{{ image | product_img_url: 'large' }}&quot; class=&quot;productimage&quot; rel=&quot;lightbox&quot; title=&quot;{{product.title | escape }}&quot;&gt;
-          &lt;img src=&quot;{{ image | product_img_url: 'medium'}}&quot; alt=&quot;{{product.title | escape }}&quot; /&gt;
-        &lt;/a&gt;
+&lt;div id=&quot;content&quot;&gt;
+  &lt;div class=&quot;box&quot;&gt;
+    &lt;div class=&quot;image&quot;&gt;
+        {% if product.images[1] %}
+            &lt;img src=&quot;{{ product.images[1] | product_img_url: 'original'}}&quot; alt=&quot;{{product.title | escape }}&quot; /&gt;
+        {% endif %}
+    &lt;/div&gt;
+    {% if collection %}            
+      &lt;div class=&quot;back&quot;&gt;
+        &lt;a href=&quot;{{ collection.url }}&quot;&gt;Back&lt;/a&gt;
+      &lt;/div&gt;
+    {% endif %}
+    &lt;div class=&quot;content-box&quot;&gt;
+      &lt;h3&gt;{{ product.title }} &lt;span&gt;{{ product.variants.first.price | money }}&lt;/span&gt;&lt;/h3&gt;
+      &lt;p&gt;{{ product.description }}&lt;/p&gt;
+      
+      {% if product.available %}
+        &lt;form action=&quot;/cart/add&quot; method=&quot;post&quot;&gt;
+          &lt;input type=&quot;hidden&quot; id=&quot;variant-select&quot; name=&quot;id&quot; value=&quot;{{ product.variants.first.id}}&quot;&gt;
+          &lt;!-- &lt;p&gt;{{ product.variants.first.title}}&lt;/p&gt; --&gt;
+        &lt;input type=&quot;image&quot; name=&quot;add&quot; value=&quot;Add to Cart&quot; id=&quot;add&quot; src=&quot;{{ 'add.gif' | asset_url }}&quot; /&gt;
+        &lt;/form&gt;
       {% else %}
-        &lt;a href=&quot;{{ image | product_img_url: 'large' }}&quot; class=&quot;productimage-small&quot; rel=&quot;lightbox&quot; title=&quot;{{product.title | escape }}&quot;&gt;
-          &lt;img src=&quot;{{ image | product_img_url: 'small'}}&quot; alt=&quot;{{product.title | escape }}&quot; /&gt;
-        &lt;/a&gt;
+          &lt;span&gt;Sold Out!&lt;/span&gt;
       {% endif %}
-    {% endfor %}
-  &lt;/div&gt;&lt;/div&gt;&lt;/div&gt;
-
-  &lt;div id=&quot;productdetails&quot;&gt;
-    &lt;h2&gt;{{ product.title }}&lt;/h2&gt;
-    
-    &lt;ul id=&quot;details&quot; class=&quot;hlist&quot;&gt;
-    &lt;li&gt;Vendor: {{ product.vendor | link_to_vendor }}&lt;/li&gt;
-    &lt;li&gt;Type: {{ product.type | link_to_type }}&lt;/li&gt;
-    &lt;/ul&gt;
-    
-    &lt;small&gt;{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}&lt;/small&gt;
-    
-    &lt;div id=&quot;productcontrols&quot;&gt;
-              {% if product.available %}
-
-    &lt;form action=&quot;/cart/add&quot; method=&quot;post&quot;&gt;
-
-      &lt;div id=&quot;price-field&quot; class=&quot;price&quot;&gt;&lt;/div&gt;
-      
-      &lt;select id=&quot;variant-select&quot; name=&quot;id&quot; class=&quot;product-info-options&quot;&gt;
-        {% for variant in product.variants %}
-          &lt;option value=&quot;{{ variant.id }}&quot;&gt;{{ variant.title }} - {{ variant.price | money }}&lt;/option&gt;
-        {% endfor %}
-      &lt;/select&gt;
-    
-      &lt;div class=&quot;addtocart&quot;&gt;&lt;input type=&quot;image&quot; name=&quot;add&quot; value=&quot;Add to Cart&quot; id=&quot;add&quot; src=&quot;{{ 'add_to_cart.gif' | asset_url }}&quot; /&gt;&lt;/div&gt;
-    &lt;/form&gt;
-              {% else %}
-                  &lt;span&gt;Sold Out!&lt;/span&gt;
-              {% endif %}
     &lt;/div&gt;
-    
-    &lt;div class=&quot;description textile&quot;&gt;
-    {{ product.description }}
+  &lt;/div&gt;
+&lt;/div&gt;
+&lt;div id=&quot;sidebar&quot;&gt;
+  {% if collection %}            
+    &lt;div class=&quot;title&quot;&gt;
+      &lt;h2&gt;{{ collection.title }}&lt;/h2&gt;
     &lt;/div&gt;
+    &lt;p&gt;{{ collection.description }}&lt;/p&gt;
+  {% endif %}
+&lt;/div&gt;
+{% if collection %}            
+&lt;div class=&quot;more-products&quot;&gt;
+  &lt;div class=&quot;top&quot;&gt;
+    &lt;a href=&quot;{{ collection.url }}&quot; class=&quot;title&quot;&gt;More {{ collection.title }} Products&lt;/a&gt;
   &lt;/div&gt;
+  &lt;ul class=&quot;product&quot;&gt;
+    {% for cproduct in collection.products %}
+      &lt;li&gt;&lt;a href=&quot;{{cproduct.url | within: collection}}&quot;&gt;&lt;img src=&quot;{{ cproduct.featured_image | product_img_url: 'original' }}&quot; /&gt;
+          &lt;strong&gt;
+            {{ cproduct.title }}
+            &lt;span&gt;{{ cproduct.variants.first.price | money }}&lt;/span&gt;
+          &lt;/strong&gt;
+        &lt;/a&gt;
+      &lt;/li&gt;
+    {% endfor %}
+  &lt;/ul&gt;
+{% endif %}
 &lt;/div&gt;
-
 &lt;script type=&quot;text/javascript&quot;&gt;
 &lt;!--
   // prototype callback for multi variants dropdown selector
@@ -73,4 +75,4 @@
     selector = new Shopify.OptionSelectors(&quot;variant-select&quot;, { product: {{ product | json }}, onVariantSelected: selectCallback }); 
   });
 --&gt;
-&lt;/script&gt;
+&lt;/script&gt;
\ No newline at end of file</diff>
      <filename>templates/product.liquid</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>b6549a5f5b166958398b4fa69e4f3329c2d65520</id>
    </parent>
  </parents>
  <author>
    <name>Darcy Brown</name>
    <email>darcy@dbcodeproject.com</email>
  </author>
  <url>http://github.com/dbcodeproject/nivenmorgan/commit/47940d505efa2eabdb2e674b65eaa91030710a2f</url>
  <id>47940d505efa2eabdb2e674b65eaa91030710a2f</id>
  <committed-date>2009-09-28T21:00:20-07:00</committed-date>
  <authored-date>2009-09-28T21:00:20-07:00</authored-date>
  <message>pass 2 for liquid</message>
  <tree>46d7989b590f1536a0f3545e79ac1998039f362e</tree>
  <committer>
    <name>Darcy Brown</name>
    <email>darcy@dbcodeproject.com</email>
  </committer>
</commit>
