Add navigation tabs to new block pages

diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb
index f4f9b04f82b4794e58d13f2f4f6c1e31486ba1d5..061989586a255b067cdcf94d219feb7d8b06df86 100644 (file)
--- a/app/views/user_blocks/_navigation.html.erb
+++ b/app/views/user_blocks/_navigation.html.erb
@@ -34,11 +34,17 @@
                   :class => ["nav-link", { :active => action_name == "blocks_by" }] %>
     </li>
   <% end %>
                   :class => ["nav-link", { :active => action_name == "blocks_by" }] %>
     </li>
   <% end %>

-  <% if @user_block %>
+  <% if @user_block&.persisted? %>

     <li class="nav-item">
       <%= link_to t(".block", :id => @user_block.id),
                   user_block_path(@user_block),
                   :class => "nav-link active" %>
     </li>
     <li class="nav-item">
       <%= link_to t(".block", :id => @user_block.id),
                   user_block_path(@user_block),
                   :class => "nav-link active" %>
     </li>

+  <% elsif @user_block&.new_record? %>
+    <li class="nav-item">
+      <%= link_to t(".new_block"),
+                  new_user_block_path,
+                  :class => "nav-link active" %>
+    </li>

   <% end %>
 </ul>
   <% end %>
 </ul>

diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index 3de6aa539ec86d48964524437641f1ca86b5f07f..14eaff2b9aa43b485e6ba1c4f4d1e5ebbe9f54f7 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,7 +1,11 @@
 <% @title = t ".title", :name => @user.display_name %>
 <% @title = t ".title", :name => @user.display_name %>

+
+<% content_for :heading_class, "pb-0" %>

 <% content_for :heading do %>
   <h1><%= t(".heading_html", :name => link_to(@user.display_name, @user)) %></h1>
 <% content_for :heading do %>
   <h1><%= t(".heading_html", :name => link_to(@user.display_name, @user)) %></h1>

+  <%= render :partial => "navigation" %>

 <% end %>
 <% end %>

+

 <%= bootstrap_form_for(@user_block) do |f| %>
   <%= hidden_field_tag "display_name", @user.display_name, :autocomplete => "off" %>
   <%= f.richtext_field :reason, :cols => 80, :rows => 20 %>
 <%= bootstrap_form_for(@user_block) do |f| %>
   <%= hidden_field_tag "display_name", @user.display_name, :autocomplete => "off" %>
   <%= f.richtext_field :reason, :cols => 80, :rows => 20 %>


@@ -18,5 +22,4 @@
   <% end %>
 
   <%= f.primary %>
   <% end %>
 
   <%= f.primary %>

-  <%= link_to t(".back"), user_blocks_path, :class => "btn btn-link" %>

 <% end %>
 <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a97eca9c016c3104d6697596a29e5cbb74404820..30721562a8098459436b18ab8cdb2b72de741fa3 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2936,7 +2936,6 @@ en:
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."

-      back: "View all blocks"

     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"


@@ -3034,6 +3033,7 @@ en:
       blocks_by_me: "Blocks by Me"
       blocks_by_user: "Blocks by %{user}"
       block: "Block #%{id}"
       blocks_by_me: "Blocks by Me"
       blocks_by_user: "Blocks by %{user}"
       block: "Block #%{id}"

+      new_block: "New Block"

   user_mutes:
     index:
       title: "Muted Users"
   user_mutes:
     index:
       title: "Muted Users"