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

Move 'Show stats and results' form to Admin::Poll#results tab

Browse Source
This commit is contained in:
Angel Perez
2018-05-18 09:19:20 -04:00
parent 63213a0e4d
commit 44b1eb929a
4 changed files with 69 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/admin/poll/polls/_form.html.erb
View File

@@ -55,17 +55,6 @@
</div>
</div>
<% if controller_name == "polls" && action_name == "edit" %>
<div class="row">
<fieldset class="fieldset">
<legend><%= t('admin.polls.new.show_results_and_stats') %></legend>
<%= f.check_box :results_enabled, checked: @poll.results_enabled?, label: t('admin.polls.new.show_results') %>
<%= f.check_box :stats_enabled, checked: @poll.stats_enabled?, label: t('admin.polls.new.show_stats') %>
<p class="small"><%= t('admin.polls.new.results_and_stats_reminder') %></p>
</fieldset>
</div>
<% end %>
<div class="row">
<div class="small-12 medium-4 column">
<%= f.submit t("admin.polls.#{admin_submit_action(@poll)}.submit_button"),

17
app/views/admin/poll/results/_show_results.html.erb Normal file
View File

@@ -0,0 +1,17 @@
<%= form_for [:admin, @poll], action: "update" do |f| %>
<div class="row">
<fieldset class="fieldset">
<legend><%= t("admin.polls.new.show_results_and_stats") %></legend>
<%= f.check_box :results_enabled, checked: @poll.results_enabled?, label: t("admin.polls.new.show_results") %>
<%= f.check_box :stats_enabled, checked: @poll.stats_enabled?, label: t("admin.polls.new.show_stats") %>
<p class="small"><%= t("admin.polls.new.results_and_stats_reminder") %></p>
</fieldset>
</div>
<div class="row">
<div class="small-12 medium-4 column">
<%= f.submit t("admin.polls.#{admin_submit_action(@poll)}.submit_button"),
class: "button success expanded" %>
</div>
</div>
<% end %>

2
app/views/admin/poll/results/index.html.erb
View File

@@ -1,4 +1,5 @@
<%= render "/admin/poll/polls/poll_header" %>
<div id="poll-resources">
<%= render "/admin/poll/polls/subnav" %>
@@ -12,5 +13,6 @@
<%= render "recount", resource: @poll %>
<%= render "result" %>
<%= render "results_by_booth" %>
<%= render "show_results", resource: @poll %>
<% end %>
</div>