alchemy_cms 7.1.7 → 7.2.0.rc1

data/app/views/alchemy/admin/languages/index.html.erb

@@ -3,7 +3,7 @@
 <% content_for :toolbar do %>
   <div class="toolbar_buttons">
     <%= render 'alchemy/admin/partials/site_select' %>
-    <%= toolbar_button(
+    <%= render Alchemy::Admin::ToolbarButton.new(
       icon: :plus,
       label: label_title,
       url: new_resource_path,
@@ -32,7 +32,7 @@
       <% end %>
       <%= render 'form', language: Alchemy::Language.new(
         Alchemy::Config.get(:default_language).merge(
-          site: Alchemy::Site.current,
+          site: Alchemy::Current.site,
           default: true,
           public: true
         )

data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb

@@ -5,12 +5,28 @@
       <%= page_layout_missing_warning %>
     <% elsif layoutpage.locked? %>
       <sl-tooltip class="like-hint-tooltip" content="<%= Alchemy.t("This page is locked", name: layoutpage.locker_name) %>">
-        <i class="icon ri-file-edit-line ri-fw ri-xl"></i>
+        <%= render_icon "file-edit", size: "xl" %>
       </sl-tooltip>
     <% else %>
-      <i class="icon ri-file-line ri-xl"></i>
+      <%= render_icon "file-edit", size: "xl" %>
     <% end %>
     </div>
+    <div class="sitemap_sitename without-status">
+      <%= link_to(
+        layoutpage.name,
+        alchemy.edit_admin_page_path(layoutpage),
+        title: Alchemy.t(:edit_page),
+        class: "sitemap_pagename_link #{cycle('even', 'odd')}"
+      ) -%>
+    </div>
+    <div class="page_infos">
+      <% if layoutpage.locked? %>
+        <span class="page_status locked">
+          <%= render_icon "edit", size: "1x" %>
+          <%= layoutpage.status_title(:locked) %>
+        </span>
+      <% end %>
+    </div>
     <div class="sitemap_right_tools">
     <%- if can?(:configure, layoutpage) -%>
       <sl-tooltip content="<%= Alchemy.t(:edit_page_properties) %>">
@@ -54,21 +70,5 @@
       </sl-tooltip>
     <%- end -%>
     </div>
-    <div class="page_infos">
-      <% if layoutpage.locked? %>
-        <span class="page_status locked">
-          <i class="icon ri-fw ri-1x ri-edit-line"></i>
-          <%= layoutpage.status_title(:locked) %>
-        </span>
-      <% end %>
-    </div>
-    <div class="sitemap_sitename without-status">
-      <%= link_to(
-        layoutpage.name,
-        alchemy.edit_admin_page_path(layoutpage),
-        title: Alchemy.t(:edit_page),
-        class: "sitemap_pagename_link #{cycle('even', 'odd')}"
-      ) -%>
-    </div>
   </div>
 </li>

data/app/views/alchemy/admin/layoutpages/edit.html.erb

@@ -1,8 +1,7 @@
 <%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
   <%= f.input :name, autofocus: true %>
-  <div class="input string">
-    <%= f.label :tag_list %>
-    <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
-  </div>
+  <%= render Alchemy::Admin::TagsAutocomplete.new do %>
+    <%= f.input :tag_list, input_html: { value: f.object.tag_list.join(",") } %>
+  <% end %>
   <%= f.submit Alchemy.t(:save) %>
 <% end %>

data/app/views/alchemy/admin/layoutpages/index.html.erb

@@ -2,7 +2,7 @@
 <div class="toolbar_buttons">
   <%= render 'alchemy/admin/partials/site_select' %>
   <%= render 'alchemy/admin/partials/language_tree_select' %>
-  <%= toolbar_button(
+  <%= render Alchemy::Admin::ToolbarButton.new(
     icon: "file-add",
     url: alchemy.new_admin_page_path(language: @current_language, layoutpage: true),
     hotkey: 'alt+n',
@@ -15,7 +15,7 @@
     tooltip_placement: "top-start",
     if_permitted_to: [:create, Alchemy::Page]
   ) %>
-  <%= toolbar_button(
+  <%= render Alchemy::Admin::ToolbarButton.new(
     icon: clipboard_empty?('pages') ? 'clipboard' : 'paste',
     url: alchemy.admin_clipboard_path(remarkable_type: 'pages'),
     dialog_options: {

data/app/views/alchemy/admin/legacy_page_urls/_legacy_page_url.html.erb

@@ -1,17 +1,16 @@
-<tr class="even" id="<%= dom_id(legacy_page_url) %>">
-  <td class="name"><%= legacy_page_url.urlname %></td>
-  <td class="tools">
+<%= turbo_frame_tag(legacy_page_url, class: ["row", cycle("even", "odd")]) do %>
+  <div class="col name"><%= legacy_page_url.urlname %></div>
+  <div class="col tools">
     <sl-tooltip content="<%= Alchemy.t(:edit) %>">
-      <%= link_to_dialog render_icon(:edit),
+      <%= link_to render_icon(:edit),
         edit_admin_legacy_page_url_path(legacy_page_url, page_id: @page.id),
-        {size: '400x125', title: Alchemy.t('Edit link')},
-        class: "icon_button" %>
+        class: "icon_button", data: { turbo_frame: dom_id(legacy_page_url)} %>
     </sl-tooltip>
     <sl-tooltip content="<%= Alchemy.t(:remove) %>">
-      <%= link_to_confirm_dialog render_icon(:minus),
-        Alchemy.t('Are you sure?'),
+      <%= link_to render_icon(:minus),
         admin_legacy_page_url_path(legacy_page_url, page_id: @page.id),
-        class: "icon_button" %>
+        class: "icon_button",
+        data: { turbo_method: :delete, turbo_confirm: Alchemy.t('Are you sure?') } %>
     </sl-tooltip>
-  </td>
-</tr>
+  </div>
+<% end %>

data/app/views/alchemy/admin/legacy_page_urls/_new.html.erb

@@ -1,20 +1,18 @@
-<%= alchemy_form_for [:admin, @legacy_page_url ||= @page.legacy_urls.build],
-  id: 'new_legacy_page_url' do |f| %>
-  <% if @legacy_page_url.errors.any? %>
-    <%= render_message :error do %>
-      <%= @legacy_page_url.errors.full_messages.join %>
+<%= turbo_frame_tag "new_legacy_page_url" do %>
+  <%= alchemy_form_for [:admin, legacy_page_url] do |f| %>
+    <% if legacy_page_url.errors.any? %>
+      <%= render_message :error do %>
+        <%= legacy_page_url.errors.full_messages.join %>
+      <% end %>
     <% end %>
-  <% end %>
-  <%= hidden_field_tag :page_id, @page.id %>
-  <div class="inline-input">
-    <div class="left-column">
-      <%= f.text_field :urlname, placeholder: Alchemy::LegacyPageUrl.human_attribute_name(:urlname) %>
-    </div>
-    <div class="right-column">
-      <button class="with_icon">
-        <%= render_icon(:plus) %>
-        <%= Alchemy.t(:add) %>
-      </button>
+    <%= hidden_field_tag :page_id, @page.id %>
+    <div class="inline-input">
+      <div class="left-column">
+        <%= f.text_field :urlname, placeholder: Alchemy::LegacyPageUrl.human_attribute_name(:urlname) %>
+      </div>
+      <div class="right-column">
+        <button><%= Alchemy.t(:add) %></button>
+      </div>
     </div>
-  </div>
+  <% end %>
 <% end %>

data/app/views/alchemy/admin/legacy_page_urls/_table.html.erb

@@ -0,0 +1,16 @@
+<div class="table">
+  <% if legacy_page_urls.any? %>
+    <header>
+      <div class="col name">
+        <%= Alchemy::LegacyPageUrl.human_attribute_name(:urlname) %>
+      </div>
+    </header>
+    <%= render partial: 'alchemy/admin/legacy_page_urls/legacy_page_url',
+      collection: legacy_page_urls %>
+  <% else %>
+    <div class="row even">
+      <div class="col"><%= Alchemy.t('No page links for this page found') %></div>
+      <div class="col tools"></div>
+    </div>
+  <% end %>
+</div>

data/app/views/alchemy/admin/legacy_page_urls/_update.turbo_stream.erb

@@ -0,0 +1,12 @@
+<%= turbo_stream.update "legacy_urls_label" do %>
+  <%= render "label", count: @page.legacy_urls.size %>
+<% end %>
+<%= turbo_stream.update "legacy_page_urls" do %>
+  <%= render "table", legacy_page_urls: @page.legacy_urls %>
+<% end %>
+<%= turbo_stream.update "new_legacy_page_url" do %>
+  <%= render 'new', legacy_page_url: @page.legacy_urls.build %>
+<% end %>
+<alchemy-growl>
+  <%= @message %>
+</alchemy-growl>

data/app/views/alchemy/admin/legacy_page_urls/create.turbo_stream.erb

@@ -0,0 +1,8 @@
+<% if @legacy_page_url.valid? %>
+  <%= render "update" %>
+<% else %>
+  <%= turbo_stream.update "new_legacy_page_url" do %>
+    <%= render 'new',
+      legacy_page_url: @legacy_page_url %>
+  <% end %>
+<% end %>

data/app/views/alchemy/admin/legacy_page_urls/destroy.turbo_stream.erb

@@ -0,0 +1 @@
+<%= render "update" %>

data/app/views/alchemy/admin/legacy_page_urls/edit.html.erb

@@ -0,0 +1,27 @@
+<%= turbo_frame_tag(@legacy_page_url, class: "row") do %>
+  <div class="col p-0">
+    <%= form_for [:admin, @legacy_page_url] do |f| %>
+      <%= content_tag :div, class: @legacy_page_url.errors.any? ? "field_with_errors" : nil do %>
+        <%= f.text_field :urlname, placeholder: Alchemy::LegacyPageUrl.human_attribute_name(:urlname), autofocus: true %>
+        <% if @legacy_page_url.errors.any? %>
+          <small class="error">
+            <%= @legacy_page_url.errors.full_messages_for(:urlname).join %>
+          </small>
+        <% end %>
+      <% end %>
+      <%= hidden_field_tag :page_id, @legacy_page_url.page_id %>
+    <% end %>
+  </div>
+  <div class="col tools">
+    <sl-tooltip content="<%= Alchemy.t(:save) %>">
+      <%= button_tag type: "submit", form: dom_id(@legacy_page_url, :edit), class: "icon_button" do %>
+        <%= render_icon :check %>
+      <% end %>
+    </sl-tooltip>
+    <sl-tooltip content="<%= Alchemy.t(:cancel) %>">
+      <%= link_to admin_legacy_page_url_path(@legacy_page_url, page_id: @legacy_page_url.page_id), class: "icon_button" do %>
+        <%= render_icon :close %>
+      <% end %>
+    </sl-tooltip>
+  </div>
+<% end %>

data/app/views/alchemy/admin/legacy_page_urls/show.html.erb

@@ -0,0 +1 @@
+<%= render "legacy_page_url", legacy_page_url: @legacy_page_url %>

data/app/views/alchemy/admin/legacy_page_urls/update.turbo_stream.erb

@@ -0,0 +1 @@
+<%= render "update" %>

data/app/views/alchemy/admin/nodes/_form.html.erb

@@ -1,7 +1,7 @@
 <%= alchemy_form_for([:admin, node], id: "node_form") do |f| %>
   <% if node.new_record? && node.root? %>
     <%= f.input :menu_type,
-      collection: Alchemy::Language.current.available_menu_names.map { |n| [I18n.t(n, scope: [:alchemy, :menu_names]), n] },
+      collection: Alchemy::Current.language.available_menu_names.map { |n| [I18n.t(n, scope: [:alchemy, :menu_names]), n] },
       include_blank: false,
       input_html: { is: 'alchemy-select' } %>
   <% else %>
@@ -32,16 +32,17 @@
   const nodeUrl = document.getElementById("node_url")
   const form = document.getElementById("node_form")
 
-  form.addEventListener("Alchemy.PageSelect.ItemAdded", (event) => {
-    const page = event.detail
-    nodeName.setAttribute("placeholder", page.name)
-    nodeUrl.value = page.url_path
-    nodeUrl.setAttribute("disabled", "disabled")
-  })
+  form.addEventListener("Alchemy.RemoteSelect.Change", (event) => {
+    const page = event.detail.added
 
-  form.addEventListener("Alchemy.PageSelect.ItemRemoved", (event) => {
-    nodeName.removeAttribute("placeholder")
-    nodeUrl.value = ""
-    nodeUrl.removeAttribute("disabled")
+    if (page) {
+      nodeName.setAttribute("placeholder", page.name)
+      nodeUrl.value = page.url_path
+      nodeUrl.setAttribute("disabled", "disabled")
+    } else {
+      nodeName.removeAttribute("placeholder")
+      nodeUrl.value = ""
+      nodeUrl.removeAttribute("disabled")
+    }
   })
 </script>

data/app/views/alchemy/admin/nodes/_label.html.erb

@@ -0,0 +1 @@
+(<%= count %>) <%= Alchemy::Node.model_name.human(count: count) %>

data/app/views/alchemy/admin/nodes/_node.html.erb

@@ -7,6 +7,25 @@
     <span class="nodes_tree-left_images">
       &nbsp;
     </span>
+    <div class="node_name">
+      <%= node.name || '&nbsp;'.html_safe %>
+      <span class="node_page">
+      <% if node.page %>
+        <%= render_icon "file-3" %>
+        <%= link_to [:edit, :admin, node.page], title: Alchemy.t(:edit_page) do %>
+          <%= node.page.name %>
+        <% end %>
+      <% end %>
+      </span>
+      <% if node.url %>
+        <span class="node_url">
+          <%= link_to node.url, node.url, target: '_blank', title: node.url %>
+          <% if node.external? %>
+            <%= render_icon "external-link", size: "sm" %>
+          <% end %>
+        </span>
+      <% end %>
+    </div>
     <span class="nodes_tree-right_tools">
       <% if can?(:edit, node) %>
         <sl-tooltip content="<%= node.root? ? Alchemy.t(:edit_menu) : Alchemy.t(:edit_node) %>">
@@ -52,25 +71,6 @@
         </sl-tooltip>
       <% end %>
     </span>
-    <div class="node_name">
-      <%= node.name || '&nbsp;'.html_safe %>
-      <span class="node_page">
-      <% if node.page %>
-        <i class="icon ri-file-3-line"></i>
-        <%= link_to [:edit, :admin, node.page], title: Alchemy.t(:edit_page) do %>
-          <%= node.page.name %>
-        <% end %>
-      <% end %>
-      </span>
-      <% if node.url %>
-        <span class="node_url">
-          <%= link_to node.url, node.url, target: '_blank', title: node.url %>
-          <% if node.external? %>
-            <i class="ri-external-link-line ri-sm"></i>
-          <% end %>
-        </span>
-      <% end %>
-    </div>
   <% end %>
   <%= content_tag :ul, class: "children #{' folded' if node.folded?}", data: { record_id: node.id } do %>
     <%= render partial: 'node', collection: node.children.includes(:page, :children) %>

data/app/views/alchemy/admin/nodes/_page_nodes.html.erb

@@ -0,0 +1,49 @@
+<%= turbo_frame_tag("page_nodes") do %>
+  <table class="list">
+    <tr>
+      <th class="name">
+        <%= Alchemy::Node.model_name.human %>
+      </th>
+      <th class="tools"></th>
+    </tr>
+    <% nodes = @page.nodes.select(&:persisted?) %>
+    <% seperator = '<alchemy-icon name="arrow-right-s" style="vertical-align: text-bottom"></alchemy-icon>' %>
+    <% if nodes.length > 0 %>
+      <% nodes.each do |node| %>
+        <tr class="even">
+          <td><%== "#{node.ancestors.map(&:name).join(seperator)}#{seperator}<strong>#{node.name}</strong>" %></td>
+          <td class="tools">
+            <sl-tooltip content="<%= Alchemy.t("delete_node") %>">
+              <%= link_to render_icon(:minus),
+                admin_node_path(node),
+                class: "icon_button",
+                data: { turbo_method: :delete, turbo_confirm: Alchemy.t('confirm_to_delete_node') } %>
+            </sl-tooltip>
+          </td>
+        </tr>
+      <% end %>
+    <% else %>
+      <tr class="even">
+        <td><%= Alchemy.t('No menu node for this page found') %></td>
+        <td class="tools"></td>
+      </tr>
+    <% end %>
+  </table>
+
+  <fieldset>
+    <legend><%= Alchemy.t('Create node on parent:') %></legend>
+
+    <%= alchemy_form_for([:admin, @page.nodes.build], id: "new_node_form") do |f| %>
+      <%= f.hidden_field :page_id, value: @page.id %>
+      <%= f.hidden_field :language_id, value: @page.language_id %>
+
+      <%= render Alchemy::Admin::NodeSelect.new(nil, url: alchemy.api_nodes_path(language_id: @page.language_id, include: :ancestors)) do %>
+        <%= f.text_field :parent_id, class: 'alchemy_selectbox full_width' %>
+      <% end %>
+
+      <div class="submit">
+        <button is="alchemy-button"><%= Alchemy.t(:create_node) %></button>
+      </div>
+    <% end %>
+  </fieldset>
+<% end %>

data/app/views/alchemy/admin/nodes/_update.turbo_stream.erb

@@ -0,0 +1,9 @@
+<% key = flash.keys.first %>
+<alchemy-growl message="<%= flash[key] %>" type="<%= key %>"></alchemy-growl>
+
+<%= turbo_stream.replace "page_nodes" do %>
+  <%= render "page_nodes" %>
+<% end %>
+<%= turbo_stream.update_all '[panel="nodes"]' do %>
+  <%= render('alchemy/admin/nodes/label', count: @page.nodes.select(&:persisted?).length) %>
+<% end %>

data/app/views/alchemy/admin/nodes/create.turbo_stream.erb

@@ -0,0 +1 @@
+<%= render "update" %>

data/app/views/alchemy/admin/nodes/destroy.turbo_stream.erb

@@ -0,0 +1 @@
+<%= render "update" %>

data/app/views/alchemy/admin/nodes/index.html.erb

@@ -6,7 +6,7 @@
   <div class="toolbar_buttons">
     <%= render 'alchemy/admin/partials/site_select' %>
     <%= render 'alchemy/admin/partials/language_tree_select' %>
-    <%= toolbar_button(
+    <%= render Alchemy::Admin::ToolbarButton.new(
       icon: 'menu-add',
       label: Alchemy.t(:create_menu),
       url: alchemy.new_admin_node_path,
@@ -35,8 +35,8 @@
         <%== Alchemy.t('alchemy/node', scope: :no_resource_found) %>
       <% end %>
       <%= render 'form', node: Alchemy::Node.new(
-          site: Alchemy::Site.current,
-          language: Alchemy::Language.current
+          site: Alchemy::Current.site,
+          language: Alchemy::Current.language
         ),
         button_label: Alchemy.t(:create) %>
     </div>

data/app/views/alchemy/admin/pages/_form.html.erb

@@ -47,10 +47,9 @@
     as: 'text',
     hint: Alchemy.t('pages.update.comma_seperated') %>
 
-  <div class="input string autocomplete_tag_list">
-    <%= f.label :tag_list %>
-    <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
-  </div>
+  <%= render Alchemy::Admin::TagsAutocomplete.new do %>
+    <%= f.input :tag_list, input_html: { value: f.object.tag_list.join(",") } %>
+  <% end %>
 
   <%= f.submit Alchemy.t(:save) %>
 <% end %>

data/app/views/alchemy/admin/pages/_legacy_urls.html.erb

@@ -2,22 +2,11 @@
   <p><%== Alchemy.t(:legacy_url_info_text) %></p>
 <% end %>
 
-<table class="list" id="legacy_page_urls">
-  <tr>
-    <th class="name">
-      <%= Alchemy::LegacyPageUrl.human_attribute_name(:urlname) %>
-    </th>
-    <th class="tools"></th>
-  </tr>
-  <%= render partial: 'alchemy/admin/legacy_page_urls/legacy_page_url',
-    collection: @page.legacy_urls %>
-  <tr class="even" id="no_page_links_notice" style="display: <%= @page.legacy_urls.any? ? 'none' : 'table-row' %>">
-    <td><%= Alchemy.t('No page links for this page found') %></td>
-    <td class="tools"></td>
-  </tr>
-</table>
+<%= turbo_frame_tag("legacy_page_urls") do %>
+  <%= render "alchemy/admin/legacy_page_urls/table", legacy_page_urls: @page.legacy_urls %>
+<% end %>
 
 <fieldset>
   <legend><%= Alchemy.t('Add page link') %></legend>
-  <%= render 'alchemy/admin/legacy_page_urls/new' %>
+  <%= render 'alchemy/admin/legacy_page_urls/new', legacy_page_url: @page.legacy_urls.build %>
 </fieldset>

data/app/views/alchemy/admin/pages/_page.html.erb

@@ -6,22 +6,57 @@
         <%= page_layout_missing_warning %>
       {{else}}
         {{#if permissions.edit_content}}
-          <span class="{{#unless root}}handle{{/unless}}">
+          <span class="page-icon {{#unless root}}handle{{/unless}}">
             {{#if locked}}
               <sl-tooltip content="{{locked_notice}}" class="like-hint-tooltip" placement="bottom-start">
-                <i class="icon ri-file-edit-line ri-fw ri-xl"></i>
+                <alchemy-icon name="file-edit" size="xl"></alchemy-icon>
               </sl-tooltip>
             {{else}}
-              <i class="icon ri-file-line ri-fw ri-xl"></i>
+              <alchemy-icon name="file" size="xl"></alchemy-icon>
             {{/if}}
           </span>
         {{else}}
           <sl-tooltip content="<%= Alchemy.t("Your user role does not allow you to edit this page") %>" class="like-hint-tooltip" placement="bottom-start">
-            <i class="icon ri-file-forbid-line ri-fw ri-xl"></i>
+            <alchemy-icon name="file-forbid" size="xl"></alchemy-icon>
           </sl-tooltip>
         {{/if}}
       {{/if}}
     </div>
+    <div class="sitemap_sitename">
+      {{#if permissions.edit_content}}
+        <%= link_to(
+          "{{name}}",
+          alchemy.edit_admin_page_path(id: "__ID__"),
+          title: Alchemy.t(:edit_page),
+          class: "sitemap_pagename_link"
+        ) -%>
+      {{else}}
+        <%= content_tag("span", "{{name}}", class: "sitemap_pagename_link") %>
+      {{/if}}
+    </div>
+    <div class="sitemap_url" title="{{url_path}}">
+      {{ url_path }}
+    </div>
+    <div class="page_infos">
+      {{#if locked}}
+      <span class="page_status locked">
+        <alchemy-icon name="edit" size="1x"></alchemy-icon>
+        {{status_titles.locked}}
+      </span>
+      {{/if}}
+      {{#if restricted}}
+      <span class="page_status">
+        <alchemy-icon name="lock" size="1x"></alchemy-icon>
+        {{status_titles.restricted}}
+      </span>
+      {{/if}}
+      {{#unless public}}
+      <span class="page_status">
+        <alchemy-icon name="cloud-off" size="1x"></alchemy-icon>
+        {{status_titles.public}}
+      </span>
+      {{/unless}}
+    </div>
     <div class="sitemap_right_tools">
       {{#if permissions.info}}
       <sl-tooltip content="<%= Alchemy.t(:page_infos) %>">
@@ -122,41 +157,6 @@
       </div>
       {{/if}}
     </div>
-    <div class="page_infos">
-      {{#if locked}}
-      <span class="page_status locked">
-        <i class="icon ri-fw ri-1x ri-edit-line"></i>
-        {{status_titles.locked}}
-      </span>
-      {{/if}}
-      {{#if restricted}}
-      <span class="page_status">
-        <i class="icon ri-fw ri-1x ri-lock-line"></i>
-        {{status_titles.restricted}}
-      </span>
-      {{/if}}
-      {{#unless public}}
-      <span class="page_status">
-        <i class="icon ri-fw ri-1x ri-cloud-off-line"></i>
-        {{status_titles.public}}
-      </span>
-      {{/unless}}
-    </div>
-    <div class="sitemap_url" title="{{url_path}}">
-      {{ url_path }}
-    </div>
-    <div class="sitemap_sitename">
-      {{#if permissions.edit_content}}
-        <%= link_to(
-          "{{name}}",
-          alchemy.edit_admin_page_path(id: "__ID__"),
-          title: Alchemy.t(:edit_page),
-          class: "sitemap_pagename_link"
-        ) -%>
-      {{else}}
-        <%= content_tag("span", "{{name}}", class: "sitemap_pagename_link") %>
-      {{/if}}
-    </div>
   </div>
   <ul id="page_{{id}}_children" class="children" data-parent-id="{{id}}">
     {{> list}}

data/app/views/alchemy/admin/pages/_table_row.html.erb

@@ -3,14 +3,14 @@
     <% if can?(:edit_content, page) %>
       <% if page.locked? %>
         <sl-tooltip class="like-hint-tooltip" content="<%= Alchemy.t("This page is locked", name: page.locker_name) %>" placement="bottom-start">
-          <i class="icon ri-file-edit-line ri-fw ri-xl"></i>
+          <%= render_icon "file-edit", size: "xl" %>
         </sl-tooltip>
       <% else %>
-        <i class="icon ri-file-line ri-fw ri-xl"></i>
+        <%= render_icon "file-edit", size: "xl" %>
       <% end %>
     <% else %>
       <sl-tooltip class="like-hint-tooltip" content="<%= Alchemy.t("Your user role does not allow you to edit this page") %>" placement="bottom-start">
-        <i class="icon ri-file-forbid-line ri-fw ri-xl"></i>
+        <%= render_icon "file-forbid", size: "xl" %>
       </sl-tooltip>
     <% end %>
   </td>

data/app/views/alchemy/admin/pages/_toolbar.html.erb

@@ -1,7 +1,7 @@
 <div class="toolbar_buttons">
   <%= render "alchemy/admin/partials/site_select" %>
   <%= render "alchemy/admin/partials/language_tree_select" %>
-  <%= toolbar_button(
+  <%= render Alchemy::Admin::ToolbarButton.new(
     icon: "file-add",
     url: alchemy.new_admin_page_path(language: @current_language),
     hotkey: 'alt+n',
@@ -57,7 +57,7 @@
   <div class="toolbar_button">
     <sl-tooltip content="<%= Alchemy.t("Sortable List") %>">
       <%= link_to(
-        render_icon("sort-desc", style: nil),
+        render_icon("sort-desc", style: false),
         alchemy.admin_pages_path(view: "list"),
         class: ["icon_button", @view == "list" && "active"].compact
       ) %>

data/app/views/alchemy/admin/pages/configure.html.erb

@@ -2,12 +2,18 @@
   <sl-tab slot="nav" panel="page_properties">
     <%= Alchemy.t('Properties') %>
   </sl-tab>
+  <sl-tab slot="nav" panel="nodes">
+    <%= render 'alchemy/admin/nodes/label', count: @page.nodes.size %>
+  </sl-tab>
   <sl-tab slot="nav" panel="legacy_urls" id="legacy_urls_label">
     <%= render 'alchemy/admin/legacy_page_urls/label', count: @page.legacy_urls.size %>
   </sl-tab>
   <sl-tab-panel name="page_properties">
     <%= render 'form' %>
   </sl-tab-panel>
+  <sl-tab-panel name="nodes">
+    <%= render 'alchemy/admin/nodes/page_nodes' %>
+  </sl-tab-panel>
   <sl-tab-panel name="legacy_urls">
     <%= render 'legacy_urls' %>
   </sl-tab-panel>