Merge branch 'master' into edge

This commit is contained in:
Anand Doshi 2013-05-22 16:32:47 +05:30
commit 87ddf11374

View File

@ -1,8 +1,6 @@
{% extends "app/website/templates/html/page.html" %} {% extends "app/website/templates/html/page.html" %}
{% block content %} {% block content %}
{% include 'app/website/templates/html/product_search_box.html' %}
{% include 'app/website/templates/html/product_breadcrumbs.html' %}
<div class="span12"> <div class="span12">
{% if slideshow %}<!-- slideshow --> {% if slideshow %}<!-- slideshow -->
{% include "app/website/templates/html/slideshow.html" %} {% include "app/website/templates/html/slideshow.html" %}
@ -12,6 +10,10 @@
{% else %} {% else %}
<h3>{{ name }}</h3> <h3>{{ name }}</h3>
{% endif %} {% endif %}
</div>
{% include 'app/website/templates/html/product_search_box.html' %}
{% include 'app/website/templates/html/product_breadcrumbs.html' %}
<div class="span12">
{% if sub_groups %} {% if sub_groups %}
<hr /> <hr />
<div class="row"> <div class="row">