X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7dbf68aa52f061b6575d42e2a0bec577da6ec827..549a46c867002c974224bc86cc5933edd8acef94:/app/views/user_blocks/new.html.erb?ds=sidebyside

diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index cea6e14ac..14eaff2b9 100644
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,28 +1,25 @@
-<% @title = t 'user_block.new.title', :name => h(@this_user.display_name) %>
-<h1><%= t('user_block.new.heading',
-          :name => link_to(
-                           h(@this_user.display_name),
-                           {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1>
+<% @title = t ".title", :name => @user.display_name %>
 
-<% form_for(@user_block) do |f| %>
-  <%= f.error_messages %>
+<% content_for :heading_class, "pb-0" %>
+<% content_for :heading do %>
+  <h1><%= t(".heading_html", :name => link_to(@user.display_name, @user)) %></h1>
+  <%= render :partial => "navigation" %>
+<% end %>
+
+<%= bootstrap_form_for(@user_block) do |f| %>
+  <%= hidden_field_tag "display_name", @user.display_name, :autocomplete => "off" %>
+  <%= f.richtext_field :reason, :cols => 80, :rows => 20 %>
+
+  <%= f.form_group do %>
+    <%= label_tag "user_block_period", t(".period"), :class => "form-label" %>
+    <%= 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 %>
 
-  <p>
-    <%= f.label :reason, t('user_block.new.reason', :name => @this_user.display_name) %><br />
-    <%= f.text_area :reason %>
-  </p>
-  <p>
-    <%= label_tag 'user_block_period', t('user_block.new.period') %><br />
-    <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_block.period', :count => h), h.to_s] }, params[:user_block_period] )) %>
-  </p>
-  <p>
+  <%= f.form_group :needs_view do %>
     <%= f.check_box :needs_view %>
-    <%= f.label :needs_view, t('user_block.new.needs_view') %>
-  </p>
-  <p>
-    <%= hidden_field_tag 'display_name', @this_user.display_name %>
-    <%= f.submit t('user_block.new.submit') %>
-  </p>
-<% end %>
+  <% end %>
 
-<%= link_to 'Back', user_blocks_path %>
+  <%= f.primary %>
+<% end %>