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

[rails.git] / app / views / user_blocks / new.html.erb

diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index bd492a354b00d38a736330899340cd02c565d329..c390134ba3db8482127f0c0a34a085a147e39aeb 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,28 +1,24 @@
-<% @title = t ".title", :name => h(@user.display_name) %>
+<% @title = t ".title", :name => @user.display_name %>
 <% content_for :heading do %>
-  <h1><%= raw t(".heading",
-                :name => link_to(h(@user.display_name),
-                                 user_path(@user))) %></h1>
+  <h1><%= t(".heading_html",
+            :name => link_to(@user.display_name,
+                             user_path(@user))) %></h1>
 <% end %>
-<%= form_for(@user_block) do |f| %>
-  <%= f.error_messages %>
+<%= 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 %>
 
-  <p>
-    <%= f.label :reason, t(".reason", :name => @user.display_name) %><br />
-    <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %>
-  </p>
-  <p>
-    <%= 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.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>
-    <%= hidden_field_tag "display_name", @user.display_name %>
-    <%= f.submit %>
-  </p>
-<% end %>
+  <% end %>
 
-<%= link_to t(".back"), user_blocks_path %>
+  <%= f.primary %>
+  <%= link_to t(".back"), user_blocks_path, :class => "btn btn-link" %>
+<% end %>