From 97f47eb734e4e3103d8c5cc1235a28a55f9583b6 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Thu, 26 Feb 2015 05:40:17 +0100
Subject: [PATCH] Little website things

---
 app/views/application/_footer.html.slim |  6 ------
 app/views/pages/contact.html.slim       | 12 +++++-------
 app/views/theme1/_footer.html.slim      |  8 +++++++-
 config/locales/models.en.yml            |  6 ++++++
 config/locales/models.nl.yml            |  6 ++++++
 config/locales/website.en.yml           |  4 ++++
 config/locales/website.nl.yml           |  4 ++++
 7 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 config/locales/website.en.yml
 create mode 100644 config/locales/website.nl.yml

diff --git a/app/views/application/_footer.html.slim b/app/views/application/_footer.html.slim
index 327cf6bc..e69de29b 100644
--- a/app/views/application/_footer.html.slim
+++ b/app/views/application/_footer.html.slim
@@ -1,6 +0,0 @@
-= yield :footer
-= link_to 'disclaimer', page_path('disclaimer')
-'
-= link_to 'privacy', page_path('privacy')
-'
-= link_to 'kernwaarden', page_path('values')
diff --git a/app/views/pages/contact.html.slim b/app/views/pages/contact.html.slim
index efc06099..6a141ca1 100644
--- a/app/views/pages/contact.html.slim
+++ b/app/views/pages/contact.html.slim
@@ -3,20 +3,18 @@
     .row: .small-12.columns=raw @page.body
     = form_for Cmtool::ContactForm.new, url: contact_forms_path, html: {class: 'contact'} do |f|
       .row
-        .large-4.columns: label Uw naam:
-        .large-2.columns= f.select :gender, [['Dhr.', 'male'], ['Mevr.', 'female']]
+        .large-4.columns= f.label :name
+        .large-2.columns= f.select :gender, [[Cmtool::ContactForm.human_attribute_name('male'), 'male'], [Cmtool::ContactForm.human_attribute_name('female'), 'female']]
         .large-6.columns.end= f.text_field :name
       .row
         .small-12.columns.end
-          label Uw vraag of opmerking:*
+          = f.label :body
           br
           = f.text_area :body, cols: 32, rows: 8
       .row
-        .large-4.columns: label Uw e-mail adres:*
+        .large-4.columns= f.label :email
         .large-8.columns.end= f.email_field :email
       .row
         .large-12.columns
-          = f.submit 'verstuur', class: 'button'
-          br
-          span * Verplicht veld
+          = f.submit t('website.contact_form.send_button'), class: 'button'
   .large-3.columns== @page.sidebar
diff --git a/app/views/theme1/_footer.html.slim b/app/views/theme1/_footer.html.slim
index 569d8a84..7e26b8b3 100644
--- a/app/views/theme1/_footer.html.slim
+++ b/app/views/theme1/_footer.html.slim
@@ -1,5 +1,11 @@
 #footer-wrap
   .footer-shadow
   .footer-content-container
-    .footer-content= render 'footer'
+    .footer-content
+      = yield :footer
+      = link_to 'disclaimer', page_path('disclaimer')
+      '
+      = link_to 'privacy', page_path('privacy')
+      '
+      = link_to 'contact', page_path('contact')
     .footer-bottom &copy; mozo.bar 2015
diff --git a/config/locales/models.en.yml b/config/locales/models.en.yml
index 0154746a..14f8a80a 100644
--- a/config/locales/models.en.yml
+++ b/config/locales/models.en.yml
@@ -88,3 +88,9 @@ en:
         color: Color
       employee_shift:
         description: Description
+      cmtool/contact_form:
+        name: "Your name:"
+        body: 'Your question or remarks:'
+        email: "Your email:*"
+        male: "Mr."
+        female: "Ms."
diff --git a/config/locales/models.nl.yml b/config/locales/models.nl.yml
index f5566078..ce6aac3a 100644
--- a/config/locales/models.nl.yml
+++ b/config/locales/models.nl.yml
@@ -87,3 +87,9 @@ nl:
         color: Kleur
       employee_shift:
         description: Toelichting
+      cmtool/contact_form:
+        name: "Je naam:"
+        body: 'Je vraag of opmerking:'
+        email: "E-mail:*"
+        male: "Dhr."
+        female: "Mvr."
diff --git a/config/locales/website.en.yml b/config/locales/website.en.yml
new file mode 100644
index 00000000..a30fe9e8
--- /dev/null
+++ b/config/locales/website.en.yml
@@ -0,0 +1,4 @@
+en:
+  website:
+    contact_form:
+      send_button: "Send form"
diff --git a/config/locales/website.nl.yml b/config/locales/website.nl.yml
new file mode 100644
index 00000000..cd136aa7
--- /dev/null
+++ b/config/locales/website.nl.yml
@@ -0,0 +1,4 @@
+nl:
+  website:
+    contact_form:
+      send_button: Verstuur