X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/217f61663048cb3040663d607364ab10937dbe9a..0eb2afa83aee217fc2c6399bd23d0d8152c09eb5:/app/views/user_blocks/edit.html.erb

diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 69ab5f9f3..8c89c80f3 100644
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,30 +1,27 @@
-<% @title = t ".title", :name => h(@user_block.user.display_name) %>
+<% @title = t ".title", :name => @user_block.user.display_name %>
 <% content_for :heading do %>
   <h1><%= t(".heading_html",
             :name => link_to(@user_block.user.display_name,
                              user_path(@user_block.user))) %></h1>
-  <ul class='secondary-actions clearfix'>
-    <li><%= link_to t(".show"), @user_block %></li>
-    <li><%= link_to t(".back"), user_blocks_path %></li>
-  </ul>
+  <nav class='secondary-actions'>
+    <ul class='clearfix'>
+      <li><%= link_to t(".show"), @user_block %></li>
+      <li><%= link_to t(".back"), user_blocks_path %></li>
+    </ul>
+  </nav>
 <% end %>
 
-<%= form_for(@user_block) 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 => h(@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 %>