Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

probe plaza finalists #524

Merged
merged 3 commits into from Jan 17, 2017
Merged

probe plaza finalists #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
610a29b
adds finalist docs
decabeza Jan 16, 2017
289c85d
adds finalist codes
decabeza Jan 16, 2017
935825b
adds finalists
decabeza Jan 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file modified app/assets/images/custom/landings/first_voting_project_x.jpg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/custom/landings/first_voting_project_y.jpg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions app/helpers/custom/probe_helper.rb
View file
Open in desktop
Expand Up @@ -9,14 +9,18 @@ def css_for_discarded_probe_option(probe_option)
end

def finalist?(probe_option)
["00"].include? probe_option.code
["03","10","28","30","68"].include? probe_option.code
end

def external_pdf?(probe_option)
probe_option.code == "30"
end

def project_x?(probe_option)
probe_option.code == "00"
probe_option.code == "30"
end

def project_y?(probe_option)
probe_option.code == "00"
probe_option.code == "10"
end
end
44 changes: 0 additions & 44 deletions app/views/custom/probe_options/plaza/_project_x.html.erb
View file
Open in desktop
@@ -1,44 +0,0 @@
<div class="orbit" role="region" aria-label="Favorite Space Pictures" data-orbit>
<ul class="orbit-container">
<button class="orbit-previous"><span class="show-for-sr">Previous Slide</span>&#9664;&#xFE0E;</button>
<button class="orbit-next"><span class="show-for-sr">Next Slide</span>&#9654;&#xFE0E;</button>
<li class="is-active orbit-slide">
<%= image_tag "plaza/example_1.jpg", alt: "", class: "orbit-image" %>
<figcaption class="orbit-caption">Ejemplo de imagen uno.</figcaption>
</li>
<li class="orbit-slide">
<%= image_tag "plaza/example_2.jpg", alt: "", class: "orbit-image" %>
<figcaption class="orbit-caption">Ejemplo de imagen dos.</figcaption>
</li>
<li class="orbit-slide">
<%= image_tag "plaza/example_3.jpg", alt: "", class: "orbit-image" %>
<figcaption class="orbit-caption">Ejemplo de imagen tres.</figcaption>
</li>
<li class="orbit-slide">
<%= image_tag "plaza/example_4.jpg", alt: "", class: "orbit-image" %>
<figcaption class="orbit-caption">Ejemplo de imagen cuatro.</figcaption>
</li>
</ul>
<nav class="orbit-bullets">
<button class="is-active" data-slide="0">
<span class="show-for-sr">First slide details.</span><span class="show-for-sr">Current Slide</span>
</button>
<button data-slide="1">
<span class="show-for-sr">Second slide details.</span>
</button>
<button data-slide="2">
<span class="show-for-sr">Third slide details.</span>
</button>
<button data-slide="3">
<span class="show-for-sr">Fourth slide details.</span>
</button>
</nav>
</div>

<p>En los últimos años , Madrid está convirtiendose en un modelo de ciudad más verde, amable , peatonal y festiva. Forma parte de un grupo de ciudades en todo el mundo que están reorientando sus modelos urbanos hacia soluciones más sostenibles poniendo al ciudadano como punto de partida en el diseño de sus espacios.</p>
<p><strong>Más peatonal</strong>. La limitación del trá co privado en muchas zonas del centro urbano, junto con la peatonlización permanente o temporal de grandes avenidas, como Madrid Pasea, así como la instauración de un sistema de bicicletas electricas de alquiler y la creación de nuevos carriles bici, está cambiando el modelo de movilidad hacia soluciones más limpias y no contaminantes.
Otras operaciones de reforma como el Prado-Recoletos, la futura reofmra de Gran Vía apuntan aún nuevas direcciones.</p>
<p><strong>Más verde</strong>. La red de espacios libres se ha consolidado con la creación de parque comoo el de Madrid RIo, que ha supuesto un increible salto de calidad cualitativo en los espacios públicos de la ciudad, y se ha convetido en un referente internacional de parque y espacio público contemporaneo.</p>
<p><strong>Más festiva</strong>. La recuperación de la calle y los espacios públicos ha supuesto una alegría y una nueva mentalidad en la ciudadanía. Conciertos, celebraciones, mercadillos , fesitvales callejeros,se han convertido en algo cotidiano los nes de semana, una expresión del caracter festivo de los madrileños.</p>
<p><strong>Más amable</strong>. Madrid se ha hecho más confortable de recorrer , más accesible para los mayores y cuidadosa con los pequeños. Más inclusiva incorporando a todo el mundo en sus espacios.
Madrid se transforma. Ahora es tiempo para la Plaza de España de participar de esa transformación.</p>
Empty file added app/views/custom/probe_options/plaza/_project_y.html.erb
View file
Open in desktop
Empty file.
15 changes: 12 additions & 3 deletions app/views/custom/probe_options/plaza/show.html.erb
View file
Open in desktop
Expand Up @@ -80,11 +80,20 @@
<div class="sidebar-divider"></div>
<% if finalist?(@probe_option) %>
<h3><%= t("probes.show.documents_finalist") %></h3>
<%= link_to @probe_option.file_path('memoria_finalista', 'pdf'),
title: "PDF #{@probe_option.name} finalista | #{@probe_option.file_size('memoria_finalista', 'pdf')}",
<% if external_pdf?(@probe_option) %>
<%= link_to "https://decide.madrid.es/system/30_memoria_finalista_welcome_mother_nature_good_bye_mr_ford.pdf",
title: "PDF #{@probe_option.name} finalista | (165Mb)",
target: "_blank", class: "button hollow expanded" do %>
<%= image_tag "icon_pdf.png", alt: "PDF" %>
<%= "<small>Memoria Final (#{@probe_option.file_size('memoria_finalista', 'pdf')})</small>".html_safe %>
<%= "<small>Memoria Final (165Mb)</small>".html_safe %>
<% end %>
<% else %>
<%= link_to @probe_option.file_path('memoria_finalista', 'pdf'),
title: "PDF #{@probe_option.name} finalista | #{@probe_option.file_size('memoria_finalista', 'pdf')}",
target: "_blank", class: "button hollow expanded" do %>
<%= image_tag "icon_pdf.png", alt: "PDF" %>
<%= "<small>Memoria Final (#{@probe_option.file_size('memoria_finalista', 'pdf')})</small>".html_safe %>
<% end %>
<% end %>
<%= link_to @probe_option.file_path('dossier_finalista', 'pdf'),
title: "PDF #{@probe_option.name} finalista | #{@probe_option.file_size('dossier_finalista', 'pdf')}",
Expand Down
21 changes: 21 additions & 0 deletions app/views/custom/probes/plaza/results.html.erb
View file
Open in desktop
Expand Up @@ -2,6 +2,27 @@

<%= render "shared/plaza_espana_header" %>

<div class="row survey-results">
<div class="small-12 column">
<h2 id="title_0" class="subtitle">Finalistas</h2>

<div class="row ">
<div class="small-12 medium-6 column">
<%= image_tag "landings/first_voting_project_x.jpg", alt: "Project X" %>
<h3 class="margin">
<%= link_to "Proyecto X", plaza_probe_option_path(38) %>
</h3>
</div>
<div class="small-12 medium-6 column">
<%= image_tag "landings/first_voting_project_y.jpg", alt: "Project Y" %>
<h3 class="margin">
<%= link_to "Proyecto Y", plaza_probe_option_path(22) %>
</h3>
</div>
</div>
</div>
</div>

<div class="row">
<div class="small-12 column">
<ul class="expanded menu text-center border-bottom border-top">
Expand Down
4 changes: 2 additions & 2 deletions app/views/pages/landings/first_voting.html.erb
View file
Open in desktop
Expand Up @@ -92,7 +92,7 @@
<figure>
<%= image_tag "landings/first_voting_project_x.jpg", alt: "Project X" %>
<figcaption>
<%= link_to "Proyecto X", plaza_path %>
<%= link_to "Proyecto X", plaza_probe_option_path(38) %>
</figcaption>
</figure>
</div>
Expand All @@ -101,7 +101,7 @@
<figure>
<%= image_tag "landings/first_voting_project_y.jpg", alt: "Project Y" %>
<figcaption>
<%= link_to "Proyecto Y", plaza_path %>
<%= link_to "Proyecto Y", plaza_probe_option_path(22) %>
</figcaption>
</figure>
</div>
Expand Down
Binary file added public/docs/plaza/03_dossier_finalista_mi_rincon_favorito_de_madrid.pdf
View file
Open in desktop
Binary file not shown.
Binary file added public/docs/plaza/03_memoria_finalista_mi_rincon_favorito_de_madrid.pdf
View file
Open in desktop
Binary file not shown.
Binary file added public/docs/plaza/10_dossier_finalista_un_paseo_por_la_cornisa.pdf
View file
Open in desktop
Binary file not shown.
Binary file added public/docs/plaza/10_memoria_finalista_un_paseo_por_la_cornisa.pdf
View file
Open in desktop
Binary file not shown.
Binary file added public/docs/plaza/28_dossier_finalista_de_este_a_oeste.pdf
View file
Open in desktop
Binary file not shown.
Binary file added public/docs/plaza/28_memoria_finalista_de_este_a_oeste.pdf
View file
Open in desktop
Binary file not shown.
Binary file added public/docs/plaza/30_dossier_finalista_welcome_mother_nature_good_bye_mr_ford.pdf
View file
Open in desktop
Binary file not shown.
Binary file added public/docs/plaza/68_dossier_finalista_pradera_urbana.pdf
View file
Open in desktop
Binary file not shown.
Binary file added public/docs/plaza/68_memoria_finalista_pradera_urbana.pdf
View file
Open in desktop
Binary file not shown.