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

Refactor user_blocks form to use bootstrap

Browse source 
Further refactoring could involve a virtual attribute for duration.
This commit is contained in:
Andy Allan 2021-01-13 17:01:51 +00:00
parent 4abd9cfcf1
commit e94a8a45ba
3 changed files with 24 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,22 +9,17 @@
</ul>
<% end %>
<%= form_for(@user_block, :html => { :class => "standard-form" }) do |f| %>
<%= f.error_messages %>
<%= bootstrap_form_for(@user_block) do |f| %>
<%= f.richtext_field :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
<p>
<%= f.label :reason, t(".reason", :name => @user_block.user.display_name) %><br />
<%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
</p>
<p>
<%= f.form_group do %>
<%= 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])) %>
</p>
<p>
<% end %>
<%= f.form_group :needs_view do %>
<%= f.check_box :needs_view %>
<%= f.label :needs_view, t(".needs_view") %>
</p>
<p>
<%= f.submit %>
</p>
<% end %>
<%= f.primary %>
<% end %>

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

@ -4,25 +4,19 @@
:name => link_to(@user.display_name,
user_path(@user))) %></h1>
<% end %>
<%= form_for(@user_block, :html => { :class => "standard-form" }) do |f| %>
<%= f.error_messages %>
<%= bootstrap_form_for(@user_block) do |f| %>
<%= hidden_field_tag "display_name", @user.display_name %>
<%= f.richtext_field :reason, :cols => 80, :rows => 20 %>
<p>
<%= f.label :reason, t(".reason", :name => @user.display_name) %><br />
<%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %>
</p>
<p>
<%= f.form_group do %>
<%= 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])) %>
</p>
<p>
<%= f.check_box :needs_view %>
<%= f.label :needs_view, t(".needs_view") %>
</p>
<p>
<%= hidden_field_tag "display_name", @user.display_name %>
<%= f.submit %>
</p>
<% end %>
<% end %>
<%= link_to t(".back"), user_blocks_path %>
<%= f.form_group :needs_view do %>
<%= f.check_box :needs_view %>
<% end %>
<%= f.primary %>
<%= link_to t(".back"), user_blocks_path, :class => "btn btn-link" %>
<% end %>