cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework issue search form to use Bootstrap form layout

Browse source
This commit is contained in:
Andy Allan 2020-08-19 10:45:27 +02:00
parent 8df3010766
commit 56ed381a7d
1 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app/views/issues/index.html.erb
View file

@ -2,13 +2,41 @@
<h1><%= t ".title" %></h1>
<% end %>
<%= form_tag(issues_path, :method => :get, :class => "standard-form") do %>
<p><%= t ".search_guidance" %></p>
<%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => "category_dropdown" } %>
<%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => "category_dropdown" } %>
<%= text_field_tag :search_by_user, params[:search_by_user], :placeholder => t(".reported_user") %>
<%= select_tag :last_updated_by, options_for_select(@users.all.collect { |f| [f.display_name, f.id] } << [t(".not_updated"), "nil"], params[:last_updated_by]), :include_blank => t(".select_last_updated_by"), :data => { :behavior => "category_dropdown" } %>
<%= submit_tag t(".search"), :name => nil %>
<%= form_tag(issues_path, :method => :get) do %>
<div class="form-row">
<div class="form-group col-md-auto">
<%= select_tag :status,
options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]),
:include_blank => t(".select_status"),
:data => { :behavior => "category_dropdown" },
:class => "form-control custom-select" %>
</div>
<div class="form-group col-md-auto">
<%= select_tag :issue_type,
options_for_select(@issue_types, params[:issue_type]),
:include_blank => t(".select_type"),
:data => { :behavior => "category_dropdown" },
:class => "form-control custom-select" %>
</div>
<div class="form-group col-md">
<%= text_field_tag :search_by_user,
params[:search_by_user],
:placeholder => t(".reported_user"),
:class => "form-control" %>
</div>
<div class="form-group col-md-auto">
<%= select_tag :last_updated_by,
options_for_select(@users.all.collect { |f| [f.display_name, f.id] } << [t(".not_updated"), "nil"], params[:last_updated_by]),
:include_blank => t(".select_last_updated_by"),
:data => { :behavior => "category_dropdown" },
:class => "form-control custom-select" %>
</div>
<div class="form-group col-md-auto">
<%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
</div>
</div>
<% end %>
<br />