From 83b44fd53aba3879b73ce2905a9f8cb617f045f4 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Sat, 5 Sep 2015 00:34:18 +0200
Subject: [PATCH] Improves layout, adds link to checkbox's label

---
 app/views/debates/_form.html.erb          | 9 ++++++++-
 app/views/layouts/_admin_header.html.erb  | 2 +-
 app/views/pages/more_information.html.erb | 2 +-
 config/locales/en.yml                     | 6 ++++--
 config/locales/es.yml                     | 6 ++++--
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb
index 334c444cf..313ec29a3 100644
--- a/app/views/debates/_form.html.erb
+++ b/app/views/debates/_form.html.erb
@@ -25,7 +25,12 @@
 
     <div class="small-12 column">
       <% if @debate.new_record? %>
-        <%= f.check_box :terms_of_service, label: t("form.accept_terms") %>
+        <%= f.label :terms_of_service do %>
+          <%= f.check_box :terms_of_service, label: false %>
+          <%= t("form.accept_terms",
+              policy: link_to(t("form.policy"), "/privacy", target: "blank"), conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe
+          %>
+        <% end %>
       <% end %>
     </div>
 
@@ -38,3 +43,5 @@
     </div>
   </div>
 <% end %>
+
+
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index fdc1d6c6e..a39906aa7 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -14,7 +14,7 @@
             <%= t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %> | <span><%= t("admin.dashboard.index.title") %></span>
           <% end %>
         </li>
-        <li class="toggle-topbar menu-icon"><a href="#"><span><%= t("layouts.header.menu") %></span></a></li>
+        <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
       </ul>
 
       <section class="top-bar-section">
diff --git a/app/views/pages/more_information.html.erb b/app/views/pages/more_information.html.erb
index 12bf34085..55cc19541 100644
--- a/app/views/pages/more_information.html.erb
+++ b/app/views/pages/more_information.html.erb
@@ -1,6 +1,6 @@
 <div class="page row-full">
   <div class="row">
-    <div class="more-information text small-12 medium-8">
+    <div class="more-information text small-12 medium-8 column">
       <h1>Más información</h1>
       <ul>
         <a href="/how_it_works">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 60e93dd5d..5afbc9f59 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -10,8 +10,8 @@ en:
       external_link_blog_url: "http://diario.madrid.es/participa/"
       open_gov: "%{open} government"
       open: "Open"
+      logo: "Open government | Participation"
       participation: Participation
-      menu: Menu
       open_city_title: "The city you want, it will be the city you want."
       open_city_slogan:
         "Start listening to Madrid.
@@ -56,7 +56,9 @@ en:
       error: error
       errors: errors
       not_saved: "prohibited this %{resource} from being saved:"
-      accept_terms: "I accept the Privacy policy and the Terms of use"
+      accept_terms: "I accept the %{policy} and the %{conditions}"
+      policy: "Privacy policy"
+      conditions: "Terms of use"
       user: account
       debate: debate
       verification::sms: phone
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 689c0d8cd..4166ec933 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -10,8 +10,8 @@ es:
       external_link_blog_url: "http://diario.madrid.es/participa/"
       open_gov: "Gobierno %{open}"
       open: "abierto"
+      logo: "Gobierno abierto | Participación"
       participation: Participación
-      menu: Menú
       open_city_title: "La ciudad que quieres será la ciudad que quieras."
       open_city_slogan:
         "Empecemos escuchando qué tiene que decir Madrid.
@@ -56,7 +56,9 @@ es:
       error: error
       errors: errores
       not_saved: "impidieron guardar %{resource}:"
-      accept_terms: "Acepto la Política de privacidad y las Condiciones de uso"
+      accept_terms: "Acepto la %{policy} y las %{conditions}"
+      policy: "Política de privacidad"
+      conditions: "Condiciones de uso"
       user: la cuenta
       debate: el debate
       verification::sms: el teléfono