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

[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 0b928de548084ce449570cce3892e90b80512547..2d8956ffca730f29c1498074e05110c3a681ca48 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,31 +1,34 @@
-<% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %>
+<% @title = t ".title", :name => @user_block.user.display_name %>
+
+<% content_for :heading_class, "pb-0" %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= raw 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>
-  <ul class='secondary-actions clearfix'>
-    <li><%= link_to t('user_block.edit.show'), @user_block %></li>
-    <li><%= link_to t('user_block.edit.back'), user_blocks_path %></li>
-  </ul>
+  <h1><%= t(".heading_html", :name => link_to(@user_block.user.display_name, @user_block.user)) %></h1>
+  <%= render :partial => "navigation" %>

 <% end %>
 
 <% end %>
 

-<%= form_for(@user_block) do |f| %>
-  <%= f.error_messages %>
+<%= bootstrap_form_for(@user_block) do |f| %>
+  <%= f.richtext_field :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
+
+  <% if @user_block.active? %>
+    <%= 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] },
+                                        UserBlock::PERIODS.min_by { |h| (params[:user_block_period].to_i - h).abs }),
+                     :class => "form-select" %>
+    <% end %>
+
+    <%= f.form_group :needs_view do %>
+      <%= f.check_box :needs_view %>
+    <% end %>
+  <% else %>
+    <div class="alert alert-info">
+      <%= t "user_blocks.update.inactive_block_cannot_be_reactivated" %>
+    </div>

 
 

-  <p>
-    <%= f.label :reason, t('user_block.edit.reason', :name => h(@user_block.user.display_name)) %><br />
-    <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
-  </p>
-  <p>
-    <%= label_tag 'user_block_period', t('user_block.edit.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])) %>
-  </p>
-  <p>
-    <%= f.check_box :needs_view %>
-    <%= f.label :needs_view, t('user_block.edit.needs_view') %>
-  </p>
-  <p>
-    <%= f.submit t('user_block.edit.submit') %>
-  </p>
-<% end %>
\ No newline at end of file
+    <%= hidden_field_tag "user_block_period", 0 %>
+    <%= f.hidden_field :needs_view %>
+  <% end %>
+
+  <%= f.primary %>
+<% end %>