From d1db4ac0684d4f28608d0933e9e5475fa10f5dd6 Mon Sep 17 00:00:00 2001
From: Marc Worrell <marc@worrell.nl>
Date: Wed, 20 Jun 2012 09:42:56 +0200
Subject: [PATCH] More finetuning of collection behaviour when there are blocks
 but no body.

---
 .../templates/tablet/_subnavbar.collection.tpl           | 2 +-
 .../mod_base_site/templates/tablet/page.collection.tpl   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/mod_base_site/templates/tablet/_subnavbar.collection.tpl b/modules/mod_base_site/templates/tablet/_subnavbar.collection.tpl
index 968f716130..57093ad1f3 100644
--- a/modules/mod_base_site/templates/tablet/_subnavbar.collection.tpl
+++ b/modules/mod_base_site/templates/tablet/_subnavbar.collection.tpl
@@ -1,7 +1,7 @@
 {% include "_subnav.tpl" %}
 
 {% include "_content_list.tpl" list=id.o.hasfeatured %}
-{% if id.body or id.blocks %}
+{% if id.body %}
     {% include "_content_list.tpl" list=id.o.haspart in_collection=id %}
 {% endif %}
 {% include "_content_list.tpl" list=id.o.relation %}
diff --git a/modules/mod_base_site/templates/tablet/page.collection.tpl b/modules/mod_base_site/templates/tablet/page.collection.tpl
index 9ce43ccf29..3359167879 100644
--- a/modules/mod_base_site/templates/tablet/page.collection.tpl
+++ b/modules/mod_base_site/templates/tablet/page.collection.tpl
@@ -2,10 +2,11 @@
 
 {% block main %}
 	{% inherit %}
-	{% if not (id.body or id.blocks) %}
+	{% if not id.body %}
 		{% include "_content_list.tpl" list=id.o.haspart in_collection=id is_large %}
-
-		{% include "_page_depiction.tpl" is_landscape %}
+		{% if not id.blocks %}
+		    {% include "_page_depiction.tpl" is_landscape %}
+		{% endif %}
 		{% include "_page_thumbnails.tpl" %}
 	{% endif %}
 {% endblock %}
@@ -17,7 +18,7 @@
 {% endblock %}
 
 {% block thumbnails %}
-{% if id.body or id.blocks %}
+{% if id.body %}
 	{% inherit %}
 {% endif %}
 {% endblock %}