Merge remote-tracking branch 'upstream/pull/4581'

[rails.git] / 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 a3bb9c682fb320954c0d0227ed74a2c7cd6f3923..db7c5e057f360d5c80ceab91cdbfee6e4fe86589 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,30 +1,29 @@
-<% @title = t '.title', :name => h(@user_block.user.display_name) %>
+<% @title = t ".title", :name => @user_block.user.display_name %>
 <% content_for :heading do %>
-  <h1><%= raw t('.title',
-                :name => link_to(h(@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>
+  <h1><%= t(".heading_html",
+            :name => link_to(@user_block.user.display_name,
+                             user_path(@user_block.user))) %></h1>
+  <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>
-    <%= label_tag 'user_block_period', t('.period') %><br />
-    <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period])) %>
-  </p>
-  <p>
+  <%= 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 %>
+
+  <%= f.form_group :needs_view do %>
     <%= f.check_box :needs_view %>
-    <%= f.label :needs_view, t('.needs_view') %>
-  </p>
-  <p>
-    <%= f.submit t('.submit') %>
-  </p>
+  <% end %>
+
+  <%= f.primary %>
 <% end %>