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

Merge pull request #676 from AyuntamientoMadrid/renaming-header

Browse Source 
Renaming header
This commit is contained in:
Raimond Garcia
2015-11-09 11:16:31 +01:00
parent f09fbd519a 09a1a2bd2a
commit 8f60f0b6d3
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/_admin_header.html.erb
View File

@@ -11,7 +11,7 @@
<li class="name">
<%= link_to root_path do %>
<%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96', alt: t("layouts.header.logo")) %>
<%= t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %> <span>|</span> <span class="logo-site"><%= t("admin.dashboard.index.title") %></span>
<%= t("layouts.header.participation_html") %> <span>|</span> <span class="logo-site"><%= t("admin.dashboard.index.title") %></span>
<% end %>
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>

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

@@ -3,7 +3,7 @@
<div class="row">
<%= render "shared/locale_switcher" %>
<div class="external-links">
<%= link_to t("layouts.header.participation"), root_path, class: ("selected" unless current_page?("/transparency") || current_page?("/opendata")) %>&nbsp;|
<%= 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;
@@ -36,16 +36,17 @@
<li class="name">
<%= link_to root_path do %>
<%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96', alt: t("layouts.header.logo")) %>
<%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> <span>|</span>
<span class="logo-site">
<% if transparency_page? %>
<%= t("layouts.header.transparency") %>
<% elsif opendata_page? %>
<%= t("layouts.header.open_data") %>
<% else %>
<%= t("layouts.header.participation") %>
<% end %>
</span>
<% 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? %>
<%= 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>

4
app/views/layouts/management.html.erb
View File

@@ -5,7 +5,7 @@
<meta charset="utf-8" />
<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) : "Admin" %></title>
<title><%= content_for?(:title) ? yield(:title) : "Management" %></title>
<%= stylesheet_link_tag "application", media: "all" %>
<%= stylesheet_link_tag "print", media: "print" %>
<%= javascript_include_tag "vendor/modernizr" %>
@@ -29,7 +29,7 @@
<li class="name">
<%= link_to management_root_path do %>
<%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96') %>
<%= t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %> <span>|</span> <span class="logo-site"><%= t("management.dashboard.index.title") %></span>
<%= t("layouts.header.participation_html") %> <span>|</span> <span class="logo-site"><%= t("management.dashboard.index.title") %></span>
<% end %>
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>

2
config/locales/en.yml
View File

@@ -14,7 +14,7 @@ en:
external_link_blog_url: "/blog"
open_gov: "%{open} government"
open: "open"
participation: "Participation"
participation_html: "Madrid <strong>Decides</strong>"
transparency: "Transparency"
open_data: "Open data"
open_city_title: "Love the city, and it will become a city you love."

2
config/locales/es.yml
View File

@@ -14,7 +14,7 @@ es:
external_link_blog_url: "/blog"
open_gov: "Gobierno %{open}"
open: "abierto"
participation: "Participación"
participation_html: "Madrid <strong>Decide</strong>"
transparency: "Transparencia"
open_data: "Datos abiertos"
open_city_title: "La ciudad que quieres será la ciudad que quieras."