From 8e5ef47d4cf5592d0eed578c37e83d6e19021682 Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@utou.ch>
Date: Sat, 8 Apr 2017 15:47:03 +0200
Subject: [PATCH] Updated tag modules

---
 publichealth/home/models/__init__.py          |  1 +
 .../home/templates/tags/contact_info.html     | 20 -------------------
 publichealth/home/templatetags/information.py |  7 +++++++
 publichealth/static/css/modules/_modules.scss |  1 +
 .../static/mockup/assets/css/main.css         | 20 +++++++++++++++++++
 publichealth/templates/footer.html            |  7 ++++++-
 6 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/publichealth/home/models/__init__.py b/publichealth/home/models/__init__.py
index 5f4f40b..c28543d 100644
--- a/publichealth/home/models/__init__.py
+++ b/publichealth/home/models/__init__.py
@@ -1,2 +1,3 @@
+from .forms import *
 from .models import *
 from .snippets import *
diff --git a/publichealth/home/templates/tags/contact_info.html b/publichealth/home/templates/tags/contact_info.html
index e84bc90..dbecca3 100644
--- a/publichealth/home/templates/tags/contact_info.html
+++ b/publichealth/home/templates/tags/contact_info.html
@@ -1,5 +1,3 @@
-<div class="col-md-4" id="contact">
-
 <address>
   <p>{{ contact.trans_title }}<br>
   {{ contact.address }}
@@ -8,21 +6,3 @@
   <a href="{{ contact.email_link }}">{{ contact.email }}</a><br>
   <a href="{{ contact.www }}">{{ contact.www_domain }}</a></p>
 </address>
-
-</div>
-<div class="col-md-4" id="contactform">
-
-<form action="https://formspree.io/{{ contact.email }}" method="POST">
-  <div class="form-group">
-    <input name="name" id="name" type="text" placeholder="Name / Nom" class="form-control">
-  </div>
-  <div class="form-group">
-    <input name="_replyto" id="email" type="email" placeholder="E-Mail" class="form-control">
-  </div>
-  <div class="form-group">
-    <textarea name="message" id="message" rows="3" placeholder="" class="form-control"></textarea>
-  </div>
-  <button class="btn btn-priamry" type="submit">Senden / Envoi</button>
-</form>
-
-</div>
diff --git a/publichealth/home/templatetags/information.py b/publichealth/home/templatetags/information.py
index 55b96c0..ddf9351 100644
--- a/publichealth/home/templatetags/information.py
+++ b/publichealth/home/templatetags/information.py
@@ -12,3 +12,10 @@ def contact_info():
     return {
         'contact': Contact.objects.last(),
     }
+
+# Contact form (footer)
+@register.inclusion_tag('tags/contact_form.html')
+def contact_form():
+    return {
+        'contact': Contact.objects.last(),
+    }
diff --git a/publichealth/static/css/modules/_modules.scss b/publichealth/static/css/modules/_modules.scss
index cbe4ea1..76e1ab3 100644
--- a/publichealth/static/css/modules/_modules.scss
+++ b/publichealth/static/css/modules/_modules.scss
@@ -3,3 +3,4 @@
 @import "banner";
 @import "footer";
 @import "news";
+@import "forms";
diff --git a/publichealth/static/mockup/assets/css/main.css b/publichealth/static/mockup/assets/css/main.css
index 6f618ce..8e84872 100755
--- a/publichealth/static/mockup/assets/css/main.css
+++ b/publichealth/static/mockup/assets/css/main.css
@@ -8478,6 +8478,7 @@ footer#footer a {
 
 #news-details {
   background: white;
+  padding-top: 0;
 }
 #news-details .category {
   margin-top: 2em;
@@ -8508,6 +8509,25 @@ footer#footer a {
 #news-details .backlink {
   margin-top: 3em;
 }
+#news-details .img-responsive {
+  width: 100%;
+}
+#news-details .links {
+  display: inline-block;
+  border-bottom: 1px solid #999;
+  padding: 1em;
+  margin: 0em;
+  list-style-type: none;
+}
+#news-details .links li:first-child {
+  display: none;
+}
+
+#contact-page form label {
+  width: 15em;
+  border-bottom: 1px dashed #ccc;
+  line-height: 155%;
+}
 
 body {
   margin-top: 104px;
diff --git a/publichealth/templates/footer.html b/publichealth/templates/footer.html
index 2a1f743..69790bd 100644
--- a/publichealth/templates/footer.html
+++ b/publichealth/templates/footer.html
@@ -9,7 +9,12 @@
 		<!-- Bottom Menu -->
 		{% footer_menu parent=site_root calling_page=self %}
 	</div>
-	{% contact_info %}
+	<div class="col-md-4" id="contact-info">
+		{% contact_info %}
+	</div>
+	<div class="col-md-4" id="contact-form">
+		{% contact_form %}
+	</div>
 </div><!-- /row -->
 </div><!-- /container -->
 </footer>