X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6aca6cfabf21da48567e8197457dae8785b7324d..e94a8a45ba8a51bc5d288e6cda713059a1c6ae1f:/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 a50ac75d7..882eb27b1 100644
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,28 +1,25 @@
-<% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %>
-<h1><%= raw t('user_block.edit.title',
-              :name => link_to(
-                               h(@user_block.user.display_name),
-                               {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name})) %></h1>
+<% @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>
+<% end %>
+
+<%= bootstrap_form_for(@user_block) do |f| %>
+  <%= f.richtext_field :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
 
-<%= form_for(@user_block) do |f| %>
-  <%= f.error_messages %>
+  <%= 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])) %>
+  <% end %>
 
-  <p>
-    <%= f.label :reason, t('user_block.edit.reason', :name => h(@user_block.user.display_name)) %><br />
-    <%= f.text_area :reason, :cols => 80, :rows => 5 %>
-  </p>
-  <p>
-    <%= label_tag 'user_block_period', t('user_block.edit.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.edit.needs_view') %>
-  </p>
-  <p>
-    <%= f.submit t('user_block.edit.submit') %>
-  </p>
-<% end %>
+  <% end %>
 
-<%= link_to t('user_block.edit.show'), @user_block %> |
-<%= link_to t('user_block.edit.back'), user_blocks_path %>
+  <%= f.primary %>
+<% end %>