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

Bootstrap 5: Update manual select boxes to use form-select class

Browse source
This commit is contained in:
Andy Allan 2022-06-29 15:29:21 +01:00
parent 2080696fe6
commit 02a6ec60ec
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,14 +11,14 @@
options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]), options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]),
:include_blank => t(".select_status"), :include_blank => t(".select_status"),
:data => { :behavior => "category_dropdown" }, :data => { :behavior => "category_dropdown" },
:class => "form-control custom-select" %> :class => "form-select" %>
</div> </div>
<div class="form-group col-md-auto"> <div class="form-group col-md-auto">
<%= select_tag :issue_type, <%= select_tag :issue_type,
options_for_select(@issue_types, params[:issue_type]), options_for_select(@issue_types, params[:issue_type]),
:include_blank => t(".select_type"), :include_blank => t(".select_type"),
:data => { :behavior => "category_dropdown" }, :data => { :behavior => "category_dropdown" },
:class => "form-control custom-select" %> :class => "form-select" %>
</div> </div>
<div class="form-group col-md"> <div class="form-group col-md">
<%= text_field_tag :search_by_user, <%= text_field_tag :search_by_user,
@ -32,7 +32,7 @@
options_for_select(@users.all.collect { |f| [f.display_name, f.id] } << [t(".not_updated"), "nil"], params[: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"), :include_blank => t(".select_last_updated_by"),
:data => { :behavior => "category_dropdown" }, :data => { :behavior => "category_dropdown" },
:class => "form-control custom-select" %> :class => "form-select" %>
</div> </div>
<div class="form-group col-md-auto"> <div class="form-group col-md-auto">
<%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %> <%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>

2
app/views/layouts/_search.html.erb
View file

@ -39,7 +39,7 @@
</div> </div>
<div class="row gx-2 m-1"> <div class="row gx-2 m-1">
<div class="col offset-1"> <div class="col offset-1">
<select class="routing_engines form-control form-control-sm" name="routing_engines"></select> <select class="routing_engines form-select form-select-sm" name="routing_engines"></select>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-sm btn-primary", :data => { :disable_with => false } %> <%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-sm btn-primary", :data => { :disable_with => false } %>

4
app/views/user_blocks/edit.html.erb
View file

@ -16,7 +16,9 @@
<%= f.form_group do %> <%= f.form_group do %>
<%= label_tag "user_block_period", t(".period") %><br /> <%= label_tag "user_block_period", t(".period") %><br />
<%= select_tag("user_block_period", options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period])) %> <%= select_tag("user_block_period",
options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period]),
:class => "form-select") %>
<% end %> <% end %>
<%= f.form_group :needs_view do %> <%= f.form_group :needs_view do %>

4
app/views/user_blocks/new.html.erb
View file

@ -10,7 +10,9 @@
<%= f.form_group do %> <%= f.form_group do %>
<%= label_tag "user_block_period", t(".period") %><br /> <%= label_tag "user_block_period", t(".period") %><br />
<%= select_tag("user_block_period", options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period])) %> <%= select_tag("user_block_period",
options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period]),
:class => "form-select") %>
<% end %> <% end %>
<%= f.form_group :needs_view do %> <%= f.form_group :needs_view do %>