From 338a606be2d1bb138d609759d9fdbca2e097edf0 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Fri, 12 Jan 2024 12:39:46 +0100 Subject: [PATCH 1/3] Fix version check for menu icon --- config/initializers/alchemy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/alchemy.rb b/config/initializers/alchemy.rb index c8f3e78..09ae56e 100644 --- a/config/initializers/alchemy.rb +++ b/config/initializers/alchemy.rb @@ -13,7 +13,7 @@ name: "modules.users", controller: "/alchemy/admin/users", action: "index", - icon: (Alchemy.gem_version > Gem::Version.new("7.0")) ? "group-line" : "users" + icon: (Alchemy.gem_version > Gem::Version.new("7.1.0-b1")) ? "group-line" : "users" } }) From b5a30a9a6bd62bc57ea29aba6dbc17ae7c9b2dcf Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Fri, 12 Jan 2024 12:40:01 +0100 Subject: [PATCH 2/3] Fix add user icon tooltip placement --- app/views/alchemy/admin/users/index.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/alchemy/admin/users/index.html.erb b/app/views/alchemy/admin/users/index.html.erb index 197a92b..4dc0eb2 100644 --- a/app/views/alchemy/admin/users/index.html.erb +++ b/app/views/alchemy/admin/users/index.html.erb @@ -5,6 +5,7 @@ url: alchemy.new_admin_user_path, title: Alchemy.t(:create_user), hotkey: 'alt+n', + tooltip_placement: "top-start", dialog_options: { title: Alchemy.t(:create_user), size: "430x560" From e87153679e3f958d1a63482b893896e1fedd5586 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Fri, 12 Jan 2024 15:24:35 +0100 Subject: [PATCH 3/3] Add title/tooltip to delete user button Will render as tooltip in Alchemy 7.1 and title in Alchemy 7.0 --- app/views/alchemy/admin/users/_user.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/alchemy/admin/users/_user.html.erb b/app/views/alchemy/admin/users/_user.html.erb index 3020208..4ed75e0 100644 --- a/app/views/alchemy/admin/users/_user.html.erb +++ b/app/views/alchemy/admin/users/_user.html.erb @@ -25,7 +25,8 @@ message: Alchemy.t(:confirm_to_delete_user), title: Alchemy.t(:delete_user), icon: :minus - } %> + }, + title: Alchemy.t(:delete_user) %> <% end %> <% if can?(:edit, user) %> <%= link_to_dialog render_icon(:edit),