RubyGems - drnic-liquid - Versions diffs - 2.1.0 - Mend

drnic-liquid 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (113) hide show

data/CHANGELOG +44 -0
data/History.txt +44 -0
data/MIT-LICENSE +20 -0
data/Manifest.txt +34 -0
data/README.rdoc +44 -0
data/Rakefile +30 -0
data/example/server/example_servlet.rb +37 -0
data/example/server/liquid_servlet.rb +28 -0
data/example/server/server.rb +12 -0
data/example/server/templates/index.liquid +6 -0
data/example/server/templates/products.liquid +45 -0
data/init.rb +8 -0
data/lib/extras/liquid_view.rb +51 -0
data/lib/liquid.rb +70 -0
data/lib/liquid/block.rb +102 -0
data/lib/liquid/condition.rb +120 -0
data/lib/liquid/context.rb +221 -0
data/lib/liquid/document.rb +17 -0
data/lib/liquid/drop.rb +51 -0
data/lib/liquid/errors.rb +11 -0
data/lib/liquid/extensions.rb +56 -0
data/lib/liquid/file_system.rb +62 -0
data/lib/liquid/htmltags.rb +74 -0
data/lib/liquid/module_ex.rb +62 -0
data/lib/liquid/standardfilters.rb +209 -0
data/lib/liquid/strainer.rb +51 -0
data/lib/liquid/tag.rb +26 -0
data/lib/liquid/tags/assign.rb +33 -0
data/lib/liquid/tags/capture.rb +35 -0
data/lib/liquid/tags/case.rb +83 -0
data/lib/liquid/tags/comment.rb +9 -0
data/lib/liquid/tags/cycle.rb +59 -0
data/lib/liquid/tags/for.rb +136 -0
data/lib/liquid/tags/if.rb +79 -0
data/lib/liquid/tags/ifchanged.rb +20 -0
data/lib/liquid/tags/include.rb +55 -0
data/lib/liquid/tags/unless.rb +33 -0
data/lib/liquid/template.rb +147 -0
data/lib/liquid/variable.rb +49 -0
data/liquid.gemspec +40 -0
data/performance/shopify.rb +92 -0
data/performance/shopify/comment_form.rb +33 -0
data/performance/shopify/database.rb +45 -0
data/performance/shopify/json_filter.rb +7 -0
data/performance/shopify/liquid.rb +18 -0
data/performance/shopify/money_filter.rb +18 -0
data/performance/shopify/paginate.rb +93 -0
data/performance/shopify/shop_filter.rb +98 -0
data/performance/shopify/tag_filter.rb +25 -0
data/performance/shopify/vision.database.yml +945 -0
data/performance/shopify/weight_filter.rb +11 -0
data/performance/tests/dropify/article.liquid +74 -0
data/performance/tests/dropify/blog.liquid +33 -0
data/performance/tests/dropify/cart.liquid +66 -0
data/performance/tests/dropify/collection.liquid +22 -0
data/performance/tests/dropify/index.liquid +47 -0
data/performance/tests/dropify/page.liquid +8 -0
data/performance/tests/dropify/product.liquid +68 -0
data/performance/tests/dropify/theme.liquid +105 -0
data/performance/tests/ripen/article.liquid +74 -0
data/performance/tests/ripen/blog.liquid +13 -0
data/performance/tests/ripen/cart.liquid +54 -0
data/performance/tests/ripen/collection.liquid +29 -0
data/performance/tests/ripen/index.liquid +32 -0
data/performance/tests/ripen/page.liquid +4 -0
data/performance/tests/ripen/product.liquid +75 -0
data/performance/tests/ripen/theme.liquid +85 -0
data/performance/tests/tribble/404.liquid +56 -0
data/performance/tests/tribble/article.liquid +98 -0
data/performance/tests/tribble/blog.liquid +41 -0
data/performance/tests/tribble/cart.liquid +134 -0
data/performance/tests/tribble/collection.liquid +70 -0
data/performance/tests/tribble/index.liquid +94 -0
data/performance/tests/tribble/page.liquid +56 -0
data/performance/tests/tribble/product.liquid +116 -0
data/performance/tests/tribble/search.liquid +51 -0
data/performance/tests/tribble/theme.liquid +90 -0
data/performance/tests/vogue/article.liquid +66 -0
data/performance/tests/vogue/blog.liquid +32 -0
data/performance/tests/vogue/cart.liquid +58 -0
data/performance/tests/vogue/collection.liquid +19 -0
data/performance/tests/vogue/index.liquid +22 -0
data/performance/tests/vogue/page.liquid +3 -0
data/performance/tests/vogue/product.liquid +62 -0
data/performance/tests/vogue/theme.liquid +122 -0
data/test/assign_test.rb +11 -0
data/test/block_test.rb +58 -0
data/test/condition_test.rb +109 -0
data/test/context_test.rb +482 -0
data/test/drop_test.rb +162 -0
data/test/error_handling_test.rb +89 -0
data/test/extra/breakpoint.rb +547 -0
data/test/extra/caller.rb +80 -0
data/test/file_system_test.rb +30 -0
data/test/filter_test.rb +95 -0
data/test/helper.rb +20 -0
data/test/html_tag_test.rb +31 -0
data/test/if_else_test.rb +131 -0
data/test/include_tag_test.rb +115 -0
data/test/module_ex_test.rb +89 -0
data/test/output_test.rb +121 -0
data/test/parsing_quirks_test.rb +41 -0
data/test/regexp_test.rb +45 -0
data/test/security_test.rb +41 -0
data/test/standard_filter_test.rb +161 -0
data/test/standard_tag_test.rb +400 -0
data/test/statements_test.rb +137 -0
data/test/strainer_test.rb +21 -0
data/test/template_test.rb +26 -0
data/test/test_helper.rb +20 -0
data/test/unless_else_test.rb +27 -0
data/test/variable_test.rb +172 -0
metadata +187 -0

data/performance/tests/tribble/search.liquid ADDED

@@ -0,0 +1,51 @@
+		<div id="page" class="innerpage clearfix">
+		<h1>Search Results</h1>
+		{% if search.performed %}
+		 {% paginate search.results by 10 %}
+		 {% if search.results == empty %}
+			<div class="latest-news">Your search for "{{search.terms | escape}}" did not yield any results</div>
+   		 {% else %}
+		<ul class="search-list clearfix">
+		 {% for item in search.results %}
+			<li>
+					<h3 class="stitle">{{ item.title | link_to: item.url }}</h3>
+					<p class="sinfo">{{ item.content | strip_html | truncatewords: 65 | highlight: search.terms }} ... <a href="{{item.url}}" title="">view this item</a></p>
+			</li>
+		{% end %}
+		</ul>
+		 {% end %}
+		<div class="paginate clearfix">
+			{{ paginate | default_pagination }}
+		</div>
+		<div id="three-reasons" class="clearfix">
+			<h3>Why Shop With Us?</h3>
+			<ul>
+				<li class="two-a">
+					<h4>24 Hours</h4>
+					<p>We're always here to help.</p>
+				</li>
+				<li class="two-c">
+					<h4>No Spam</h4>
+					<p>We'll never share your info.</p>
+				</li>
+				<li class="two-d">
+					<h4>Secure Servers</h4>
+					<p>Checkout is 256bit encrypted.</p>
+				</li>
+			</ul>
+		</div>
+	</div>
+{% end %}
+{% end %}

data/performance/tests/tribble/theme.liquid ADDED

@@ -0,0 +1,90 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>{{shop.name}} - {{page_title}}</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	{{ 'reset.css'     | asset_url | stylesheet_tag }}
+	{{ 'style.css'     | asset_url | stylesheet_tag }}
+	{{ 'lightbox.css'                         | asset_url | stylesheet_tag }}
+  {{ 'prototype/1.6/prototype.js'           | global_asset_url  | script_tag }}
+  {{ 'scriptaculous/1.8.2/scriptaculous.js' | global_asset_url  | script_tag }}
+	{{ 'lightbox.js'                          | asset_url | script_tag }}
+  {{ 'option_selection.js'                  | shopify_asset_url | script_tag }}
+  {{ content_for_header }}
+</head>
+<body id="page-{{template}}">
+<div id="wrap">
+	<div id="top">
+		<div id="cart">
+			<h3>Shopping Cart</h3>
+			<p class="cart-count">
+				{% if cart.item_count == 0 %}
+					Your cart is currently empty
+				{% else %}
+					{{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} <span>-</span> Total: {{cart.total_price | money_with_currency }} <span>-</span> <a href="/cart">View Cart</a>
+				{% end %}
+			</p>
+		</div>
+		<div id="site-title">
+			<h3><a href="/">{{shop.name}}</a></h3>
+			<h4><span>Tribble: A Shopify Theme</span></h4>
+		</div>
+	</div>
+	<ul id="nav">
+		{% for link in linklists.main-menu.links %}
+		 <li>{{ link.title | link_to: link.url }}</li>
+		{% end %}
+	</ul>
+	{{ content_for_layout }}
+	<div id="foot" class="clearfix">
+		<div class="quick-links">
+			<h4>Quick Navigation</h4>
+			<ul class="clearfix">
+				<li><a href="/">Home</a></li>
+				<li><a href="#top">Back to top</a></li>
+				{% for link in linklists.main-menu.links %}
+		 		<li>{{ link.title | link_to: link.url }}</li>
+				{% end %}
+			</ul>
+		</div>
+		<div class="quick-contact">
+			<h4>Quick Contact</h4>
+			<div class="vcard">
+  				<div class="org fn">
+   					<div class="organization-name">Really Great Widget Co.</div>
+  				</div>
+				<div class="adr">
+  					<span class="street-address">2531 Barrington Court</span>
+  					<span class="locality">Hayward</span>,
+					<abbr title="California" class="region">CA</abbr>
+	  				<span class="postal-code">94545</span>
+ 				</div>
+				<a class="email" href="mailto:email@myshopifysite.com">
+					email@myshopifysite.com
+				</a>
+				<div class="tel">
+					<span class="type">Support:</span> <span class="value">800-555-9954</span>
+				</div>
+			</div>
+		</div>
+		<p><a href="http://shopify.com" class="we-made">Powered by Shopify</a> &copy; Copyright {{ "now" | date: "%Y" }} {{ shop.name }}, All Rights Reserved.  <a href="/blogs/news.xml" id="foot-rss">RSS Feed</a></p>
+	</div>
+</div>
+</body>
+</html>

data/performance/tests/vogue/article.liquid ADDED

@@ -0,0 +1,66 @@
+<div class="article">
+  <h3 class="article-head-title">{{ article.title }}</h3>
+  <p> posted {{ article.created_at | date: "%Y %h" }} by {{ article.author }}</p>
+  <div class="article-body textile">
+    {{ article.content }}
+  </div>
+</div>
+{% if blog.comments_enabled? %}
+<div id="comments">
+  <h3>Comments</h3>
+  <!-- List all comments -->
+  <ul>
+  {% for comment in article.comments %}
+    <li>
+      <div class="comment">
+        {{ comment.content }}
+      </div>
+  	  <div class="comment-details">
+  		  Posted by {{ comment.author }} on {{ comment.created_at | date: "%B %d, %Y" }}
+      </div>
+  	</li>
+  {% end %}
+  </ul>
+  <!-- Comment Form -->
+  {% form article %}
+    <h3>Leave a comment</h3>
+    <!-- Check if a comment has been submitted in the last request, and if yes display an appropriate message -->
+    {% if form.posted_successfully? %}
+      {% if blog.moderated? %}
+        <div class="notice">
+          Successfully posted your comment.<br />
+          It will have to be approved by the blog owner first before showing up.
+        </div>
+      {% else %}
+        <div class="notice">Successfully posted your comment.</div>
+      {% end %}
+    {% end %}
+    {% if form.errors %}
+      <div class="notice error">Not all the fields have been filled out correctly!</div>
+    {% end %}
+    <dl>
+      <dt class="{% if form.errors contains 'author' %}error{% end %}"><label for="comment_author">Your name</label></dt>
+      <dd><input type="text" id="comment_author" name="comment[author]" size="40" value="{{form.author}}" class="{% if form.errors contains 'author' %}input-error{% end %}" /></dd>
+      <dt class="{% if form.errors contains 'email' %}error{% end %}"><label for="comment_email">Your email</label></dt>
+      <dd><input type="text" id="comment_email" name="comment[email]" size="40" value="{{form.email}}" class="{% if form.errors contains 'email' %}input-error{% end %}" /></dd>
+      <dt class="{% if form.errors contains 'body' %}error{% end %}"><label for="comment_body">Your comment</label></dt>
+      <dd><textarea id="comment_body" name="comment[body]" cols="40" rows="5" class="{% if form.errors contains 'body' %}input-error{% end %}">{{form.body}}</textarea></dd>
+    </dl>
+    {% if blog.moderated? %}
+      <p class="hint">comments have to be approved before showing up</p>
+    {% end %}
+    <input type="submit" value="Post comment" />
+  {% end %}
+</div>
+{% end %}

data/performance/tests/vogue/blog.liquid ADDED

@@ -0,0 +1,32 @@
+<div id="shop-id-label_about">
+<h3 class="article-head-title">{{page.title}}</h3>
+{% paginate blog.articles by 20 %}
+  {% for article in blog.articles  %}
+    <div class="article">
+      <h3 class="article-head-title">
+        <a href="{{article.url}}">{{ article.title }}</a>
+      </h3>
+      <p>
+      {% if blog.comments_enabled? %}
+        <a href="{{article.url}}#comments">{{ article.comments_count }} comments</a>
+        &mdash;
+      {% end %}
+      posted {{ article.created_at | date: "%Y %h" }} by {{ article.author }}</p>
+      <div class="article-body textile">
+        {{ article.content }}
+      </div>
+    </div>
+  {% end %}
+  <div id="pagination">
+    {{ paginate | default_pagination }}
+  </div>
+{% end %}
+</div>
+<div class="clear-me"></div>

data/performance/tests/vogue/cart.liquid ADDED

@@ -0,0 +1,58 @@
+<h1>Shopping Cart</h1>
+{% if cart.item_count == 0 %}
+	<p><strong>Your shopping basket is empty.</strong> Perhaps a featured item below is of interest...</p>
+	<table id="gallery">
+	{% tablerow product in collections.frontpage.products cols: 3 limit: 12 %}
+		<div class="gallery-image">
+			<a href="{{ product.url | within: collections.frontpage }}" title="{{ product.title | escape }} &mdash; {{ product.description | strip_html | truncate: 50 | escape }}"><img src="{{ product.images.first | product_img_url: 'medium' }}" alt="{{ product.title | escape }}" /></a>
+		</div>
+		<div class="gallery-info">
+			<a href="{{ product.url | within: collections.frontpage }}">{{ product.title | truncate: 30 }}</a><br />
+			<small>{{ product.price | money }}{% if product.compare_at_price_max > product.price %} <del>{{ product.compare_at_price_max | money }}</del>{% end %}</small>
+		</div>
+	{% end %}
+	</table>
+{% else %}
+<script type="text/javascript">
+  function remove_item(id) {
+      document.getElementById('updates_'+id).value = 0;
+      document.getElementById('cartform').submit();
+  }
+</script>
+<form action="/cart" method="post" id="cartform">
+	<table id="basket">
+		<tr>
+			<th>Item Description</th>
+			<th>Price</th>
+			<th>Qty</th>
+			<th>Delete</th>
+			<th>Total</th>
+		</tr>{% for item in cart.items %}
+		<tr class="basket-{% cycle 'odd', 'even' %}">
+			<td class="basket-column-one">
+				<div class="basket-images">
+					<a href="{{ item.product.url }}" title="{{ item.title | escape }} &mdash; {{ item.product.description | strip_html | truncate: 50 | escape }}"><img src="{{ item.product.images.first | product_img_url: 'thumb' }}" alt="{{ item.title | escape }}" /></a>
+				</div>
+				<div class="basket-desc">
+					<p><a href="{{ item.product.url }}">{{ item.title }}</a></p>
+					{{ item.product.description | strip_html | truncate: 120 }}
+				</div>
+			</td>
+			<td class="basket-column">{{ item.price | money }}{% if item.variant.compare_at_price > item.price %}<br /><del>{{ item.variant.compare_at_price | money }}</del>{% end %}</td>
+			<td class="basket-column"><input type="text" size="4" name="updates[{{item.variant.id}}]" id="updates_{{ item.variant.id }}" value="{{ item.quantity }}" onfocus="this.select();"/></td>
+			<td class="basket-column"><a href="#" onclick="remove_item({{ item.variant.id }}); return false;">Remove</a></td>
+			<td class="basket-column">{{ item.line_price | money }}</td>
+		</tr>{% end %}
+	</table>
+	<div id="basket-right">
+		<h3>Subtotal {{ cart.total_price | money }}</h3>
+		<input type="image" src="{{ 'update.png' | asset_url }}" id="update-cart" name="update" value="Update" />
+		<input type="image" src="{{ 'checkout.png' | asset_url }}" name="checkout" value="Checkout" />
+		{% if additional_checkout_buttons %}
+    <div class="additional-checkout-buttons">
+      <p>- or -</p>
+      {{ content_for_additional_checkout_buttons }}
+    </div>
+    {% end %}
+	</div>
+</form>{% end %}

data/performance/tests/vogue/collection.liquid ADDED

@@ -0,0 +1,19 @@
+{% paginate collection.products by 12 %}{% if collection.products.size == 0 %}
+	<strong>No products found in this collection.</strong>{% else %}
+	<h1>{{ collection.title }}</h1>
+	{{ collection.description }}
+	<table id="gallery">
+	{% tablerow product in collection.products cols: 3 %}
+		<div class="gallery-image">
+			<a href="{{ product.url | within: collection }}" title="{{ product.title | escape }} &mdash; {{ product.description | strip_html | truncate: 50 | escape }}"><img src="{{ product.images.first | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a>
+		</div>
+		<div class="gallery-info">
+			<a href="{{ product.url | within: collection }}">{{ product.title | truncate: 30 }}</a><br />
+			<small>{{ product.price | money }}{% if product.compare_at_price_max > product.price %} <del>{{ product.compare_at_price_max | money }}</del>{% end %}</small>
+		</div>
+	{% end %}
+	</table>{% if paginate.pages > 1 %}
+	<div id="paginate">
+		{{ paginate | default_pagination }}
+	</div>{% end %}{% end %}
+{% end %}

data/performance/tests/vogue/index.liquid ADDED

@@ -0,0 +1,22 @@
+	<div id="about-excerpt">
+  	{% assign article = pages.frontpage %}
+    {% if article.content != "" %}
+		  <h2>{{ article.title }}</h2>
+  		{{ article.content }}
+  	{% else %}
+  	  In <em>Admin &gt; Blogs &amp; Pages</em>, create a page with the handle <strong><code>frontpage</code></strong> and it will show up here.<br />
+  	  {{ "Learn more about handles" | link_to "http://wiki.shopify.com/Handle" }}
+  	{% end %}
+	</div>
+	<table id="gallery">
+	{% tablerow product in collections.frontpage.products cols: 3 limit: 12 %}
+		<div class="gallery-image">
+			<a href="{{ product.url | within: collections.frontpage }}" title="{{ product.title | escape }} &mdash; {{ product.description | strip_html | truncate: 50 | escape }}"><img src="{{ product.images.first | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a>
+		</div>
+		<div class="gallery-info">
+			<a href="{{ product.url | within: collections.frontpage }}">{{ product.title | truncate: 30 }}</a><br />
+			<small>{{ product.price | money }}{% if product.compare_at_price_max > product.price %} <del>{{ product.compare_at_price_max | money }}</del>{% end %}</small>
+		</div>
+	{% end %}
+	</table>

data/performance/tests/vogue/page.liquid ADDED

@@ -0,0 +1,3 @@
+	<h1>{{ page.title }}</h1>
+	{{ page.content }}

data/performance/tests/vogue/product.liquid ADDED

@@ -0,0 +1,62 @@
+<div id="product-left">
+	{% for image in product.images %}{% if forloop.first %}<div id="product-image">
+		<a href="{{ image | product_img_url: 'large' }}" rel="lightbox[images]" title="{{ product.title | escape }}"><img src="{{ image | product_img_url: 'medium' }}" alt="{{ product.title | escape }}" /></a>
+	</div>{% else %}
+	<div class="product-images">
+		<a href="{{ image | product_img_url: 'large' }}" rel="lightbox[images]" title="{{ product.title | escape }}"><img src="{{ image | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a>
+	</div>{% end %}{% end %}
+</div>
+<div id="product-right">
+	<h1>{{ product.title }}</h1>
+	{{ product.description }}
+	{% if product.available %}
+	<form action="/cart/add" method="post">
+	  <div id="product-variants">
+      <div id="price-field"></div>
+      <select id="product-select" name='id'>
+        {% for variant in product.variants %}
+          <option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
+        {% end %}
+      </select>
+		</div>
+    <input type="image" src="{{ 'purchase.png' | asset_url }}" name="add" value="Purchase" id="purchase" />
+	</form>
+	{% else %}
+	  <p class="bold-red">This product is temporarily unavailable</p>
+	{% end %}
+	<div id="product-details">
+		<strong>Continue Shopping</strong><br />
+		Browse more {{ product.type | link_to_type }} or additional {{ product.vendor | link_to_vendor }} products.
+	</div>
+</div>
+<script type="text/javascript">
+<!--
+  // mootools callback for multi variants dropdown selector
+  var selectCallback = function(variant, selector) {
+    if (variant && variant.available == true) {
+      // selected a valid variant
+      $('purchase').removeClass('disabled'); // remove unavailable class from add-to-cart button
+      $('purchase').disabled = false;           // reenable add-to-cart button
+      $('price-field').innerHTML = Shopify.formatMoney(variant.price, "{{shop.money_with_currency_format}}");  // update price field
+    } else {
+      // variant doesn't exist
+      $('purchase').addClass('disabled');      // set add-to-cart button to unavailable class
+      $('purchase').disabled = true;              // disable add-to-cart button
+      $('price-field').innerHTML = (variant) ? "Sold Out" : "Unavailable"; // update price-field message
+    }
+  };
+  // initialize multi selector for product
+  window.addEvent('domready', function() {
+    new Shopify.OptionSelectors("product-select", { product: {{ product | json }}, onVariantSelected: selectCallback });
+  });
+-->
+</script>

data/performance/tests/vogue/theme.liquid ADDED

@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>{{ shop.name }} &mdash; {{ page_title }}</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+{{ 'stylesheet.css' | asset_url | stylesheet_tag }}
+<!-- Additional colour schemes for this theme. If you want to use them, just replace the above line with one of these
+{{ 'caramel.css' | asset_url | stylesheet_tag }}
+{{ 'sea.css' | asset_url | stylesheet_tag }}
+-->
+{{ 'mootools.js'        | global_asset_url  | script_tag }}
+{{ 'slimbox.js'         | global_asset_url  | script_tag }}
+{{ 'option_selection.js' | shopify_asset_url | script_tag }}
+{{ content_for_header }}
+</head>
+<body id="page-{{ template }}">
+<div id="header">
+	<div class="container">
+		<div id="logo">
+			<h1><a href="/" title="{{ shop.name }}">{{ shop.name }}</a></h1>
+		</div>
+		<div id="navigation">
+			<ul id="navigate">
+				<li><a href="/cart">View Cart</a></li>
+			  {% for link in linklists.main-menu.links reversed %}
+				  <li><a href="{{ link.url }}">{{ link.title }}</a></li>
+				{% end %}
+			</ul>
+		</div>
+	</div>
+</div>
+<div id="mini-header">
+	<div class="container">
+		<div id="shopping-cart">
+			<a href="/cart">Your shopping cart contains {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}</a>
+		</div>
+		<div id="search-box">
+			<form action="/search" method="get">
+				<input type="text" name="q" id="q" />
+				<input type="image" src="{{ 'seek.png' | asset_url }}" value="Seek" onclick="this.parentNode.submit(); return false;" id="seek" />
+			</form>
+		</div>
+	</div>
+</div>
+<div id="layout">
+	<div class="container">
+		<div id="layout-left" {% if template != "cart" %}{% if template != "product" %}style="width:619px"{% end %}{% end %}>{% if template == "search" %}
+			<h1>Search Results</h1>{% end %}
+			{{ content_for_layout }}
+		</div>{% if template != "cart" %}{% if template != "product" %}
+		<div id="layout-right">
+			{% if template == "index" %}
+			{% if blogs.news.articles.size > 1 %}
+    	<a href="{{ shop.url }}/blogs/news.xml"><img src="{{ 'feed.png' | asset_url }}" alt="Subscribe" class="feed" /></a>
+    	<h3><a href="/blogs/news">More news</a></h3>
+    	<ul id="blogs">{% for article in blogs.news.articles limit: 6 offset: 1 %}
+    		<li><a href="{{ article.url }}">{{ article.title | strip_html | truncate: 30 }}</a><br />
+    			<small>{{ article.content | strip_html | truncatewords: 12 }}</small>
+    		</li>{% end %}
+    	</ul>
+    	{% end %}
+    	{% end %}
+    	{% if template == "collection" %}
+    	<h3>Collection Tags</h3>
+    	<div id="tags">{% if collection.tags.size == 0 %}
+    		No tags found.{% else %}
+    		<span class="tags">{% for tag in collection.tags %}{% if current_tags contains tag %} {{ tag | highlight_active_tag | link_to_remove_tag: tag }}{% else %} {{ tag | highlight_active_tag | link_to_add_tag: tag }}{% end %}{% unless forloop.last %}, {% end %}{% end %}</span>{% end %}
+    	</div>
+    	{% end %}
+      <h3>Navigation</h3>
+      <ul id="links">
+      {% for link in linklists.main-menu.links %}
+				<li><a href="{{ link.url }}">{{ link.title }}</a></li>
+			{% end %}
+		  </ul>
+		  {% if template != "page" %}
+			<h3>Featured Products</h3>
+			<ul id="featuring">{% for product in collections.frontpage.products limit: 6 %}
+				<li class="featuring-list">
+				  <div class="featuring-image">
+						<a href="{{ product.url | within: collections.frontpage }}" title="{{ product.title | escape }} &mdash; {{ product.description | strip_html | truncate: 50 }}"><img src="{{ product.images.first | product_img_url: 'icon' }}" alt="{{ product.title | escape }}" /></a>
+					</div>
+					<div class="featuring-info">
+						<a href="{{ product.url | within: collections.frontpage }}">{{ product.title | strip_html | truncate: 28 }}</a><br />
+						<small><span class="light">from</span> {{ product.price | money }}</small>
+					</div>
+				</li>{% end %}
+			</ul>
+			{% end %}
+		</div>{% end %}{% end %}
+	</div>
+</div>
+<div id="footer">
+	<div id="footer-fader">
+		<div class="container">
+			<div id="footer-right">{% for link in linklists.footer.links %}
+				{{ link.title | link_to: link.url }} {% unless forloop.last %}&#124;{% end %}{% end %}
+			</div>
+			<span id="footer-left">
+				Copyright &copy; {{ "now" | date: "%Y" }} <a href="/">{{ shop.name }}</a>. All Rights Reserved. All prices {{ shop.currency }}.<br />
+				This website is powered by <a href="http://www.shopify.com">Shopify</a>.
+			</span>
+		</div>
+	</div>
+</div>
+</body>
+</html>