alchemy_cms 7.1.7 → 7.2.0.rc1

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

@@ -2,6 +2,8 @@
 
 <% content_for(:main_menu_style) { 'collapsed-menu' } %>
 
+<% content_for(:alchemy_body_class) { 'elements-window-visible' } %>
+
 <% content_for(:toolbar) do %>
 <div class="toolbar_buttons">
   <div class="toolbar_button">
@@ -103,7 +105,7 @@
       <label><%= Alchemy.t(:preview_url) %></label>
       <%= select_tag 'preview_url',
         options_for_select(@preview_urls),
-        class: 'large', is: 'alchemy-select' %>
+        class: 'large' %>
     </div>
   <% end %>
   <div class="toolbar_button">
@@ -127,12 +129,22 @@
 </div>
 <% end %>
 
-<% content_for :javascripts do %>
-
 <% content_for :javascript_includes do %>
   <meta name="turbo-cache-control" content="no-cache">
 <% end %>
 
+<iframe
+  url="<%= @preview_url %>"
+  id="alchemy_preview_window"
+  is="alchemy-preview-window"
+  frameborder="0">
+</iframe>
+
+<%= turbo_frame_tag "alchemy_elements_window", src: alchemy.admin_elements_path(page_version_id: @page_version.id) do %>
+  <alchemy-spinner></alchemy-spinner>
+<% end %>
+
+<% content_for :javascripts do %>
 <script type="text/javascript" charset="utf-8">
   $(document).one('turbo:load', function() {
     $('#unlock_page_form, #publish_page_form').on('submit', function(event) {
@@ -142,65 +154,6 @@
     });
     Alchemy.PagePublicationFields();
     Alchemy.PageLeaveObserver();
-    Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(page_version_id: @page_version.id) %>', {
-      texts: {
-        title: '<%= Alchemy.t("Elements") %>',
-        dirtyTitle: '<%= Alchemy.t("Warning!") %>',
-        dirtyMessage: '<%= Alchemy.t(:element_dirty_close_window_notice) %>',
-        ok_label: '<%= Alchemy.t("Yes") %>',
-        cancel_label: '<%= Alchemy.t("No") %>',
-        hideElements: '<%= Alchemy.t(:hide_elements) %>',
-        showElements: '<%= Alchemy.t(:show_elements) %>'
-      },
-      toolbarButtons: [
-        {
-          label: '<%= Alchemy.t("New Element") %>',
-          hotkey: 'alt+n',
-          iconClass: 'add-line',
-          align: 'start',
-          onClick: function() {
-            Alchemy.openDialog('<%= alchemy.new_admin_element_path(page_version_id: @page_version.id) %>', {
-              title: '<%= Alchemy.t("New Element") %>',
-              size: '320x125'
-            });
-          }
-        },
-        {
-          label: '<%= Alchemy.t("Show clipboard") %>',
-          iconClass: '<%= clipboard_empty?("elements") ? "clipboard-line" : "clipboard-fill" %>',
-          buttonId: 'clipboard_button',
-          onClick: function() {
-            Alchemy.openDialog('<%= alchemy.admin_clipboard_path(remarkable_type: "elements") %>', {
-              title :'<%= Alchemy.t("Clipboard") %>',
-              size: '400x305'
-            });
-          }
-        }
-      ]
-    }, function() {
-      if (window.location.hash) {
-        $(window.location.hash).trigger('FocusElementEditor.Alchemy');
-      }
-    });
-
-    Alchemy.PreviewWindow.init(<%== @preview_urls.first %>);
-
-    $('#preview_size').bind('open.selectBoxIt', function (e) {
-      $('#top_menu').css('z-index', 5000);
-    });
-
-    $('#preview_size').bind('blur.selectBoxIt', function (e) {
-      $('#top_menu').css('z-index', 30);
-    });
-
-    $('select#preview_size').on('change', function() {
-      var width = this.value;
-      if (width === 'auto') {
-        Alchemy.PreviewWindow.currentWindow.css('width', '');
-      } else {
-        Alchemy.PreviewWindow.resize(width);
-      }
-    });
   });
 
 </script>

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

@@ -9,9 +9,9 @@
   }
   if (locked_page_icon) {
     if (locked_page_icon.parentElement.classList.contains("handle")) {
-      locked_page_icon_content = '<span class="handle"><i class="icon ri-file-line ri-fw ri-xl"></i></span>'
+      locked_page_icon_content = '<span class="handle"><alchemy-icon name="file" size="xl"></alchemy-icon></span>'
     } else {
-      locked_page_icon_content = '<i class="icon ri-file-line ri-fw ri-xl"></i>'
+      locked_page_icon_content = '<alchemy-icon name="file" size="xl"></alchemy-icon>'
     }
     locked_page_icon.outerHTML = locked_page_icon_content
   }

data/app/views/alchemy/admin/partials/_autocomplete_tag_list.html.erb

@@ -1 +1,3 @@
-<%= f.text_field :tag_list, value: f.object.tag_list.join(","), data: {autocomplete: alchemy.autocomplete_admin_tags_path} %>
+<%= render Alchemy::Admin::TagsAutocomplete.new do %>
+  <%= f.text_field :tag_list, value: object.tag_list.join(",") %>
+<% end %>

data/app/views/alchemy/admin/partials/_flash_notices.html.erb

@@ -1,5 +1,7 @@
-<div id="flash_notices" style="display: <%= flash.keys.blank? ? "none" : "block" %>">
+<div id="flash_notices">
 <% flash.keys.each do |flash_type| %>
-  <%= render_flash_notice(flash[flash_type.to_sym], flash_type) if flash[flash_type.to_sym].present? %>
+  <% if flash[flash_type.to_sym].present? %>
+    <%= render Alchemy::Admin::Message.new(flash[flash_type.to_sym], type: flash_type, dismissable: true) %>
+  <% end %>
 <% end %>
 </div>

data/app/views/alchemy/admin/partials/_language_tree_select.html.erb

@@ -7,7 +7,7 @@
         'language_id',
         options_for_select(
           languages.map { |l| [l.name, l.id] },
-          Alchemy::Language.current.id
+          Alchemy::Current.language.id
         ),
         class: 'short',
         is: 'alchemy-select',

data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb

@@ -6,9 +6,12 @@
       <% elsif navigation["inline_image"] %>
         <%== navigation["inline_image"] %>
       <% elsif navigation["icon"] %>
-        <i class="icon ri-<%= navigation["icon"] %>"></i>
+        <%# Cannot use the render_icon helper, because the navigation["icon"] includes the style %>
+        <svg class="icon">
+          <use href="<%= asset_path("remixicon.symbol.svg") %>#ri-<%= navigation["icon"] %>" />
+        </svg>
       <% else %>
-        <i class="icon ri-table-line"></i>
+        <%= render_icon :table %>
       <% end %>
       <label><%= Alchemy.t(navigation['name']) %></label>
     <% end %>

data/app/views/alchemy/admin/partials/_remote_search_form.html.erb

@@ -12,7 +12,7 @@
       placeholder: Alchemy.t(:search),
       class: 'search_input_field',
       id: nil %>
-    <%= link_to render_icon(:times, size: 'xs'), url_for({
+    <%= link_to render_icon(:times, size: '1x'), url_for({
         action: 'index',
         form_field_id: @form_field_id,
         size: @size,
@@ -21,6 +21,6 @@
       remote: true,
       class: 'search_field_clear',
       title: Alchemy.t(:click_to_show_all),
-      style: search_filter_params[:q].blank? ? 'display: none' : 'display: block' %>
+      style: search_filter_params[:q].blank? ? 'visibility: hidden' : 'visibility: visible' %>
   </div>
 <% end %>

data/app/views/alchemy/admin/partials/_search_form.html.erb

@@ -11,11 +11,11 @@
     <% local_assigns.fetch(:additional_query_fields, []).each do |field| %>
       <%= f.hidden_field field, id: nil %>
     <% end %>
-    <%= link_to render_icon(:times, size: 'xs'), url,
+    <%= link_to render_icon(:times, size: '1x'), url,
         class: 'search_field_clear',
         id: 'search_field_clear',
         title: Alchemy.t(:click_to_show_all),
-        style: search_filter_params.fetch(:q, {}).fetch(resource_handler.search_field_name, '').present? ? 'display: block' : 'display: none' %>
+        style: search_filter_params.fetch(:q, {}).fetch(resource_handler.search_field_name, '').present? ? 'visibility: visible' : 'visibility: hidden' %>
 
     <% search_filter_params.fetch(:filter, []).each do |filter_param| %>
       <%= hidden_field_tag "filter[#{filter_param[0]}]", filter_param[1], id: nil %>

data/app/views/alchemy/admin/partials/_site_select.html.erb

@@ -2,7 +2,7 @@
 <div class="toolbar_button">
   <sl-tooltip content="<%= Alchemy.t("Current site") %>">
     <%= select_tag 'change_site',
-      options_for_select(sites_for_select, Alchemy::Site.current.id),
+      options_for_select(sites_for_select, Alchemy::Current.site.id),
       is: 'alchemy-select' %>
   </sl-tooltip>
 </div>

data/app/views/alchemy/admin/picture_descriptions/_form.html.erb

@@ -0,0 +1,11 @@
+<% field_name_prefix = "picture[descriptions_attributes][#{picture_description_counter}]" %>
+
+<% if picture_description.persisted? %>
+  <%= hidden_field field_name_prefix, :id, value: picture_description.id %>
+<% else %>
+  <%= hidden_field field_name_prefix, :language_id, value: picture_description.language_id %>
+  <%= hidden_field field_name_prefix, :picture_id, value: picture_description.picture_id %>
+<% end %>
+
+<%= label field_name_prefix, :text, Alchemy::PictureDescription.human_attribute_name(:text), class: "control-label" %>
+<%= text_area field_name_prefix, :text, value: picture_description.text, rows: 3 %>

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

@@ -0,0 +1,6 @@
+<turbo-frame id="picture_descriptions">
+  <%= render "form", {
+    picture_description: @picture_description,
+    picture_description_counter: @picture.descriptions.index(@picture_description)
+  } %>
+</turbo-frame>

data/app/views/alchemy/admin/pictures/_form.html.erb

@@ -1,10 +1,11 @@
 <%= alchemy_form_for [:admin, @picture] do |f| %>
   <%= f.input :name %>
-  <div class="input tag_list">
+  <%= render "picture_description_field", f: f %>
+  <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>
     <%= f.label :tag_list %>
-    <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
+    <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>
     <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>
-  </div>
+  <% end %>
   <%= hidden_field_tag :q, search_filter_params[:q] %>
   <%= hidden_field_tag :size, @size %>
   <%= hidden_field_tag :tagged_with, search_filter_params[:tagged_with] %>

data/app/views/alchemy/admin/pictures/_infos.html.erb

@@ -35,7 +35,7 @@
                     <% page_link = link_to element.display_name_with_preview_text,
                                    edit_admin_page_path(page, anchor: "element_#{element.id}") %>
                     <% ingredients = picture_ingredients.map { |p| Alchemy::IngredientEditor.new(p).translated_role }.to_sentence %>
-                    <%= render_icon('draggable', style: nil) %>
+                    <%= render_icon('draggable', style: false) %>
                     <p>
                       <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
                     </p>

data/app/views/alchemy/admin/pictures/_picture_description_field.html.erb

@@ -0,0 +1,29 @@
+<div class="input">
+  <% if Alchemy::Language.published.many? %>
+    <label class="inline-label" style="float: right">
+      <%= Alchemy::Language.model_name.human %>
+      <%= select_tag :language_id, options_from_collection_for_select(
+          Alchemy::Language.published, :id, ->(l) { l.code.upcase },
+          selected: @picture_description.language_id,
+        ), data: {
+          url: alchemy.edit_admin_picture_description_url(id: "__ID__", picture_id: @picture)
+        } %>
+    </label>
+  <% end %>
+
+  <turbo-frame id="picture_descriptions">
+    <%= render "alchemy/admin/picture_descriptions/form",
+      picture_description_counter: @picture.descriptions.index(@picture_description),
+      picture_description: @picture_description %>
+  </turbo-frame>
+</div>
+
+<script type="module">
+  const select = document.querySelector("#language_id")
+
+  select.addEventListener("change", () => {
+    const url = new URL(select.dataset.url)
+    url.searchParams.set("language_id", select.value)
+    Turbo.visit(url, { frame: "picture_descriptions" })
+  })
+</script>

data/app/views/alchemy/admin/pictures/_tag_list.html.erb

@@ -1,12 +1,12 @@
 <% if Alchemy::Picture.tag_counts.any? %>
   <h3><%= Alchemy.t("Filter by tag") %></h3>
-  <%= js_filter_field '.tag-list li' %>
+  <%= render Alchemy::Admin::ListFilter.new(".tag-list li") %>
   <ul>
     <%= render_tag_list('Alchemy::Picture') %>
   </ul>
   <% if search_filter_params[:tagged_with].present? %>
     <%= link_to(
-      render_icon(:close) + Alchemy.t('Remove tag filter'),
+      render_icon(:close, size: '1x') + Alchemy.t('Remove tag filter'),
       url_for(search_filter_params.except(:tagged_with)),
       remote: request.xhr?,
       class: 'secondary button small with_icon'

data/app/views/alchemy/admin/pictures/archive_overlay.js.erb

@@ -2,6 +2,4 @@
   var dialog = Alchemy.currentDialog();
   dialog.dialog_body.html('<%= j render("archive_overlay") %>');
   Alchemy.ImageLoader('#assign_image_list');
-  Alchemy.ListFilter(dialog.dialog_body);
 })();
-

data/app/views/alchemy/admin/pictures/edit_multiple.html.erb

@@ -17,11 +17,11 @@
     <%= text_field_tag :pictures_name %>
   </div>
 
-  <div class="input tag_list">
+  <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>
     <%= label_tag :pictures_tag_list, Alchemy.t(:tags), class: 'control-label' %>
-    <%= text_field_tag :pictures_tag_list, @tags, data: {autocomplete: alchemy.autocomplete_admin_tags_path} %>
+    <%= text_field_tag :pictures_tag_list, @tags %>
     <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>
-  </div>
+  <% end %>
 
   <div class="submit">
     <%= button_tag Alchemy.t(:save), name: nil, class: 'button' %>

data/app/views/alchemy/admin/pictures/show.html.erb

@@ -14,7 +14,7 @@
       ),
       class: "previous-picture",
       remote: true do %>
-      <i class="icon ri-arrow-left-s-line ri-fw"></i>
+      <%= render_icon "arrow-left-wide", size: "xl" %>
     <% end %>
   <% end %>
   <% if @next %>
@@ -28,7 +28,7 @@
       ),
       class: "next-picture",
       remote: true do %>
-      <i class="icon ri-arrow-right-s-line ri-fw"></i>
+      <%= render_icon "arrow-right-wide", size: "xl" %>
     <% end %>
   <% end %>
 </div>
@@ -39,5 +39,5 @@
 </div>
 
 <div class="picture-overlay-handle">
-  <i class="icon ri-contract-right-line ri-fw"></i>
+  <%= render_icon "contract-right" %>
 </div>

data/app/views/alchemy/admin/resources/_form.html.erb

@@ -18,10 +18,9 @@
     <% end %>
   <% end %>
   <% if f.object.respond_to?(:tag_list) %>
-    <div class="input string autocomplete_tag_list">
-      <%= f.label :tag_list %>
-      <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
-    </div>
+    <%= render Alchemy::Admin::TagsAutocomplete.new do %>
+      <%= f.input :tag_list, input_html: { value: f.object.tag_list.join(",") } %>
+    <% end %>
   <% end %>
   <%= f.submit Alchemy.t(:save) %>
 <% end %>

data/app/views/alchemy/admin/resources/_tag_list.html.erb

@@ -1,12 +1,12 @@
 <div class="tag-list<%= ' with_filter_bar' if resource_has_filters %><%= ' filtered' if search_filter_params[:tagged_with].present? %>">
   <h3><%= Alchemy.t("Filter by tag") %></h3>
-  <%= js_filter_field '.tag-list li' %>
+  <%= render Alchemy::Admin::ListFilter.new(".tag-list li") %>
   <ul>
     <%= render_tag_list(resource_model.name) %>
   </ul>
   <% if search_filter_params[:tagged_with].present? %>
     <%= link_to(
-      render_icon(:times, size: 'xs') + Alchemy.t('Remove tag filter'),
+      render_icon(:times, size: '1x') + Alchemy.t('Remove tag filter'),
       url_for(search_filter_params.except(:tagged_with)),
       remote: request.xhr?,
       class: 'secondary button small with_icon'

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

@@ -2,7 +2,7 @@
 
 <% content_for(:toolbar) do %>
   <div class="toolbar_buttons">
-    <%= toolbar_button(
+    <%= render Alchemy::Admin::ToolbarButton.new(
       icon: "add",
       label: label_title,
       url: new_resource_path,
@@ -15,7 +15,7 @@
       },
       if_permitted_to: [:create, resource_model]
     ) %>
-    <%= toolbar_button(
+    <%= render Alchemy::Admin::ToolbarButton.new(
       icon: :download,
       url: resource_url_proxy.url_for(action: 'index', format: 'csv', q: search_filter_params[:q], sort: params[:sort]),
       label: Alchemy.t(:download_csv),

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

@@ -2,7 +2,7 @@
 
 <% content_for :toolbar do %>
   <div class="toolbar_buttons">
-    <%= toolbar_button(
+    <%= render Alchemy::Admin::ToolbarButton.new(
       icon: :plus,
       label: label_title,
       url: new_resource_path,

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

@@ -7,7 +7,7 @@
 <% end %>
 
 <% content_for(:toolbar) do %>
-  <%= toolbar_button(
+  <%= render Alchemy::Admin::ToolbarButton.new(
     icon: :info,
     label: 'Info',
     url: alchemy.dashboard_info_path,
@@ -38,13 +38,13 @@
 <h3>Info Message</h3>
 
 <%= render_message do %>
-  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+  <p>Lorem ipsum <strong>dolor</strong> sit amet, consectetur adipiscing elit.</p>
 <% end %>
 
 <h3>Warning Message</h3>
 
 <%= render_message :warning do %>
-  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+  <p>Lorem ipsum dolor sit amet, <a href="">consectetur</a> adipiscing elit.</p>
 <% end %>
 
 <h3>Error Message</h3>
@@ -53,27 +53,32 @@
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
 <% end %>
 
+<h3>Growl Messages</h3>
+
+<%= link_to render_icon(:check), 'javascript:Alchemy.growl("Success message")', class: "icon_button" %>
+<%= link_to render_icon(:info), 'javascript:Alchemy.growl("Info message", "info")', class: "icon_button" %>
+<%= link_to render_icon(:alert), 'javascript:Alchemy.growl("Warning message", "warn")', class: "icon_button" %>
+<%= link_to render_icon(:bug), 'javascript:Alchemy.growl("Error message", "error")', class: "icon_button" %>
+
 <h2>Dialog Links</h2>
 
-<div class="panel">
-  <sl-tooltip content="Open in Dialog">
-    <a
-      href="/admin/styleguide"
-      is="alchemy-dialog-link"
-      class="icon_button"
-      data-dialog-options="{&quot;size&quot;:&quot;800x600&quot;,&quot;title&quot;:&quot;Styleguide in Dialog&quot;}"
-    >
-      <i class="icon ri-window-line"></i>
-    </a>
-  </sl-tooltip>
+<sl-tooltip content="Open in Dialog">
   <a
-    href="#"
+    href="/admin/styleguide"
     is="alchemy-dialog-link"
-    class="icon_button disabled"
+    class="icon_button"
+    data-dialog-options="{&quot;size&quot;:&quot;800x600&quot;,&quot;title&quot;:&quot;Styleguide in Dialog&quot;}"
   >
-    <i class="icon ri-window-line"></i>
+    <%= render_icon "window" %>
   </a>
-</div>
+</sl-tooltip>
+<a
+  href="#"
+  is="alchemy-dialog-link"
+  class="icon_button disabled"
+>
+  <%= render_icon "window" %>
+</a>
 
 <h2>Forms</h2>
 
@@ -213,33 +218,33 @@
   </tr>
   <tr class="even">
     <td class="icon">
-      <i class="icon ri-fw ri-user-line"></i>
+      <%= render_icon "user" %>
     </td>
     <td>Even table cell 1</td>
     <td>Even table cell 2</td>
     <td>Even table cell 3</td>
     <td class="tools">
       <a href="#" class="icon_button">
-        <i class="icon ri-fw ri-delete-bin-2-line"></i>
+        <%= render_icon "delete-bin-2" %>
       </a>
       <a href="#" class="icon_button">
-        <i class="icon ri-fw ri-edit-line"></i>
+        <%= render_icon "edit" %>
       </a>
     </td>
   </tr>
   <tr class="odd">
     <td class="icon">
-      <i class="icon ri-fw ri-user-line"></i>
+      <%= render_icon "user", style: "fill" %>
     </td>
     <td>Odd table cell 1</td>
     <td>Odd table cell 2</td>
     <td>Odd table cell 3</td>
     <td class="tools">
       <a href="#" class="icon_button">
-        <i class="icon ri-fw ri-delete-bin-2-line"></i>
+        <%= render_icon "delete-bin-2" %>
       </a>
       <a href="#" class="icon_button">
-        <i class="icon ri-fw ri-edit-line"></i>
+        <%= render_icon "edit" %>
       </a>
     </td>
   </tr>

data/app/views/alchemy/admin/tags/_tag.html.erb

@@ -25,7 +25,7 @@
         {
           title: Alchemy.t(:edit_tag),
           size: '360x410'
-        } %>
+        }, class: "icon_button" %>
     </sl-tooltip>
   <% end %>
   </td>

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

@@ -13,7 +13,7 @@
     <div class="input tags">
       <label class="control-label"><%= Alchemy.t('Tags') %></label>
       <div class="control_group" id="tags_tag_list">
-        <%= js_filter_field '.tag-list li' %>
+        <%= render Alchemy::Admin::ListFilter.new(".tag-list li") %>
         <ul class="tags tag-list">
           <%= render partial: "radio_tag", collection: @tags, locals: {name: "tag"} %>
         </ul>

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

@@ -1,6 +1,6 @@
 <% content_for :toolbar do %>
   <div class="toolbar_buttons">
-    <%= toolbar_button(
+    <%= render Alchemy::Admin::ToolbarButton.new(
       icon: :plus,
       label: Alchemy.t('New Tag'),
       url: alchemy.new_admin_tag_path,

data/app/views/alchemy/base/500.html.erb

@@ -1,5 +1,5 @@
 <%= content_for :toolbar do %>
-  <%= toolbar_button(
+  <%= render Alchemy::Admin::ToolbarButton.new(
     icon: 'angle-double-left',
     url: request.referer || alchemy.admin_dashboard_path,
     label: Alchemy.t(:back),
@@ -18,21 +18,10 @@
     <%= @error.class %>
     <%= @notice %>
   </h2>
-  <p class="hidden">
-  <% @trace.each do |line| %>
-    <%= line %><br>
-  <% end %>
-  </p>
-  <a href="#" class="error_details--toggle">
-    <%= Alchemy.t('Show error details') %>
-  </a>
+  <details>
+    <summary><%= Alchemy.t('Show error details') %></summary>
+    <% @trace.each do |line| %>
+      <%= line %><br>
+    <% end %>
+  </details>
 <% end %>
-
-<script>
-  $(function(){
-    $('.error_details--toggle').on("click", function(){
-      $('.error.message p').toggleClass('hidden');
-      return false;
-    });
-  });
-</script>

data/app/views/alchemy/base/error_notice.html.erb

@@ -1 +1,3 @@
-<%= render_flash_notice @notice, :error %>
+<%= render_message :error do %>
+  <strong><%= @notice %></strong>
+<% end %>

data/app/views/alchemy/ingredients/_boolean_editor.html.erb

@@ -5,7 +5,7 @@
     <%= f.label :value, style: "display: inline-block", for: nil do %>
       <%= f.check_box :value, id: nil %>
       <%= render_ingredient_role(boolean_editor) %>
-      <%= render_hint_for(boolean_editor, size: "lg", fixed_width: false) %>
+      <%= render_hint_for(boolean_editor, size: "1x", fixed_width: false) %>
     <% end %>
   <% end %>
 <% end %>

data/app/views/alchemy/ingredients/_datetime_editor.html.erb

@@ -12,6 +12,6 @@
     ) %>
   <% end %>
   <label for="<%= datetime_editor.form_field_id %>" class="ingredient-date--label">
-    <i class="icon ri-calendar-line ri-fw"></i>
+    <%= render_icon "calendar" %>
   </label>
 <% end %>