From c47f5e84b6c667b39e3f9736ed21e032354efed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Thu, 3 Dec 2015 12:51:51 +0100
Subject: [PATCH] removes provisional transparency page

---
 app/controllers/pages_controller.rb       | 3 ---
 app/helpers/application_helper.rb         | 6 +-----
 app/views/layouts/_footer.html.erb        | 2 +-
 app/views/layouts/_header.html.erb        | 5 +++--
 app/views/pages/transparency.html.erb     | 8 --------
 config/locales/en.yml                     | 2 ++
 config/locales/es.yml                     | 2 ++
 config/locales/pages.en.yml               | 1 -
 config/locales/pages.es.yml               | 1 -
 config/routes.rb                          | 1 -
 spec/controllers/pages_controller_spec.rb | 5 -----
 11 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 app/views/pages/transparency.html.erb

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 20093c33e..805e7aebc 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -34,9 +34,6 @@ class PagesController < ApplicationController
   def participation
   end
 
-  def transparency
-  end
-
   def proposals_info
   end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1d56ae4d3..87d9ecc82 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -7,16 +7,12 @@ module ApplicationHelper
     request.path == '/'
   end
 
-  def transparency_page?
-    request.path == '/transparency'
-  end
-
   def opendata_page?
     request.path == '/opendata'
   end
 
   def header_css
-    home_page? || transparency_page? || opendata_page? ? '' : 'results'
+    home_page? || opendata_page? ? '' : 'results'
   end
 
   # if current path is /debates current_path_with_query_params(foo: 'bar') returns /debates?foo=bar
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 3c2e47a77..b170aa431 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -27,7 +27,7 @@
 
         <div class="small-12 medium-4 column">
           <h4>
-            <%= link_to t("layouts.footer.transparency_title"), "/transparency" %>
+            <%= link_to t("layouts.footer.transparency_title"), t("layouts.footer.transparency_url") %>
           </h4>
           <p><%= t("layouts.footer.transparency_text") %></p>
         </div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 3fbbc97eb..3b67d0790 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -3,8 +3,8 @@
     <div class="row">
       <%= render "shared/locale_switcher" %>
       <div class="external-links">
-        <%= link_to t("layouts.header.participation_html"), root_path, class: ("selected" unless current_page?("/transparency") || current_page?("/opendata")) %>&nbsp;|
-        <%= link_to t("layouts.header.external_link_transparency"), "https://transparencia.madrid.es/" %>&nbsp;|
+        <%= link_to t("layouts.header.participation_html"), root_path, class: ("selected" unless current_page?("/opendata")) %>&nbsp;|
+        <%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %>&nbsp;|
         <%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %>&nbsp;|&nbsp;
           <div class="social inline-block">
             <%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("social.twitter") do %>
@@ -35,6 +35,7 @@
         <li class="name">
           <%= link_to root_path do %>
             <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '80x80', alt: t("layouts.header.logo")) %>
+
             <% if opendata_page? %>
               <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}") %> <span>|</span>
               <span class="logo-site"><%= t("layouts.header.open_data") %></span>
diff --git a/app/views/pages/transparency.html.erb b/app/views/pages/transparency.html.erb
deleted file mode 100644
index af72d3454..000000000
--- a/app/views/pages/transparency.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% 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">
-      <p><%= t('pages.while_unfinished_html') %></p>
-    </div>
-  </div>
-</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 198d51646..8f377af1d 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -7,6 +7,7 @@ en:
     header:
       logo: "Madrid"
       external_link_transparency: "Transparency"
+      external_link_transparency_url: "https://transparencia.madrid.es"
       external_link_opendata: "Open data"
       external_link_opendata_url: "http://datos.madrid.es"
       external_link_blog: "Blog"
@@ -38,6 +39,7 @@ en:
       participation_title: "Participation"
       participation_text: "Decide how to shape the Madrid you want to live in."
       transparency_title: "Transparency"
+      transparency_url: "https://transparencia.madrid.es"
       transparency_text: "Find out anything about the Madrid City Council."
       open_data_title: "Open data"
       open_data_text: "Every detail about the City Council is yours to access."
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1566242e0..a1b1952f2 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -7,6 +7,7 @@ es:
     header:
       logo: "Madrid"
       external_link_transparency: "Transparencia"
+      external_link_transparency_url: "https://transparencia.madrid.es"
       external_link_opendata: "Datos abiertos"
       external_link_opendata_url: "http://datos.madrid.es"
       external_link_blog: "Blog"
@@ -38,6 +39,7 @@ es:
       participation_title: "Participación"
       participation_text: "Decide cómo debe ser la ciudad de Madrid que quieres."
       transparency_title: "Transparencia"
+      transparency_url: "https://transparencia.madrid.es"
       transparency_text: "Obtén cualquier información sobre el Ayuntamiento de Madrid."
       open_data_title: "Datos Abiertos"
       open_data_text: "Todos los datos del Ayuntamiento son tuyos."
diff --git a/config/locales/pages.en.yml b/config/locales/pages.en.yml
index 4bf588d5c..51f71f08e 100755
--- a/config/locales/pages.en.yml
+++ b/config/locales/pages.en.yml
@@ -3,7 +3,6 @@ en:
     titles:
       more_information: "More information"
       privacy: "Privacy Policy"
-      transparency: "Transparency"
       opendata: "Open Data"
       conditions: "Terms of use"
       accessibility: "Accessibility"
diff --git a/config/locales/pages.es.yml b/config/locales/pages.es.yml
index 4084c0405..7c72578e9 100644
--- a/config/locales/pages.es.yml
+++ b/config/locales/pages.es.yml
@@ -3,7 +3,6 @@ es:
     titles:
       more_information: "Más información"
       privacy: "Política de Privacidad"
-      transparency: "Transparencia"
       opendata: "Datos abiertos"
       conditions: "Condiciones de uso"
       accessibility: "Accesibilidad"
diff --git a/config/routes.rb b/config/routes.rb
index cb42ef6da..75c4ce695 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -269,7 +269,6 @@ Rails.application.routes.draw do
   get "/more_information", to: "pages#more_information"
   get "/opendata", to: "pages#opendata"
   get "/participation", to: "pages#participation"
-  get "/transparency", to: "pages#transparency"
   get "/proposals_info", to: "pages#proposals_info"
   get "/participation_facts", to: "pages#participation_facts"
   get "/participation_world", to: "pages#participation_world"
diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb
index 62893df04..d80533bc9 100644
--- a/spec/controllers/pages_controller_spec.rb
+++ b/spec/controllers/pages_controller_spec.rb
@@ -25,11 +25,6 @@ describe PagesController do
   end
 
   describe 'Provisional pages' do
-    it 'should include a transparency page' do
-      get :transparency
-      expect(response).to be_ok
-    end
-
     it 'should include a opendata page' do
       get :opendata
       expect(response).to be_ok