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

Moves geozones from questions to polls in admin show views

Browse Source
This commit is contained in:
kikito
2017-01-24 18:08:48 +01:00
parent 176a190149
commit ab63c18d01
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/admin/poll/polls/show.html.erb
View File

@@ -6,9 +6,15 @@
<%= @poll.name %> <%= @poll.name %>
</h2> </h2>
<br> <br>
<p class="inline-block"> <span>
(<%= l @poll.starts_at.to_date %> - <%= l @poll.ends_at.to_date %>) (<%= l @poll.starts_at.to_date %> - <%= l @poll.ends_at.to_date %>)
</p> </span>
<% if @poll.geozone_restricted %>
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<span>
<%= @poll.geozones.pluck(:name).to_sentence %>
<span>
<% end %>
<div id="poll-resources" class="tabs-content" data-tabs-content="assigned-resources-tabs"> <div id="poll-resources" class="tabs-content" data-tabs-content="assigned-resources-tabs">
<%= render "filter_subnav" %> <%= render "filter_subnav" %>
@@ -27,4 +33,4 @@
<%= render "search_officers" %> <%= render "search_officers" %>
<%= render 'officers' %> <%= render 'officers' %>
</div> </div>
</div> </div>

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

@@ -46,15 +46,6 @@
<%= @question.description %> <%= @question.description %>
</p> </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) %> <%= link_to t("admin.questions.show.preview"), question_path(@question) %>
</div> </div>