consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improves header and footer styles

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2015-12-03 19:30:01 +01:00
parent da25779ec7
commit bf5aac32c0
4 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/layouts/_footer.html.erb
View File

@@ -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">

26
app/views/layouts/_header.html.erb
View File

@@ -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">

3
config/locales/en.yml
View File

@@ -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"

3
config/locales/es.yml
View File

@@ -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"