X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/daa2496024cf0bdc65e58eb6e2802784f411f68b..8dc16bd8dbd362a0e823f8abd989d871ce5de32f:/app/views/user_blocks/new.html.erb?ds=sidebyside diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb index 99f9252d1..9ea63f885 100644 --- a/app/views/user_blocks/new.html.erb +++ b/app/views/user_blocks/new.html.erb @@ -1,19 +1,16 @@ -

<%= t('user_block.new.title', :name => @display_name) %>

- -<% form_for(@user_block) do |f| %> +<% @title = t 'user_block.new.title', :name => h(@this_user.display_name) %> +<% content_for :heading do %> +

<%= raw t('user_block.new.heading', + :name => link_to( + h(@this_user.display_name), + {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %>

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

- <%= check_box_tag 'tried_contacting', 'yes', (params[:tried_contacting] == "yes") %> - <%= label_tag 'tried_contacting', t('user_block.new.tried_contacting') %> -

-

- <%= check_box_tag 'tried_waiting', 'yes', (params[:tried_waiting] == "yes") %> - <%= label_tag 'tried_waiting', t('user_block.new.tried_waiting') %> -

-

- <%= f.label :reason, t('user_block.new.reason', :name => @display_name) %>
- <%= f.text_area :reason %> + <%= f.label :reason, t('user_block.new.reason', :name => @this_user.display_name) %>
+ <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %>

<%= label_tag 'user_block_period', t('user_block.new.period') %>
@@ -24,9 +21,9 @@ <%= f.label :needs_view, t('user_block.new.needs_view') %>

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

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