From d8b4af5add9af8046e8180ef478aa7b2a6134578 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 30 Dec 2016 17:17:46 +0100
Subject: [PATCH 1/2] adds meta description and keywords

---
 app/views/layouts/_meta_tags.html.erb  | 5 +++++
 app/views/layouts/application.html.erb | 3 ++-
 app/views/layouts/devise.html.erb      | 1 +
 config/locales/settings.en.yml         | 2 ++
 config/locales/settings.es.yml         | 2 ++
 db/dev_seeds.rb                        | 4 ++--
 db/seeds.rb                            | 4 ++++
 7 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 app/views/layouts/_meta_tags.html.erb

diff --git a/app/views/layouts/_meta_tags.html.erb b/app/views/layouts/_meta_tags.html.erb
new file mode 100644
index 000000000..443f7352f
--- /dev/null
+++ b/app/views/layouts/_meta_tags.html.erb
@@ -0,0 +1,5 @@
+<meta name="description"
+      content="<%= content_for?(:meta_description) ? yield(:meta_description) : setting["meta_description"]  %>" />
+
+<meta name="keywords"
+      content="<%= content_for?(:meta_keywords) ? yield(:meta_keywords) : setting["meta_keywords"]  %>" />
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 34e7776fb..7a1dae4d9 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,7 +4,8 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <%=render "layouts/tracking_data"%>
+    <%= render "layouts/tracking_data" %>
+    <%= render "layouts/meta_tags" %>
     <title><%= content_for?(:title) ? yield(:title) : setting['org_name'] %></title>
     <%= stylesheet_link_tag    "application" %>
     <!--[if lt IE 9]>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index b3599fc0f..9704795a7 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <title><%= content_for?(:title) ? yield(:title) : "Gobierno abierto" %></title>
+    <%= render "layouts/meta_tags" %>
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
     <%= csrf_meta_tags %>
diff --git a/config/locales/settings.en.yml b/config/locales/settings.en.yml
index 20aa31c3d..eca4a820c 100755
--- a/config/locales/settings.en.yml
+++ b/config/locales/settings.en.yml
@@ -33,3 +33,5 @@ en:
         voting_allowed: Voting on investment projects
     mailer_from_name: Origin email name
     mailer_from_address: Origin email address
+    meta_description: "Site description (SEO)"
+    meta_keywords: "Keywords (SEO)"
\ No newline at end of file
diff --git a/config/locales/settings.es.yml b/config/locales/settings.es.yml
index f01235528..6ff702a62 100644
--- a/config/locales/settings.es.yml
+++ b/config/locales/settings.es.yml
@@ -33,3 +33,5 @@ es:
         voting_allowed: Votaciones sobre propuestas de inversión.
     mailer_from_name: Nombre email remitente
     mailer_from_address: Dirección email remitente
+    meta_description: "Descripción del sitio (SEO)"
+    meta_keywords: "Palabras clave (SEO)"
\ No newline at end of file
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index dfdd42731..7abfcb3d0 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -34,8 +34,8 @@ Setting.create(key: 'feature.signature_sheets', value: "true")
 Setting.create(key: 'per_page_code', value: "")
 Setting.create(key: 'comments_body_max_length', value: '1000')
 Setting.create(key: 'mailer_from_name', value: 'Consul')
-Setting.create(key: 'mailer_from_address', value: 'noreply@consul.dev')
-
+Setting.create(key: 'meta_description', value: 'Citizen Participation and Open Government Application')
+Setting.create(key: 'meta_keywords', value: 'citizen participation, open government')
 
 puts "Creating Geozones"
 ('A'..'Z').each { |i| Geozone.create(name: "District #{i}", external_code: i.ord, census_code: i.ord) }
diff --git a/db/seeds.rb b/db/seeds.rb
index d8be294c7..070523605 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -57,6 +57,10 @@ Setting["org_name"] = "Consul"
 # Consul installation place name (City, Country...)
 Setting["place_name"] = "Consul-land"
 
+# Meta tags for SEO
+Setting["meta_description"] = nil
+Setting["meta_keywords"] = nil
+
 # Feature flags
 Setting['feature.debates'] = true
 Setting['feature.spending_proposals'] = true

From 00581fcacc4e13b87cec618ba4ab0c004877f41b Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 30 Dec 2016 17:21:50 +0100
Subject: [PATCH 2/2] adds setting key deleted by mistake

---
 db/dev_seeds.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index 7abfcb3d0..1b31e8226 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -34,6 +34,7 @@ Setting.create(key: 'feature.signature_sheets', value: "true")
 Setting.create(key: 'per_page_code', value: "")
 Setting.create(key: 'comments_body_max_length', value: '1000')
 Setting.create(key: 'mailer_from_name', value: 'Consul')
+Setting.create(key: 'mailer_from_address', value: 'noreply@consul.dev')
 Setting.create(key: 'meta_description', value: 'Citizen Participation and Open Government Application')
 Setting.create(key: 'meta_keywords', value: 'citizen participation, open government')