diff --git a/app/models/alchemy/attachment.rb b/app/models/alchemy/attachment.rb
index c8a818126a..68fb43416a 100644
--- a/app/models/alchemy/attachment.rb
+++ b/app/models/alchemy/attachment.rb
@@ -138,29 +138,27 @@ def extension
def icon_css_class
case file_mime_type
when "application/pdf"
- "file-pdf"
- when "application/msword"
- "file-word"
+ "file-pdf-2"
when *TEXT_FILE_TYPES
- "file-alt"
+ "file-text"
when *EXCEL_FILE_TYPES
- "file-excel"
+ "file-excel-2"
when *POWERPOINT_FILE_TYPES
- "file-powerpoint"
+ "file-ppt-2"
when *WORD_FILE_TYPES
- "file-word"
+ "file-word-2"
when *VCARD_FILE_TYPES
- "address-card"
+ "profile"
when *ARCHIVE_FILE_TYPES
- "file-archive"
+ "file-zip"
when *AUDIO_FILE_TYPES
- "file-audio"
+ "file-music"
when *IMAGE_FILE_TYPES
"file-image"
when *VIDEO_FILE_TYPES
"file-video"
else
- "file"
+ "file-3"
end
end
diff --git a/app/views/alchemy/admin/attachments/_attachment.html.erb b/app/views/alchemy/admin/attachments/_attachment.html.erb
index 53064d629c..3386afd0e0 100644
--- a/app/views/alchemy/admin/attachments/_attachment.html.erb
+++ b/app/views/alchemy/admin/attachments/_attachment.html.erb
@@ -1,6 +1,6 @@
- <%= render_icon attachment.icon_css_class, style: 'regular', size: 'lg' %>
+ <%= render_icon attachment.icon_css_class %>
<% if can?(:show, attachment) %>
@@ -26,7 +26,7 @@
<% if can?(:show, attachment) %>
<%= link_to_dialog(
- render_icon('info-circle'),
+ render_icon(:information),
alchemy.admin_attachment_path(attachment),
{
title: attachment.name,
diff --git a/app/views/alchemy/admin/attachments/_replace_button.html.erb b/app/views/alchemy/admin/attachments/_replace_button.html.erb
index 05d0a3c5aa..e6b2794ad4 100644
--- a/app/views/alchemy/admin/attachments/_replace_button.html.erb
+++ b/app/views/alchemy/admin/attachments/_replace_button.html.erb
@@ -4,7 +4,7 @@
name: "#{f.object_name}[#{file_attribute}]",
id: "replace_#{dom_id(object)}" %>
<%= label_tag "replace_#{dom_id(object)}", title: Alchemy.t(:replace_file) do %>
- <%= render_icon :sync %>
+ <%= render_icon "file-upload" %>
<% end %>
<% end %>
diff --git a/app/views/alchemy/admin/attachments/show.html.erb b/app/views/alchemy/admin/attachments/show.html.erb
index 77e7a3f027..866c054d49 100644
--- a/app/views/alchemy/admin/attachments/show.html.erb
+++ b/app/views/alchemy/admin/attachments/show.html.erb
@@ -1,7 +1,7 @@
-<% case @attachment.icon_css_class %>
-<% when "file-image" %>
+<% case @attachment.file_mime_type %>
+<% when *Alchemy::Filetypes::IMAGE_FILE_TYPES %>
<%= image_tag(@attachment.url, class: "full_width") %>
-<% when "file-audio" %>
+<% when *Alchemy::Filetypes::AUDIO_FILE_TYPES %>
<%= audio_tag(@attachment.url, preload: "none", controls: true, class: "full_width") %>
-<% when "file-video" %>
+<% when *Alchemy::Filetypes::VIDEO_FILE_TYPES %>
<%= video_tag(@attachment.url, preload: "metadata", controls: true, class: "full_width") %>
-<% when "file-pdf" %>
+<% when "application/pdf" %>
diff --git a/app/views/alchemy/admin/clipboard/clear.js.erb b/app/views/alchemy/admin/clipboard/clear.js.erb
index 8e94bc8b83..0d4613dc88 100644
--- a/app/views/alchemy/admin/clipboard/clear.js.erb
+++ b/app/views/alchemy/admin/clipboard/clear.js.erb
@@ -1,3 +1,3 @@
$("#clipboard_items").replaceWith("<%= j render_message { Alchemy.t('No items in your clipboard') } -%>");
-$('#clipboard_button .icon').removeClass('fa-paste').addClass('fa-clipboard');
+$('#clipboard_button .icon').removeClass('ri-clipboard-fill').addClass('ri-clipboard-line');
Alchemy.pleaseWaitOverlay(false);
diff --git a/app/views/alchemy/admin/clipboard/insert.js.erb b/app/views/alchemy/admin/clipboard/insert.js.erb
index d68d8c98fc..13dfe9ae82 100644
--- a/app/views/alchemy/admin/clipboard/insert.js.erb
+++ b/app/views/alchemy/admin/clipboard/insert.js.erb
@@ -13,7 +13,7 @@
<% else -%>
Alchemy.growl('<%= j Alchemy.t("item copied to clipboard", name: @item.class.name == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>')
<% end -%>
-$('#clipboard_button .icon').removeClass('fa-clipboard').addClass('fa-paste');
+$('#clipboard_button .icon').removeClass('ri-clipboard-line').addClass('ri-clipboard-fill');
<%# Update add nested element forms for any elements that accept ONLY this as a nested element %>
<% if @item.class == Alchemy::Element %>
diff --git a/app/views/alchemy/admin/dashboard/_locked_pages.html.erb b/app/views/alchemy/admin/dashboard/_locked_pages.html.erb
index b65cd3f2b3..53ad7bfd85 100644
--- a/app/views/alchemy/admin/dashboard/_locked_pages.html.erb
+++ b/app/views/alchemy/admin/dashboard/_locked_pages.html.erb
@@ -39,7 +39,7 @@
<% if (current_alchemy_user.id == page.locked_by) || can?(:manage, Alchemy::Site.current) %>
<%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_url)) do %>
- <%= render_icon(:times, size: 'xs') %>
+ <%= render_icon(:close, size: '1x') %>
<% end %>
<% end %>
diff --git a/app/views/alchemy/admin/dashboard/index.html.erb b/app/views/alchemy/admin/dashboard/index.html.erb
index 7fdca1e35b..46f13a4fec 100644
--- a/app/views/alchemy/admin/dashboard/index.html.erb
+++ b/app/views/alchemy/admin/dashboard/index.html.erb
@@ -1,6 +1,6 @@
<%= content_for :toolbar do %>
<%= toolbar_button(
- icon: 'info-circle',
+ icon: 'information',
label: Alchemy.t(:info),
url: alchemy.dashboard_info_path,
title: Alchemy.t(:info),
diff --git a/app/views/alchemy/admin/dashboard/info.html.erb b/app/views/alchemy/admin/dashboard/info.html.erb
index a98f042611..60d8e3caf3 100644
--- a/app/views/alchemy/admin/dashboard/info.html.erb
+++ b/app/views/alchemy/admin/dashboard/info.html.erb
@@ -60,5 +60,8 @@
FontAwesome Icons
+
+ Remix Icon
+
<% end %>
diff --git a/app/views/alchemy/admin/elements/_element.html.erb b/app/views/alchemy/admin/elements/_element.html.erb
index 4dd15e93ea..3ded7286d2 100644
--- a/app/views/alchemy/admin/elements/_element.html.erb
+++ b/app/views/alchemy/admin/elements/_element.html.erb
@@ -40,7 +40,7 @@
<%= content_tag :details, class: "ingredient-group", id: "element_#{element.id}_ingredient_group_#{group.parameterize.underscore}", is: "alchemy-ingredient-group" do %>
<%= element.translated_group group %>
-
+
<%= render ingredients, element_form: f %>
<% end %>
diff --git a/app/views/alchemy/admin/elements/_header.html.erb b/app/views/alchemy/admin/elements/_header.html.erb
index 3eb7519a04..4f6dc80cfb 100644
--- a/app/views/alchemy/admin/elements/_header.html.erb
+++ b/app/views/alchemy/admin/elements/_header.html.erb
@@ -5,11 +5,7 @@
<% elsif element.deprecated? %>
<%= hint_with_tooltip element.deprecation_notice %>
<% else %>
- <% if element.public? %>
- <%= render_icon('window-maximize', style: 'regular', class: 'element') %>
- <% else %>
- <%= render_icon('window-close', class: 'element') %>
- <% end %>
+ <%= render_icon('draggable', style: nil, class: 'element') %>
<% end %>
@@ -23,6 +19,6 @@
title: Alchemy.t(element.folded? ? :show_element_content : :hide_element_content),
class: "element-toggle"
}) do %>
- <%= render_icon element.folded? ? 'plus-square' : 'minus-square' %>
+ <%= render_icon element.folded? ? 'arrow-left-s' : 'arrow-down-s' %>
<% end %>
diff --git a/app/views/alchemy/admin/elements/_toolbar.html.erb b/app/views/alchemy/admin/elements/_toolbar.html.erb
index 98df3a0f6a..1816c7b2d4 100644
--- a/app/views/alchemy/admin/elements/_toolbar.html.erb
+++ b/app/views/alchemy/admin/elements/_toolbar.html.erb
@@ -1,48 +1,46 @@
<% remarkable_type = "elements" %>
-
-
- <%= link_to(
- render_icon(:clone),
- alchemy.insert_admin_clipboard_path(remarkable_type: remarkable_type, remarkable_id: element.id),
- remote: true,
- method: :post,
- class: "icon_button"
- ) %>
- <%= Alchemy.t(:copy_element) %>
-
-
- <%= link_to(
- render_icon(:cut),
- alchemy.insert_admin_clipboard_path(remarkable_type: remarkable_type, remarkable_id: element.id, remove: true),
- remote: true,
- method: :post,
- class: "icon_button"
- ) %>
- <%= Alchemy.t(:cut_element) %>
-
-
- <%= link_to_confirm_dialog(
- render_icon('trash-alt'),
- Alchemy.t(:confirm_to_delete_element),
- alchemy.admin_element_path(element),
- class: "icon_button"
- ) -%>
- <%= Alchemy.t("Delete element") %>
-
-
- <%= link_to(
- render_icon(element.public? ? 'eye-slash' : 'eye'),
- alchemy.publish_admin_element_path(id: element.id),
- remote: true,
- method: :patch,
- class: "icon_button"
- ) %>
- <% if element.public? %>
- <%= Alchemy.t(:hide_element) %>
- <% else %>
- <%= Alchemy.t(:show_element) %>
- <% end %>
-
-
+
+ <%= link_to(
+ render_icon("file-copy"),
+ alchemy.insert_admin_clipboard_path(remarkable_type: remarkable_type, remarkable_id: element.id),
+ remote: true,
+ method: :post,
+ class: "icon_button"
+ ) %>
+ <%= Alchemy.t(:copy_element) %>
+
+
+ <%= link_to(
+ render_icon("scissors-cut"),
+ alchemy.insert_admin_clipboard_path(remarkable_type: remarkable_type, remarkable_id: element.id, remove: true),
+ remote: true,
+ method: :post,
+ class: "icon_button"
+ ) %>
+ <%= Alchemy.t(:cut_element) %>
+
+
+ <%= link_to_confirm_dialog(
+ render_icon('delete-bin-2'),
+ Alchemy.t(:confirm_to_delete_element),
+ alchemy.admin_element_path(element),
+ class: "icon_button"
+ ) -%>
+ <%= Alchemy.t("Delete element") %>
+
+
+ <%= link_to(
+ render_icon(element.public? ? 'eye-off' : 'eye'),
+ alchemy.publish_admin_element_path(id: element.id),
+ remote: true,
+ method: :patch,
+ class: "icon_button"
+ ) %>
+ <% if element.public? %>
+ <%= Alchemy.t(:hide_element) %>
+ <% else %>
+ <%= Alchemy.t(:show_element) %>
+ <% end %>
+
diff --git a/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb b/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb
index 8917817488..4eb42f5a50 100644
--- a/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb
+++ b/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb
@@ -4,14 +4,14 @@
<% if layoutpage.definition.blank? %>
<%= page_layout_missing_warning %>
<% else %>
-
+
<% end %>
-
-
- <%= page.status_title(:public) %>
-
-
-
- <%= page.status_title(:restricted) %>
-
+ <%= render "alchemy/admin/pages/page_infos", page: page %>
<% if can?(:info, page) %>
diff --git a/app/views/alchemy/admin/pages/_toolbar.html.erb b/app/views/alchemy/admin/pages/_toolbar.html.erb
index b3d4072300..88d996ce1e 100644
--- a/app/views/alchemy/admin/pages/_toolbar.html.erb
+++ b/app/views/alchemy/admin/pages/_toolbar.html.erb
@@ -2,7 +2,7 @@
<%= render "alchemy/admin/partials/site_select" %>
<%= render "alchemy/admin/partials/language_tree_select" %>
<%= toolbar_button(
- icon: :plus,
+ icon: "file-add",
url: alchemy.new_admin_page_path(language: @current_language),
hotkey: 'alt+n',
dialog_options: {
@@ -44,7 +44,7 @@
">
<%= link_to(
- render_icon(:stream),
+ render_icon(:"menu-2"),
alchemy.admin_pages_path(view: "tree"),
class: "icon_button"
) %>
@@ -52,7 +52,7 @@
diff --git a/app/views/alchemy/admin/uploader/_button.html.erb b/app/views/alchemy/admin/uploader/_button.html.erb
index 44c012c9ed..a9d040851e 100644
--- a/app/views/alchemy/admin/uploader/_button.html.erb
+++ b/app/views/alchemy/admin/uploader/_button.html.erb
@@ -5,7 +5,7 @@
<%= hidden_field_tag("#{f.object_name}[upload_hash]", Time.current.hash) if object.respond_to?(:upload_hash) %>
<%= f.label file_attribute, data: {alchemy_hotkey: 'alt+n'} do %>