diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 6e5ad3d7b..710fb8c6d 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -134,7 +134,7 @@ header { min-height: rem-calc(480); &.results { - min-height: rem-calc(192); + min-height: rem-calc(216); } h1 { @@ -276,6 +276,35 @@ header { } } +.subnavigation { + background: white; + border-bottom: 1px solid white; + clear: both; + + a { + color: $link; + font-size: rem-calc(14); + font-weight: bold; + + &.active { + color: $text; + + &:after { + bottom: -17px; + left: 50%; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + border-top-color: #fff; + border-width: 8px; + margin-left: -8px; + } + } + } +} + // 05. Footer // - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb new file mode 100644 index 000000000..b88dcded4 --- /dev/null +++ b/app/views/layouts/_admin_header.html.erb @@ -0,0 +1,50 @@ +
+ + +
+ +
+ + <% if home_page? %> +
+
+

<%= t("layouts.header.open_city") %>

+

<%= t("layouts.header.open_city_slogan") %>

+ <%= link_to t("layouts.header.see_all_debates"), debates_path, class: 'button radius' %> +
+
+ <% end %> +
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index b88dcded4..d525c5c62 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -35,6 +35,21 @@ <%= render 'devise/menu/login_items' %> <%= render 'shared/admin_login_items' %> + + diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index b23b3e193..c754951f2 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -13,7 +13,7 @@ - <%= render 'layouts/header' %> + <%= render 'layouts/admin_header' %> <% if notice %>

<%= notice %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 115a4aa57..0866dfa7d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -15,6 +15,10 @@ en: language: Site language administration: Administration moderation: Moderation + welcome: Welcome + news: News + debates: Debates + initiatives: Initiatives footer: copyright: "Ayuntamiento de Madrid, 2015. All rights reserved" form: diff --git a/config/locales/es.yml b/config/locales/es.yml index 0203e5d48..1091a30e9 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -15,6 +15,10 @@ es: language: Idioma de la página administration: Administar moderation: Moderar + welcome: Portada + news: Novedades + debates: Debates + initiatives: Iniciativas footer: copyright: "Ayuntamiento de Madrid, %{year}. Todos los derechos reservados" form: