From bf5aac32c07f51c07c9f178f1d9ef193e70ae459 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 3 Dec 2015 19:30:01 +0100
Subject: [PATCH] Improves header and footer styles

---
 app/views/layouts/_footer.html.erb | 12 +++++++-----
 app/views/layouts/_header.html.erb | 26 +++-----------------------
 config/locales/en.yml              |  3 +--
 config/locales/es.yml              |  3 +--
 4 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 1b58963c8..3c2e47a77 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -43,11 +43,13 @@
 
     <div class="subfooter row">
       <div class="small-12 medium-9 column">
-        <%= t("layouts.footer.copyright", year: Time.now.year) %>&nbsp;|&nbsp;
-        <%= link_to t("layouts.footer.more_info"), "/more_information" %>&nbsp;|&nbsp;
-        <%= link_to t("layouts.footer.privacy"), "/privacy" %>&nbsp;|&nbsp;
-        <%= link_to t("layouts.footer.conditions"), "/conditions" %>&nbsp;|&nbsp;
-        <%= link_to t("layouts.footer.accessibility"), "/accessibility" %>
+        <p>
+          <%= t("layouts.footer.copyright", year: Time.now.year) %>&nbsp;|&nbsp;
+          <%= link_to t("layouts.footer.more_info"), "/more_information" %>&nbsp;|&nbsp;
+          <%= link_to t("layouts.footer.privacy"), "/privacy" %>&nbsp;|&nbsp;
+          <%= link_to t("layouts.footer.conditions"), "/conditions" %>&nbsp;|&nbsp;
+          <%= link_to t("layouts.footer.accessibility"), "/accessibility" %>
+        </p>
       </div>
 
       <div class="small-12 medium-3 column social">
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 51cca123d..3fbbc97eb 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -4,9 +4,8 @@
       <%= 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"), "/transparency", class: ("selected" if current_page?("/transparency")) %>&nbsp;|
-        <%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %>
-          &nbsp;|&nbsp;
+        <%= link_to t("layouts.header.external_link_transparency"), "https://transparencia.madrid.es/" %>&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 %>
               <span class="sr-only"><%= t("social.twitter") %></span>
@@ -36,17 +35,12 @@
         <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 transparency_page? %>
-              <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}") %> <span>|</span>
-              <span class="logo-site"><%= t("layouts.header.transparency") %></span>
-            <% elsif opendata_page? %>
+            <% 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>
             <% else %>
                <%= t("layouts.header.participation_html") %>
             <% end %>
-
           <% end %>
         </li>
       </ul>
@@ -91,20 +85,6 @@
     </div>
   <% end %>
 
-  <% if transparency_page? %>
-    <div class="row home-page">
-      <div class="small-12 medium-7 column">
-        <h1><%= t("pages.transparency.title") %></h1>
-        <h2><%= t("pages.transparency.slogan_html") %></h2>
-        <%= link_to t("pages.transparency.go_old"), t("layouts.header.external_link_transparency_url"), target: "_blank", class: "button radius" %>
-      </div>
-      <div class="show-for-medium-up small-12 medium-5 column text-center">
-        <i class="icon-debates icon-home-big"></i>
-        <i class="icon-debates icon-home-small"></i>
-      </div>
-    </div>
-  <% end %>
-
   <% if opendata_page? %>
     <div class="row home-page">
       <div class="small-12 medium-7 column">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cba8fcc67..b3dacaad8 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -27,10 +27,9 @@ en:
       locale: "Language:"
       administration: "Administration"
       moderation: "Moderation"
-      # highlights: "Highlights"
       more_information: "More information"
       debates: "Debates"
-      proposals: "Citizen proposals"
+      proposals: "Proposals"
     footer:
       description: "This portal uses the %{consul} which is %{open_source}. From Madrid out into the world."
       open_source: "open-source software"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index be8dcca77..85e24ffed 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -27,10 +27,9 @@ es:
       locale: "Idioma:"
       administration: "Administrar"
       moderation: "Moderar"
-      # highlights: "Portada"
       more_information: "Más información"
       debates: "Debates"
-      proposals: "Propuestas ciudadanas"
+      proposals: "Propuestas"
     footer:
       description: "Este portal usa la %{consul} que es %{open_source}. De Madrid, para el mundo entero."
       open_source: "software libre"