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

Merge branch 'poll-questions' of github.com:AyuntamientoMadrid/participacion into poll-questions

Browse Source
This commit is contained in:
rgarcia
2016-11-18 20:11:17 +01:00
parent 28e0c825f1 596cf1dc38
commit 19b5887f54
4 changed files with 69 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/stylesheets/admin.scss
View File

@@ -398,3 +398,18 @@ table.investment-projects-summary {
white-space: nowrap;
}
}
.geozone {
background: #ececec;
border-radius: rem-calc(6);
color: $text;
display: inline-block;
font-size: $small-font-size;
margin-bottom: $line-height/3;
padding: $line-height/4 $line-height/3;
text-decoration: none;
&:hover {
background: #e0e0e0;
}
}

91
app/views/admin/poll/questions/show.html.erb
View File

@@ -1,42 +1,55 @@
<div class="small-12 column">
<% if @question.proposal.present? %>
<div>
<%= I18n.t("admin.questions.show.proposal") %>:
<%= render "shared/back_link" %>
<div class="clear"></div>
<div class="row margin-top">
<div class="small-12 medium-9 column">
<% if @question.proposal.present? %>
<%= t("admin.questions.show.proposal") %>
<%= link_to @question.proposal.title, proposal_path(@question.proposal) %>
</div>
<% end %>
<div>
<%= I18n.t("admin.questions.show.title") %>:
<%= @question.title %>
</div>
<div>
<%= I18n.t("admin.questions.show.author") %>:
<%= link_to @question.author.name, user_path(@question.author) %>
</div>
<div>
<%= I18n.t("admin.questions.show.valid_answers") %>:
<%= @question.valid_answers.join(", ") %>
</div>
<div>
<%= I18n.t("admin.questions.show.summary") %>:
<%= @question.summary %>
</div>
<div>
<%= I18n.t("admin.questions.show.description") %>:
<%= @question.description %>
</div>
<div>
<%= I18n.t("admin.questions.show.geozones") %>:
<% @question.geozones.each do |geozone| %>
<div>
<%= geozone.name %>
</div>
<% end %>
<strong><%= t("admin.questions.show.title") %></strong>
<h1><%= @question.title %></h1>
<p>
<strong><%= t("admin.questions.show.author") %></strong>
<br>
<%= link_to @question.author.name, user_path(@question.author) %>
</p>
<p>
<strong><%= t("admin.questions.show.valid_answers") %></strong>
</p>
<% @question.valid_answers.each do |answer| %>
<span class="button">
<%= answer %>
</span>
<% end %>
<p>
<strong><%= t("admin.questions.show.summary") %></strong>
<br>
<%= @question.summary %>
</p>
<p>
<strong><%= t("admin.questions.show.description") %></strong>
<br>
<%= @question.description %>
</p>
<p>
<strong><%= t("admin.questions.show.geozones") %></strong>
<br>
<% @question.geozones.each do |geozone| %>
<span class="geozone">
<%= geozone.name %>
</span>
<% end %>
</p>
<%= link_to t("admin.questions.show.preview"), question_path(@question) %>
</div>
</div>
</div>

1
config/locales/admin.en.yml
View File

@@ -193,6 +193,7 @@ en:
summary: Summary
description: Description
geozones: Geozones
preview: View on website
booths:
index:
title: "List of booths"

1
config/locales/admin.es.yml
View File

@@ -193,6 +193,7 @@ es:
summary: Resumen
description: Descripción
geozones: Distritos
preview: Ver en la web
booths:
index:
title: "Lista de urnas"