Tell Potlatch 2 which locale to use

[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 3ca0b903137c373536ea84c8cd1d52849ea741fa..387335d9d07e4b6e20248e38228bee58c5078bb6 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,15 +1,18 @@
-<h1><%= t('user_block.edit.title', :name => @user_block.user.display_name) %></h1>
+<% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %>
+<h1><%= 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>

 
 <% form_for(@user_block) do |f| %>
   <%= f.error_messages %>
 
   <p>
 
 <% form_for(@user_block) do |f| %>
   <%= f.error_messages %>
 
   <p>

-    <%= f.label :reason, t('user_block.edit.reason', :name => @user_block.user.display_name) %><br />
-    <%= f.text_area :reason %>
+    <%= 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 />
   </p>
   <p>
     <%= label_tag 'user_block_period', t('user_block.edit.period') %><br />

-    <%= hidden_field_tag 'what is the period', params[:user_block_period] %>

     <%= 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>
     <%= 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>