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

Moves geozones from questions to polls in admin forms

Browse Source
This commit is contained in:
kikito
2017-01-24 18:08:15 +01:00
parent 65b0d27995
commit 176a190149
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,30 +1,42 @@
<%= form_for [:admin, @poll] do |f| %> <%= form_for [:admin, @poll] do |f| %>
<div class="row"> <div class="row">
<div class="small-12 medium-6 column"> <div class="small-12 medium-6 column">
<%= f.text_field :name, <%= f.text_field :name %>
placeholder: t('admin.polls.form.name'),
label: t("admin.polls.form.name") %>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="small-12 medium-6 column"> <div class="small-12 medium-6 column">
<%= f.label :starts_at, t("admin.polls.form.starts_at") %>
<%= f.text_field :starts_at, <%= f.text_field :starts_at,
label: false,
value: @poll.starts_at.present? ? l(@poll.starts_at.to_date) : nil, value: @poll.starts_at.present? ? l(@poll.starts_at.to_date) : nil,
class: "js-calendar-full" %> class: "js-calendar-full" %>
</div> </div>
<div class="small-12 medium-6 column"> <div class="small-12 medium-6 column">
<%= f.label :ends_at, t("admin.polls.form.ends_at") %>
<%= f.text_field :ends_at, <%= f.text_field :ends_at,
label: false,
value: @poll.ends_at.present? ? l(@poll.ends_at.to_date) : nil, value: @poll.ends_at.present? ? l(@poll.ends_at.to_date) : nil,
class: "js-calendar-full" %> class: "js-calendar-full" %>
</div> </div>
</div> </div>
<div class="row">
<div class="small-6 medium-6 column">
<%= f.check_box :geozone_restricted, data: { checkbox_toggle: "#geozones" } %>
</div>
</div>
<div id="geozones" style="<%= @poll.geozone_restricted? ? '' : 'display:none' %>">
<div class="row">
<%= f.collection_check_boxes(:geozone_ids, @geozones, :id, :name) do |b| %>
<div class="small-6 medium-3 column">
<%= b.label do %>
<%= b.check_box + b.text %>
<% end %>
</div>
<% end %>
</div>
</div>
<div class="row"> <div class="row">
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">
<%= f.submit t("admin.polls.#{admin_submit_action(@poll)}.submit_button"), <%= f.submit t("admin.polls.#{admin_submit_action(@poll)}.submit_button"),

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

@@ -29,17 +29,6 @@
ckeditor: { language: I18n.locale } %> ckeditor: { language: I18n.locale } %>
</div> </div>
<div class="row">
<%= f.collection_check_boxes(:geozone_ids, @geozones, :id, :name) do |b| %>
<div class="small-6 medium-3 column">
<%= b.label do %>
<%= b.check_box + b.text %>
<% end %>
</div>
<% end %>
</div>
<%# TODO include all link %>
<div class="row"> <div class="row">
<div class="actions small-12 medium-4 column margin-top"> <div class="actions small-12 medium-4 column margin-top">
<%= f.submit(class: "button expanded", value: t("shared.save")) %> <%= f.submit(class: "button expanded", value: t("shared.save")) %>