Skip to content

Commit

Permalink
Adds new texts on header, debates and footer
Browse files Browse the repository at this point in the history
  • Loading branch information
@decabeza
decabeza committed Aug 27, 2015
1 parent c806547 commit 900f00b
Show file tree
Hide file tree
Showing 7 changed files with 112 additions and 49 deletions.
21 changes: 21 additions & 0 deletions app/assets/stylesheets/participacion.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,12 @@ header {
margin: 0;
}

p {
color: white;
font-size: rem-calc(18);
line-height: $line-height;
}

.button {
color: white;
font-family: inherit;
Expand Down Expand Up @@ -431,6 +437,11 @@ footer {

.logo {
@include logo;

a {
line-height: rem-calc(36);
padding-left: 0;
}
}

h4 {
Expand All @@ -446,6 +457,16 @@ footer {
opacity: .5;
}
}

.footer-description {
a {
text-decoration: underline;

&:hover {
color: rgba(255,255,255,.6);
}
}
}
}

.subfooter {
Expand Down
4 changes: 3 additions & 1 deletion app/views/debates/new.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<li><%= t("debates.new.recommendation_one") %></li>
<li><%= t("debates.new.recommendation_two") %></li>
<li><%= t("debates.new.recommendation_three") %></li>
<li><%= t("debates.new.recommendation_four") %></li>
<li><%= t("debates.new.recommendation_five") %></li>
</ul>
</div>
</div>
</div>
10 changes: 0 additions & 10 deletions app/views/layouts/_admin_header.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,4 @@
</section>
</nav>
</div>

<% if home_page? %>
<div class="row home-page">
<div class="small-12 column text-center">
<h1><%= t("layouts.header.open_city") %></h1>
<h2><%= t("layouts.header.open_city_slogan") %></h2>
<%= link_to t("layouts.header.see_all_debates"), debates_path, class: 'button radius' %>
</div>
</div>
<% end %>
</header>
47 changes: 23 additions & 24 deletions app/views/layouts/_footer.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,35 @@
<footer>
<div class="row-full">
<div class="row">
<div class="small-12 column">
<div class="right">
<%= link_to "Enlace 1", "#", class: "link" %> | <%= link_to "Enlace 2", "#", class: "link" %>
</div>

<div class="logo left">
<%= link_to root_path do %>
<%= image_tag('logo_madrid_white.png', class: 'left', size: '96x96') %>
<%= t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %>
<% end %>
<div class="small-12 medium-4 column">
<div class="logo">
<%= link_to t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %>
</div>
</div>

<div class="small-12 medium-3 column clear">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
<p class="footer-description">
<%= t("layouts.footer.description",
open_source: link_to(t('layouts.footer.open_source'), t('layouts.footer.open_source_url'), target: 'blank'),
github_url: link_to(t('layouts.footer.github_url'), t('layouts.footer.github_url'), target: 'blank')).html_safe
%>
</p>
</div>

<div class="small-12 medium-3 column">
<h4>Lorem ipsum dolor</h4>
<p>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
</div>
<div class="small-12 medium-8 column">
<div class="small-12 medium-4 column">
<h4><%= t("layouts.footer.participation_title") %></h4>
<p><%= t("layouts.footer.participation_text") %></p>
</div>

<div class="small-12 medium-3 column">
<h4>Ut enim ad minim</h4>
<p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
</div>
<div class="small-12 medium-4 column">
<h4><%= t("layouts.footer.transparency_title") %></h4>
<p><%= t("layouts.footer.transparency_text") %></p>
</div>

<div class="small-12 medium-3 column">
<h4>Duis aute irure</h4>
<p>Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<div class="small-12 medium-4 column">
<h4><%= t("layouts.footer.open_data_title") %></h4>
<p><%= t("layouts.footer.open_data_text") %></p>
</div>
</div>
</div>

Expand All @@ -40,4 +39,4 @@
</div>
</div>
</div>
</footer>
</footer>
9 changes: 5 additions & 4 deletions app/views/layouts/_header.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<%= render "shared/locale_switcher" %>
<div class="external-links">
<%= link_to t("layouts.header.participation"), root_path, class: "selected" %>&nbsp;|
<%= link_to t("layouts.header.external_link_transparency"), "#" %>&nbsp;|
<%= link_to t("layouts.header.external_link_opendata"), "#" %>
<%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url"), target: "_blank" %>&nbsp;|
<%= link_to t("layouts.header.external_link_opendata"), t("layouts.header.external_link_opendata_url"), target: "_blank" %>
</div>
</div>
</section>
Expand Down Expand Up @@ -50,8 +50,9 @@
<% if home_page? %>
<div class="row home-page">
<div class="small-12 column text-center">
<h1><%= t("layouts.header.open_city") %></h1>
<h2><%= t("layouts.header.open_city_slogan") %></h2>
<h1><%= t("layouts.header.open_city_title") %></h1>
<p><%= t("layouts.header.open_city_slogan") %></p>
<p><%= t("layouts.header.open_city_text") %></p>
<%= link_to t("layouts.header.see_all_debates"), debates_path, class: "button radius" %>
</div>
</div>
Expand Down
35 changes: 30 additions & 5 deletions config/locales/en.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,24 @@ en:
layouts:
header:
external_link_transparency: Transparency
external_link_transparency_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Transparencia?vgnextfmt=default&vgnextchannel=20fd850769797310VgnVCM2000000c205a0aRCRD"
external_link_opendata: Open data
external_link_opendata_url: "http://datos.madrid.es"
external_link_blog: Blog
open_gov: "%{open} government"
open: "Open"
participation: Participation
menu: Menu
open_city: We are opening Madrid
open_city_slogan: So the citizens can decide what kind of city they want.
open_city_title: "The city you want, it will be the city you want."
open_city_slogan:
"Start listening to Madrid.
For that we open this digital Puerta del Sol, where all the locals can meet to discuss and share everything we want.
Also a place where you can talk directly with all the employees of the City of Madrid, from the Mayor to any officer."
open_city_text:
"Here every voice has its place, and are citizens, and no one in their name, they decide to vote debates what issues are
most important of every time. Officials have individual users with whom you may participate in the debates, and evaluated,
the same level as everyone else. Because the Madrid City Council works for its citizens, and must respond to them."
open_city_soon: "And soon... we opened the section of citizen proposals."
see_all_debates: See all debates
my_account_link: My account
locale: "Site language:"
Expand All @@ -21,7 +31,20 @@ en:
debates: Debates
initiatives: Initiatives
footer:
description:
"The city you want, it will be the city you want. Get more information here on this page.
This Open Government Portal is %{open_source}, and code is in %{github_url}.
Madrid, for the whole world."
open_source: "software libre AGPLv3"
open_source_url: "http://www.gnu.org/licenses/agpl-3.0.html"
github_url: "https://github.com/ayuntamientomadrid"
copyright: "Ayuntamiento de Madrid, 2015. All rights reserved"
participation_title: "Participation"
participation_text: Decide what should be the city of Madrid you want.
transparency_title: Transparency
transparency_text: Get any information on the City of Madrid.
open_data_title: Open Data
open_data_text: All City Council data are yours
form:
error: error
errors: errors
Expand Down Expand Up @@ -90,9 +113,11 @@ en:
publish_new: Publish new debate
back_link: Back
recommendations_title: Tips for creating a debate
recommendation_one: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
recommendation_two: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
recommendation_three: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
recommendation_one: "On the Internet it is easy to say things you would not dare to say face to face. The tone of what you say you will be matched by a similar tone in the answers."
recommendation_two: "Do not write the title of the debate or whole sentences in capital. On the Internet this is considered shouting. And nobody likes to scream."
recommendation_three: "Any discussion or comment that involves an illegal act will be eliminated, also intending to sabotage the debate spaces, everything else is permitted."
recommendation_four: "The harsh criticism are very welcome. This is a space of thought but we recommend preserving the elegance and intelligence. The world is better with them present."
recommendation_five: "Enjoy this space, voices that fill it, it is yours too."
comments:
form:
leave_comment: Write a comment
Expand Down
35 changes: 30 additions & 5 deletions config/locales/es.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,24 @@ es:
layouts:
header:
external_link_transparency: Transparencia
external_link_transparency_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Transparencia?vgnextfmt=default&vgnextchannel=20fd850769797310VgnVCM2000000c205a0aRCRD"
external_link_opendata: Datos abiertos
external_link_opendata_url: "http://datos.madrid.es"
external_link_blog: Blog
open_gov: "Gobierno %{open}"
open: "abierto"
participation: Participación
menu: Menú
open_city: Estamos abriendo Madrid
open_city_slogan: Para que todos los madrileños decidamos que ciudad queremos tener.
open_city_title: "La ciudad que quieres, será la ciudad que quieras."
open_city_slogan:
"Empecemos escuchando qué tiene que decir Madrid.
Para ello abrimos esta Puerta del Sol digital, donde todos los madrileños podemos encontrarnos para debatir y compartir todo lo que queramos.
También un espacio donde poder hablar directamente con todos los trabajadores del Ayuntamiento de Madrid, desde la Alcaldesa hasta cualquier funcionario."
open_city_text:
"Aquí cualquier voz tiene su espacio, y son los ciudadanos, y nadie en su nombre, los que deciden votando los debates cuáles son los temas
más importantes de cada momento. Los funcionarios tienen usuarios propios con los que podrán participar en los debates, y ser evaluados,
al mismo nivel que todos los demás. Porque el Ayuntamiento de Madrid trabaja para sus ciudadanos, y ante ellos debe responder."
open_city_soon: "Y muy pronto... abrimos la sección de propuestas ciudadanas."
see_all_debates: Ver todos los debates
my_account_link: Mi cuenta
locale: "Idioma de la página:"
Expand All @@ -21,7 +31,20 @@ es:
debates: Debates
initiatives: Iniciativas
footer:
description:
"La ciudad que quieres, será la ciudad que quieras. Obtén aquí más información sobre esta página.
Este Portal de Gobierno Abierto es %{open_source}, y su código se encuentra en %{github_url}.
De Madrid, para el mundo entero."
open_source: "software libre AGPLv3"
open_source_url: "http://www.gnu.org/licenses/agpl-3.0.html"
github_url: "https://github.com/ayuntamientomadrid"
copyright: "Ayuntamiento de Madrid, %{year}. Todos los derechos reservados"
participation_title: "Participación"
participation_text: "Decide cómo debe ser la ciudad de Madrid que quieres."
transparency_title: Transparencia
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
form:
error: error
errors: errores
Expand Down Expand Up @@ -90,9 +113,11 @@ es:
publish_new: Publicar debate nuevo
back_link: Volver
recommendations_title: Recomendaciones para crear un debate
recommendation_one: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
recommendation_two: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
recommendation_three: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
recommendation_one: "En internet es fácil decir cosas que uno no se atrevería a decir cara a cara. El tono de lo que digas será correspondido con un tono similar en las respuestas."
recommendation_two: "No escribas el título del debate o frases enteras en mayúsculas. En internet eso se considera gritar. Y a nadie le gusta que le griten."
recommendation_three: "Cualquier debate o comentario que implique una acción ilegal será eliminado, también los que tengan la intención de sabotear los espacios de debate, todo lo demás está permitido."
recommendation_four: "Las críticas despiadadas son muy bienvenidas. Este es un espacio de pensamiento. Pero te recomendamos conservar la elegancia y la inteligencia. El mundo es mejor con ellas presentes."
recommendation_five: "Disfruta de este espacio, de las voces que lo llenan, también es tuyo."
comments:
form:
leave_comment: Deja tu comentario
Expand Down

0 comments on commit 900f00b

Please sign in to comment.