Merge branch 'master' into dont_render_blank_blocks

Conflicts:
	lib/liquid/tags/cycle.rb
	lib/liquid/tags/increment.rb
This commit is contained in:
Florian Weingarten
2013-06-27 10:03:18 -04:00
66 changed files with 1943 additions and 1945 deletions
+3
View File
@@ -1,5 +1,8 @@
# Liquid Version History
IMPORTANT: Liquid 2.6 is going to be the last version of Liquid which maintains explicit Ruby 1.8 compatability.
The following releases will only be tested against Ruby 1.9 and Ruby 2.0 and are likely to break on Ruby 1.8.
## 2.6.0 / Master branch (not yet released)
* ...
+16 -16
View File
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="en-us" />
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="en-us" />
<title>products</title>
<title>products</title>
<meta name="ROBOTS" content="ALL" />
<meta http-equiv="imagetoolbar" content="no" />
<meta name="MSSmartTagsPreventParsing" content="true" />
<meta name="Copyright" content="(c) 2005 Copyright content: Copyright design: Tobias Luetke" />
<!-- (c) Copyright 2005 by Tobias Luetke All Rights Reserved. -->
</head>
<meta name="ROBOTS" content="ALL" />
<meta http-equiv="imagetoolbar" content="no" />
<meta name="MSSmartTagsPreventParsing" content="true" />
<meta name="Copyright" content="(c) 2005 Copyright content: Copyright design: Tobias Luetke" />
<!-- (c) Copyright 2005 by Tobias Luetke All Rights Reserved. -->
</head>
<body>
<body>
<h1>{{ description | split: '~' | first }}</h1>
<h1>{{ description | split: '~' | first }}</h1>
<h2>{{ description | split: '~' | last }}</h2>
<h2>{{ description | split: '~' | last }}</h2>
<h2>There are currently {{products | count}} products in the {{section}} catalog</h2>
<h2>There are currently {{products | count}} products in the {{section}} catalog</h2>
{% if cool_products %}
Cool products :)
@@ -45,5 +45,5 @@
</ul>
</body>
</body>
</html>
+8 -8
View File
@@ -48,16 +48,16 @@ module Liquid
def record_when_condition(markup)
while markup
# Create a new nodelist and assign it to the new block
if not markup =~ WhenSyntax
raise SyntaxError.new("Syntax Error in tag 'case' - Valid when condition: {% when [condition] [or condition2...] %} ")
end
# Create a new nodelist and assign it to the new block
if not markup =~ WhenSyntax
raise SyntaxError.new("Syntax Error in tag 'case' - Valid when condition: {% when [condition] [or condition2...] %} ")
end
markup = $2
markup = $2
block = Condition.new(@left, '==', $1)
block.attach(@nodelist)
@blocks.push(block)
block = Condition.new(@left, '==', $1)
block.attach(@nodelist)
@blocks.push(block)
end
end
+6 -9
View File
@@ -1,5 +1,4 @@
module Liquid
# Cycle is usually used within a loop to alternate between values, like colors or DOM classes.
#
# {% for item in items %}
@@ -19,11 +18,11 @@ module Liquid
def initialize(tag_name, markup, tokens)
case markup
when NamedSyntax
@variables = variables_from_string($2)
@name = $1
@variables = variables_from_string($2)
@name = $1
when SimpleSyntax
@variables = variables_from_string(markup)
@name = "'#{@variables.to_s}'"
@name = "'#{@variables.to_s}'"
else
raise SyntaxError.new("Syntax Error in 'cycle' - Valid syntax: cycle [name :] var [, var2, var3 ...]")
end
@@ -49,14 +48,12 @@ module Liquid
end
private
def variables_from_string(markup)
markup.split(',').collect do |var|
var =~ /\s*(#{QuotedFragment})\s*/o
$1 ? $1 : nil
end.compact
var =~ /\s*(#{QuotedFragment})\s*/o
$1 ? $1 : nil
end.compact
end
end
Template.register_tag('cycle', Cycle)
+1 -3
View File
@@ -1,12 +1,11 @@
module Liquid
# increment is used in a place where one needs to insert a counter
# into a template, and needs the counter to survive across
# multiple instantiations of the template.
# (To achieve the survival, the application must keep the context)
#
# if the variable does not exist, it is created with value 0.
#
# Hello: {% increment variable %}
#
# gives you:
@@ -18,7 +17,6 @@ module Liquid
class Increment < Tag
def initialize(tag_name, markup, tokens)
@variable = markup.strip
super
end
+3 -3
View File
@@ -17,14 +17,14 @@
<ul id="comment-list">
{% for comment in article.comments %}
<li>
<div class="comment-details">
<span class="comment-author">{{ comment.author }}</span> said on <span class="comment-date">{{ comment.created_at | date: "%B %d, %Y" }}</span>:
<div class="comment-details">
<span class="comment-author">{{ comment.author }}</span> said on <span class="comment-date">{{ comment.created_at | date: "%B %d, %Y" }}</span>:
</div>
<div class="comment">
{{ comment.content }}
</div>
</li>
</li>
{% endfor %}
</ul>
+1 -1
View File
@@ -10,7 +10,7 @@
<h3 class="title">
<a href="{{article.url}}">{{ article.title }}</a>
</h3>
<h4 class="date">Posted on {{ article.created_at | date: "%B %d, '%y" }} by {{ article.author }}.</h4>
<h4 class="date">Posted on {{ article.created_at | date: "%B %d, '%y" }} by {{ article.author }}.</h4>
</div>
<div class="article-body textile">
+10 -10
View File
@@ -20,17 +20,17 @@
{% for item in cart.items %}
<li id="item-{{item.id}}" class="clearfix">
<div class="thumb">
<div class="prodimage">
<div class="prodimage">
<a href="{{item.product.url}}" title="View {{item.title}} Page"><img src="{{item.product.featured_image | product_img_url: 'thumb' }}" alt="{{item.title | escape }}" /></a>
</div></div>
<h3 style="padding-right: 150px">
<a href="{{item.product.url}}" title="View {{item.title | escape }} Page">
{{ item.title }}
{% if item.variant.available == true %}
({{item.variant.title}})
{% endif %}
</a>
</h3>
<a href="{{item.product.url}}" title="View {{item.title | escape }} Page">
{{ item.title }}
{% if item.variant.available == true %}
({{item.variant.title}})
{% endif %}
</a>
</h3>
<small class="itemcost">Costs {{ item.price | money }} each, <span class="money">{{item.line_price | money }}</span> total.</small>
<p class="right">
<label for="updates">How many? </label>
@@ -49,10 +49,10 @@
</div>
<div class="info">
<input type="image" value="Checkout!" name="checkout" src="{{ 'checkout.gif' | asset_url }}" />
<input type="image" value="Checkout!" name="checkout" src="{{ 'checkout.gif' | asset_url }}" />
</div>
{% if additional_checkout_buttons %}
{% if additional_checkout_buttons %}
<div class="additional-checkout-buttons">
<p>- or -</p>
{{ content_for_additional_checkout_buttons }}
+1 -1
View File
@@ -9,7 +9,7 @@
<div class="description">
<h3><a href="{{product.url}}">{{product.title}}</a></h3>
<p>{{ product.description | strip_html | truncatewords: 35 }}</p>
<p class="money">{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</p>
<p class="money">{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</p>
</div>
</li>
{% endfor %}
+15 -15
View File
@@ -5,7 +5,7 @@
<a href="{{ product.url }}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a>
<h3><a href="{{ product.url }}">{{ product.title }}</a></h3>
<div class="description">{{ product.description | strip_html | truncatewords: 18 }}</div>
<p class="money">{{ product.price_min | money }}</p>
<p class="money">{{ product.price_min | money }}</p>
</div>
{% endfor %}
{% for product in collections.frontpage.products offset:1 %}
@@ -18,30 +18,30 @@
</div></div></div>
<div id="mainarticle">
{% assign article = pages.frontpage %}
{% assign article = pages.frontpage %}
{% if article.content != "" %}
<h2>{{ article.title }}</h2>
<h2>{{ article.title }}</h2>
<div class="article-body textile">
{{ article.content }}
</div>
{% else %}
<div class="article-body textile">
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" }}
{{ article.content }}
</div>
{% endif %}
{% else %}
<div class="article-body textile">
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" }}
</div>
{% endif %}
</div>
<br style="clear: both;" />
<div id="articles">
{% for article in blogs.news.articles offset:1 %}
<div class="article">
<h2>{{ article.title }}</h2>
<div class="article-body textile">
{{ article.content }}
</div>
</div>
<h2>{{ article.title }}</h2>
<div class="article-body textile">
{{ article.content }}
</div>
</div>
{% endfor %}
</div>
+17 -17
View File
@@ -1,18 +1,18 @@
<div id="productpage">
<div id="productimages"><div id="productimages-top"><div id="productimages-bottom">
{% for image in product.images %}
{% if forloop.first %}
<a href="{{ image | product_img_url: 'large' }}" class="productimage" rel="lightbox">
<img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
</a>
{% else %}
<a href="{{ image | product_img_url: 'large' }}" class="productimage-small" rel="lightbox">
<img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
</a>
{% endif %}
{% endfor %}
</div></div></div>
<div id="productimages"><div id="productimages-top"><div id="productimages-bottom">
{% for image in product.images %}
{% if forloop.first %}
<a href="{{ image | product_img_url: 'large' }}" class="productimage" rel="lightbox">
<img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
</a>
{% else %}
<a href="{{ image | product_img_url: 'large' }}" class="productimage-small" rel="lightbox">
<img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
</a>
{% endif %}
{% endfor %}
</div></div></div>
<h2>{{ product.title }}</h2>
@@ -26,15 +26,15 @@
<div id="variant-add">
<form action="/cart/add" method="post">
<select id="variant-select" name="id" class="product-info-options">
<select id="variant-select" name="id" class="product-info-options">
{% for variant in product.variants %}
<option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
{% endfor %}
</select>
</select>
<div id="price-field" class="price"></div>
<div id="price-field" class="price"></div>
<div style="text-align:center;"><input type="image" name="add" value="Add to Cart" id="add" src="{{ 'addtocart.gif' | asset_url }}" /></div>
<div style="text-align:center;"><input type="image" name="add" value="Add to Cart" id="add" src="{{ 'addtocart.gif' | asset_url }}" /></div>
</form>
</div>
+42 -42
View File
@@ -1,67 +1,67 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>{{shop.name}} - {{page_title}}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>{{shop.name}} - {{page_title}}</title>
{{ 'textile.css' | global_asset_url | stylesheet_tag }}
{{ 'textile.css' | global_asset_url | stylesheet_tag }}
{{ 'lightbox/v204/lightbox.css' | global_asset_url | stylesheet_tag }}
{{ 'prototype/1.6/prototype.js' | global_asset_url | script_tag }}
{{ 'prototype/1.6/prototype.js' | global_asset_url | script_tag }}
{{ 'scriptaculous/1.8.2/scriptaculous.js' | global_asset_url | script_tag }}
{{ 'lightbox/v204/lightbox.js' | global_asset_url | script_tag }}
{{ 'option_selection.js' | shopify_asset_url | script_tag }}
{{ 'layout.css' | asset_url | stylesheet_tag }}
{{ 'shop.js' | asset_url | script_tag }}
{{ 'layout.css' | asset_url | stylesheet_tag }}
{{ 'shop.js' | asset_url | script_tag }}
{{ content_for_header }}
{{ content_for_header }}
</head>
<body id="page-{{template}}">
<p class="hide"><a href="#rightsiders">Skip to navigation.</a></p>
<!-- mini cart -->
<p class="hide"><a href="#rightsiders">Skip to navigation.</a></p>
<!-- mini cart -->
{% if cart.item_count > 0 %}
<div id="minicart" style="display:none;"><div id="minicart-inner">
<div id="minicart-items">
<h2>There {{ cart.item_count | pluralize: 'is', 'are' }} {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} in <a href="/cart" title="View your cart">your cart</a>!</h2><h4 style="font-size: 16px; margin: 0 0 10px 0; padding: 0;">Your subtotal is {{ cart.total_price | money }}.</h4>
{% for item in cart.items %}
<div class="thumb">
<div class="prodimage"><a href="{{item.product.url}}" onMouseover="tooltip('{{ item.quantity }} x {{ item.title }} ({{ item.variant.title }})', 200)"; onMouseout="hidetooltip()"><img src="{{ item.product.featured_image | product_img_url: 'thumb' }}" /></a></div>
</div>
{% endfor %}
</div>
<br style="clear:both;" />
</div></div>
<div id="minicart" style="display:none;"><div id="minicart-inner">
<div id="minicart-items">
<h2>There {{ cart.item_count | pluralize: 'is', 'are' }} {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} in <a href="/cart" title="View your cart">your cart</a>!</h2><h4 style="font-size: 16px; margin: 0 0 10px 0; padding: 0;">Your subtotal is {{ cart.total_price | money }}.</h4>
{% for item in cart.items %}
<div class="thumb">
<div class="prodimage"><a href="{{item.product.url}}" onMouseover="tooltip('{{ item.quantity }} x {{ item.title }} ({{ item.variant.title }})', 200)"; onMouseout="hidetooltip()"><img src="{{ item.product.featured_image | product_img_url: 'thumb' }}" /></a></div>
</div>
{% endfor %}
</div>
<br style="clear:both;" />
</div></div>
{% endif %}
<div id="container">
<div id="header">
<!-- Begin Header -->
<div id="header">
<!-- Begin Header -->
<h1 id="logo"><a href="/" title="Go Home">{{shop.name}}</a></h1>
<div id="cartlinks">
{% if cart.item_count > 0 %}
<h2 id="cartcount"><a href="/cart" onMouseover="tooltip('There {{ cart.item_count | pluralize: 'is', 'are' }} {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} in your cart!', 200)"; onMouseout="hidetooltip()">{{ cart.item_count }} {{ cart.item_count | pluralize: 'thing', 'things' }}!</a></h2>
<a href="/cart" id="minicartswitch" onclick="superSwitch(this, 'minicart', 'Close Mini Cart'); return false;" id="cartswitch">View Mini Cart ({{ cart.total_price | money }})</a>
<a href="/cart" id="minicartswitch" onclick="superSwitch(this, 'minicart', 'Close Mini Cart'); return false;" id="cartswitch">View Mini Cart ({{ cart.total_price | money }})</a>
{% endif %}
</div>
<!-- End Header -->
</div>
<hr />
</div>
<hr />
<div id="main">
<div id="content">
<div id="innercontent">
{{ content_for_layout }}
</div>
</div>
<div id="content">
<div id="innercontent">
{{ content_for_layout }}
</div>
</div>
<hr />
<div id="rightsiders">
<hr />
<div id="rightsiders">
<ul class="rightlinks">
{% for link in linklists.main-menu.links %}
@@ -83,18 +83,18 @@
{% endfor %}
</ul>
</div>
</div>
<hr /><br style="clear:both;" />
<hr /><br style="clear:both;" />
<div id="footer">
<div class="footerinner">
All prices are in {{ shop.currency }}.
Powered by <a href="http://www.shopify.com" title="Shopify, Hosted E-Commerce">Shopify</a>.
</div>
</div>
<div id="footer">
<div class="footerinner">
All prices are in {{ shop.currency }}.
Powered by <a href="http://www.shopify.com" title="Shopify, Hosted E-Commerce">Shopify</a>.
</div>
</div>
</div>
</div>
</div>
<div id="tooltip"></div>
+3 -3
View File
@@ -21,10 +21,10 @@
{{ comment.content }}
</div>
<div class="comment-details">
Posted by {{ comment.author }} on {{ comment.created_at | date: "%B %d, %Y" }}
<div class="comment-details">
Posted by {{ comment.author }} on {{ comment.created_at | date: "%B %d, %Y" }}
</div>
</li>
</li>
{% endfor %}
</ul>
+8 -8
View File
@@ -9,7 +9,7 @@
{% if cart.item_count == 0 %}
<p>Your shopping cart is empty...</p>
<p><a href="/"><img src="{{ 'continue_shopping_icon.gif' | asset_url }}" alt="Continue shopping"/></a><p>
<p><a href="/"><img src="{{ 'continue_shopping_icon.gif' | asset_url }}" alt="Continue shopping"/></a><p>
{% else %}
<form action="/cart" method="post" id="cart">
@@ -26,21 +26,21 @@
{% for item in cart.items %}
<tr class="{% cycle 'odd', 'even' %}">
<td class="short">{{ item.product.featured_image | product_img_url: 'thumb' | img_tag }}</td>
<td><a href="{{item.product.url}}">{{ item.title }}</a></td>
<td><a href="{{item.product.url}}">{{ item.title }}</a></td>
<td class="short"><input type="text" class="quantity" name="updates[{{item.variant.id}}]" id="updates_{{item.variant.id}}" value="{{item.quantity}}" onfocus="this.select();"/></td>
<td class="cart-price">{{ item.price | money }}</td>
<td class="cart-price">{{item.line_price | money }}</td>
<td class="short"><a href="#" onclick="remove_item({{item.variant.id}}); return false;" class="remove"><img src="{{ 'cancel_icon.gif' | asset_url }}" alt="Remove" /></a></td>
</tr>
{% endfor %}
</table>
<p class="updatebtn"><input type="image" value="Update Cart" name="update" src="{{ 'update_icon.gif' | asset_url }}" alt="Update" /></p>
<p class="subtotal">
<strong>Subtotal:</strong> {{cart.total_price | money_with_currency }}
</p>
</table>
<p class="updatebtn"><input type="image" value="Update Cart" name="update" src="{{ 'update_icon.gif' | asset_url }}" alt="Update" /></p>
<p class="subtotal">
<strong>Subtotal:</strong> {{cart.total_price | money_with_currency }}
</p>
<p class="checkout"><input type="image" src="{{ 'checkout_icon.gif' | asset_url }}" alt="Proceed to Checkout" value="Proceed to Checkout" name="checkout" /></p>
{% if additional_checkout_buttons %}
{% if additional_checkout_buttons %}
<div class="additional-checkout-buttons">
<p>- or -</p>
{{ content_for_additional_checkout_buttons }}
+1 -1
View File
@@ -15,7 +15,7 @@
<div class="prod-list-description">
<h3><a href="{{product.url}}">{{product.title}}</a></h3>
<p>{{ product.description | strip_html | truncatewords: 35 }}</p>
<p class="prd-price">{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</p>
<p class="prd-price">{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</p>
</div>
</li>
{% endfor %}
+28 -28
View File
@@ -1,32 +1,32 @@
<div id="home-page">
<h3 class="heading-shaded">Featured products...</h3>
<div class="featured-prod-row clearfix">
{% for product in collections.frontpage.products %}
<div class="featured-prod-item">
<p>
<a href="{{product.url}}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</p>
<h4><a href="{{product.url}}">{{product.title}}</a></h4>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
<p class="prd-price">Was:<del>{{product.compare_at_price | money}}</del></p>
<p class="prd-price"><ins>Now: {{product.price_min | money}}</ins></p>
{% endif %}
{% else %}
<p class="prd-price"><ins>{{product.price_min | money}}</ins></p>
{% endif %}
</div>
{% endfor %}
</div>
<h3 class="heading-shaded">Featured products...</h3>
<div class="featured-prod-row clearfix">
{% for product in collections.frontpage.products %}
<div class="featured-prod-item">
<p>
<a href="{{product.url}}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</p>
<h4><a href="{{product.url}}">{{product.title}}</a></h4>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
<p class="prd-price">Was:<del>{{product.compare_at_price | money}}</del></p>
<p class="prd-price"><ins>Now: {{product.price_min | money}}</ins></p>
{% endif %}
{% else %}
<p class="prd-price"><ins>{{product.price_min | money}}</ins></p>
{% endif %}
</div>
{% endfor %}
</div>
<div id="articles">
{% assign article = pages.frontpage %}
<div id="articles">
{% assign article = pages.frontpage %}
{% if article.content != "" %}
<h3>{{ article.title }}</h3>
{{ 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" }}
{% endif %}
</div>
<h3>{{ article.title }}</h3>
{{ 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" }}
{% endif %}
</div>
</div>
+28 -28
View File
@@ -1,31 +1,31 @@
<div id="product-page">
<h2 class="heading-shaded">{{ product.title }}</h2>
<div id="product-details">
<div id="product-images">
{% for image in product.images %}
{% if forloop.first %}
<a href="{{ image | product_img_url: 'large' }}" class="product-image" rel="lightbox[ product]" title="">
<img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
</a>
{% else %}
<a href="{{ image | product_img_url: 'large' }}" class="product-image-small" rel="lightbox[ product]" title="">
<img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
</a>
{% endif %}
{% endfor %}
</div>
<h2 class="heading-shaded">{{ product.title }}</h2>
<div id="product-details">
<div id="product-images">
{% for image in product.images %}
{% if forloop.first %}
<a href="{{ image | product_img_url: 'large' }}" class="product-image" rel="lightbox[ product]" title="">
<img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
</a>
{% else %}
<a href="{{ image | product_img_url: 'large' }}" class="product-image-small" rel="lightbox[ product]" title="">
<img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
</a>
{% endif %}
{% endfor %}
</div>
<ul id="product-info">
<li>Vendor: {{ product.vendor | link_to_vendor }}</li>
<li>Type: {{ product.type | link_to_type }}</li>
</ul>
<ul id="product-info">
<li>Vendor: {{ product.vendor | link_to_vendor }}</li>
<li>Type: {{ product.type | link_to_type }}</li>
</ul>
<small>{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</small>
<small>{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</small>
<div id="product-options">
<div id="product-options">
{% if product.available %}
<form action="/cart/add" method="post">
<form action="/cart/add" method="post">
<select id="product-select" name='id'>
{% for variant in product.variants %}
@@ -35,16 +35,16 @@
<div id="price-field"></div>
<div class="add-to-cart"><input type="image" name="add" value="Add to Cart" id="add" src="{{ 'add-to-cart.gif' | asset_url }}" /></div>
</form>
<div class="add-to-cart"><input type="image" name="add" value="Add to Cart" id="add" src="{{ 'add-to-cart.gif' | asset_url }}" /></div>
</form>
{% else %}
<span>Sold Out!</span>
{% endif %}
</div>
</div>
<div class="product-description">
{{ product.description }}
</div>
<div class="product-description">
{{ product.description }}
</div>
</div>
</div>
+60 -60
View File
@@ -2,15 +2,15 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<title>{{shop.name}} - {{page_title}}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
{{ 'main.css' | asset_url | stylesheet_tag }}
{{ 'shop.js' | asset_url | script_tag }}
{{ 'shop.js' | asset_url | script_tag }}
{{ 'mootools.js' | asset_url | script_tag }}
{{ 'slimbox.js' | asset_url | script_tag }}
{{ 'mootools.js' | asset_url | script_tag }}
{{ 'slimbox.js' | asset_url | script_tag }}
{{ 'option_selection.js' | shopify_asset_url | script_tag }}
{{ 'slimbox.css' | asset_url | stylesheet_tag }}
{{ 'slimbox.css' | asset_url | stylesheet_tag }}
{{ content_for_header }}
</head>
@@ -18,67 +18,67 @@
<body id="page-{{template}}">
<p class="hide"><a href="#navigation">Skip to navigation.</a></p>
<div id="wrapper">
<div class="content clearfix">
<div id="header">
<h2><a href="/">{{shop.name}}</a></h2>
</div>
<div id="left-col">
{{ content_for_layout }}
</div>
<div id="right-col">
{% if template != 'cart' %}
<div id="cart-right-col">
<dl id="cart-right-col-info">
<dt>Shopping Cart</dt>
<dd>
{% if cart.item_count != 0 %}
<a href="/cart">{{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}</a> in your cart
{% else %}
Your cart is empty
{% endif %}
</dd>
</dl>
</div>
{% endif %}
<div id="search">
<dl id="searchbox">
<dt>Search</dt>
<dd>
<form action="/search" method="get">
<fieldset>
<input class="search-input" type="text" onclick="this.select()" value="Search this shop..." name="q" />
</fieldset>
</form>
</dd>
</dl>
</div>
<div id="navigation">
<dl class="navbar">
<dt>Navigation</dt>
{% for link in linklists.main-menu.links %}
<dd>{{ link.title | link_to: link.url }}</dd>
{% endfor %}
</dl>
<div class="content clearfix">
<div id="header">
<h2><a href="/">{{shop.name}}</a></h2>
</div>
<div id="left-col">
{{ content_for_layout }}
</div>
<div id="right-col">
{% if template != 'cart' %}
<div id="cart-right-col">
<dl id="cart-right-col-info">
<dt>Shopping Cart</dt>
<dd>
{% if cart.item_count != 0 %}
<a href="/cart">{{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}</a> in your cart
{% else %}
Your cart is empty
{% endif %}
</dd>
</dl>
</div>
{% endif %}
<div id="search">
<dl id="searchbox">
<dt>Search</dt>
<dd>
<form action="/search" method="get">
<fieldset>
<input class="search-input" type="text" onclick="this.select()" value="Search this shop..." name="q" />
</fieldset>
</form>
</dd>
</dl>
</div>
<div id="navigation">
<dl class="navbar">
<dt>Navigation</dt>
{% for link in linklists.main-menu.links %}
<dd>{{ link.title | link_to: link.url }}</dd>
{% endfor %}
</dl>
{% if tags %}
<dl class="navbar">
<dt>Tags</dt>
{% for tag in collection.tags %}
<dd>{{ tag | highlight_active_tag | link_to_tag: tag }}</dd>
{% endfor %}
</dl>
{% endif %}
</div>
</div>
{% if tags %}
<dl class="navbar">
<dt>Tags</dt>
{% for tag in collection.tags %}
<dd>{{ tag | highlight_active_tag | link_to_tag: tag }}</dd>
{% endfor %}
</dl>
{% endif %}
</div>
</div>
</div>
</div>
<div id="content-padding"></div>
</div>
<div id="footer">
{% for link in linklists.footer.links %}
{{ link.title | link_to: link.url }} {% if forloop.rindex != 1 %} | {% endif %}
{% endfor %}
{% for link in linklists.footer.links %}
{{ link.title | link_to: link.url }} {% if forloop.rindex != 1 %} | {% endif %}
{% endfor %}
</div>
</body>
+46 -46
View File
@@ -1,56 +1,56 @@
<div id="page" class="innerpage clearfix">
<div id="page" class="innerpage clearfix">
<div id="text-page">
<div class="entry">
<h1>Oh no!</h1>
<div class="entry-post">
Seems like you are looking for something that just isn't here. <a href="/">Try heading back to our main page</a>. Or you can checkout some of our featured products below.
</div>
</div>
</div>
<div id="text-page">
<div class="entry">
<h1>Oh no!</h1>
<div class="entry-post">
Seems like you are looking for something that just isn't here. <a href="/">Try heading back to our main page</a>. Or you can checkout some of our featured products below.
</div>
</div>
</div>
<h1>Featured Products</h1>
<ul class="item-list clearfix">
<h1>Featured Products</h1>
<ul class="item-list clearfix">
{% for product in collections.frontpage.products %}
<li>
<form action="/cart/add" method="post">
<div class="item-list-item">
<div class="ili-top clearfix">
<div class="ili-top-content">
<h2><a href="{{product.url}}">{{product.title}}</a></h2>
<p>{{ product.description | truncatewords: 15 }}</p>
</div>
<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</div>
{% for product in collections.frontpage.products %}
<li>
<form action="/cart/add" method="post">
<div class="item-list-item">
<div class="ili-top clearfix">
<div class="ili-top-content">
<h2><a href="{{product.url}}">{{product.title}}</a></h2>
<p>{{ product.description | truncatewords: 15 }}</p>
</div>
<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</div>
<div class="ili-bottom clearfix">
<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
<input type="submit" class="" value="Add to Basket" />
<p>
<a href="{{product.url}}">View Details</a>
<div class="ili-bottom clearfix">
<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
<input type="submit" class="" value="Add to Basket" />
<p>
<a href="{{product.url}}">View Details</a>
<span>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
{{product.compare_at_price | money}} -
{% endif %}
{% endif %}
<strong>
{{product.price_min | money}}
</strong>
</span>
</p>
</div>
</div>
</form>
</li>
{% endfor %}
<span>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
{{product.compare_at_price | money}} -
{% endif %}
{% endif %}
<strong>
{{product.price_min | money}}
</strong>
</span>
</p>
</div>
</div>
</form>
</li>
{% endfor %}
</ul>
</div>
<!-- end page -->
</ul>
</div>
<!-- end page -->
+32 -32
View File
@@ -1,15 +1,15 @@
<div id="page" class="innerpage clearfix">
<div id="text-page">
<div id="page" class="innerpage clearfix">
<div id="text-page">
<div class="entry">
<h1><span>{{article.title}}</span></h1>
<div class="entry-post">
<div class="meta">{{ article.created_at | date: "%b %d" }}</div>
{{ article.content }}
</div>
<div class="entry">
<h1><span>{{article.title}}</span></h1>
<div class="entry-post">
<div class="meta">{{ article.created_at | date: "%b %d" }}</div>
{{ article.content }}
</div>
<!-- Comments -->
<!-- Comments -->
{% if blog.comments_enabled? %}
<div id="comments">
<h2>Comments</h2>
@@ -22,10 +22,10 @@
{{ comment.content }}
</div>
<div class="comment-details">
Posted by <span class="comment-author">{{ comment.author }}</span> on <span class="comment-date">{{ comment.created_at | date: "%B %d, %Y" }}</span>
<div class="comment-details">
Posted by <span class="comment-author">{{ comment.author }}</span> on <span class="comment-date">{{ comment.created_at | date: "%B %d, %Y" }}</span>
</div>
</li>
</li>
{% endfor %}
</ul>
@@ -75,24 +75,24 @@
<!-- END Comments -->
</div>
</div>
</div>
</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>
<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>
+36 -36
View File
@@ -1,41 +1,41 @@
<div id="page" class="innerpage clearfix">
<div id="text-page">
<h1>Post from our blog...</h1>
{% paginate blog.articles by 20 %}
{% for article in blog.articles %}
<div id="page" class="innerpage clearfix">
<div id="text-page">
<h1>Post from our blog...</h1>
{% paginate blog.articles by 20 %}
{% for article in blog.articles %}
<div class="entry">
<h1><span><a href="{{ article.url }}">{{ article.title }}</a></span></h1>
<div class="entry-post">
<div class="meta">{{ article.created_at | date: "%b %d" }}</div>
{{ article.content }}
</div>
</div>
<div class="entry">
<h1><span><a href="{{ article.url }}">{{ article.title }}</a></span></h1>
<div class="entry-post">
<div class="meta">{{ article.created_at | date: "%b %d" }}</div>
{{ article.content }}
</div>
</div>
{% endfor %}
{% endfor %}
<div class="paginate clearfix">
{{ paginate | default_pagination }}
</div>
<div class="paginate clearfix">
{{ paginate | default_pagination }}
</div>
{% endpaginate %}
</div>
{% endpaginate %}
</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>
<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>
+98 -98
View File
@@ -5,55 +5,55 @@
}
</script>
<div id="page" class="innerpage clearfix">.
{% if cart.item_count == 0 %}
<h1>Your cart is currently empty.</h1>
{% else %}
<div id="page" class="innerpage clearfix">.
{% if cart.item_count == 0 %}
<h1>Your cart is currently empty.</h1>
{% else %}
<h1>Your Cart <span>({{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}, {{cart.total_price | money_with_currency }} total)</span></h1>
<h1>Your Cart <span>({{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}, {{cart.total_price | money_with_currency }} total)</span></h1>
<form action="/cart" method="post" id="cart-form">
<form action="/cart" method="post" id="cart-form">
<div id="cart-wrap">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<th scope="col" class="td-image"><label>Image</label></th>
<th scope="col" class="td-title"><label>Product Title</label></th>
<th scope="col" class="td-count"><label>Count</label></th>
<th scope="col" class="td-price"><label>Cost</label></th>
<th scope="col" class="td-delete"><label>Remove</label></th>
</tr>
<div id="cart-wrap">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<th scope="col" class="td-image"><label>Image</label></th>
<th scope="col" class="td-title"><label>Product Title</label></th>
<th scope="col" class="td-count"><label>Count</label></th>
<th scope="col" class="td-price"><label>Cost</label></th>
<th scope="col" class="td-delete"><label>Remove</label></th>
</tr>
{% for item in cart.items %}
<tr class="{% cycle 'reg', 'alt' %}">
<td colspan="5">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="td-image"><a href="{{item.product.url}}">{{ item.product.featured_image | product_img_url: 'thumb' | img_tag }}</a></td>
<td class="td-title"><p>{{ item.title }}</p></td>
<td class="td-count"><label>Count:</label> <input type="text" class="quantity item-count" name="updates[{{item.variant.id}}]" id="updates_{{item.variant.id}}" value="{{item.quantity}}" onfocus="this.select();"/></td>
<td class="td-price">{{item.line_price | money }}</td>
<td class="td-delete"><a href="#" onclick="remove_item({{item.variant.id}}); return false;">Remove</a></td>
</tr>
</table>
</td>
</tr>
{% endfor %}
</table>
{% for item in cart.items %}
<tr class="{% cycle 'reg', 'alt' %}">
<td colspan="5">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="td-image"><a href="{{item.product.url}}">{{ item.product.featured_image | product_img_url: 'thumb' | img_tag }}</a></td>
<td class="td-title"><p>{{ item.title }}</p></td>
<td class="td-count"><label>Count:</label> <input type="text" class="quantity item-count" name="updates[{{item.variant.id}}]" id="updates_{{item.variant.id}}" value="{{item.quantity}}" onfocus="this.select();"/></td>
<td class="td-price">{{item.line_price | money }}</td>
<td class="td-delete"><a href="#" onclick="remove_item({{item.variant.id}}); return false;">Remove</a></td>
</tr>
</table>
</td>
</tr>
{% endfor %}
</table>
<div id="finish-up">
<div id="finish-up">
<div class="latest-news-box">
{{ pages.shopping-cart.content }}
</div>
<div class="latest-news-box">
{{ pages.shopping-cart.content }}
</div>
<p class="order-total">
<span><strong>Order Total:</strong> {{cart.total_price | money_with_currency }}</span>
</p>
<p class="order-total">
<span><strong>Order Total:</strong> {{cart.total_price | money_with_currency }}</span>
</p>
<p class="update-cart"><input type="submit" value="Refresh Cart" name="update" /></p>
<p class="update-cart"><input type="submit" value="Refresh Cart" name="update" /></p>
<p class="go-checkout"><input type="submit" value="Proceed to Checkout" name="checkout" /></p>
<p class="go-checkout"><input type="submit" value="Proceed to Checkout" name="checkout" /></p>
{% if additional_checkout_buttons %}
<div class="additional-checkout-buttons">
@@ -62,73 +62,73 @@
</div>
{% endif %}
</div>
</div>
</div>
</div>
</form>
</form>
{% endif %}
{% endif %}
<h1 class="other-products"><span>Other Products You Might Enjoy</span></h1>
<ul class="item-list clearfix">
<h1 class="other-products"><span>Other Products You Might Enjoy</span></h1>
<ul class="item-list clearfix">
{% for product in collections.frontpage.products limit:2 %}
<li>
<form action="/cart/add" method="post">
<div class="item-list-item">
<div class="ili-top clearfix">
<div class="ili-top-content">
<h2><a href="{{product.url}}">{{product.title}}</a></h2>
<p>{{ product.description | truncatewords: 15 }}</p>
</div>
<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</div>
{% for product in collections.frontpage.products limit:2 %}
<li>
<form action="/cart/add" method="post">
<div class="item-list-item">
<div class="ili-top clearfix">
<div class="ili-top-content">
<h2><a href="{{product.url}}">{{product.title}}</a></h2>
<p>{{ product.description | truncatewords: 15 }}</p>
</div>
<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</div>
<div class="ili-bottom clearfix">
<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
<input type="submit" class="" value="Add to Basket" />
<p>
<a href="{{product.url}}">View Details</a>
<div class="ili-bottom clearfix">
<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
<input type="submit" class="" value="Add to Basket" />
<p>
<a href="{{product.url}}">View Details</a>
<span>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
{{product.compare_at_price | money}} -
{% endif %}
{% endif %}
<strong>
{{product.price_min | money}}
</strong>
</span>
</p>
</div>
</div>
</form>
</li>
{% endfor %}
<span>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
{{product.compare_at_price | money}} -
{% endif %}
{% endif %}
<strong>
{{product.price_min | money}}
</strong>
</span>
</p>
</div>
</div>
</form>
</li>
{% endfor %}
</ul>
</ul>
<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 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 page -->
</div>
<!-- end page -->
+61 -61
View File
@@ -1,70 +1,70 @@
<div id="page" class="innerpage clearfix">
<h1>{{ collection.title }}</h1>
{% if collection.description.size > 0 %}
<div class="latest-news">{{ collection.description }}</div>
{% endif %}
<div id="page" class="innerpage clearfix">
<h1>{{ collection.title }}</h1>
{% if collection.description.size > 0 %}
<div class="latest-news">{{ collection.description }}</div>
{% endif %}
{% paginate collection.products by 8 %}
{% paginate collection.products by 8 %}
<ul class="item-list clearfix">
{% for product in collection.products %}
<li>
<form action="/cart/add" method="post">
<div class="item-list-item">
<div class="ili-top clearfix">
<div class="ili-top-content">
<h2><a href="{{product.url}}">{{product.title}}</a></h2>
<p>{{ product.description | truncatewords: 15 }}</p>
</div>
<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</div>
<ul class="item-list clearfix">
{% for product in collection.products %}
<li>
<form action="/cart/add" method="post">
<div class="item-list-item">
<div class="ili-top clearfix">
<div class="ili-top-content">
<h2><a href="{{product.url}}">{{product.title}}</a></h2>
<p>{{ product.description | truncatewords: 15 }}</p>
</div>
<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</div>
<div class="ili-bottom clearfix">
<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
<input type="submit" class="" value="Add to Basket" />
<p>
<a href="{{product.url}}">View Details</a>
<div class="ili-bottom clearfix">
<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
<input type="submit" class="" value="Add to Basket" />
<p>
<a href="{{product.url}}">View Details</a>
<span>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
{{product.compare_at_price | money}} -
{% endif %}
{% endif %}
<strong>
{{product.price_min | money}}
</strong>
</span>
</p>
</div>
</div>
</form>
</li>
{% endfor %}
</ul>
<span>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
{{product.compare_at_price | money}} -
{% endif %}
{% endif %}
<strong>
{{product.price_min | money}}
</strong>
</span>
</p>
</div>
</div>
</form>
</li>
{% endfor %}
</ul>
<div class="paginate clearfix">
{{ paginate | default_pagination }}
</div>
<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>
<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>
{% endpaginate %}
+84 -84
View File
@@ -1,94 +1,94 @@
<div id="gwrap">
<div id="gbox">
<h1>Three Great Reasons You Should Shop With Us...</h1>
<ul>
<li class="gbox1">
<h2>Free Shipping</h2>
<p>On all orders over $25</p>
</li>
<li class="gbox2">
<h2>Top Quality</h2>
<p>Hand made in our shop</p>
</li>
<li class="gbox3">
<h2>100% Guarantee</h2>
<p>Any time, any reason</p>
</li>
</ul>
</div>
</div>
<div id="gwrap">
<div id="gbox">
<h1>Three Great Reasons You Should Shop With Us...</h1>
<ul>
<li class="gbox1">
<h2>Free Shipping</h2>
<p>On all orders over $25</p>
</li>
<li class="gbox2">
<h2>Top Quality</h2>
<p>Hand made in our shop</p>
</li>
<li class="gbox3">
<h2>100% Guarantee</h2>
<p>Any time, any reason</p>
</li>
</ul>
</div>
</div>
<div id="page" class="clearfix">
<div id="page" class="clearfix">
<div class="latest-news">{{pages.alert.content}}</div>
<div class="latest-news">{{pages.alert.content}}</div>
<ul class="item-list clearfix">
<ul class="item-list clearfix">
{% for product in collections.frontpage.products %}
<li>
<form action="/cart/add" method="post">
<div class="item-list-item">
<div class="ili-top clearfix">
<div class="ili-top-content">
<h2><a href="{{product.url}}">{{product.title}}</a></h2>
{{ product.description | truncatewords: 15 }}</p> <!-- extra cloding <p> tag for truncation -->
</div>
<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</div>
{% for product in collections.frontpage.products %}
<li>
<form action="/cart/add" method="post">
<div class="item-list-item">
<div class="ili-top clearfix">
<div class="ili-top-content">
<h2><a href="{{product.url}}">{{product.title}}</a></h2>
{{ product.description | truncatewords: 15 }}</p> <!-- extra cloding <p> tag for truncation -->
</div>
<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</div>
<div class="ili-bottom clearfix">
<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
<input type="submit" class="" value="Add to Basket" />
<p>
<a href="{{product.url}}">View Details</a>
<div class="ili-bottom clearfix">
<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
<input type="submit" class="" value="Add to Basket" />
<p>
<a href="{{product.url}}">View Details</a>
<span>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
{{product.compare_at_price | money}} -
{% endif %}
{% endif %}
<strong>
{{product.price_min | money}}
</strong>
</span>
</p>
</div>
</div>
</form>
</li>
{% endfor %}
<span>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
{{product.compare_at_price | money}} -
{% endif %}
{% endif %}
<strong>
{{product.price_min | money}}
</strong>
</span>
</p>
</div>
</div>
</form>
</li>
{% endfor %}
</ul>
</ul>
<div id="one-two">
<div id="two">
<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-b">
<h4>Save Energy</h4>
<p>We're green, all the way.</p>
</li>
<li class="two-d">
<h4>Secure Servers</h4>
<p>Checkout is 256bits encrypted.</p>
</li>
</ul>
</div>
<div id="one-two">
<div id="two">
<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-b">
<h4>Save Energy</h4>
<p>We're green, all the way.</p>
</li>
<li class="two-d">
<h4>Secure Servers</h4>
<p>Checkout is 256bits encrypted.</p>
</li>
</ul>
</div>
<div id="one">
<h3>Our Company</h3>
{{pages.about-us.content | truncatewords: 49}} <a href="/pages/about-us">read more</a></p>
</div>
</div>
<div id="one">
<h3>Our Company</h3>
{{pages.about-us.content | truncatewords: 49}} <a href="/pages/about-us">read more</a></p>
</div>
</div>
</div>
<!-- end page -->
</div>
<!-- end page -->
+46 -46
View File
@@ -1,56 +1,56 @@
<div id="page" class="innerpage clearfix">
<div id="page" class="innerpage clearfix">
<div id="text-page">
<div class="entry">
<h1>{{page.title}}</h1>
<div class="entry-post">
{{page.content}}
</div>
</div>
</div>
<div id="text-page">
<div class="entry">
<h1>{{page.title}}</h1>
<div class="entry-post">
{{page.content}}
</div>
</div>
</div>
<h1>Featured Products</h1>
<ul class="item-list clearfix">
<h1>Featured Products</h1>
<ul class="item-list clearfix">
{% for product in collections.frontpage.products %}
<li>
<form action="/cart/add" method="post">
<div class="item-list-item">
<div class="ili-top clearfix">
<div class="ili-top-content">
<h2><a href="{{product.url}}">{{product.title}}</a></h2>
<p>{{ product.description | truncatewords: 15 }}</p>
</div>
<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</div>
{% for product in collections.frontpage.products %}
<li>
<form action="/cart/add" method="post">
<div class="item-list-item">
<div class="ili-top clearfix">
<div class="ili-top-content">
<h2><a href="{{product.url}}">{{product.title}}</a></h2>
<p>{{ product.description | truncatewords: 15 }}</p>
</div>
<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
</div>
<div class="ili-bottom clearfix">
<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
<input type="submit" class="" value="Add to Basket" />
<p>
<a href="{{product.url}}">View Details</a>
<div class="ili-bottom clearfix">
<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
<input type="submit" class="" value="Add to Basket" />
<p>
<a href="{{product.url}}">View Details</a>
<span>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
{{product.compare_at_price | money}} -
{% endif %}
{% endif %}
<strong>
{{product.price_min | money}}
</strong>
</span>
</p>
</div>
</div>
</form>
</li>
{% endfor %}
<span>
{% if product.compare_at_price %}
{% if product.price_min != product.compare_at_price %}
{{product.compare_at_price | money}} -
{% endif %}
{% endif %}
<strong>
{{product.price_min | money}}
</strong>
</span>
</p>
</div>
</div>
</form>
</li>
{% endfor %}
</ul>
</div>
<!-- end page -->
</ul>
</div>
<!-- end page -->
+64 -64
View File
@@ -1,90 +1,90 @@
<div id="page" class="innerpage clearfix">
<h1>{{ collection.title }} {{ product.title }}</h1>
<h1>{{ collection.title }} {{ product.title }}</h1>
<p class="latest-news"><strong>Product Tags: </strong>
{% for tag in product.tags %}
<a href="/collections/all/{{ tag }}">{{ tag }}</a> |
<p class="latest-news"><strong>Product Tags: </strong>
{% for tag in product.tags %}
<a href="/collections/all/{{ tag }}">{{ tag }}</a> |
{% endfor %}
</p>
</p>
<div class="product clearfix">
<div class="product-info">
<h1>{{ product.title }}</h1>
<div class="product-info-description">
<p>{{ product.description }} </p>
</div>
<div class="product clearfix">
<div class="product-info">
<h1>{{ product.title }}</h1>
<div class="product-info-description">
<p>{{ product.description }} </p>
</div>
{% if product.available %}
<form action="/cart/add" method="post">
{% if product.available %}
<form action="/cart/add" method="post">
<h2>Product Options:</h2>
<h2>Product Options:</h2>
<select id="product-info-options" name="id" class="product-info-options">
<select id="product-info-options" name="id" class="product-info-options">
{% for variant in product.variants %}
<option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
{% endfor %}
</select>
</select>
<div id="price-field"></div>
<div id="price-field"></div>
<div class="product-purchase-btn">
<input type="submit" class="add-this-to-cart" id="add-this-to-cart" value="Add to Basket" />
</div>
<div class="product-purchase-btn">
<input type="submit" class="add-this-to-cart" id="add-this-to-cart" value="Add to Basket" />
</div>
</form>
{% else %}
</form>
{% else %}
<h2>Sold out!</h2>
<p>Sorry, we're all out of this product. Check back often and order when it returns</p>
{% endif %}
</div>
{% endif %}
</div>
<div class="product-images clearfix">
{% for image in product.images %}
<div class="product-images clearfix">
{% for image in product.images %}
{% if forloop.first %}
<div class="product-image-large">
<img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
</div>
{% else %}
{% endif %}
{% endfor %}
{% if forloop.first %}
<div class="product-image-large">
<img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
</div>
{% else %}
{% endif %}
{% endfor %}
<ul class="product-thumbs clearfix">
{% for image in product.images %}
{% if forloop.first %}
{% else %}
<ul class="product-thumbs clearfix">
{% for image in product.images %}
{% if forloop.first %}
{% else %}
<li>
<a href="{{ image | product_img_url: 'large' }}" class="product-thumbs" rel="lightbox[product]" title="">
<img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
</a>
</li>
{% endif %}
{% endfor %}
</ul>
</div>
</div>
<li>
<a href="{{ image | product_img_url: 'large' }}" class="product-thumbs" rel="lightbox[product]" title="">
<img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
</a>
</li>
{% endif %}
{% endfor %}
</ul>
</div>
</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 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 page -->
+37 -37
View File
@@ -2,50 +2,50 @@
<div id="page" class="innerpage clearfix">
<h1>Search Results</h1>
{% if search.performed %}
<div id="page" class="innerpage clearfix">
<h1>Search Results</h1>
{% if search.performed %}
{% paginate search.results by 10 %}
{% 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 %}
{% 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>
{% endfor %}
</ul>
{% endif %}
<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>
{% endfor %}
</ul>
{% endif %}
<div class="paginate clearfix">
{{ paginate | default_pagination }}
</div>
<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>
<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>
{% endpaginate %}
{% endif %}
+60 -60
View File
@@ -2,15 +2,15 @@
<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"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
{{ 'reset.css' | asset_url | stylesheet_tag }}
{{ 'style.css' | asset_url | stylesheet_tag }}
{{ 'reset.css' | asset_url | stylesheet_tag }}
{{ 'style.css' | asset_url | stylesheet_tag }}
{{ 'lightbox.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 }}
{{ 'lightbox.js' | asset_url | script_tag }}
{{ 'option_selection.js' | shopify_asset_url | script_tag }}
{{ content_for_header }}
@@ -19,70 +19,70 @@
<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>
{% endif %}
</p>
</div>
<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>
{% endif %}
</p>
</div>
<div id="site-title">
<h3><a href="/">{{shop.name}}</a></h3>
<h4><span>Tribble: A Shopify Theme</span></h4>
<div id="site-title">
<h3><a href="/">{{shop.name}}</a></h3>
<h4><span>Tribble: A Shopify Theme</span></h4>
</div>
</div>
</div>
</div>
<ul id="nav">
{% for link in linklists.main-menu.links %}
<li>{{ link.title | link_to: link.url }}</li>
{% endfor %}
</ul>
<ul id="nav">
{% for link in linklists.main-menu.links %}
<li>{{ link.title | link_to: link.url }}</li>
{% endfor %}
</ul>
{{ content_for_layout }}
{{ 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>
{% endfor %}
</ul>
</div>
<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>
{% endfor %}
</ul>
</div>
<div class="quick-contact">
<h4>Quick Contact</h4>
<div class="vcard">
<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 protected]">
[email protected]
</a>
<div class="tel">
<span class="type">Support:</span> <span class="value">800-555-9954</span>
</div>
</div>
<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 protected]">
[email protected]
</a>
<div class="tel">
<span class="type">Support:</span> <span class="value">800-555-9954</span>
</div>
</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>
<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>
+3 -3
View File
@@ -18,10 +18,10 @@
{{ comment.content }}
</div>
<div class="comment-details">
Posted by {{ comment.author }} on {{ comment.created_at | date: "%B %d, %Y" }}
<div class="comment-details">
Posted by {{ comment.author }} on {{ comment.created_at | date: "%B %d, %Y" }}
</div>
</li>
</li>
{% endfor %}
</ul>
+42 -42
View File
@@ -1,17 +1,17 @@
<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>{% endif %}</small>
</div>
{% endtablerow %}
</table>
<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>{% endif %}</small>
</div>
{% endtablerow %}
</table>
{% else %}
<script type="text/javascript">
function remove_item(id) {
@@ -20,39 +20,39 @@
}
</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>{% endif %}</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>{% endfor %}
</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 %}
<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>{% endif %}</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>{% endfor %}
</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>
{% endif %}
</div>
</div>
</form>{% endif %}
+17 -17
View File
@@ -1,19 +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>{% endif %}</small>
</div>
{% endtablerow %}
</table>{% if paginate.pages > 1 %}
<div id="paginate">
{{ paginate | default_pagination }}
</div>{% endif %}{% endif %}
<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>{% endif %}</small>
</div>
{% endtablerow %}
</table>{% if paginate.pages > 1 %}
<div id="paginate">
{{ paginate | default_pagination }}
</div>{% endif %}{% endif %}
{% endpaginate %}
+20 -20
View File
@@ -1,22 +1,22 @@
<div id="about-excerpt">
{% assign article = pages.frontpage %}
<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" }}
{% endif %}
</div>
<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" }}
{% endif %}
</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>{% endif %}</small>
</div>
{% endtablerow %}
</table>
<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>{% endif %}</small>
</div>
{% endtablerow %}
</table>
+2 -2
View File
@@ -1,3 +1,3 @@
<h1>{{ page.title }}</h1>
{{ page.content }}
<h1>{{ page.title }}</h1>
{{ page.content }}
+20 -20
View File
@@ -1,19 +1,19 @@
<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>{% endif %}{% endfor %}
{% 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>{% endif %}{% endfor %}
</div>
<div id="product-right">
<h1>{{ product.title }}</h1>
{{ product.description }}
<h1>{{ product.title }}</h1>
{{ product.description }}
{% if product.available %}
<form action="/cart/add" method="post">
{% if product.available %}
<form action="/cart/add" method="post">
<div id="product-variants">
<div id="product-variants">
<div id="price-field"></div>
<select id="product-select" name='id'>
@@ -21,18 +21,18 @@
<option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
{% endfor %}
</select>
</div>
</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>
{% endif %}
</form>
{% else %}
<p class="bold-red">This product is temporarily unavailable</p>
{% endif %}
<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 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>
+78 -78
View File
@@ -22,100 +22,100 @@
<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>
{% endfor %}
</ul>
</div>
</div>
<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>
{% endfor %}
</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 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"{% endif %}{% endif %}>{% if template == "search" %}
<h1>Search Results</h1>{% endif %}
{{ content_for_layout }}
</div>{% if template != "cart" %}{% if template != "product" %}
<div class="container">
<div id="layout-left" {% if template != "cart" %}{% if template != "product" %}style="width:619px"{% endif %}{% endif %}>{% if template == "search" %}
<h1>Search Results</h1>{% endif %}
{{ 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>{% endfor %}
</ul>
{% endif %}
{% endif %}
<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>{% endfor %}
</ul>
{% endif %}
{% endif %}
{% 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 }}{% endif %}{% unless forloop.last %}, {% endunless %}{% endfor %}</span>{% endif %}
</div>
{% endif %}
{% 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 }}{% endif %}{% unless forloop.last %}, {% endunless %}{% endfor %}</span>{% endif %}
</div>
{% endif %}
<h3>Navigation</h3>
<ul id="links">
{% for link in linklists.main-menu.links %}
<li><a href="{{ link.url }}">{{ link.title }}</a></li>
{% endfor %}
</ul>
<li><a href="{{ link.url }}">{{ link.title }}</a></li>
{% endfor %}
</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>{% endfor %}
</ul>
{% endif %}
</div>{% endif %}{% endif %}
</div>
{% 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>{% endfor %}
</ul>
{% endif %}
</div>{% endif %}{% endif %}
</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;{% endunless %}{% endfor %}
</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 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;{% endunless %}{% endfor %}
</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>