mrjamesriley/laurel.diff

## laurel.diff
diff --git a/laurel/templates/theme.liquid b/laurel/templates/theme.liquid
index 39db121..5da1698 100644
--- a/laurel/templates/theme.liquid
+++ b/laurel/templates/theme.liquid
@@ -95,6 +95,7 @@


   <body class="{{ template }}" data-logo-width="160px" data-banner-width="788px">
+
     <div class="container">
       <div id="sidebar" class="float-left clear block">
         <div id="header" class="text-align-left clear">
@@ -112,34 +113,15 @@

           <div class="nav">
             {% search %}
-            <ul class="text-align-left">
-              {% for link in navigation.main.links %}
-                {% if link.url == '/cart' %}
-                  <li class="cart-link {% if link.active %}active{% endif %}">
-                    <a href="{{ link.url }}" class="{% if link.active %}active{% endif %}" title="{{ link.title | escape }}">{{ link.title }}</a>
-                    {% if cart.items_count %}<div id="cart_bubble" class="text-align-center"><span id="cart_count">{{ cart.items_count }}</span></div>{% endif %}
-                  </li>
-                {% elsif link.url == '/collections/all' and collections.all.visible == false %}
-                  {% comment %}Do not render All Products link if the All Products collection is hidden.{% endcomment %}
-                {% elsif link.url == '/collections/all' and collections.all.visible == true and collections.size > 1 %}
-                  {% comment %}Do not render All Products link if the collection would be visible and other collections are also visible. In that case we render the full navigation links block.{% endcomment %}
-                {% else %}
-                  <li class="{% if forloop.index == 1 %}first{% endif %} {% if link.active %}active{% endif %}"><a href="{{ link.url }}" class="{% if link.active %}active{% endif %}" title="{{ link.title | escape }}" {% if link.external %}target="_blank"{% endif %}>{{ link.title }}</a></li>
-                {% endif %}
-              {% endfor %}
-            </ul>
+            {% navigation name: main, orientation: vertical %}
           </div>
-
-
         </div>


         {% if collections.size > 1 or collections.size == 1 and collections.all.visible == false %}
           <div class="subnav block">
-            {% for link in navigation.collections.links %}
-              <span class="{% if forloop.index == 1 %}first{% endif %} {% if link.active %}active{% endif %}"><a href="{{link.url}}" rel="tag" class="{% if link.active %}active{% endif %}" title="{{ link.title | escape }}">{{link.title}}</a></span>
-            {% endfor %}
+            {% navigation name: collections, orientation: vertical %}
           </div>
         {% endif %}

@@ -155,9 +137,7 @@

       <div id="footer" class="block clear">
         <div class="nav shop-policies">
-          {% for link in navigation.footer.links %}
-            <span><a href="{{ link.url }}" class="user-nav-font {% if link.active == true %}active{% endif %}" title="{{ link.title | escape }}">{{ link.title }}</a></span>
-          {% endfor %}
+          {% navigation name: footer %}
         </div>

         {% supadupa_strapline %}
	diff --git a/laurel/templates/theme.liquid b/laurel/templates/theme.liquid
	index 39db121..5da1698 100644
	--- a/laurel/templates/theme.liquid
	+++ b/laurel/templates/theme.liquid
	@@ -95,6 +95,7 @@


	<body class="{{ template }}" data-logo-width="160px" data-banner-width="788px">
	+
	<div class="container">
	<div id="sidebar" class="float-left clear block">
	<div id="header" class="text-align-left clear">
	@@ -112,34 +113,15 @@

	<div class="nav">
	{% search %}
	- <ul class="text-align-left">
	- {% for link in navigation.main.links %}
	- {% if link.url == '/cart' %}
	- <li class="cart-link {% if link.active %}active{% endif %}">
	- <a href="{{ link.url }}" class="{% if link.active %}active{% endif %}" title="{{ link.title \| escape }}">{{ link.title }}</a>
	- {% if cart.items_count %}<div id="cart_bubble" class="text-align-center"><span id="cart_count">{{ cart.items_count }}</span></div>{% endif %}
	- </li>
	- {% elsif link.url == '/collections/all' and collections.all.visible == false %}
	- {% comment %}Do not render All Products link if the All Products collection is hidden.{% endcomment %}
	- {% elsif link.url == '/collections/all' and collections.all.visible == true and collections.size > 1 %}
	- {% comment %}Do not render All Products link if the collection would be visible and other collections are also visible. In that case we render the full navigation links block.{% endcomment %}
	- {% else %}
	- <li class="{% if forloop.index == 1 %}first{% endif %} {% if link.active %}active{% endif %}"><a href="{{ link.url }}" class="{% if link.active %}active{% endif %}" title="{{ link.title \| escape }}" {% if link.external %}target="_blank"{% endif %}>{{ link.title }}</a></li>
	- {% endif %}
	- {% endfor %}
	- </ul>
	+ {% navigation name: main, orientation: vertical %}
	</div>
	-
	-
	</div>



	{% if collections.size > 1 or collections.size == 1 and collections.all.visible == false %}
	<div class="subnav block">
	- {% for link in navigation.collections.links %}
	- <span class="{% if forloop.index == 1 %}first{% endif %} {% if link.active %}active{% endif %}"><a href="{{link.url}}" rel="tag" class="{% if link.active %}active{% endif %}" title="{{ link.title \| escape }}">{{link.title}}</a></span>
	- {% endfor %}
	+ {% navigation name: collections, orientation: vertical %}
	</div>
	{% endif %}

	@@ -155,9 +137,7 @@

	<div id="footer" class="block clear">
	<div class="nav shop-policies">
	- {% for link in navigation.footer.links %}
	- <span><a href="{{ link.url }}" class="user-nav-font {% if link.active == true %}active{% endif %}" title="{{ link.title \| escape }}">{{ link.title }}</a></span>
	- {% endfor %}
	+ {% navigation name: footer %}
	</div>

	{% supadupa_strapline %}