alchemy_cms 8.2.7 → 8.3.1

data/app/types/alchemy/wildcard_url_type.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class WildcardUrlType < ActiveModel::Type::Value
+    def cast(value)
+      case value
+      when nil then nil
+      when Symbol, String then normalize(value)
+      else value
+      end
+    end
+
+    def assert_valid_value(value)
+      case value
+      when nil
+        nil
+      when Symbol, String
+        assert_valid_param!(normalize(value))
+      else
+        raise ArgumentError, "#{value.inspect} is not a valid wildcard_url. Must be a Symbol or String."
+      end
+    end
+
+    private
+
+    # Normalizes a wildcard_url input to a String. Symbols are turned into a
+    # dynamic segment with a leading colon (`:slug` => `":slug"`).
+    #
+    # @param value [String, Symbol]
+    # @return [String]
+    def normalize(value)
+      value.is_a?(Symbol) ? ":#{value}" : value.to_s
+    end
+
+    def assert_valid_param!(value)
+      if value.include?("/")
+        raise ArgumentError,
+          "wildcard_url #{value.inspect}: cannot contain \"/\". " \
+          "Must be a single URL segment."
+      end
+
+      unless value.match?(/:\w+/)
+        raise ArgumentError,
+          "wildcard_url #{value.inspect}: must contain a dynamic segment, e.g. \":id\"."
+      end
+    end
+  end
+end

data/app/views/alchemy/_menubar.html.erb

@@ -114,14 +114,10 @@
 
     <script type="module" data-turbo-eval="false">
       class Menubar extends HTMLElement {
-        constructor() {
-          super()
+        connectedCallback() {
           const template = this.querySelector("template")
           const attachedShadowRoot = this.attachShadow({ mode: "open" })
           attachedShadowRoot.appendChild(template.content.cloneNode(true))
-        }
-
-        connectedCallback() {
           const width = this.bar.offsetWidth
           this.bar.style = `--panel-width: ${width}px; --left-offset: calc(var(--icon-size) + 32px);`
           this.bar.addEventListener("touchstart", this, { passive: false })

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

@@ -2,8 +2,11 @@
   url: {action: :update, q: search_filter_params[:q], page: params[:page]}) do |f| -%>
   <%= f.input :name, input_html: {autofocus: true} %>
   <%= f.input :file_name, input_html: {autofocus: true}, hint: Alchemy.t(:attachment_filename_notice) %>
-  <%= render Alchemy::Admin::TagsAutocomplete.new do %>
-    <%= f.input :tag_list, input_html: { value: f.object.tag_list.join(",") } %>
-  <% end %>
+  <div class="input tags">
+    <%= f.label :tag_list, class: "control-label" %>
+    <%= render Alchemy::Admin::TagsAutocomplete.new do %>
+      <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>
+    <% end %>
+  </div>
   <%= f.submit Alchemy.t(:save) %>
 <% end %>

data/app/views/alchemy/admin/dashboard/_dashboard.html.erb

@@ -1,3 +1,4 @@
 <%= render "top" %>
-<%= render "left_column" %>
-<%= render "right_column" %>
+<%= render "stats" %>
+<%= render "widgets" %>
+<%= render "footer" %>

data/app/views/alchemy/admin/dashboard/_footer.html.erb

@@ -0,0 +1,22 @@
+<footer>
+  <div id="legal_info">
+    <%= Alchemy.t('Alchemy is open software and itself uses open software and free resources:') %>
+    <ul>
+      <li>
+        <a href="https://rubyonrails.org" target="_blank">Ruby on Rails</a>
+      </li>
+      <li>
+        <a href="https://jquery.com" target="_blank">jQuery</a>
+      </li>
+      <li>
+        <a href="https://shoelace.style" target="_blank">Shoelace</a>
+      </li>
+      <li>
+        <a href="https://www.tiny.cloud" target="_blank">TinyMCE</a>
+      </li>
+      <li>
+        <a href="https://remixicon.com" target="_blank">Remix Icons</a>
+      </li>
+    </ul>
+  </div>
+</footer>

data/app/views/alchemy/admin/dashboard/_stats.html.erb

@@ -0,0 +1,7 @@
+<% if Alchemy.config.dashboard.stats.any? %>
+  <div class="stats">
+    <% Alchemy.config.dashboard.stats.each do |stat, args| %>
+      <%= render stat.new(**args) %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/alchemy/admin/dashboard/_top.html.erb

@@ -1,12 +1,4 @@
-<h1>
-  <% if @first_time -%>
-  <%= Alchemy.t(:welcome_note, name: current_alchemy_user.try(:name)) %>
-  <% else -%>
-  <%= Alchemy.t(:welcome_back_note, name: current_alchemy_user.try(:name)) %>
-  <% end -%>
-</h1>
-<% if @last_sign_at %>
-<p>
-  <small><%= Alchemy.t('Your last login was on', time: l(@last_sign_at, format: :'alchemy.default')) %></small>
-</p>
-<% end %>
+<div class="top-row">
+  <%= render Alchemy::Admin::Dashboard::Widgets::Greeting.new(user: current_alchemy_user) %>
+  <%= render Alchemy::Admin::Dashboard::Widgets::SystemInfo.new %>
+</div>

data/app/views/alchemy/admin/dashboard/_widgets.html.erb

@@ -0,0 +1,7 @@
+<% if Alchemy.config.dashboard.widgets.any? %>
+  <div class="widgets">
+    <% Alchemy.config.dashboard.widgets.each do |widget, args| %>
+      <%= render widget.new(**args) %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -1,20 +1,3 @@
-<%= content_for :toolbar do %>
-  <div class="toolbar_buttons">
-    <%= render Alchemy::Admin::ToolbarButton.new(
-      icon: 'information',
-      label: Alchemy.t(:info),
-      url: alchemy.dashboard_info_path,
-      title: Alchemy.t(:info),
-      dialog_options: {
-        title: Alchemy.t(:info),
-        size: "420x380"
-      },
-      if_permitted_to: [:info, :alchemy_admin_dashboard],
-      hotkey: 'alt+i'
-    ) %>
-  </div>
-<% end %>
-
 <div id="dashboard">
   <%= render "dashboard" %>
 </div>

data/app/views/alchemy/admin/dashboard/info.html.erb

@@ -1,62 +1 @@
-<div class="logo">
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 267 91"
-  >
-    <path
-      d="M261.749 29.77h-9.812l-.72 2.738a193.53 193.53 0 0 0-.802 3.217c-.334-1.384-.604-2.5-.767-3.162l-.685-2.792H234.075c-1.102-.371-2.338-.564-3.705-.564-2.537 0-4.557.864-6.104 1.934-1.406-1.15-3.402-1.934-6.221-1.934-1.341 0-2.524.242-3.564.625l-.006-.061H201.334v4.17c-2.345-3.051-5.884-4.735-10.401-4.735-4.196 0-8.831 1.936-11.655 6.784-1.194-3.746-3.896-6.784-9.557-6.784-1.385 0-2.626.24-3.727.617v-12.19l-4.204.623-6.934 1.027-3.132.464v10.324a22.109 22.109 0 0 0-6.086-.864c-5.96 0-9.341 2.652-11.128 4.876-.108.133-.2.284-.303.422V17.633l-4.207.623-6.933 1.027-3.131.464v24.04l-5.118-18.709-.739-2.701H99.863l-.745 2.686L95.854 36.8 80.915 21.597a2.922 2.922 0 0 0-2.823-.776l-18.554 4.875a2.918 2.918 0 0 0-.634-.981L39.437 4.906a2.927 2.927 0 0 0-2.826-.777L9.797 11.173a2.92 2.92 0 0 0-2.073 2.054L.372 40.078a2.922 2.922 0 0 0 .735 2.818L20.6 62.705a2.921 2.921 0 0 0 2.822.774l9.259-2.43-3.051 11.1a2.921 2.921 0 0 0 .735 2.821l10.94 11.122a2.92 2.92 0 0 0 2.822.778l15.08-3.953a2.919 2.919 0 0 0 2.077-2.055l3.536-12.978.316.324a2.928 2.928 0 0 0 2.064.872c.254.001.508-.031.761-.098l20.839-5.48H103.275l.72-2.733.82-3.121h3.794l.822 3.122.718 2.732h24.059v-4.307c.07.092.133.194.207.282 1.729 2.119 5.001 4.643 10.76 4.643 2.735 0 4.945-.705 6.55-1.415v.797H180.119v-4.383c2.392 3.007 5.737 4.495 9.134 4.885-1.602 1.106-3.095 2.759-4.467 4.952-2.161 3.454-3.211 6.441-3.211 9.137 0 2.014.524 3.774 1.562 5.236 1.388 1.967 3.57 3.053 6.143 3.053.226 0 .384-.016.896-.073.142-.014.243-.025.312-.03 1.014-.043 2.078-.446 4.047-1.521.468-.248.973-.622 2.077-1.656.966 3.029 2.97 3.501 4.119 3.501 2.479 0 4.354-1.665 4.575-4.057.007-.045.041-.233.189-.649.774 1.335 2.059 2.415 4.188 2.415 2.658 0 4.791-2.088 6.555-4.378.065.155.132.312.203.47 1.794 4.082 4.646 4.694 6.185 4.694.76 0 1.52-.168 2.307-.503.228.213.463.419.726.605a6.818 6.818 0 0 0 3.993 1.302c2.273 0 4.515-.764 6.661-2.274 3.357-2.369 4.061-5.111 4.061-6.996 0-2.266-1.092-4.215-3.014-5.406a4.177 4.177 0 0 0 2.142-1.312c.918 1.27 1.794 2.475 2.303 3.129l1.917 2.468 2.74-1.503.268-.144c2.382-1.291 7.335-3.979 9.847-12.048l8.677-27.888 1.479-4.759h-4.984z"
-      fill="transparent"
-    />
-    <path
-      fill="currentColor"
-      d="M102.705 26.102h8.626l9.245 33.793h-7.549l-1.541-5.856h-9.448l-1.541 5.856h-7.189l9.397-33.793zm.411 23.008h7.291c-1.282-5.857-2.925-12.841-3.594-16.487-.719 3.647-2.362 10.63-3.697 16.487zm27.472 10.786h-6.931V22.969l6.931-1.026v37.953zm22.187-1.748c-.977.409-3.545 2.364-7.549 2.364-6.883 0-10.682-4.314-10.682-13.405 0-9.554 3.953-14.176 11.143-14.176 2.878 0 5.239.719 6.163 1.079l-.822 5.083c-.666-.256-2.517-.822-4.365-.822-3.388 0-4.981 2.62-4.981 8.579 0 6.061 1.747 8.267 4.775 8.267 2.108 0 4.008-1.128 4.726-1.386l1.592 4.417zm2.671-35.179l6.931-1.026v14.943h.105c.717-.667 3.079-3.954 7.291-3.954 4.826 0 6.728 2.979 6.728 9.193v17.771h-6.934V43.819c0-3.801-.616-4.879-2.721-4.879-2.107 0-3.853 2.157-4.47 2.876v18.079h-6.931V22.969zm44.73 35.026c-.771.514-3.956 2.518-9.038 2.518-5.957 0-10.785-3.852-10.785-13.097 0-9.811 4.775-14.484 10.63-14.484 5.854 0 9.963 3.646 9.963 12.273 0 1.851-.257 3.339-.309 3.597h-13.401c.05 4.571 2.311 6.469 5.235 6.469 2.773 0 5.086-1.231 6.319-1.795l1.386 4.519zm-12.941-13.509h7.034c0-5.237-1.437-6.624-3.338-6.624-1.798 0-3.646 1.643-3.696 6.624zm17.82-10.989h6.107l.31 3.543c.772-.925 2.722-4.109 6.624-4.109 2.98 0 4.828 1.027 5.598 4.057.874-1.181 3.03-4.057 6.728-4.057 4.468 0 6.37 2.517 6.37 9.141v17.823h-6.883V42.637c0-2.311-.358-3.697-2.158-3.697-1.797 0-3.183 2.054-3.543 2.876v18.079h-6.625V42.637c0-2.311-.358-3.697-2.157-3.697-1.796 0-3.131 2.003-3.542 2.876v18.079h-6.828V33.497zm56.744 0l-8.679 27.887c-2.156 6.934-6.213 8.886-8.37 10.067-.718-.926-2.414-3.287-3.081-4.213.771-.668 4.467-2.566 5.546-6.778l-8.318-26.963h7.239c.771 3.132 3.545 14.688 4.314 19.002.821-4.417 3.545-15.87 4.367-19.002h6.982z"
-    />
-    <g>
-      <path
-        fill="currentColor"
-        d="M193.986 68.011c.319 0 .667.193 1.031.578.897.95 1.506 1.125 2.353.546.367-.254.548-.633.508-1.05-.054-.799-.66-1.456-1.799-1.957-.818-.364-1.438-.541-1.896-.541-2.436.013-4.74 1.736-6.854 5.116-1.807 2.889-2.722 5.389-2.722 7.435 0 1.336.326 2.474.969 3.379.796 1.128 1.983 1.701 3.526 1.701.029 0 .213-.016.555-.054.268-.028.427-.045.47-.046.306 0 .867-.139 2.703-1.14.226-.117.704-.468 2.439-2.166 1.932-1.896 2.285-2.549 2.366-2.884.084-.275.01-.583-.22-.921-.238-.344-.523-.518-.838-.518a.786.786 0 0 0-.708.429c-.872 1.35-1.932 2.444-3.146 3.266-1.295.868-2.615 1.308-3.923 1.308-.778 0-1.671-.234-1.671-2.074 0-1.427.742-3.47 2.211-6.08 1.621-2.872 3.183-4.327 4.646-4.327zm30.25 10.553c-.354 0-.695.247-1.103.798-.301.408-.535.409-.654.408-.259-.01-1.135-.388-1.441-4.977l-.305-4.414c-.25-1.795-.915-2.704-1.979-2.704-.68 0-1.78.545-4.245 4.804a46.07 46.07 0 0 1-2.457 3.695c-.936 1.256-1.511 1.87-1.856 2.171-.082-.436-.124-.979-.124-1.635 0-.533.027-1.253.081-2.143.055-.995.089-1.633.101-1.925.039-2.004-.251-3.293-.885-3.941a1.569 1.569 0 0 0-1.157-.483c-1.114 0-2.453 1.26-4.214 3.968-.44.683-1.144 1.88-2.093 3.565.149-2.311.529-4.59 1.141-6.795.071-.267.054-.669-.433-1.089-.33-.287-.703-.436-1.107-.436-.863 0-1.277 1.173-1.539 2.19-.313 1.16-.526 2.592-.635 4.245-.119 1.754-.181 3.891-.181 6.36 0 .357.075.868.233 1.577.203.807.5 1.631 1.17 1.631.813 0 1.32-.423 1.381-1.157.113-1.165 1.095-3.422 2.918-6.71 1.54-2.804 2.334-3.953 2.701-4.42 0 .089 0 .194-.005.32-.15 3.265-.211 5.245-.182 5.886.105 2.516.823 3.792 2.139 3.792 1.21 0 2.685-1.261 4.636-3.968.255-.355 2.324-3.588 3.537-5.488.234-.37.414-.648.545-.854.012.086.021.184.031.293.052.55.064 1.329.038 2.328v2.002c.01 1.115.313 2.354.903 3.685.812 1.851 1.907 2.786 3.252 2.786.459 0 .972-.164 1.575-.502.819-.475 1.234-1.083 1.234-1.804.001-.652-.392-1.059-1.021-1.059zm6.628-4.902c-2.19 0-2.468-.365-2.475-.365 0-.874.821-2.04 2.372-3.37 1.809-1.556 2.828-1.882 3.366-1.882.036 0 .073.003.123.006.072.004.298.046.826.328.721.386.872.415 1.009.415.727 0 1.163-.494 1.163-1.324 0-.631-.425-1.187-1.268-1.647-.651-.35-1.201-.517-1.684-.517-1.572 0-3.401 1.039-5.592 3.175-2.195 2.138-3.262 3.892-3.262 5.361 0 .738.509 1.313 1.518 1.711.65.258 1.33.402 2.023.432l3.86.141c.473.023.891.157 1.28.407.556.367.619.737.619.983 0 .86-1.161 1.629-2.133 2.122-1.358.688-2.57 1.035-3.598 1.035-.625 0-.625-.247-.625-.444 0-.104.017-.197.054-.283.126-.3.213-.694.266-1.218l.035-.339-.312-.132c-.656-.279-1.311.032-1.813.841-.316.495-.47.93-.47 1.33 0 .904.4 1.646 1.192 2.199a3.557 3.557 0 0 0 2.134.712c1.598 0 3.218-.569 4.811-1.693 1.794-1.263 2.701-2.733 2.701-4.371.002-2.398-2.057-3.613-6.12-3.613z"
-      />
-    </g>
-    <g fill-rule="evenodd" clip-rule="evenodd" fill="currentColor">
-      <path
-        d="M47.632 51.588L23.382 57.956 5.754 40.043 12.401 15.762 36.65 9.393 54.254 27.305z"
-      />
-      <path
-        d="M57.42 79.029L43.781 82.603 33.888 72.543 37.632 58.91 51.244 55.334 61.138 65.395z"
-      />
-      <path
-        d="M86.963 59.079L67.775 64.128 53.829 49.94 59.066 30.726 78.277 25.679 92.223 39.865z"
-      />
-    </g>
-  </svg>
-  Version <%= @alchemy_version %>
-</div>
-
-<p class="center">
-  <small>
-    Ruby <%= RUBY_VERSION %>, Rails <%= Rails.version %>
-  </small>
-</p>
-
-<%= render Alchemy::Admin::UpdateCheck.new %>
-
-<%= render_message do %>
-  <p><%= Alchemy.t('Alchemy is open software and itself uses open software and free resources:') %></p>
-  <ul>
-    <li>
-      <a href="https://rubyonrails.org" target="_blank">Ruby on Rails</a>
-    </li>
-    <li>
-      <a href="https://jquery.com" target="_blank">jQuery Javascript Library</a>
-    </li>
-    <li>
-      <a href="https://shoelace.style" target="_blank">Shoelace Web Components Library</a>
-    </li>
-    <li>
-      <a href="https://www.tiny.cloud" target="_blank">TinyMCE - Javascript WYSIWYG Editor</a>
-    </li>
-    <li>
-      <a href="https://remixicon.com" target="_blank">Remix Icons</a>
-    </li>
-  </ul>
-<% end %>
+<%= render Alchemy::Admin::Dashboard::Widgets::SystemInfo.new %>

data/app/views/alchemy/admin/dashboard/widgets/show.html.erb

@@ -0,0 +1,3 @@
+<turbo-frame id="<%= @id %>">
+  <%= render @widget.new %>
+</turbo-frame>

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

@@ -12,7 +12,8 @@
         <% end %>
         <%= render Alchemy::Admin::ElementSelect.new(
           @elements,
-          field_name: form.field_name(:name)
+          field_name: form.field_name(:name),
+          autofocus: true
         ) %>
       </div>
       <%= form.hidden_field :parent_element_id, value: @parent_element.try(:id) %>

data/app/views/alchemy/admin/elements/_schedule.html.erb

@@ -31,21 +31,8 @@
     </alchemy-message>
   <% end %>
 
-  <%= alchemy_form_for [:publish, :admin, element], remote: false, data: {turbo: true} do |f| %>
-    <div class="input">
-      <div class="input-row">
-        <div class="input-column">
-          <label for="element_public_on"><%= Alchemy::Element.human_attribute_name(:public_on) %></label>
-          <%= f.datetime_local_field :public_on, include_seconds: false %>
-          <%= f.error :public_on %>
-        </div>
-        <div class="input-column">
-          <label for="element_public_until"><%= Alchemy::Element.human_attribute_name(:public_until) %></label>
-          <%= f.datetime_local_field :public_until, include_seconds: false %>
-          <%= f.error :public_until %>
-        </div>
-      </div>
-    </div>
+  <%= alchemy_form_for [:publish, :admin, element], remote: false, data: {turbo: true}, class: "full_width" do |f| %>
+    <%= render "alchemy/admin/elements/schedule_fields", element:, form: f %>
     <div class="submit">
       <button
         type="button"

data/app/views/alchemy/admin/elements/_schedule_fields.html.erb

@@ -0,0 +1,2 @@
+<%# Overwrite this partial if you want to add more fields to the element schedule form %>
+<%= render Alchemy::Admin::ElementScheduleTimestamps.new(element:) %>

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

@@ -1,9 +1,12 @@
 <%= turbo_frame_tag @page do %>
   <%= alchemy_form_for [:admin, @page], url: alchemy.admin_layoutpage_path(@page), class: 'edit_page', remote: false do |f| %>
     <%= f.input :name, autofocus: true %>
-    <%= render Alchemy::Admin::TagsAutocomplete.new do %>
-      <%= f.input :tag_list, input_html: { value: f.object.tag_list.join(",") } %>
-    <% end %>
+    <div class="input tags">
+      <%= f.label :tag_list, class: "control-label" %>
+      <%= render Alchemy::Admin::TagsAutocomplete.new do %>
+        <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>
+      <% end %>
+    </div>
     <%= f.submit Alchemy.t(:save) %>
   <% end %>
 <% end %>

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

@@ -10,7 +10,6 @@
   <% 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/nodes/_page_nodes.html.erb

@@ -2,7 +2,7 @@
   <table class="list">
     <tr>
       <th class="name">
-        <%= Alchemy::Node.model_name.human %>
+        <%= Alchemy::Node.model_name.human(count: @page.nodes.size) %>
       </th>
       <th class="tools"></th>
     </tr>
@@ -11,7 +11,7 @@
     <% 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><%== 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),
@@ -36,13 +36,15 @@
     <%= 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 class="inline-input">
+        <div class="left-column">
+          <%= 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>
+        <div class="right-column">
+          <button is="alchemy-button"><%= Alchemy.t(:create_node) %></button>
+        </div>
       </div>
     <% end %>
   </fieldset>

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

@@ -1,7 +1,7 @@
-<%= turbo_frame_tag @page do %>
-  <%= alchemy_form_for [:admin, @page], class: 'edit_page', remote: false do |f| %>
-    <% unless @page.language_root? || @page.layoutpage %>
-      <%= render Alchemy::Admin::PageSelect.new(@page.parent) do %>
+<%= turbo_frame_tag page do %>
+  <%= alchemy_form_for [:admin, page], class: 'edit_page', remote: false do |f| %>
+    <% unless page.language_root? || page.layoutpage %>
+      <%= render Alchemy::Admin::PageSelect.new(page.parent) do %>
         <%= f.input :parent_id, required: true %>
       <% end %>
     <% end %>
@@ -9,21 +9,24 @@
     <div class="input check_boxes">
       <label class="control-label"><%= Alchemy.t(:page_status) %></label>
       <div class="control_group">
-        <%= render 'alchemy/admin/pages/publication_fields' %>
-        <%= page_status_checkbox(@page, :restricted) %>
+        <%= render 'alchemy/admin/pages/publication_fields', page: %>
+        <%= page_status_checkbox(page, :restricted) %>
         <% if Alchemy.config.sitemap.show_flag %>
-          <%= page_status_checkbox(@page, :sitemap) %>
+          <%= page_status_checkbox(page, :sitemap) %>
         <% end %>
       </div>
     </div>
 
     <%= f.input :name, autofocus: true %>
-    <%= f.input :urlname, as: 'string', input_html: {value: @page.slug}, label: Alchemy::Page.human_attribute_name(:slug) %>
+    <%= f.input :urlname, as: 'string', input_html: {
+      value: page.slug,
+      disabled: page.has_wildcard_url?
+    }, label: Alchemy::Page.human_attribute_name(:slug) %>
 
-    <%= f.fields_for :draft_version, @page.draft_version do |v| %>
+    <%= f.fields_for :draft_version, page.draft_version do |v| %>
       <alchemy-char-counter max-chars="60">
         <%= v.input :title, input_html: {
-          disabled: @page.attribute_fixed?(:title)
+          disabled: page.attribute_fixed?(:title)
         } %>
       </alchemy-char-counter>
     <% end %>
@@ -32,7 +35,7 @@
       <div class="input check_boxes">
         <label class="control-label"><%= Alchemy.t(:fulltext_search) %></label>
         <div class="control_group">
-          <%= page_status_checkbox(@page, :searchable) %>
+          <%= page_status_checkbox(page, :searchable) %>
         </div>
       </div>
     <% end %>
@@ -40,15 +43,15 @@
     <div class="input check_boxes">
       <label class="control-label"><%= Alchemy.t(:search_engines) %></label>
       <div class="control_group">
-        <%= page_status_checkbox(@page, :robot_index) %>
-        <%= page_status_checkbox(@page, :robot_follow) %>
+        <%= page_status_checkbox(page, :robot_index) %>
+        <%= page_status_checkbox(page, :robot_follow) %>
       </div>
     </div>
 
-    <%= f.fields_for :draft_version, @page.draft_version do |v| %>
+    <%= f.fields_for :draft_version, page.draft_version do |v| %>
       <alchemy-char-counter max-chars="160">
         <%= v.input :meta_description, as: 'text', input_html: {
-          disabled: @page.attribute_fixed?(:meta_description)
+          disabled: page.attribute_fixed?(:meta_description)
         } %>
       </alchemy-char-counter>
 
@@ -56,13 +59,16 @@
         as: 'text',
         hint: Alchemy.t('pages.update.comma_seperated'),
         input_html: {
-          disabled: @page.attribute_fixed?(:meta_keywords)
+          disabled: page.attribute_fixed?(:meta_keywords)
         } %>
     <% end %>
 
-    <%= render Alchemy::Admin::TagsAutocomplete.new do %>
-      <%= f.input :tag_list, input_html: { value: f.object.tag_list.join(",") } %>
-    <% end %>
+    <div class="input tags">
+      <%= f.label :tag_list, class: "control-label" %>
+      <%= render Alchemy::Admin::TagsAutocomplete.new do %>
+        <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>
+      <% end %>
+    </div>
 
     <%= hidden_field_tag :view, params[:view] %>
     <%= f.submit Alchemy.t(:save) %>

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

@@ -5,7 +5,7 @@
     <%= link_to alchemy.edit_admin_page_path(locked_page) do %>
       <%= render 'alchemy/admin/pages/page_infos', page: locked_page %>
     <% end %>
-    <%= form_tag(alchemy.unlock_admin_page_path(locked_page), remote: true) do %>
+    <%= form_tag(alchemy.unlock_admin_page_path(locked_page)) do %>
       <button class="icon_button small" title="<%= Alchemy.t(:explain_unlocking) %>">
         <%= render_icon(:close, size: '1x') %>
       </button>

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

@@ -1,32 +1,2 @@
-<alchemy-page-publication-fields>
-  <% checkbox = check_box_tag :page_public, nil, @page.public? || @page.scheduled?, name: nil, disabled: @page.attribute_fixed?(:public_on) %>
-
-  <label class="checkbox">
-  <% if @page.attribute_fixed?(:public_on) || @page.attribute_fixed?(:public_until) %>
-    <sl-tooltip class="like-hint-tooltip" content="<%= Alchemy.t(:attribute_fixed) %>" placement="bottom-start">
-      <%= checkbox %>
-      <%= Alchemy::Page.human_attribute_name :public %>
-    </sl-tooltip>
-  <% else %>
-    <%= checkbox %>
-    <%= Alchemy::Page.human_attribute_name :public %>
-  <% end %>
-  </label>
-
-  <%= content_tag :div, class: [
-    @page.public_on.present? || @page.public_until.present? ? nil : 'hidden',
-    'page-publication-date-fields',
-    'input-row'
-  ] do %>
-    <div class="input-column">
-      <%= label :page, :public_on %>
-      <%= datetime_local_field :page, :public_on, include_seconds: false,
-        disabled: @page.attribute_fixed?(:public_on) %>
-    </div>
-    <div class="input-column">
-      <%= label :page, :public_until %>
-      <%= datetime_local_field :page, :public_until, include_seconds: false,
-        disabled: @page.attribute_fixed?(:public_until) %>
-    </div>
-  <% end %>
-</alchemy-page-publication-fields>
+<%# Overwrite this partial if you want to add more fields to the page schedule form %>
+<%= render Alchemy::Admin::PagePublicationFields.new(page:) %>

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

@@ -33,24 +33,7 @@
   <% end %>
   <% table.column :updated_at, sortable: true %>
   <% table.column :status, class_name: :right do |page| %>
-    <% if page.locked? %>
-      <span class="page_status locked">
-        <%= render_icon(:edit, size: "1x") %>
-        <%= page.status_title(:locked) %>
-      </span>
-    <% end %>
-    <% if page.restricted? %>
-      <span class="page_status">
-        <%= render_icon(:lock, size: "1x") %>
-        <%= page.status_title(:restricted) %>
-      </span>
-    <% end %>
-    <% unless page.public? %>
-      <span class="page_status">
-        <%= render_icon("cloud-off", size: "1x") %>
-        <%= page.status_title(:public) %>
-      </span>
-    <% end %>
+    <%= render Alchemy::Admin::PageStatusIndicators.new(page:) %>
   <% end %>
 
   <% table.with_action :info, Alchemy.t(:page_infos) do |page| %>

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

@@ -9,10 +9,10 @@
     <%= render 'alchemy/admin/legacy_page_urls/label', count: @page.legacy_urls.size %>
   </sl-tab>
   <sl-tab-panel name="page_properties">
-    <%= render 'form' %>
+    <%= render 'form', page: @page %>
   </sl-tab-panel>
   <sl-tab-panel name="nodes">
-    <%= render 'alchemy/admin/nodes/page_nodes' %>
+    <%= render 'alchemy/admin/nodes/page_nodes', page: @page %>
   </sl-tab-panel>
   <sl-tab-panel name="legacy_urls">
     <%= render 'legacy_urls' %>

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

@@ -35,6 +35,12 @@
         <% end %>
         <%= @page.status_message(:public) %>
       </span>
+      <% if @page.scheduled? %>
+        <span class="page_status">
+          <alchemy-icon name="calendar-schedule" size="1x"></alchemy-icon>
+          <%= @page.status_message(:scheduled) %>
+        </span>
+      <% end %>
       <span class="page_status">
         <% if @page.restricted? %>
           <%= render_icon(:lock, size: "1x") %>

data/app/views/alchemy/admin/pages/unlock.turbo_stream.erb

@@ -0,0 +1,20 @@
+<alchemy-growl><%= @notice %></alchemy-growl>
+<%= turbo_stream.remove "locked_page_#{@page.id}" %>
+<% if @page.layoutpage %>
+  <%= turbo_stream.replace "page_#{@page.id}" do %>
+    <%= render "alchemy/admin/layoutpages/layoutpage", layoutpage: @page %>
+  <% end %>
+<% else %>
+  <%= turbo_stream.replace "alchemy_pages_tree" do %>
+    <%= turbo_frame_tag "alchemy_pages_tree", src: alchemy.tree_admin_pages_path do %>
+      <alchemy-spinner></alchemy-spinner>
+    <% end %>
+  <% end %>
+<% end %>
+<% ["LockedPages", "RecentPages"].each do |widget| %>
+  <%= turbo_stream.replace widget do %>
+    <%= turbo_frame_tag widget, src: alchemy.admin_dashboard_widget_path(id: widget) do %>
+      <alchemy-spinner size="small"></alchemy-spinner>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -11,7 +11,7 @@
     class: "picture-form" do |f| %>
     <%= f.input :name %>
     <%= render "alchemy/admin/pictures/picture_description_field", f: f %>
-    <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>
+    <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input tags") do %>
       <%= f.label :tag_list %>
       <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>
       <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>

data/app/views/alchemy/admin/pictures/edit_multiple.html.erb

@@ -12,7 +12,7 @@
     <%= text_field_tag :pictures_name %>
   </div>
 
-  <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>
+  <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input tags") do %>
     <%= label_tag :pictures_tag_list, Alchemy.t(:tags), class: 'control-label' %>
     <%= text_field_tag :pictures_tag_list, @tags %>
     <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>

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

@@ -1,4 +1,4 @@
-<%= alchemy_form_for resource_instance_variable, url: resource_path(resource_instance_variable, search_filter_params) do |f| %>
+<%= alchemy_form_for resource, url: resource_path(resource, search_filter_params) do |f| %>
   <% resource_handler.editable_attributes.each do |attribute| %>
     <% if relation = attribute[:relation] %>
       <%= f.association relation[:name].to_sym,
@@ -18,9 +18,12 @@
     <% end %>
   <% end %>
   <% if f.object.respond_to?(:tag_list) %>
-    <%= render Alchemy::Admin::TagsAutocomplete.new do %>
-      <%= f.input :tag_list, input_html: { value: f.object.tag_list.join(",") } %>
-    <% end %>
+    <div class="input tags">
+      <%= f.label :tag_list, class: "control-label" %>
+      <%= render Alchemy::Admin::TagsAutocomplete.new do %>
+        <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>
+      <% end %>
+    </div>
   <% end %>
   <%= f.submit Alchemy.t(:save) %>
 <% end %>

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

@@ -1 +1,3 @@
-<%= render 'form' %>
+<%= render "form",
+  resource: resource_instance_variable,
+  resource_name.to_sym => resource_instance_variable %>

data/app/views/alchemy/admin/resources/new.html.erb

@@ -1 +1,3 @@
-<%= render 'form' %>
+<%= render "form",
+  resource: resource_instance_variable,
+  resource_name.to_sym => resource_instance_variable %>