From 0c394b095339e722c3585286883083243c949dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Mon, 28 Sep 2015 13:41:55 +0200
Subject: [PATCH 1/6] adds title to debates#index

---
 app/views/debates/index.html.erb | 1 +
 config/locales/en.yml            | 1 +
 config/locales/es.yml            | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 38593a359..d6cd4f6ca 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('debates.index.title') %><% end %>
 <% content_for :header_addon do %>
   <%= render "shared/search_form_header",
              search_path: debates_path(page: 1),
diff --git a/config/locales/en.yml b/config/locales/en.yml
index afca65d6f..a49ba1c9f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -74,6 +74,7 @@ en:
     menu: "Menu"
   debates:
     index:
+      title: Debates
       start_debate: Start a debate
       select_order: Order by
       select_order_long: Order debates by
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 395d8c6ae..1d9d8f483 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -74,6 +74,7 @@ es:
     menu: "Menú"
   debates:
     index:
+      title: Debates
       start_debate: Empieza un debate
       select_order: Ordenar por
       select_order_long: Estás viendo los debates

From de37081a45543329a852ebfd3da726ad96e056bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Mon, 28 Sep 2015 13:42:20 +0200
Subject: [PATCH 2/6] adds title to proposals#index

---
 app/views/proposals/index.html.erb | 1 +
 config/locales/en.yml              | 1 +
 config/locales/es.yml              | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 4d9a2de57..28807d247 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('proposals.index.title') %><% end %>
 <% content_for :header_addon do %>
   <%= render "shared/search_form_header",
              search_path: proposals_path(page: 1),
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a49ba1c9f..d658f5474 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -149,6 +149,7 @@ en:
         submit_button: "Save changes"
   proposals:
     index:
+      title: Proposals
       start_proposal: Start a proposal
       select_order: Order by
       select_order_long: Order proposals by
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1d9d8f483..ae1e57b0a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -149,6 +149,7 @@ es:
         submit_button: "Guardar cambios"
   proposals:
     index:
+      title: Propuestas ciudadanas
       start_proposal: Crea una propuesta
       select_order: Ordenar por
       select_order_long: Estás viendo las propuestas

From f50586017be321363047aad9f7e74728c01f2a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Mon, 28 Sep 2015 13:42:45 +0200
Subject: [PATCH 3/6] adds title to pages views

---
 app/views/pages/conditions.html.erb       | 1 +
 app/views/pages/more_information.html.erb | 1 +
 app/views/pages/opendata.html.erb         | 1 +
 app/views/pages/privacy.html.erb          | 1 +
 app/views/pages/transparency.html.erb     | 1 +
 config/locales/pages.en.yml               | 6 ++++++
 config/locales/pages.es.yml               | 6 ++++++
 7 files changed, 17 insertions(+)

diff --git a/app/views/pages/conditions.html.erb b/app/views/pages/conditions.html.erb
index bcd6304ef..df0436a4c 100644
--- a/app/views/pages/conditions.html.erb
+++ b/app/views/pages/conditions.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.conditions') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="text small-12 column">
diff --git a/app/views/pages/more_information.html.erb b/app/views/pages/more_information.html.erb
index 4b64b2137..d935484f0 100644
--- a/app/views/pages/more_information.html.erb
+++ b/app/views/pages/more_information.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.more_information') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="more-information text small-12 medium-8 column">
diff --git a/app/views/pages/opendata.html.erb b/app/views/pages/opendata.html.erb
index 5ca8e8116..7d5302b0d 100644
--- a/app/views/pages/opendata.html.erb
+++ b/app/views/pages/opendata.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.opendata') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="alert-box info radius text small-12 column">
diff --git a/app/views/pages/privacy.html.erb b/app/views/pages/privacy.html.erb
index 424b3d8a5..a79000ac8 100644
--- a/app/views/pages/privacy.html.erb
+++ b/app/views/pages/privacy.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.privacy') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="text small-12 column">
diff --git a/app/views/pages/transparency.html.erb b/app/views/pages/transparency.html.erb
index ac3c12d10..a8b254adf 100644
--- a/app/views/pages/transparency.html.erb
+++ b/app/views/pages/transparency.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.transparency') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="alert-box info radius text small-12 column">
diff --git a/config/locales/pages.en.yml b/config/locales/pages.en.yml
index 6d730d17e..1c670b314 100644
--- a/config/locales/pages.en.yml
+++ b/config/locales/pages.en.yml
@@ -1,5 +1,11 @@
 en:
   pages:
+    titles:
+      more_information: "More information"
+      privacy: "Privacy Policy"
+      transparency: "Transparency"
+      opendata: "Open Data"
+      conditions: "Terms of use"
     conditions:
       "Terms of use"
     privacy:
diff --git a/config/locales/pages.es.yml b/config/locales/pages.es.yml
index c743e39e2..8abf49953 100644
--- a/config/locales/pages.es.yml
+++ b/config/locales/pages.es.yml
@@ -1,5 +1,11 @@
 es:
   pages:
+    titles:
+      more_information: "Más información"
+      privacy: "Política de Privacidad"
+      transparency: "Transparencia"
+      opendata: "Datos abiertos"
+      conditions: "Condiciones de uso"
     conditions:
       "Condiciones de uso"
     privacy:

From dbcb10bd096cdca482588a00975ba01eff4ccfb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Mon, 28 Sep 2015 13:42:58 +0200
Subject: [PATCH 4/6] adds title to highlights page

---
 app/views/welcome/highlights.html.erb | 1 +
 config/locales/en.yml                 | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/welcome/highlights.html.erb b/app/views/welcome/highlights.html.erb
index a0e95c7a2..5a6d40df8 100644
--- a/app/views/welcome/highlights.html.erb
+++ b/app/views/welcome/highlights.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('welcome.signed_in_home_title') %><% end %>
 <% cache [locale_and_user_status, @list, @debate_votes, @proposal_votes, @paginator.current_page, @paginator.total_pages] do %>
   <section role="main">
     <div class="wrap row">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d658f5474..67a805059 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -311,7 +311,6 @@ en:
       all: "You are not authorized to %{action} %{subject}."
   welcome:
     signed_in_home_title: Recent activity
-    signed_in_home_title: Actividad reciente
     debates:
       title: "Debate"
       description: "Meet, discuss and share what we think is important in our city."

From 7d8f1f262926c4b438ee4bb178277b32900e971b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Mon, 28 Sep 2015 13:51:17 +0200
Subject: [PATCH 5/6] adds title for public devise views

---
 app/views/devise/confirmations/new.html.erb        | 1 +
 app/views/devise/passwords/new.html.erb            | 1 +
 app/views/devise/sessions/new.html.erb             | 1 +
 app/views/organizations/registrations/new.html.erb | 1 +
 app/views/users/registrations/new.html.erb         | 1 +
 5 files changed, 5 insertions(+)

diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index b815288b2..722609134 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t("devise_views.confirmations.title") %><% end %>
 <h1 class="text-center"><%= t("devise_views.confirmations.title") %></h1>
 
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index e433c0477..c82774991 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t("devise_views.passwords.new.title") %><% end %>
 <h1 class="text-center"><%= t("devise_views.passwords.new.title") %></h1>
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
   <%= render 'shared/errors', resource: resource %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index f1df8e1cc..1b8ab15bc 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t("devise_views.sessions.new.title") %><% end %>
 <h2><%= t("devise_views.sessions.new.title") %></h2>
 
 <%# render 'devise/omniauth_form' %>
diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb
index 5c3b1097d..aa340bd24 100644
--- a/app/views/organizations/registrations/new.html.erb
+++ b/app/views/organizations/registrations/new.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t("devise_views.organizations.registrations.new.title") %><% end %>
 <h2><%= t("devise_views.organizations.registrations.new.title") %></h2>
 
  <%= form_for(resource, as: :user, url: organization_registration_path) do |f| %>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index 5d676e288..8d2d9f919 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t("devise_views.users.registrations.new.title") %><% end %>
 <h2><%= t("devise_views.users.registrations.new.title") %></h2>
 
 <%# render 'devise/omniauth_form' %>

From 44938e278923c1758673e8bea164e38e765faa46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Mon, 28 Sep 2015 14:01:26 +0200
Subject: [PATCH 6/6] adds title to accessibility page

---
 app/views/pages/accessibility.html.erb | 1 +
 config/locales/pages.en.yml            | 1 +
 config/locales/pages.es.yml            | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/views/pages/accessibility.html.erb b/app/views/pages/accessibility.html.erb
index bf6ae6187..e36d16d55 100644
--- a/app/views/pages/accessibility.html.erb
+++ b/app/views/pages/accessibility.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t('pages.titles.accessibility') %><% end %>
 <div class="page row-full">
   <div class="row">
     <div class="text small-12 column">
diff --git a/config/locales/pages.en.yml b/config/locales/pages.en.yml
index 1c670b314..051217223 100644
--- a/config/locales/pages.en.yml
+++ b/config/locales/pages.en.yml
@@ -6,6 +6,7 @@ en:
       transparency: "Transparency"
       opendata: "Open Data"
       conditions: "Terms of use"
+      accessibility: "Accessibility"
     conditions:
       "Terms of use"
     privacy:
diff --git a/config/locales/pages.es.yml b/config/locales/pages.es.yml
index 8abf49953..e1068f4ed 100644
--- a/config/locales/pages.es.yml
+++ b/config/locales/pages.es.yml
@@ -6,6 +6,7 @@ es:
       transparency: "Transparencia"
       opendata: "Datos abiertos"
       conditions: "Condiciones de uso"
+      accessibility: "Accesibilidad"
     conditions:
       "Condiciones de uso"
     privacy: