Prefer string interpolation to concatenation

[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 99f9252d1f65821743c22f9fb53b2dad8cdcc632..1ebba0f042ef79feb8b83a6d995d89811439f73d 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,32 +1,28 @@
-<h1><%= t('user_block.new.title', :name => @display_name) %></h1>
-
-<% form_for(@user_block) do |f| %>
+<% @title = t ".title", :name => @user.display_name %>
+<% content_for :heading do %>
+  <h1><%= t(".heading_html",
+            :name => link_to(@user.display_name,
+                             user_path(@user))) %></h1>
+<% end %>
+<%= form_for(@user_block, :html => { :class => "standard-form" }) do |f| %>

   <%= f.error_messages %>
 
   <p>
   <%= f.error_messages %>
 
   <p>

-    <%= check_box_tag 'tried_contacting', 'yes', (params[:tried_contacting] == "yes") %>
-    <%= label_tag 'tried_contacting', t('user_block.new.tried_contacting') %>
-  </p>
-  <p>
-    <%= check_box_tag 'tried_waiting', 'yes', (params[:tried_waiting] == "yes") %>
-    <%= label_tag 'tried_waiting', t('user_block.new.tried_waiting') %>
-  </p>
-  <p>
-    <%= f.label :reason, t('user_block.new.reason', :name => @display_name) %><br />
-    <%= f.text_area :reason %>
+    <%= f.label :reason, t(".reason", :name => @user.display_name) %><br />
+    <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %>

   </p>
   <p>
   </p>
   <p>

-    <%= label_tag 'user_block_period', t('user_block.new.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] )) %>
+    <%= 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.check_box :needs_view %>
   </p>
   <p>
     <%= f.check_box :needs_view %>

-    <%= f.label :needs_view, t('user_block.new.needs_view') %>
+    <%= f.label :needs_view, t(".needs_view") %>

   </p>
   <p>
   </p>
   <p>

-    <%= hidden_field_tag 'display_name', @display_name %>
-    <%= f.submit t('user_block.new.submit') %>
+    <%= hidden_field_tag "display_name", @user.display_name %>
+    <%= f.submit %>

   </p>
 <% end %>
 
   </p>
 <% end %>
 

-<%= link_to 'Back', user_blocks_path %>
+<%= link_to t(".back"), user_blocks_path %>