[merge] merge with master

website/templates/html/product_group.html

@@ -12,6 +12,10 @@
 	{% else %}
 	<h3>{{ name }}</h3>
 	{% endif %}
+</div>
+{% include 'app/website/templates/html/product_search_box.html' %}
+{% include 'app/website/templates/html/product_breadcrumbs.html' %}
+<div class="col col-lg-12">
 	{% if sub_groups %}
 	<hr />
 	<div class="row">

website/templates/html/product_page.html

@@ -35,23 +35,25 @@
 				{{ web_long_description or web_short_description or 
 					"[No description given]" }}
 				</div>
-				{% if obj.doclist.get({"doctype":"Item Website Specification"}) %}
+				<div class="item-price hide"></div>
+				<div class="item-stock"></div>
+			</div>
+		</div>
+		{% if obj.doclist.get({"doctype":"Item Website Specification"}) -%}
+		<div class="row" style="margin-top: 20px">
+			<div class="span12">
 				<h4>Specifications</h4>
 				<table class="table table-bordered" style="width: 100%">
 				{% for d in obj.doclist.get(
-					{"doctype":"Item Website Specification"}) %}
+					{"doctype":"Item Website Specification"}) -%}
 					<tr>
 						<td style="width: 30%;">{{ d.label }}</td>
 						<td>{{ d.description }}</td>
 					</tr>
-				{% endfor %}
+				{%- endfor %}
 				</table>
-				{% endif %}
-				<div class="item-price hide">
-					<p>Price:</p>
-				</div>
-				<div class="item-stock"></div>
 			</div>
 		</div>
+		{%- endif %}
 	</div>
 {% endblock %}

website/templates/html/slideshow.html

@@ -8,7 +8,7 @@
 			{% if slide.heading or slide.description %}
 			<div class="carousel-caption">
 				{% if slide.heading %}<h4>{{ slide.heading }}</h4>{% endif %}
-				{% if slide.heading %}<p>{{ slide.description }}</p>{% endif %}
+				{% if slide.description %}<p>{{ slide.description }}</p>{% endif %}
 			</div>
 			{% endif %}
 		</div>