7 files changed, 82 insertions, 44 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 69aa268..a72be68 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -22,6 +22,7 @@ class NodesController < ApplicationController
 
   def new
     @node = Node.new node_params
+    @selected_kind = CccConventions::NODE_KINDS.key?(params[:kind]) ? params[:kind] : "generic"
     if params.has_key?(:parent_id)
       @parent_id = params[:parent_id]
       @parent_name = Node.find(@parent_id).title
diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index 2baf813..a89f879 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -58,4 +58,9 @@ module NodesHelper
       t(:event_schedule_none)
     end
   end
+
+  def matching_node_kinds(node)
+    path = node.unique_path
+    CccConventions::NODE_KINDS.select { |_, config| config[:parent_match]&.call(path) }
+  end
 end
diff --git a/app/views/nodes/new.html.erb b/app/views/nodes/new.html.erb
index 0a05325..71f2fbf 100644
--- a/app/views/nodes/new.html.erb
+++ b/app/views/nodes/new.html.erb
@@ -13,7 +13,7 @@
   <div class="node_content">
     <% CccConventions::NODE_KINDS.each do |kind, config| %>
       <p>
-        <%= radio_button_tag :kind, kind, kind == "generic",
+        <%= radio_button_tag :kind, kind, kind == @selected_kind,
           data: { path_prefix: resolve_kind_text(config[:path_prefix]) } %>
         <%= resolve_kind_text(config[:label]) %>
         <% if config[:hint] %>
@@ -29,7 +29,7 @@
     <span class="field_hint">A URL slug will be generated from this automatically. You can review or adjust it afterward under the "metadata" section's Slug field.</span>
   </div>
 
-  <div id="parent_search_field">
+  <div id="parent_search_field" style="<%= @selected_kind == "generic" ? "" : "display: none;" %>">
     <div class="node_description">Parent</div>
     <div class="node_content">
       <%= text_field_tag :parent_search_term, @parent_name %>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 189adb8..963bc37 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -101,17 +101,30 @@
       <%= link_to 'add event', new_event_path(node_id: @node.id, tag_list: mapping&.last, auto_tag_source: mapping&.first, return_to: request.path) %>
     </div>
 
-    <% if @node.children.any? %>
+    <% matches = matching_node_kinds(@node) %>
+    <% if @node.children.any? || matches.any? %>
       <div class="node_description">Children</div>
       <div class="node_content node_info_group">
-        <details>
-          <summary><%= pluralize(@node.children.count, 'child', 'children') %></summary>
-          <ul>
-            <% @node.children.order(:slug).each do |child| %>
-              <li><%= link_to (child.head&.title || child.draft&.title || child.slug), node_path(child) %></li>
+        <% if @node.children.any? %>
+          <details>
+            <summary><%= pluralize(@node.children.count, 'child', 'children') %></summary>
+            <ul>
+              <% @node.children.order(:slug).each do |child| %>
+                <li><%= link_to (child.head&.title || child.draft&.title || child.slug), node_path(child) %></li>
+              <% end %>
+            </ul>
+          </details>
+        <% end %>
+        <% if matches.any? %>
+          <p class="add_child_links">
+            <% matches.each_with_index do |(kind, config), index| %>
+              <%= " &middot; ".html_safe if index > 0 %>
+              <% link_params = { kind: kind } %>
+              <% link_params[:parent_id] = @node.id if kind == "generic" %>
+              <%= link_to "add '#{resolve_kind_text(config[:label])}' child", new_node_path(link_params) %>
             <% end %>
-          </ul>
-        </details>
+          </p>
+        <% end %>
       </div>
     <% end %>
 
diff --git a/lib/ccc_conventions.rb b/lib/ccc_conventions.rb
index c0f9943..b420452 100644
--- a/lib/ccc_conventions.rb
+++ b/lib/ccc_conventions.rb
@@ -4,44 +4,49 @@ module CccConventions
 
   NODE_KINDS = {
     "top_level" => {
-      parent:      -> { Node.root },
-      path_prefix: "",
-      label:       "Top Level"
+      parent:       -> { Node.root },
+      parent_match: ->(path) { path == [] },
+      path_prefix:  "",
+      label:        "Top Level"
     },
     "generic" => {
-      label: "Generic",
-      hint:  "Can be created anywhere - choose the parent below."
-      # no path_prefix - depends on whatever parent gets chosen; see below
+      parent_match: ->(path) { true },
+      label:        "Generic",
+      hint:         "Can be created anywhere - choose the parent below."
     },
     "update" => {
-      parent:      -> { Update.find_or_create_parent },
-      tags:        ["update"],
-      path_prefix: -> { "updates/#{Time.now.year}" },
-      label:       "Update",
-      hint:        -> { "Automatically created in /updates/#{Time.now.year}/, gets tag \"update\", and inherits the update template." }
+      parent:       -> { Update.find_or_create_parent },
+      parent_match: ->(path) { path[0] == "updates" && (path.length == 1 || path[1] =~ /\A\d{4}\z/) },
+      tags:         ["update"],
+      path_prefix:  -> { "updates/#{Time.now.year}" },
+      label:        "Update",
+      hint:         -> { "Automatically created in /updates/#{Time.now.year}/, gets tag \"update\", and inherits the update template." }
     },
     "press_release" => {
-      parent:      -> { Update.find_or_create_parent },
-      tags:        ["update", "pressemitteilung"],
-      path_prefix: -> { "updates/#{Time.now.year}" },
-      label:       "Pressemitteilung",
-      hint:        -> { "Automatically created in /updates/#{Time.now.year}/, gets tags \"update, pressemitteilung\", and inherits the update template." }
+      parent:       -> { Update.find_or_create_parent },
+      parent_match: ->(path) { path[0] == "updates" && (path.length == 1 || path[1] =~ /\A\d{4}\z/) },
+      tags:         ["update", "pressemitteilung"],
+      path_prefix:  -> { "updates/#{Time.now.year}" },
+      label:        "Pressemitteilung",
+      hint:         -> { "Automatically created in /updates/#{Time.now.year}/, gets tags \"update, pressemitteilung\", and inherits the update template." }
     },
     "erfa" => {
-      parent:      -> { Node.find_by_unique_name!(ERFA_PARENT_NAME) },
-      tags:        ["erfa-detail"],
-      template:    "chapter_detail",
-      path_prefix: ERFA_PARENT_NAME,
-      label:       "Erfa",
-      hint:        "Automatically created under the Erfa-Kreise overview page, gets tag \"erfa-detail\", and uses the chapter detail template."
+      parent:       -> { Node.find_by_unique_name!(ERFA_PARENT_NAME) },
+      parent_match: ->(path) { path == ["club", "erfas"] },
+      tags:         ["erfa-detail"],
+      template:     "chapter_detail",
+      path_prefix:  ERFA_PARENT_NAME,
+      label:        "Erfa",
+      hint:         "Automatically created under the Erfa-Kreise overview page, gets tag \"erfa-detail\", and uses the chapter detail template."
     },
     "chaostreff" => {
-      parent:      -> { Node.find_by_unique_name!(CHAOSTREFF_PARENT_NAME) },
-      tags:        ["chaostreff-detail"],
-      template:    "chapter_detail",
-      path_prefix: CHAOSTREFF_PARENT_NAME,
-      label:       "Chaostreff",
-      hint:        "Automatically created under the Chaostreffs overview page, gets tag \"chaostreff-detail\", and uses the chapter detail template."
+      parent:       -> { Node.find_by_unique_name!(CHAOSTREFF_PARENT_NAME) },
+      parent_match: ->(path) { path == ["club", "chaostreffs"] },
+      tags:         ["chaostreff-detail"],
+      template:     "chapter_detail",
+      path_prefix:  CHAOSTREFF_PARENT_NAME,
+      label:        "Chaostreff",
+      hint:         "Automatically created under the Chaostreffs overview page, gets tag \"chaostreff-detail\", and uses the chapter detail template."
     }
   }.freeze
 end
diff --git a/public/javascripts/admin_search.js b/public/javascripts/admin_search.js
index 2565929..6ef9087 100644
--- a/public/javascripts/admin_search.js
+++ b/public/javascripts/admin_search.js
@@ -208,14 +208,20 @@ parent_search = {
   },
 
   initialize_radio_buttons : function() {
-    $("input[name='kind']").bind("change", function(){
-      if ($(this).val() === "generic") {
-        $("#parent_search_field").show();
-      } else {
-        $("#parent_search_field").hide();
-      }
+    parent_search.sync_parent_field();
+    $("input[name='kind']").bind("change", function() {
+      parent_search.sync_parent_field();
       parent_search.update_resulting_path();
     });
+  },
+
+  sync_parent_field : function() {
+    var kind = $("input[name='kind']:checked").val();
+    if (kind === "generic") {
+      $("#parent_search_field").show();
+    } else {
+      $("#parent_search_field").hide();
+    }
   }
 }
 
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 1196d83..3033798 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -338,6 +338,14 @@ input[type=radio] {
   border: 1px solid #989898;
 }
 
+.add_child_links {
+  margin-top: 0.5rem;
+}
+
+.add_child_links a {
+  white-space: nowrap;
+}
+
 div#login_form input[type=text], div#login_form input[type=password] {
   width: 150px;
 }