From 651d134280c17ae61d92f0c8392328ea48201fde Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Thu, 14 Dec 2023 09:55:14 +0100
Subject: [PATCH 1/3] Use icon_button for page folder

---
 app/assets/javascripts/alchemy/templates/page_folder.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/alchemy/templates/page_folder.hbs b/app/assets/javascripts/alchemy/templates/page_folder.hbs
index eb9536b8b5..350b32ea38 100644
--- a/app/assets/javascripts/alchemy/templates/page_folder.hbs
+++ b/app/assets/javascripts/alchemy/templates/page_folder.hbs
@@ -1,3 +1,3 @@
-<a class="page_folder" data-page-id="{{ page.id }}">
-  <i class="ri-arrow-{{#if page.folded }}right{{else}}down{{/if}}-s-line ri-fw"></i>
+<a class="page_folder icon_button" data-page-id="{{ page.id }}">
+  <i class="icon ri-arrow-{{#if page.folded }}right{{else}}down{{/if}}-s-line ri-fw"></i>
 </a>

From 20b05bcd4929972e4c5f71344e63dd011f82fa1e Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Thu, 14 Dec 2023 09:57:30 +0100
Subject: [PATCH 2/3] Allow to drag locked pages

There is no reason to not allow dragndrop locked pages as this
does not effect page content.
---
 app/views/alchemy/admin/pages/_page.html.erb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/alchemy/admin/pages/_page.html.erb b/app/views/alchemy/admin/pages/_page.html.erb
index 3fa2a5d889..7f927b5d25 100644
--- a/app/views/alchemy/admin/pages/_page.html.erb
+++ b/app/views/alchemy/admin/pages/_page.html.erb
@@ -6,15 +6,15 @@
         <%= page_layout_missing_warning %>
       {{else}}
         {{#if permissions.edit_content}}
-          {{#if locked}}
-            <sl-tooltip content="{{locked_notice}}" class="like-hint-tooltip" placement="bottom-start">
-              <i class="icon ri-file-edit-fill ri-fw ri-xl"></i>
-            </sl-tooltip>
-          {{else}}
           <span class="{{#unless root}}handle{{/unless}}">
-            <i class="icon ri-file-line ri-fw ri-xl"></i>
+            {{#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>
+              </sl-tooltip>
+            {{else}}
+              <i class="icon ri-file-line ri-fw ri-xl"></i>
+            {{/if}}
           </span>
-          {{/if}}
         {{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>

From 5068b3760e8d36ee726aa9cc2b04de43f5217d56 Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Thu, 14 Dec 2023 10:07:27 +0100
Subject: [PATCH 3/3] Show locked notice in page status

To make this more accessible and obvious in what state a locked
page is, we show this state as well.
---
 app/serializers/alchemy/page_tree_serializer.rb   |  3 ++-
 app/views/alchemy/admin/pages/_page.html.erb      |  6 ++++++
 app/views/alchemy/admin/pages/_table_row.html.erb |  8 +++++++-
 app/views/alchemy/admin/pages/info.html.erb       | 13 +++++++------
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/serializers/alchemy/page_tree_serializer.rb b/app/serializers/alchemy/page_tree_serializer.rb
index 9462e7a8a8..48ab105dc1 100644
--- a/app/serializers/alchemy/page_tree_serializer.rb
+++ b/app/serializers/alchemy/page_tree_serializer.rb
@@ -105,7 +105,8 @@ def page_permissions(page, ability)
     def page_status_titles(page)
       {
         public: page.status_title(:public),
-        restricted: page.status_title(:restricted)
+        restricted: page.status_title(:restricted),
+        locked: page.status_title(:locked)
       }
     end
   end
diff --git a/app/views/alchemy/admin/pages/_page.html.erb b/app/views/alchemy/admin/pages/_page.html.erb
index 7f927b5d25..c5ea5553c9 100644
--- a/app/views/alchemy/admin/pages/_page.html.erb
+++ b/app/views/alchemy/admin/pages/_page.html.erb
@@ -123,6 +123,12 @@
       {{/if}}
     </div>
     <div class="page_infos">
+      {{#if locked}}
+      <span class="page_status">
+        <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>
diff --git a/app/views/alchemy/admin/pages/_table_row.html.erb b/app/views/alchemy/admin/pages/_table_row.html.erb
index 692dbb4ce4..1d2225d2cb 100644
--- a/app/views/alchemy/admin/pages/_table_row.html.erb
+++ b/app/views/alchemy/admin/pages/_table_row.html.erb
@@ -3,7 +3,7 @@
     <% 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-fill ri-fw ri-xl"></i>
+          <i class="icon ri-file-edit-line ri-fw ri-xl"></i>
         </sl-tooltip>
       <% else %>
         <i class="icon ri-file-line ri-fw ri-xl"></i>
@@ -37,6 +37,12 @@
     <%= l(page.updated_at, format: :"alchemy.default") %>
   </td>
   <td class="status right">
+    <% if page.locked? %>
+      <span class="page_status">
+        <%= render_icon(:edit, size: "1x") %>
+        <%= page.status_title(:locked) %>
+      </span>
+    <% end %>
     <% if page.restricted? %>
       <span class="page_status">
         <%= render_icon(:lock, size: "1x") %>
diff --git a/app/views/alchemy/admin/pages/info.html.erb b/app/views/alchemy/admin/pages/info.html.erb
index 7f90709e17..ff1d708ddd 100644
--- a/app/views/alchemy/admin/pages/info.html.erb
+++ b/app/views/alchemy/admin/pages/info.html.erb
@@ -20,6 +20,13 @@
   <div class="value">
     <label><%= Alchemy.t(:page_status) %></label>
     <p>
+      <% if @page.locked? %>
+        <span class="page_status">
+          <%= render_icon(:edit, size: "1x") %>
+          <%= Alchemy.t(:currently_edited_by) %>
+          <%= @page.locker_name %>
+        </span>
+      <% end %>
       <span class="page_status">
         <% if @page.public? %>
           <%= render_icon(:cloud, size: "1x") %>
@@ -46,10 +53,4 @@
     <label><%= Alchemy.t(:page_was_updated) %></label>
     <p><%= Alchemy.t(:from_at) % {by: @page.updater_name, at: l(@page.updated_at, format: :'alchemy.page_status')} %></p>
   </div>
-  <% if @page.locked? %>
-  <div class="value">
-    <label><%= Alchemy.t(:currently_edited_by) %></label>
-    <p><%= @page.locker_name %></p>
-  </div>
-  <% end %>
 </div>