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 @@ -
-

{{ contact.trans_title }}
{{ contact.address }} @@ -8,21 +6,3 @@ {{ contact.email }}
{{ contact.www_domain }}

- -
-
- -
-
- -
-
- -
-
- -
- -
- -
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 @@ {% footer_menu parent=site_root calling_page=self %} - {% contact_info %} +
+ {% contact_info %} +
+
+ {% contact_form %} +