alchemy_cms 8.3.0 → 8.3.1

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/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

@@ -18,7 +18,7 @@
     <% end %>
   <% end %>
   <% if f.object.respond_to?(:tag_list) %>
-    <div class="input">
+    <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(",") %>

data/config/locales/alchemy.en.yml

@@ -277,7 +277,7 @@ en:
     "Confirm new password": "Confirm new password"
     "Copy": "Copy"
     "Could not load Adobe Flash® Plugin!": "Could not load Adobe Flash® Plugin!"
-    "Create node on parent:": "Create node on parent:"
+    "Create node on parent:": "Attach to menu"
     "Currently locked pages": "Currently locked pages"
     "Default language has to be public": "Default language has to be public"
     "Delete image": "Delete image"
@@ -429,7 +429,7 @@ en:
     "Create site": "Create a new site"
     create_language_tree_heading: "Create new homepage"
     create_menu: "Add a menu"
-    create_node: "Add a menu node"
+    create_node: "Add to menu"
     create_page: "Create a new subpage"
     currently_edited_by: "This page is locked by"
     custom_color: "Custom color"

data/lib/alchemy/version.rb

@@ -3,7 +3,7 @@
 module Alchemy
   extend self
 
-  VERSION = "8.3.0"
+  VERSION = "8.3.1"
 
   def version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.3.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -1207,7 +1207,7 @@ files:
 - app/views/alchemy/admin/pages/publish.turbo_stream.erb
 - app/views/alchemy/admin/pages/show.html.erb
 - app/views/alchemy/admin/pages/tree.html.erb
-- app/views/alchemy/admin/pages/unlock.js.erb
+- app/views/alchemy/admin/pages/unlock.turbo_stream.erb
 - app/views/alchemy/admin/pages/update.turbo_stream.erb
 - app/views/alchemy/admin/partials/_autocomplete_tag_list.html.erb
 - app/views/alchemy/admin/partials/_flash_notices.html.erb

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

@@ -1,20 +0,0 @@
-(function() {
-  var locked_page_icon_content
-  var locked_page_tab = document.querySelector('#locked_page_<%= @page.id -%>')
-  var locked_page_icon = document.querySelector(
-    '#page_<%= @page.id -%> > .sitemap_page > .sitemap_left_images .like-hint-tooltip'
-  ) || document.querySelector('[data-page-id="<%= @page.id -%>"] i.icon')
-  if (locked_page_tab) {
-    locked_page_tab.remove()
-  }
-  if (locked_page_icon) {
-    if (locked_page_icon.parentElement.classList.contains("handle")) {
-      locked_page_icon_content = '<span class="handle"><alchemy-icon name="file" size="xl"></alchemy-icon></span>'
-    } else {
-      locked_page_icon_content = '<alchemy-icon name="file" size="xl"></alchemy-icon>'
-    }
-    locked_page_icon.outerHTML = locked_page_icon_content
-  }
-  document.querySelector("#page_<%= @page.id -%> .page_status.locked")?.remove()
-  Alchemy.growl('<%= flash[:notice] -%>')
-})()