From e19787c6ca542736db40e042554f5c0103531821 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Thu, 6 Aug 2026 05:17:27 +0200 Subject: Rebuild the sitemap rows around the shared title and action patterns --- app/views/nodes/show.html.erb | 11 +++++- app/views/nodes/sitemap.html.erb | 50 +++++++++++++++++++----- config/locales/de.yml | 7 +++- config/locales/en.yml | 7 +++- public/stylesheets/admin.css | 64 ++++++++++++++++++++++++++----- test/controllers/nodes_controller_test.rb | 20 ++++++---- 6 files changed, 130 insertions(+), 29 deletions(-) diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb index a94e001c..105e37ea 100644 --- a/app/views/nodes/show.html.erb +++ b/app/views/nodes/show.html.erb @@ -231,7 +231,7 @@ <% end %> - <% if @node.head %> + <% if @node.head && !@node.root? %>
<%= t(".public") %> @@ -251,6 +251,15 @@
<% end %> + <% if @node.root? %> +
+ + <%= t(".public") %> + <%= t(".root_has_no_public_url") %> + +
+ <% end %> + <% if @node.draft %>
diff --git a/app/views/nodes/sitemap.html.erb b/app/views/nodes/sitemap.html.erb index ea64b356..019d4c92 100644 --- a/app/views/nodes/sitemap.html.erb +++ b/app/views/nodes/sitemap.html.erb @@ -1,23 +1,55 @@ -

<%= t(".title") %>

+<%= render "shared/page_actions", + :title => t(".title"), + :icon_name => "file-plus", + :label => t(".create_at_root"), + :options => [[t(".create_at_root"), new_node_path(:parent_id => Node.root.id)]] %>
+ <% open_details = [] # levels with a currently-open
+ world_icon = icon("world", library: "tabler", "aria-hidden": true) + create_icon = icon("file-plus", library: "tabler", "aria-hidden": true) + show_icon = icon("eye", library: "tabler", "aria-hidden": true) %> + <% @sitemap.each_with_index do |(node, level), index| %> <% while open_details.any? && open_details.last >= level %>
<% open_details.pop %> <% end %> -
-

<%= link_to title_for_node(node), node_path(node) %>

- <%= link_to_path("#{node.unique_name} ↗", node.unique_name) %> -

- <%= link_to 'Show', node_path(node) %> - <%= link_to 'Create Child', new_node_path(:parent_id => node.id) %> -

-
+ <% unless level.zero? %> +
+
+ + <%= flag("file-text-shield", t(".flag_restricted"), :tier => :attention) if node.restricted? %> + <%= flag("external-link", t(".flag_external")) if node.external_url.present? %> + +
+
<%= link_to title_for_node(node), node_path(node) %>
+
+ <%= world_icon %> + <%= link_to_path(node.unique_name, node.unique_name) %> +
+
+
+ + <%= link_to new_node_path(:parent_id => node.id), + "aria-label" => t(".create_child"), title: t(".create_child") do %> + <%= create_icon %> + <% end %> + + + <%= link_to node_path(node), "aria-label" => t("admin.common.show"), + title: t("admin.common.show") do %> + <%= show_icon %> + <% end %> + +
+
+
+ <% end %> <% next_level = @sitemap[index + 1]&.last %> <% if next_level && next_level > level %> diff --git a/config/locales/de.yml b/config/locales/de.yml index 591b45d1..10f4b606 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -538,7 +538,8 @@ de: add_child: "Kind vom Typ %{kind} anlegen" abstract_locale: "Abstract (%{lang})" body_locale: "Text (%{lang})" - restricted_hint: "Geschützter Bereich — Veröffentlichen und Papierkorb sind der Redaktion vorbehalten. Entwürfe kannst du frei bearbeiten." + restricted_hint: "Geschützter Bereich. Veröffentlichen und Papierkorb sind der Redaktion vorbehalten. Entwürfe kannst du frei bearbeiten." + root_has_no_public_url: "Der Root-Node hat keine öffentliche Adresse. Er wird von der Startseite geliefert." drafts: title: "Nodes mit Entwürfen, Autosaves oder Sperren" mine: @@ -547,6 +548,10 @@ de: title: "Nodes mit Tag: %{tag}" sitemap: title: "Sitemap" + create_at_root: "Seite auf oberster Ebene anlegen" + create_child: "Hier eine Seite anlegen" + flag_restricted: "Veröffentlichen unterhalb erfordert Redaktion" + flag_external: "Leitet weiter — hier keine Seiten anlegen" descendants: one: "1 Unterseite" other: "%{count} Unterseiten" diff --git a/config/locales/en.yml b/config/locales/en.yml index f8a7144c..adcc591e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -485,7 +485,8 @@ en: add_child: "Add child type %{kind}" abstract_locale: "Abstract (%{lang})" body_locale: "Body (%{lang})" - restricted_hint: "Protected section — publishing and trashing are reserved for Redaktion. You can edit drafts freely." + restricted_hint: "Protected section. Publishing and trashing are reserved for Redaktion. You can edit drafts freely." + root_has_no_public_url: "The root node has no public address. It is served from the home page." drafts: title: "Nodes with drafts, autosaves or locks" mine: @@ -494,6 +495,10 @@ en: title: "Nodes tagged: %{tag}" sitemap: title: "Sitemap" + create_at_root: "Create a top-level page" + create_child: "Add a page here" + flag_restricted: "Publishing below this point needs Redaktion" + flag_external: "Redirects elsewhere — do not add pages under this" descendants: one: "1 descendant" other: "%{count} descendants" diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css index acb87aba..334e0bd5 100644 --- a/public/stylesheets/admin.css +++ b/public/stylesheets/admin.css @@ -835,7 +835,6 @@ table.revisions_table tr:hover { gap: 0.3rem; margin-top: 0.35rem; font-size: 0.875rem; - color: var(--text-muted); } .assets_table .asset_meta svg, @@ -1439,23 +1438,67 @@ form.button_to button[type="submit"] { margin-bottom: 0; } +#sitemap { + max-width: 60rem; +} + +#sitemap .title_with_flags { + align-items: start; +} + +#sitemap .title_body { + flex: 1; +} + +#sitemap .node_path { + display: flex; + align-items: center; + gap: 0.3rem; + margin-top: 0.15rem; + font-size: 0.875rem; + color: var(--text-muted); +} + +#sitemap .node_path svg { + width: 0.875rem; + height: 0.875rem; + flex-shrink: 0; +} + +#sitemap .node_path a { + color: var(--text-muted); + overflow-wrap: anywhere; +} + +#sitemap .action_grid { + grid-template-columns: repeat(2, auto); +} + .sitemap_node { padding-bottom: 0.5rem; margin-bottom: 0.5rem; border-bottom: 1px solid var(--hairline); } -.sitemap_node h4 { - margin: 0; +#sitemap .sitemap_node:has(+ details) { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0.25rem; } -.sitemap_node .field_hint { - display: block; - margin: 2px 0 0; +#sitemap .sitemap_node:has(+ details) + details > summary { + padding-bottom: 0.5rem; + margin-bottom: 0.5rem; + border-bottom: 1px solid var(--hairline); } -.sitemap_node p { - margin: 2px 0 0; +#sitemap > .sitemap_node { + border-bottom-width: 8px; + margin-bottom: 0.75rem; +} + +#sitemap > details > summary { + display: none; } #sitemap details details { @@ -1472,7 +1515,10 @@ form.button_to button[type="submit"] { } #sitemap summary { - padding: 4px 0; + padding: 0.10rem 0 0.5rem 0; + margin-left: -0.25rem; + margin-top: -0.1rem; + color: var(--text-muted); } #sitemap details:not([open]) > summary { diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb index 27c28cfe..c2898cbb 100644 --- a/test/controllers/nodes_controller_test.rb +++ b/test/controllers/nodes_controller_test.rb @@ -644,8 +644,8 @@ class NodesControllerTest < ActionController::TestCase doc = Nokogiri::HTML::DocumentFragment.parse(response.body) - erfas_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(erfas.unique_name) } - other_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(other.unique_name) } + erfas_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.node_path')&.text&.include?(erfas.unique_name) } + other_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.node_path')&.text&.include?(other.unique_name) } erfas_details = erfas_node_div.next_element other_details = other_node_div.next_element @@ -667,20 +667,24 @@ class NodesControllerTest < ActionController::TestCase assert_response :success doc = Nokogiri::HTML::DocumentFragment.parse(response.body) - erfas_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(erfas.unique_name) } + erfas_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.node_path')&.text&.include?(erfas.unique_name) } erfas_details = erfas_node_div.next_element assert_equal 'details', erfas_details.name assert_match I18n.t("nodes.sitemap.descendants", :count => 2), @response.body end - test "sitemap shows Show and Create Child, not Revisions" do - node = Node.root.children.create!(:slug => "sitemap_actions_test") + test "sitemap offers Create Child and Show, not Revisions" do + Node.root.children.create!(:slug => "sitemap_actions_test") login_as :quentin get :sitemap - assert_select ".sitemap_node_actions", :text => /Show/ - assert_select ".sitemap_node_actions", :text => /Create Child/ - assert_select ".sitemap_node_actions", :text => /Revisions/, :count => 0 + + assert_select ".sitemap_node .action_grid a[title=?]", + I18n.t("nodes.sitemap.create_child") + assert_select ".sitemap_node .action_grid a[title=?]", + I18n.t("admin.common.show") + assert_select ".sitemap_node .action_grid a[title=?]", + I18n.t("admin.common.revisions"), :count => 0 end test "create logs a create NodeAction with path and title" do -- cgit v1.3