From 5a2196abfc5755cb22f104b26ac3c130489c1682 Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@utou.ch>
Date: Wed, 10 May 2017 16:57:35 +0200
Subject: [PATCH] Info blocks action optional, layout fixed

---
 .../home/templates/home/article_index_page.html  |  6 +++---
 publichealth/home/templates/infos.html           | 16 ++++++++++------
 publichealth/static/css/modules/_articles.scss   |  5 +++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/publichealth/home/templates/home/article_index_page.html b/publichealth/home/templates/home/article_index_page.html
index 92310fc..1c9e9a2 100644
--- a/publichealth/home/templates/home/article_index_page.html
+++ b/publichealth/home/templates/home/article_index_page.html
@@ -43,12 +43,12 @@
       {% for block in subcategories %}
       <article class="col-md-4">
 				<a href="{% pageurl block %}">
+          <header>
+            <h4>{{ block.trans_title }}</h4>
+          </header>
           <div class="image">
   					{% image block.feed_image fill-300x300 %}
   				</div>
-          <header>
-            <h3>{{ block.trans_title }}</h3>
-          </header>
         </a>
       </article>
       {% endfor %}
diff --git a/publichealth/home/templates/infos.html b/publichealth/home/templates/infos.html
index 25c088f..0a845c9 100644
--- a/publichealth/home/templates/infos.html
+++ b/publichealth/home/templates/infos.html
@@ -5,16 +5,20 @@
 		<div class="row infoblocks">
     	{% for block in page.trans_infos %}
 			<article class="col-md-4">
-				<div class="image">
-					{% image block.value.photo fill-300x300 %}
-				</div>
-				<header>
-					<h3>{{ block.value.title }}</h3>
-				</header>
+				<a href="{{ block.value.url }}">
+					<div class="image">
+						{% image block.value.photo fill-300x300 %}
+					</div>
+					<header>
+						<h3>{{ block.value.title }}</h3>
+					</header>
+				</a>
 				{{ block.value.summary|richtext }}
+				{% if block.value.action %}
 				<footer>
 					<a href="{{ block.value.url }}" class="btn btn-default">{{ block.value.action }}</a>
 				</footer>
+				{% endif %}
 			</article>
     	{% endfor %}
 		</div>
diff --git a/publichealth/static/css/modules/_articles.scss b/publichealth/static/css/modules/_articles.scss
index 72c740d..f3d6fe5 100644
--- a/publichealth/static/css/modules/_articles.scss
+++ b/publichealth/static/css/modules/_articles.scss
@@ -41,6 +41,11 @@ section {
   }
 }
 
+// Article index blocks
+.article-subcategories article {
+  margin-bottom: 1.5em;
+}
+
 // Special article layout
 .article-page .lead {
   h2,h3,h4,h5 { text-align: center; }