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

[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 aaa2fcaa4372222716698a2545260335593a5b88..14480eac8bc69fa8e58fb901b77b8b1076b994de 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -21,6 +21,8 @@
     <%= f.form_group :needs_view do %>
       <%= f.check_box :needs_view %>
     <% end %>
+
+    <%= f.primary %>
   <% else %>
     <div class="alert alert-info">
       <% if @user_block.active? %>
@@ -32,7 +34,11 @@
 
     <%= hidden_field_tag "user_block_period", 0 %>
     <%= hidden_field_tag "user_block[needs_view]", false %>
-  <% end %>
 
-  <%= f.primary %>
+    <% if @user_block.active? %>
+      <%= f.submit t(".revoke"), :class => "btn btn-danger" %>
+    <% else %>
+      <%= f.primary %>
+    <% end %>
+  <% end %>
 <% end %>