X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82..cdf9634d08540baf0264bdf74bd9a2f6bebfb124:/app/views/user_blocks/edit.html.erb?ds=sidebyside
diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 8c89c80f3..14480eac8 100644
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,27 +1,44 @@
<% @title = t ".title", :name => @user_block.user.display_name %>
+
+<% content_for :heading_class, "pb-0" %>
<% content_for :heading do %>
-
<%= t(".heading_html",
- :name => link_to(@user_block.user.display_name,
- user_path(@user_block.user))) %>
-
+ <%= t(".heading_html", :name => link_to(@user_block.user.display_name, @user_block.user)) %>
+ <%= render :partial => "navigation" %>
<% end %>
<%= bootstrap_form_for(@user_block) do |f| %>
<%= f.richtext_field :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
- <%= f.form_group do %>
- <%= label_tag "user_block_period", t(".period") %>
- <%= 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])) %>
- <% end %>
+ <% if @user_block.active? && @user_block.creator == current_user %>
+ <%= 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 %>
+ <%= f.form_group :needs_view do %>
+ <%= f.check_box :needs_view %>
+ <% end %>
- <%= f.primary %>
+ <%= f.primary %>
+ <% else %>
+
+ <% if @user_block.active? %>
+ <%= t "user_blocks.update.only_creator_can_edit_without_revoking" %>
+ <% else %>
+ <%= t "user_blocks.update.inactive_block_cannot_be_reactivated" %>
+ <% end %>
+
+
+ <%= hidden_field_tag "user_block_period", 0 %>
+ <%= hidden_field_tag "user_block[needs_view]", false %>
+
+ <% if @user_block.active? %>
+ <%= f.submit t(".revoke"), :class => "btn btn-danger" %>
+ <% else %>
+ <%= f.primary %>
+ <% end %>
+ <% end %>
<% end %>