alchemy-devise 8.3.0 → 8.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd67a95b3b8acb62ea89b7234b435f88fac641446715bc55c6d0ba97768c37c2
-  data.tar.gz: 66083de450b32ee439685bd643b5a15ad733d827271de44330a624aff372c4bc
+  metadata.gz: 9d93b11ac9b4d82e39ec5edaf499a157c979650c8b0f216e83096c0eaec35fee
+  data.tar.gz: 79f9bef20385ec3087e1d511b5703a54bb05ade4121e68de4de82cd99281838b
 SHA512:
-  metadata.gz: 7819848589227eb5be3deb2438547145fe968565cc9bbcd01b371f2312fa2de543c31e134611dedce6c67d5942116af268e111227626d18db832b65759729f35
-  data.tar.gz: 5b868139b4b7b6b26c7b1fbeca32899b4aee323ecfc82aa8d8158b98ebcddf40a4bf39b0e3794cfe735b31b4169f5f96c771855ec31306f94bf17adb4a679978
+  metadata.gz: db1fe1c10b41be58963417888d579fed0c1483d3d57b39f213b9904393533b40c374332ecc6b41e9ac9303ac94ef7a0e25dab5ff8f2afcf04f7674ee2d4de653
+  data.tar.gz: ae65df4a2cc41142fba04013e481969a2b035843da7775065734a4f23d703bd06dd90d0d9c15b8e823f22239d268f1a45e2f61141d237778be0082f9742abf83

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## 8.4.1 (2026-09-23)
+
+<!-- Release notes generated using configuration in .github/release.yml at 8.4-stable -->
+
+## What's Changed
+### Other Changes
+* [8.4-stable] Merge pull request #306 from AlchemyCMS/fix-login-css-relative-color by @alchemycms-bot[bot] in https://github.com/AlchemyCMS/alchemy-devise/pull/307
+* [8.4-stable] Merge pull request #309 from AlchemyCMS/fix/apply-csp-to-devise-controllers by @alchemycms-bot[bot] in https://github.com/AlchemyCMS/alchemy-devise/pull/310
+
+
+**Full Changelog**: https://github.com/AlchemyCMS/alchemy-devise/compare/v8.4.0...v8.4.1
+
+## 8.4.0 (2026-09-01)
+
+<!-- Release notes generated using configuration in .github/release.yml at 8.4-stable -->
+
+## What's Changed
+### New Features
+* feat: New login and signup screens by @tvdeyen in https://github.com/AlchemyCMS/alchemy-devise/pull/291
+* feat(admin): Use primary action for add user button  by @tvdeyen in https://github.com/AlchemyCMS/alchemy-devise/pull/292
+* feat: Use `Alchemy::UserMethods` module by @tvdeyen in https://github.com/AlchemyCMS/alchemy-devise/pull/295
+### Dependencies
+* chore(deps-dev): update simplecov-cobertura requirement from ~> 3.0 to ~> 4.0 by @dependabot[bot] in https://github.com/AlchemyCMS/alchemy-devise/pull/286
+* chore(deps-dev): bump sass from 1.101.0 to 1.102.0 by @dependabot[bot] in https://github.com/AlchemyCMS/alchemy-devise/pull/293
+### Other Changes
+* chore: Update specs for Alchemy 8.4/main by @tvdeyen in https://github.com/AlchemyCMS/alchemy-devise/pull/290
+* fix: Wrap toolbar buttons in container by @tvdeyen in https://github.com/AlchemyCMS/alchemy-devise/pull/294
+
+
+**Full Changelog**: https://github.com/AlchemyCMS/alchemy-devise/compare/v8.3.0...v8.4.0
+
 ## 8.3.0 (2026-06-25)
 
 <!-- Release notes generated using configuration in .github/release.yml at main -->

data/app/assets/builds/alchemy-devise.css

@@ -1 +1 @@
-body.user_sessions #errors,body.user_sessions .message.info,body.passwords #errors,body.passwords .message.info{border-color:rgba(0,0,0,0)}body.user_sessions #errors,body.passwords #errors{margin-left:157px}.logo-box{width:250px;margin:0 10px 1.5em 200px}.logo-box svg{width:200px;height:auto}.login_signup_box{position:absolute;top:50%;left:50%;transform:translate(-50%, -50%);--form-right-column-width: 1.65fr}.login_signup_box alchemy-message{width:281px;margin-left:auto}.no-js .login_signup_box{display:none}.login_signup_box .message{margin-left:157px}.login_signup_box .submit>label{text-align:start}.login_signup_box .submit>label input[type=checkbox]{margin:0 var(--spacing-0) 0 0}.login_signup_box .submit>a{display:inline-flex;align-items:center;gap:var(--spacing-0);grid-column:2;grid-row:1}.login_signup_box .submit>a:hover alchemy-icon{transform:translateX(-2px);transition:transform var(--transition-duration)}
+body.signup,body.user_sessions,body.passwords{background-image:url("https://picsum.photos/1920/1200.webp?grayscale");background-size:cover;background-position:center}body.signup #errors,body.signup .message.info,body.user_sessions #errors,body.user_sessions .message.info,body.passwords #errors,body.passwords .message.info{border-color:rgba(0,0,0,0)}body.signup #errors,body.user_sessions #errors,body.passwords #errors{margin-left:157px}body.signup #main_content,body.user_sessions #main_content,body.passwords #main_content{padding-top:var(--spacing-2);display:flex;flex-direction:column;justify-content:center}body.signup::after,body.user_sessions::after,body.passwords::after{content:"Image from Unsplash";position:absolute;bottom:var(--spacing-2);right:var(--spacing-2);font-size:var(--font-size_small);color:var(--body-background-color)}.logo-box{display:flex;flex-direction:column;align-items:center;justify-content:center;gap:var(--spacing-4);background-color:color-mix(in srgb, var(--body-background-color) 50%, transparent);backdrop-filter:blur(5px);border-radius:var(--border-radius_large);box-shadow:var(--dialog-box-shadow);padding:var(--spacing-4);margin-bottom:var(--spacing-6);text-shadow:0 0 2px var(--body-background-color)}.logo-box svg{width:200px;height:auto}.login_signup_box{position:relative;max-width:450px;margin:auto;--form-right-column-width: 1.65fr}.no-js .login_signup_box{display:none}.login_signup_box alchemy-message{margin-bottom:1.5em}.login_signup_box .panel{--panel-background-color: var(--body-background-color);width:100%;max-width:100%;margin:0;box-shadow:var(--dialog-box-shadow);border-radius:var(--border-radius_large);border-color:rgba(0,0,0,0)}@media(max-width: 500px){.login_signup_box .input,.login_signup_box .submit{grid-template-columns:1fr}.login_signup_box .input label,.login_signup_box .submit label{text-align:start;margin-bottom:var(--spacing-1)}}.login_signup_box .submit>a{display:inline-flex;align-items:center;gap:var(--spacing-0);width:fit-content}.login_signup_box .submit>a:hover alchemy-icon{transform:translateX(-2px);transition:transform var(--transition-duration)}@media(min-width: 501px){.login_signup_box .submit{grid-template-columns:var(--form-left-column-width) minmax(254px, var(--form-right-column-width))}.login_signup_box .submit>label{text-align:start}.login_signup_box .submit>label input[type=checkbox]{margin:0 var(--spacing-0) 0 0}.login_signup_box .submit>a{grid-column:2;grid-row:1}}

data/app/assets/stylesheets/alchemy-devise/login.scss

@@ -1,5 +1,10 @@
+body.signup,
 body.user_sessions,
 body.passwords {
+  background-image: url("https://picsum.photos/1920/1200.webp?grayscale");
+  background-size: cover;
+  background-position: center;
+
   #errors,
   .message.info {
     border-color: transparent;
@@ -8,11 +13,37 @@ body.passwords {
   #errors {
     margin-left: 157px;
   }
+
+  #main_content {
+    padding-top: var(--spacing-2);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+
+  &::after {
+    content: "Image from Unsplash";
+    position: absolute;
+    bottom: var(--spacing-2);
+    right: var(--spacing-2);
+    font-size: var(--font-size_small);
+    color: var(--body-background-color);
+  }
 }
 
 .logo-box {
-  width: 250px;
-  margin: 0 10px 1.5em 200px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: var(--spacing-4);
+  background-color: color-mix(in srgb, var(--body-background-color) 50%, transparent);
+  backdrop-filter: blur(5px);
+  border-radius: var(--border-radius_large);
+  box-shadow: var(--dialog-box-shadow);
+  padding: var(--spacing-4);
+  margin-bottom: var(--spacing-6);
+  text-shadow: 0 0 2px var(--body-background-color);
 
   svg {
     width: 200px;
@@ -21,40 +52,47 @@ body.passwords {
 }
 
 .login_signup_box {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
+  position: relative;
+  max-width: 450px;
+  margin: auto;
   --form-right-column-width: 1.65fr;
 
-  alchemy-message {
-    width: 281px;
-    margin-left: auto;
-  }
-
   .no-js & {
     display: none;
   }
 
-  .message {
-    margin-left: 157px;
+  alchemy-message {
+    margin-bottom: 1.5em;
   }
 
-  .submit {
-    > label {
-      text-align: start;
+  .panel {
+    --panel-background-color: var(--body-background-color);
+    width: 100%;
+    max-width: 100%;
+    margin: 0;
+    box-shadow: var(--dialog-box-shadow);
+    border-radius: var(--border-radius_large);
+    border-color: transparent;
+  }
 
-      input[type="checkbox"] {
-        margin: 0 var(--spacing-0) 0 0;
+  @media (max-width: 500px) {
+    .input,
+    .submit {
+      grid-template-columns: 1fr;
+
+      label {
+        text-align: start;
+        margin-bottom: var(--spacing-1);
       }
     }
+  }
 
+  .submit {
     > a {
       display: inline-flex;
       align-items: center;
       gap: var(--spacing-0);
-      grid-column: 2;
-      grid-row: 1;
+      width: fit-content;
 
       &:hover {
         alchemy-icon {
@@ -64,4 +102,26 @@ body.passwords {
       }
     }
   }
+
+  @media (min-width: 501px) {
+    .submit {
+      grid-template-columns: var(--form-left-column-width) minmax(
+          254px,
+          var(--form-right-column-width)
+        );
+
+      > label {
+        text-align: start;
+
+        input[type="checkbox"] {
+          margin: 0 var(--spacing-0) 0 0;
+        }
+      }
+
+      > a {
+        grid-column: 2;
+        grid-row: 1;
+      }
+    }
+  }
 }

data/app/controllers/alchemy/admin/passwords_controller.rb

@@ -6,6 +6,7 @@ module Alchemy
   module Admin
     class PasswordsController < ::Devise::PasswordsController
       include Alchemy::Admin::Locale
+      include Alchemy::Admin::CspProtection
 
       helper "Alchemy::Admin::Base"
 

data/app/controllers/alchemy/admin/user_sessions_controller.rb

@@ -6,6 +6,7 @@ module Alchemy
   module Admin
     class UserSessionsController < ::Devise::SessionsController
       include Alchemy::Admin::Locale
+      include Alchemy::Admin::CspProtection
 
       protect_from_forgery prepend: true
 

data/app/controllers/alchemy/admin/users_controller.rb

@@ -69,7 +69,7 @@ module Alchemy
       def set_roles
         if can_update_role?
           @user_roles = User::ROLES.map do |role|
-            [User.human_rolename(role), role]
+            [User.human_alchemy_rolename(role), role]
           end
         end
       end

data/app/models/alchemy/devise/ability.rb

@@ -26,19 +26,19 @@ module Alchemy
       private
 
       def member?
-        @user.try(:has_role?, :member)
+        @user.try(:has_alchemy_role?, :member)
       end
 
       def author?
-        @user.try(:has_role?, :author)
+        @user.try(:has_alchemy_role?, :author)
       end
 
       def editor?
-        @user.try(:has_role?, :editor)
+        @user.try(:has_alchemy_role?, :editor)
       end
 
       def admin?
-        @user.try(:has_role?, :admin)
+        @user.try(:has_alchemy_role?, :admin)
       end
     end
   end

data/app/models/alchemy/user.rb

@@ -21,18 +21,19 @@ module Alchemy
     devise(*Alchemy::Devise.config.devise_modules)
 
     include Alchemy::Taggable
+    include Alchemy::UserMethods
 
     attr_accessor :send_credentials
 
     has_many :folded_pages
 
     validates :login, uniqueness: {case_sensitive: false}, presence: :login_required?
-    validates_presence_of :alchemy_roles
 
-    # Unlock all locked pages before destroy.
-    before_destroy :unlock_pages!
+    scope :admins, -> {
+      Alchemy::Deprecation.warn("#{name}.admins is deprecated. Please use #{name}.alchemy_admins instead.")
+      alchemy_admins
+    }
 
-    scope :admins, -> { where(arel_table[:alchemy_roles].matches("%admin%")) }
     scope :logged_in, -> { where("last_request_at > ?", logged_in_timeout.seconds.ago) }
     scope :logged_out, -> { where("last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago) }
 
@@ -61,9 +62,8 @@ module Alchemy
         ]
       end
 
-      def human_rolename(role)
-        Alchemy.t("user_roles.#{role}")
-      end
+      deprecate human_rolename: :human_alchemy_rolename, deprecator: Alchemy::Deprecation
+      alias_method :human_rolename, :human_alchemy_rolename
 
       def logged_in_timeout
         Alchemy.config.get(:auto_logout_time).minutes.to_i
@@ -73,53 +73,26 @@ module Alchemy
     def role_symbols
       alchemy_roles.map(&:to_sym)
     end
+    deprecate :role_symbols, deprecator: Alchemy::Deprecation
 
     def role
       alchemy_roles.first
     end
-
-    def alchemy_roles
-      read_attribute(:alchemy_roles).split(" ")
-    end
-
-    def alchemy_roles=(roles_string)
-      if roles_string.is_a? Array
-        write_attribute(:alchemy_roles, roles_string.join(" "))
-      elsif roles_string.is_a? String
-        write_attribute(:alchemy_roles, roles_string)
-      end
-    end
+    deprecate :role, deprecator: Alchemy::Deprecation
 
     def add_role(role)
       self.alchemy_roles = alchemy_roles.push(role.to_s).uniq
     end
+    deprecate add_role: :"alchemy_roles=", deprecator: Alchemy::Deprecation
 
-    # Returns true if the user ahs admin role
-    def is_admin?
-      has_role? "admin"
-    end
-
-    alias_method :admin?, :is_admin?
+    alias_method :is_admin?, :alchemy_admin?
+    deprecate is_admin?: :alchemy_admin?, deprecator: Alchemy::Deprecation
 
-    # Returns true if the user has the given role.
-    def has_role?(role)
-      alchemy_roles.include? role.to_s
-    end
-
-    # Calls unlock on all locked pages
-    def unlock_pages!
-      pages_locked_by_me.map(&:unlock!)
-    end
-
-    # Returns all pages locked by user.
-    #
-    # A page gets locked, if the user requests to edit the page.
-    #
-    def pages_locked_by_me
-      Page.locked_by(self).order(:updated_at)
-    end
+    alias_method :has_role?, :has_alchemy_role?
+    deprecate has_role?: :has_alchemy_role?, deprecator: Alchemy::Deprecation
 
-    alias_method :locked_pages, :pages_locked_by_me
+    alias_method :human_roles_string, :human_alchemy_roles
+    deprecate human_roles_string: :human_alchemy_roles, deprecator: Alchemy::Deprecation
 
     # Returns the firstname and lastname as a string
     #
@@ -160,11 +133,8 @@ module Alchemy
       !logged_in?
     end
 
-    def human_roles_string
-      alchemy_roles.map do |role|
-        self.class.human_rolename(role)
-      end.to_sentence
-    end
+    alias_method :pages_locked_by_me, :locked_pages
+    deprecate pages_locked_by_me: :locked_pages, deprecator: Alchemy::Deprecation
 
     def store_request_time!
       update_column(:last_request_at, Time.now)
@@ -173,7 +143,7 @@ module Alchemy
     # Delivers a welcome mail depending from user's role.
     #
     def deliver_welcome_mail
-      if has_role?("author") || has_role?("editor") || has_role?("admin")
+      if has_alchemy_role?("author") || has_alchemy_role?("editor") || has_alchemy_role?("admin")
         Notifications.alchemy_user_created(self).deliver_later
       else
         Notifications.member_created(self).deliver_later

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

@@ -2,32 +2,32 @@
   <%= stylesheet_link_tag "alchemy-devise" %>
 <% end %>
 
+<% content_for(:main_menu_style) { 'collapsed-menu' } %>
+
 <div class="login_signup_box">
-  <%= render "alchemy/admin/user_sessions/logo" %>
-<% if @user.errors.blank? %>
-  <%= render_message do %>
-    <p>
-      <strong><%= Alchemy.t('Password reset') %></strong>
-    </p>
-    <p><%= Alchemy.t('Please enter a new password') %></p>
-  <% end %>
-<% else %>
-  <%= render "devise/shared/error_messages", resource: resource %>
-<% end %>
-  <%= alchemy_form_for resource, as: resource_name, url: admin_update_password_path, method: 'patch' do |f| %>
-    <%= f.hidden_field :reset_password_token %>
-    <%= f.input :password, autofocus: true, label: Alchemy.t("New password"),
-      required: true, input_html: {autocomplete: "new-password"} %>
-    <%= f.input :password_confirmation, label: Alchemy.t("Confirm new password"),
-      required: true, input_html: {autocomplete: "new-password"} %>
-    <div class="submit">
-      <%= link_to alchemy.admin_login_path do %>
-        <%= render_icon("arrow-left-s", size: "1x") %>
-        <%= Alchemy.t(:login) %>
-      <% end %>
-      <button type="submit">
-        <%= Alchemy.t("Change password") %>
-      </button>
-    </div>
+  <%= render "alchemy/admin/user_sessions/logo" do %>
+    <% if @user.errors.blank? %>
+      <strong><%= Alchemy.t('Please enter a new password') %></strong>
+    <% end %>
   <% end %>
+
+  <div class="panel">
+    <%= render "devise/shared/error_messages", resource: resource %>
+    <%= alchemy_form_for resource, as: resource_name, url: admin_update_password_path, method: 'patch' do |f| %>
+      <%= f.hidden_field :reset_password_token %>
+      <%= f.input :password, autofocus: true, label: Alchemy.t("New password"),
+        required: true, input_html: {autocomplete: "new-password"} %>
+      <%= f.input :password_confirmation, label: Alchemy.t("Confirm new password"),
+        required: true, input_html: {autocomplete: "new-password"} %>
+      <div class="submit">
+        <%= link_to alchemy.admin_login_path do %>
+          <%= render_icon("arrow-left-s", size: "1x") %>
+          <%= Alchemy.t(:login) %>
+        <% end %>
+        <button type="submit">
+          <%= Alchemy.t("Change password") %>
+        </button>
+      </div>
+    <% end %>
+  </div>
 </div>

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

@@ -2,34 +2,35 @@
   <%= stylesheet_link_tag "alchemy-devise" %>
 <% end %>
 
+<% content_for(:main_menu_style) { 'collapsed-menu' } %>
+
 <div class="login_signup_box">
-  <%= render "alchemy/admin/user_sessions/logo" %>
-<% if @user.errors.blank? %>
-  <%= render_message do %>
-    <p>
+  <%= render "alchemy/admin/user_sessions/logo" do %>
+    <% if @user.errors.blank? %>
       <strong><%= Alchemy.t('Password reset') %></strong>
-    </p>
-    <p><%= Alchemy.t('Please enter your email address') %></p>
-  <% end %>
-<% else %>
-  <%= render "devise/shared/error_messages", resource: resource %>
-<% end %>
-  <%= alchemy_form_for :user, url: admin_reset_password_path, html: {method: 'post'} do |f| %>
-    <%= f.input :email,
-      autofocus: true,
-      required: true,
-      input_html: {
-        autocomplete: "email",
-        value: params[:email]
-      } %>
-    <div class="submit">
-      <%= link_to alchemy.admin_login_path do %>
-        <%= render_icon("arrow-left-s", size: "1x") %>
-        <%= Alchemy.t(:login) %>
-      <% end %>
-      <button type="submit">
-        <%= Alchemy.t("Send reset instructions") %>
-      </button>
-    </div>
+      <strong><%= Alchemy.t('Please enter your email address') %></strong>
+    <% end %>
   <% end %>
+
+  <div class="panel">
+    <%= render "devise/shared/error_messages", resource: resource %>
+    <%= alchemy_form_for :user, url: admin_reset_password_path, html: {method: 'post'} do |f| %>
+      <%= f.input :email,
+        autofocus: true,
+        required: true,
+        input_html: {
+          autocomplete: "email",
+          value: params[:email]
+        } %>
+      <div class="submit">
+        <%= link_to alchemy.admin_login_path do %>
+          <%= render_icon("arrow-left-s", size: "1x") %>
+          <%= Alchemy.t(:login) %>
+        <% end %>
+        <button type="submit">
+          <%= Alchemy.t("Send reset instructions") %>
+        </button>
+      </div>
+    <% end %>
+  </div>
 </div>

data/app/views/alchemy/admin/user_sessions/_logo.html.erb

@@ -13,11 +13,11 @@
       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>
+    <g fill="currentColor">
       <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"
       />
+      <text x="94" y="83"><%= Alchemy.version %></text>
     </g>
     <g fill-rule="evenodd" clip-rule="evenodd" fill="currentColor">
       <path
@@ -31,5 +31,5 @@
       />
     </g>
   </svg>
-  <small><%= Alchemy.version %></small>
+  <%= yield %>
 </div>

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

@@ -2,31 +2,32 @@
   <%= stylesheet_link_tag "alchemy-devise" %>
 <% end %>
 
+<% content_for(:main_menu_style) { 'collapsed-menu' } %>
+
 <div class="login_signup_box">
-  <%= render "alchemy/admin/user_sessions/logo" %>
-  <%= render_message do %>
-    <p>
-      <strong><%= Alchemy.t('modules.user_sessions') %></strong>
-    </p>
-    <p><%= Alchemy.t('welcome_please_identify_notice') %></p>
+  <%= render "alchemy/admin/user_sessions/logo" do %>
+    <strong><%= Alchemy.t('welcome_please_identify_notice') %></strong>
   <% end %>
-  <%= alchemy_form_for :user, url: {action: 'create'}, id: 'login', data: { turbo: false } do |f| %>
-    <%= f.input Devise.authentication_keys.first, autofocus: true, required: true,
-      input_html: {autocomplete: Devise.authentication_keys.first == :email ? "email" : "username"} %>
-    <%= f.input :password, required: true, input_html: {autocomplete: "current-password"} %>
-    <% if devise_mapping.rememberable? %>
-      <div class="input">
-        <span class="control-label">&nbsp;</span>
 
-        <%= f.label :remember_me, class: "checkbox" do %>
-          <%= f.check_box :remember_me, checked: true %>
-          <%= Alchemy.t(:remember_me, scope: 'admin.login', days: Devise.remember_for.in_days.to_i) %>
-        <% end %>
+  <div class="panel">
+    <%= alchemy_form_for :user, url: {action: 'create'}, id: 'login', data: { turbo: false } do |f| %>
+      <%= f.input Devise.authentication_keys.first, autofocus: true, required: true,
+        input_html: {autocomplete: Devise.authentication_keys.first == :email ? "email" : "username"} %>
+      <%= f.input :password, required: true, input_html: {autocomplete: "current-password"} %>
+      <% if devise_mapping.rememberable? %>
+        <div class="input">
+          <span class="control-label">&nbsp;</span>
+
+          <%= f.label :remember_me, class: "checkbox" do %>
+            <%= f.check_box :remember_me, checked: true %>
+            <%= Alchemy.t(:remember_me, scope: 'admin.login', days: Devise.remember_for.in_days.to_i) %>
+          <% end %>
+        </div>
+      <% end %>
+      <div class="submit">
+        <%= link_to Alchemy.t('Forgot your password?'), admin_new_password_path %>
+        <button type="submit"><%= Alchemy.t(:login) %></button>
       </div>
     <% end %>
-    <div class="submit">
-      <%= link_to Alchemy.t('Forgot your password?'), admin_new_password_path %>
-      <button type="submit"><%= Alchemy.t(:login) %></button>
-    </div>
-  <% end %>
+  </div>
 </div>

data/app/views/alchemy/admin/users/_resource_table.html.erb

@@ -25,7 +25,7 @@
     <%= user.last_sign_in_at.present? ? l(user.last_sign_in_at, format: :"alchemy.default") : Alchemy.t(:unknown) %>
   <% end %>
   <% table.column :role, header: Alchemy::User.human_attribute_name(:alchemy_roles) do |user| %>
-    <%= user.human_roles_string %>
+    <%= user.human_alchemy_roles %>
   <% end %>
   <% table.delete_button tooltip: Alchemy.t(:delete_user), confirm_message: Alchemy.t(:confirm_to_delete_user) %>
   <% table.edit_button tooltip: Alchemy.t(:edit_user), dialog_size: "460x530" %>

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

@@ -3,12 +3,19 @@
     <%= render "fields", f: f, user_roles: @user_roles %>
   <% end %>
 <% else %>
-  <%= content_for :toolbar do %>
-    <sl-tooltip content="<%= Alchemy.t(:back) %>">
-      <%= link_to request.referer || alchemy.admin_dashboard_path, class: "icon_button" do %>
-        <alchemy-icon name="arrow-left-s"></alchemy-icon>
-      <% end %>
-    </sl-tooltip>
+  <% content_for :toolbar do %>
+    <div class="toolbar_buttons">
+      <sl-tooltip content="<%= Alchemy.t(:back) %>">
+        <%= render Alchemy::Admin::ToolbarButton.new(
+          label: Alchemy.t(:back),
+          primary: true,
+          icon: "arrow-left-s",
+          url: request.referer || alchemy.admin_dashboard_path,
+          skip_permission_check: true,
+          dialog: false
+        ) %>
+      </sl-tooltip>
+    </div>
   <% end %>
 
   <div class="panel">

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

@@ -3,19 +3,21 @@
 <% end %>
 
 <%= content_for :toolbar do %>
-  <%= render Alchemy::Admin::ToolbarButton.new(
-    icon: :plus,
-    label: Alchemy.t(:create_user),
-    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: "460x530"
-    },
-    if_permitted_to: [:create, Alchemy::User]
-  ) %>
+  <div class="toolbar_buttons">
+    <%= render Alchemy::Admin::ToolbarButton.new(
+      icon: :plus,
+      label: Alchemy.t(:create_user),
+      primary: true,
+      url: alchemy.new_admin_user_path,
+      hotkey: 'alt+n',
+      tooltip_placement: "top-start",
+      dialog_options: {
+        title: Alchemy.t(:create_user),
+        size: "460x530"
+      },
+      if_permitted_to: [:create, Alchemy::User]
+    ) %>
+  </div>
   <%= render "alchemy/admin/partials/search_form" %>
 <% end %>
 

data/app/views/alchemy/admin/users/signup.html.erb

@@ -2,15 +2,19 @@
   <%= stylesheet_link_tag "alchemy-devise" %>
 <% end %>
 
+<% content_for(:main_menu_style) { 'collapsed-menu' } %>
+
 <div class="login_signup_box">
-  <%= render "alchemy/admin/user_sessions/logo" %>
-  <%= render_message do %>
+  <%= render "alchemy/admin/user_sessions/logo" do %>
     <p>
       <strong><%= Alchemy.t('Welcome to Alchemy') %></strong>
     </p>
     <p><%= Alchemy.t("Please Signup") %></p>
   <% end %>
-  <%= alchemy_form_for [:admin, @user] do |f| %>
-    <%= render 'fields', f: f %>
-  <% end %>
+
+  <div class="panel">
+    <%= alchemy_form_for [:admin, @user] do |f| %>
+      <%= render 'fields', f: f %>
+    <% end %>
+  </div>
 </div>

data/lib/alchemy/devise/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Devise
-    VERSION = "8.3.0"
+    VERSION = "8.4.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-devise
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.4.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.3.0
+        version: 8.4.0.a
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.3.0
+        version: 8.4.0.a
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Devise based user authentication for AlchemyCMS.
 test_files: []