alchemy_cms 7.0.14 → 7.1.0.pre.b1

data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb

@@ -1,57 +1,50 @@
 <% linkable = picture_editor.settings[:linkable] != false %>
 <% croppable = picture_editor.allow_image_cropping? %>
 
-<%= link_to_dialog render_icon(:crop),
-  alchemy.crop_admin_ingredient_path(picture_editor.ingredient, {
-    crop_from_form_field_id: picture_editor.form_field_id(:crop_from),
-    crop_size_form_field_id: picture_editor.form_field_id(:crop_size),
-    picture_id: picture_editor.picture&.id
-  }), {
-    size: "1080x615",
-    title: Alchemy.t("Edit Picturemask"),
-    image_loader: false,
-    padding: false
-  }, {
-    title: Alchemy.t("Edit Picturemask"),
-    class: croppable ? "crop_link" : "disabled crop_link",
-    tabindex: croppable ? nil : "-1",
-    onclick: "return false"
-  } %>
-
-<%= link_to_dialog render_icon("file-image", style: "regular"),
-  alchemy.admin_pictures_path(
-    form_field_id: picture_editor.form_field_id(:picture_id)
-  ),
-  {
-    title: (picture_editor.picture ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image)),
-    size: "790x590",
-    padding: false
-  },
-  title: (picture_editor.picture ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image)) %>
+<%= content_tag "sl-tooltip", content: Alchemy.t("Edit Picturemask"), placement: "top-start", disabled: !croppable do %>
+  <%= link_to_dialog render_icon(:crop),
+    alchemy.crop_admin_ingredient_path(picture_editor.ingredient, {
+      crop_from_form_field_id: picture_editor.form_field_id(:crop_from),
+      crop_size_form_field_id: picture_editor.form_field_id(:crop_size),
+      picture_id: picture_editor.picture&.id
+    }), {
+      size: "1080x615",
+      title: Alchemy.t("Edit Picturemask"),
+      image_loader: false,
+      padding: false
+    }, {
+      class: croppable ? "crop_link icon_button" : "disabled crop_link icon_button" ,
+      tabindex: croppable ? nil : "-1",
+      onclick: "return false"
+    } %>
+<% end %>
 
-<%= link_to_if linkable, render_icon(:link), "", {
-  onclick: "new Alchemy.LinkDialog(this).open(); return false;",
-  class: picture_editor.linked? ? "linked" : nil,
-  title: Alchemy.t(:link_image),
-  "data-parent-selector": "[data-ingredient-id='#{picture_editor.id}']",
-  id: "edit_link_#{picture_editor.id}"
-} do %>
-  <span class="disabled" tabindex="-1"><%= render_icon(:link) %></span>
+<%= content_tag "sl-tooltip", content: picture_editor.picture ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image) do %>
+  <%= link_to_dialog render_icon("image-add"),
+    alchemy.admin_pictures_path(
+      form_field_id: picture_editor.form_field_id(:picture_id)
+    ),
+    {
+      title: Alchemy.t(:choose_image),
+      size: "800x600",
+      padding: false
+    },
+    class: "icon_button" %>
 <% end %>
 
-<%= link_to_if linkable, render_icon(:unlink), "", {
-  onclick: "return Alchemy.LinkDialog.removeLink(this, '[data-ingredient-id=\"#{picture_editor.id}\"]')",
-  class: picture_editor.linked? ? "linked" : "disabled",
-  tabindex: picture_editor.linked? ? nil : "-1",
-  title: Alchemy.t(:unlink)
-} do %>
-  <span class="disabled" tabindex="-1"><%= render_icon(:unlink) %></span>
+<% if linkable %>
+  <%= render "alchemy/ingredients/shared/link_tools", ingredient_editor: picture_editor %>
+<% else %>
+  <span class="disabled"><%= render_icon("link", style: "m") %></span>
+  <span class="disabled"><%= render_icon("link-unlink", style: "m") %></span>
 <% end %>
 
-<%= link_to_dialog render_icon(:edit),
-  alchemy.edit_admin_ingredient_path(id: picture_editor.id),
-  {
-    title: Alchemy.t(:edit_image_properties),
-    size: "380x255"
-  },
-  title: Alchemy.t(:edit_image_properties) %>
+<%= content_tag "sl-tooltip", content: Alchemy.t(:edit_image_properties), placement: "top-end" do %>
+  <%= link_to_dialog render_icon(:edit),
+    alchemy.edit_admin_ingredient_path(id: picture_editor.id),
+    {
+      title: Alchemy.t(:edit_image_properties),
+      size: "380x255"
+    },
+    class: "icon_button" %>
+<% end %>

data/app/views/kaminari/alchemy/_first_page.html.erb

@@ -7,9 +7,11 @@
     remote:        data-remote
 -%>
 <% if current_page.first? %>
-  <span class="first-page disabled"><i class="icon fas fa-angle-double-left"></i></span>
+  <span class="first-page disabled">
+    <i class="icon ri-skip-left-line ri-fw"></i>
+  </span>
 <% else %>
   <%= link_to url, remote: remote, title: Alchemy.t(:first, scope: 'pagination'), class: 'first-page' do %>
-    <i class="icon fas fa-angle-double-left"></i>
+    <i class="icon ri-skip-left-line ri-fw"></i>
   <% end %>
 <% end %>

data/app/views/kaminari/alchemy/_gap.html.erb

@@ -5,4 +5,4 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page gap"><i class="icon fas fa-ellipsis-h"></i></span>
+<span class="page gap"><i class="icon ri-more-line"></i></span>

data/app/views/kaminari/alchemy/_last_page.html.erb

@@ -7,9 +7,11 @@
     remote:        data-remote
 -%>
 <% if current_page.last? %>
-  <span class="last-page disabled"><i class="icon fas fa-angle-double-right"></i></span>
+  <span class="last-page disabled">
+    <i class="icon ri-skip-right-line ri-fw"></i>
+  </span>
 <% else %>
   <%= link_to url, remote: remote, title: Alchemy.t(:last, scope: 'pagination'), class: 'last-page' do %>
-    <i class="icon fas fa-angle-double-right"></i>
+    <i class="icon ri-skip-right-line ri-fw"></i>
   <% end %>
 <% end %>

data/app/views/kaminari/alchemy/_next_page.html.erb

@@ -7,9 +7,11 @@
     remote:        data-remote
 -%>
 <% if current_page.last? -%>
-  <span class="next_page disabled"><i class="icon fas fa-angle-right"></i></span>
+  <span class="next_page disabled">
+    <i class="icon ri-arrow-right-s-line ri-fw"></i>
+  </span>
 <% else -%>
   <%= link_to url, rel: 'next', remote: remote, title: Alchemy.t(:next_page, scope: 'pagination'), class: 'next_page' do %>
-    <i class="icon fas fa-angle-right"></i>
+    <i class="icon ri-arrow-right-s-line ri-fw"></i>
   <% end %>
 <% end -%>

data/app/views/kaminari/alchemy/_prev_page.html.erb

@@ -7,9 +7,11 @@
     remote:        data-remote
 -%>
 <% if current_page.first? -%>
-  <span class="previous_page disabled"><i class="icon fas fa-angle-left"></i></span>
+  <span class="previous_page disabled">
+    <i class="icon ri-arrow-left-s-line ri-fw"></i>
+  </span>
 <% else -%>
   <%= link_to url, rel: 'prev', remote: remote, class: 'previous_page', title: Alchemy.t(:previous_page, scope: 'pagination') do %>
-    <i class="icon fas fa-angle-left"></i>
+    <i class="icon ri-arrow-left-s-line ri-fw"></i>
   <% end %>
 <% end -%>

data/app/views/layouts/alchemy/admin.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="<%= ::I18n.locale %>" class="no-js">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -13,25 +13,10 @@
     <script>
       // Global Alchemy JavaScript object.
       var Alchemy = {};
-      // Setting TinyMCE path.
-      var tinyMCEPreInit = {
-        <% if ActionController::Base.config.asset_host_set? %>
-        base: '<%= asset_url(assets_prefix + '/tinymce') %>',
-        <% else %>
-        base: '<%= asset_path(assets_prefix + '/tinymce') %>',
-        <% end %>
-        suffix: '.min'
-      };
       // Store regular expression for external link url matching.
       Alchemy.link_url_regexp = <%= link_url_regexp.inspect %>;
-      // Holds the default Alchemy TinyMCE configuration
-      Alchemy.TinymceDefaults = {
-        plugins: '<%= Alchemy::Tinymce.plugins.join(',') %>',
-        <% Alchemy::Tinymce.init.each do |k, v| %>
-        <%= k %>: <%== v.to_json %>,
-        <% end %>
-      };
     </script>
+    <%= render 'alchemy/admin/tinymce/setup' %>
     <%= render 'alchemy/admin/partials/routes' %>
     <%= javascript_include_tag('alchemy/admin/all', 'data-turbo-track' => true) %>
     <%= javascript_importmap_tags("alchemy_admin", importmap: Alchemy.importmap) %>
@@ -44,16 +29,12 @@
     <% end %>
     <%= yield :javascript_includes %>
   </head>
-  <%= content_tag :body, id: 'alchemy', class: alchemy_body_class do %>
+  <%= content_tag :body, id: 'alchemy', class: alchemy_body_class + ["alchemy-light"] do %>
     <noscript>
       <h1><%= Alchemy.t(:javascript_disabled_headline) %></h1>
       <p><%= Alchemy.t(:javascript_disabled_text) %></p>
     </noscript>
-    <div id="overlay">
-      <div id="overlay_text_box">
-        <span id="overlay_text"><%= Alchemy.t(:please_wait) %></span>
-      </div>
-    </div>
+    <alchemy-overlay text="<%= Alchemy.t(:please_wait) %>"></alchemy-overlay>
     <div id="left_menu">
       <div id="main_navi">
         <% sorted_alchemy_modules.each do |alchemy_module| %>
@@ -64,14 +45,17 @@
       <div id="logout" class="main_navi_entry">
         <% if current_alchemy_user %>
           <%= link_to_dialog(
-            "#{render_icon('sign-out-alt', size: 'lg', class: 'module')}<label>#{Alchemy.t(:leave)}</label>".html_safe,
+            %(
+              #{render_icon('logout-box-r', class: 'module')}
+              <label>#{Alchemy.t(:leave)}</label>
+            ).html_safe,
             alchemy.leave_admin_path, {
               size: "300x155",
               title: Alchemy.t("Leave Alchemy")
           }, {'data-alchemy-hotkey' => 'alt+q'}) %>
         <% else %>
           <%= link_to(alchemy.root_path) do %>
-            <i class="icon fas fa-sign-out-alt fa-fw fa-lg"></i>
+            <i class="icon ri-logout-r-line ri-fw ri-lg"></i>
             <label><%= Alchemy.t(:leave) %></label>
           <% end %>
         <% end %>
@@ -89,8 +73,7 @@
           <%= current_alchemy_user_name %>
           <% if Alchemy::I18n.available_locales.length > 1 %>
             <%= select_tag 'change_locale',
-              options_for_select(translations_for_select, ::I18n.locale),
-              class: 'alchemy_selectbox tiny' %>
+              options_for_select(translations_for_select, ::I18n.locale) %>
           <% end %>
         </div>
       </div>
@@ -104,8 +87,6 @@
       <%= yield %>
     </div>
     <script>
-      // Store current locale for javascript translations.
-      Alchemy.locale = '<%= ::I18n.locale %>';
       // Setting the correct locale for select2 dropdown replacement.
       $.extend($.fn.select2.defaults, $.fn.select2.locales['<%= ::I18n.locale %>']);
     </script>

data/config/alchemy/modules.yml

@@ -4,78 +4,78 @@
   engine_name: alchemy
   position: 1
   navigation:
-    name: 'modules.dashboard'
-    controller: '/alchemy/admin/dashboard'
+    name: Home
+    controller: "/alchemy/admin/dashboard"
     action: index
-    inline_image: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="-4 -6 32 32" class="svg-inline--fa fa-lg fa-fw"><path fill="currentColor" d="M15.7 7.9L9.9 2.2 2.1 4.3 0 12.1l5.7 5.8 7.8-2.1 2.2-7.9zm-5.3 10.3l-1.2 4.4 3.2 3.2 4.4-1.2 1.2-4.4-3.2-3.2-4.4 1.2zM23.5 7.3L17.2 9l-1.7 6.2 4.5 4.6 6.2-1.7 1.7-6.2-4.4-4.6z"/></svg>'
+    icon: home-2-line
 
 - name: pages
   engine_name: alchemy
   position: 2
   navigation:
-    name: 'modules.pages'
-    controller: '/alchemy/admin/pages'
+    name: "modules.pages"
+    controller: "/alchemy/admin/pages"
     action: index
-    icon: file-alt
+    icon: pages-line
     sub_navigation:
-      - name: 'modules.pages'
-        controller: '/alchemy/admin/pages'
+      - name: "modules.pages"
+        controller: "/alchemy/admin/pages"
         action: index
-      - name: 'modules.layoutpages'
-        controller: '/alchemy/admin/layoutpages'
+      - name: "modules.layoutpages"
+        controller: "/alchemy/admin/layoutpages"
         action: index
     nested:
-      - controller: '/alchemy/admin/pages'
+      - controller: "/alchemy/admin/pages"
         action: edit
 
 - name: menus
   engine_name: alchemy
   position: 3
   navigation:
-    name: 'modules.menus'
-    controller: '/alchemy/admin/nodes'
+    name: "modules.menus"
+    controller: "/alchemy/admin/nodes"
     action: index
-    icon: list-ul
+    icon: menu-2-line
 
 - name: languages
   engine_name: alchemy
   position: 4
   navigation:
-    name: 'modules.languages'
-    controller: '/alchemy/admin/languages'
+    name: "modules.languages"
+    controller: "/alchemy/admin/languages"
     action: index
-    icon: flag
+    icon: translate-2
 
 - name: sites
   engine_name: alchemy
   position: 5
   navigation:
-    name: 'modules.sites'
-    controller: '/alchemy/admin/sites'
+    name: "modules.sites"
+    controller: "/alchemy/admin/sites"
     action: index
-    icon: bullseye
+    icon: global-line
 
 - name: tags
   engine_name: alchemy
   position: 6
   navigation:
-    name: 'modules.tags'
-    controller: '/alchemy/admin/tags'
+    name: "modules.tags"
+    controller: "/alchemy/admin/tags"
     action: index
-    icon: tags
+    icon: price-tag-3-line
 
 - name: archive
   engine_name: alchemy
   position: 7
   navigation:
-    controller: '/alchemy/admin/pictures'
+    controller: "/alchemy/admin/pictures"
     action: index
-    name: 'modules.library'
-    icon: archive
+    name: "modules.library"
+    icon: archive-drawer-line
     sub_navigation:
-      - name: 'modules.pictures'
-        controller: '/alchemy/admin/pictures'
+      - name: "modules.pictures"
+        controller: "/alchemy/admin/pictures"
         action: index
-      - name: 'modules.attachments'
-        controller: '/alchemy/admin/attachments'
+      - name: "modules.attachments"
+        controller: "/alchemy/admin/attachments"
         action: index

data/config/importmap.rb

@@ -1,8 +1,17 @@
+pin "@ungap/custom-elements", to: "https://ga.jspm.io/npm:@ungap/custom-elements@1.3.0/index.js", preload: true
 pin "flatpickr", to: "https://ga.jspm.io/npm:flatpickr@4.6.13/dist/esm/index.js", preload: true
 pin "lodash-es/debounce", to: "https://ga.jspm.io/npm:lodash-es@4.17.21/debounce.js", preload: true
 pin "lodash-es/max", to: "https://ga.jspm.io/npm:lodash-es@4.17.21/max.js", preload: true
-pin "sortablejs", to: "https://ga.jspm.io/npm:sortablejs@1.15.0/modular/sortable.esm.js", preload: true
+pin "sortablejs", to: "https://ga.jspm.io/npm:sortablejs@1.15.1/modular/sortable.esm.js", preload: true
 pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
+pin "@shoelace/animation-registry", to: "https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.12.0/cdn/utilities/animation-registry.js", preload: true
+pin "@shoelace/switch", to: "https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.12.0/cdn/components/switch/switch.js", preload: true
+pin "@shoelace/tab", to: "https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.12.0/cdn/components/tab/tab.js", preload: true
+pin "@shoelace/tab-group", to: "https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.12.0/cdn/components/tab-group/tab-group.js", preload: true
+pin "@shoelace/tab-panel", to: "https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.12.0/cdn/components/tab-panel/tab-panel.js", preload: true
+pin "@shoelace/tooltip", to: "https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.12.0/cdn/components/tooltip/tooltip.js", preload: true
+pin "@shoelace/progress-bar", to: "https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.12.0/cdn/components/progress-bar/progress-bar.js", preload: true
+pin "@rails/ujs", to: "https://ga.jspm.io/npm:@rails/ujs@7.1.2/app/assets/javascripts/rails-ujs.esm.js"
 
 pin "alchemy_admin", to: "alchemy_admin.js", preload: true
 pin_all_from File.expand_path("../app/javascript/alchemy_admin", __dir__), under: "alchemy_admin"

data/config/initializers/rails_live_reload.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+if defined?(RailsLiveReload)
+  RailsLiveReload.configure do |config|
+    # Default watched folders & files
+    config.watch %r{app/views/.+\.(erb)$}
+    config.watch %r{(app|vendor)/(assets|javascript)/\w+/(.+\.(s?css|coffee|js|html|png|jpg)).*}, reload: :always
+
+    # More examples:
+    config.watch %r{app/(helpers|components|decorators)/.+\.rb}, reload: :always
+    config.watch %r{config/locales/.+\.yml}, reload: :always
+  end
+end

data/config/locales/alchemy.en.yml

@@ -223,6 +223,10 @@ en:
         host: Either enter a <a href="https://en.wikipedia.org/wiki/Fully_qualified_domain_name" target="_blank">FQDN</a> or use a asterisk (*) to allow all domains to access this site.
         aliases: Enter additional domains this site should be accessible by. Please separate them by space or new line.
 
+    admin:
+      elements:
+        toolbar:
+          hide: Hide
     add_nested_element: "Add %{name}"
     anchor: "Anchor"
     anchor_link_headline: You can link to an anchor from the current page.
@@ -362,7 +366,7 @@ en:
     all_pictures: "All pictures"
     apply: "apply"
     assign_file: "Assign a file"
-    assign_image: "Assign an image"
+    assign_image: "Assign this image"
     attached_to: "attached to"
     attachment_filename_notice: "* Please do not use any special characters for the filename."
     auto_play: "Play movie after load"
@@ -420,6 +424,7 @@ en:
     edit_tag: "Edit tag"
     edit_selected_pictures: "Edit selected pictures"
     element_editor_not_found: "Error within this Element"
+    element_hidden: "Hidden"
     element_of_type: "Element"
     element_saved: "Saved element."
     enter_external_link: "Please enter the URL you want to link with"
@@ -522,19 +527,27 @@ en:
     "Page created": "Page: '%{name}' created."
     page_infos: "Page info"
     page_properties: "Page properties"
-    page_public: "published"
     page_published: "Published page"
-    page_restricted: "restricted"
     page_states:
       public:
-        "true": "Page is published."
-        "false": "Page is unpublished."
+        "true": "Page is available online."
+        "false": "Page is unavailable for website visitors."
       locked:
         "true": "Page is being edited at the moment."
         "false": ""
       restricted:
-        "true": "Page is restricted."
-        "false": "Page is not restricted."
+        "true": "Page is only accessible by members."
+        "false": "Page is accessible by all visitors."
+    page_status_titles:
+      public:
+        "true": "online"
+        "false": "offline"
+      locked:
+        "true": "locked"
+        "false": ""
+      restricted:
+        "true": "restricted"
+        "false": "accessible"
     page_status: "Status"
     page_title: "Title"
     page_type: "Type"
@@ -547,7 +560,7 @@ en:
     password: "Password"
     paste: "paste"
     pictures_in_page: "%{page} in %{pictures}"
-    place_link: "Link text"
+    place_link: "Add link"
     player_version: "Flash Player version"
     "please enter subject and mail address": "Please enter recipient and subject."
     please_confirm: "Please confirm"
@@ -604,7 +617,7 @@ en:
     title: "Title"
     to_alchemy: "To Alchemy"
     unknown: "unknown"
-    unlink: "Remove link from this image."
+    unlink: "Remove link"
     unlock_page: "Leave page"
     unlocked_page: "Unlocked page %{name}."
     uploader:
@@ -616,6 +629,7 @@ en:
         button_label: Upload image(s)
         upload_success: "Picture %{name} uploaded successfully"
         upload_failure: "Error while uploading %{name}: %{error}"
+      error: "Could not upload file! %{error}"
     want_to_create_new_language: "Do you want to create a new empty language tree?"
     want_to_make_copy_of_existing_language: "Do you want to copy an existing language tree?"
     "We need at least one default.": "A default language must exist."

data/config/routes.rb

@@ -45,7 +45,8 @@ Alchemy::Engine.routes.draw do
       end
       member do
         patch :publish
-        post :fold
+        post :collapse
+        post :expand
       end
     end
 

data/lib/alchemy/auth_accessors.rb

@@ -11,6 +11,7 @@
 # +Alchemy.login_path defaults to +'/login'+
 # +Alchemy.logout_path defaults to +'/logout'+
 # +Alchemy.logout_method defaults to +'delete'+
+# +Alchemy.unauthorized_path defaults to +'/'+
 #
 # Anyway, you can tell Alchemy about your authentication model configuration:
 #
@@ -22,6 +23,7 @@
 #   5. The path to the login form - @see: Alchemy.login_path
 #   6. The path to the logout method - @see: Alchemy.logout_path
 #   7. The http verb for the logout method - @see: Alchemy.logout_method
+#   8. The path to the page showing the user she's unauthorized - @see: Alchemy.unauthorized_path
 #
 # == Example
 #
@@ -33,6 +35,7 @@
 #     Alchemy.login_path = '/auth/login'
 #     Alchemy.logout_path = '/auth/logout'
 #     Alchemy.logout_method = 'get'
+#     Alchemy.unauthorized_path = '/home'
 #
 # If you don't have your own user model or don't want to provide one,
 # add the `alchemy-devise` gem into your App's Gemfile.
@@ -49,7 +52,8 @@ module Alchemy
     :signup_path,
     :login_path,
     :logout_path,
-    :logout_method
+    :logout_method,
+    :unauthorized_path
 
   # Defaults
   #
@@ -60,6 +64,7 @@ module Alchemy
   @@login_path = "/login"
   @@logout_path = "/logout"
   @@logout_method = "delete"
+  @@unauthorized_path = "/"
 
   # Returns the user class
   #

data/lib/alchemy/controller_actions.rb

@@ -59,15 +59,17 @@ module Alchemy
       Site.current = current_alchemy_site
     end
 
-    # Sets the current language for Alchemy.
+    # Try to find and stores current language for Alchemy.
     #
     def set_alchemy_language(lang = nil)
       @language = if lang
         lang.is_a?(Language) ? lang : load_alchemy_language_from_id_or_code(lang)
       else
-        load_alchemy_language_from_params || Language.default
+        # find the best language and remember it for later
+        load_alchemy_language_from_params ||
+          load_alchemy_language_from_session ||
+          Language.default
       end
-
       store_current_alchemy_language(@language)
     end
 
@@ -78,15 +80,26 @@ module Alchemy
       end
     end
 
+    # Load language from session if it's present on current site.
+    # Otherwise return nil so we can load the default language from current site.
+    def load_alchemy_language_from_session
+      if session[:alchemy_language_id].present? && Site.current
+        Site.current.languages.find_by(id: session[:alchemy_language_id])
+      end
+    end
+
     def load_alchemy_language_from_id_or_code(id_or_code)
       Language.find_by(id: id_or_code) ||
         Language.find_by_code(id_or_code)
     end
 
-    # Stores language in +Language.current+
+    # Stores language's id in the session.
+    #
+    # Also stores language in +Language.current+
     #
     def store_current_alchemy_language(language)
       if language&.id
+        session[:alchemy_language_id] = language.id
         Language.current = language
       end
     end

data/lib/alchemy/dev_support/live_reload_watcher.rb

@@ -0,0 +1,5 @@
+module Alchemy
+  class LiveReloadWatcher < RailsLiveReload::Watcher
+    def root = Alchemy::Engine.root
+  end
+end

data/lib/alchemy/engine.rb

@@ -46,8 +46,8 @@ module Alchemy
     initializer "alchemy.ransack" do
       Ransack.configure do |config|
         config.custom_arrows = {
-          up_arrow: '<i class="fa fas fa-xs fa-arrow-up"></i>',
-          down_arrow: '<i class="fa fas fa-xs fa-arrow-down"></i>'
+          up_arrow: '<i class="ri-1x ri-arrow-up-line"></i>',
+          down_arrow: '<i class="ri-1x ri-arrow-down-line"></i>'
         }
       end
     end
@@ -59,6 +59,12 @@ module Alchemy
           Alchemy.user_class.stampable(stamper_class_name: Alchemy.user_class.name)
         end
       end
+
+      if defined?(RailsLiveReload) && Rails.env.development?
+        require "alchemy/dev_support/live_reload_watcher"
+
+        Alchemy::LiveReloadWatcher.init
+      end
     end
 
     initializer "alchemy.webp-mime_type" do