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

[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 c92fe74ec5649b7564203f922e3fc9a7f6fd2ca3..1ebba0f042ef79feb8b83a6d995d89811439f73d 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,10 +1,10 @@
-<% @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| %>
+<%= form_for(@user_block, :html => { :class => "standard-form" }) do |f| %>
   <%= f.error_messages %>
 
   <p>
@@ -13,7 +13,7 @@
   </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])) %>
+    <%= 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.check_box :needs_view %>
@@ -21,7 +21,7 @@
   </p>
   <p>
     <%= hidden_field_tag "display_name", @user.display_name %>
-    <%= f.submit t(".submit") %>
+    <%= f.submit %>
   </p>
 <% end %>