spina 2.11.0 → 2.12.0

data/app/helpers/spina/admin/icons_helper.rb

@@ -7,6 +7,7 @@ module Spina::Admin
 	  end
 		
 		def heroicon(name, style: :outline, **options)
+			name = heroicons_naming_v1_to_v2(name)
 	    file = read_file(Spina::Engine.root.join("app/assets/icons/heroicons", style.to_s, "#{name}.svg"))
 	    return "" if file.nil?
 	    doc = Nokogiri::XML(file)
@@ -20,7 +21,136 @@ module Spina::Admin
 	    def read_file(path)
 	      return nil unless File.exist?(path)
 	      File.read(path)
-	    end  
+	    end
+			
+			def heroicons_naming_v1_to_v2(name)
+				lookup_table = {
+					"adjustments" => "adjustments-vertical",
+					"annotation" => "chat-bubble-bottom-center-text",
+					"archive" => "archive-box",
+					"arrow-circle-down" => "arrow-down-circle",
+					"arrow-circle-left" => "arrow-left-circle",
+					"arrow-circle-right" => "arrow-right-circle",
+					"arrow-circle-up" => "arrow-up-circle",
+					"arrow-narrow-down" => "arrow-long-down",
+					"arrow-narrow-left" => "arrow-long-left",
+					"arrow-narrow-right" => "arrow-long-right",
+					"arrow-narrow-up" => "arrow-long-up",
+					"arrow-sm-left" => nil,
+					"arrow-sm-right" => nil,
+					"arrow-sm-up" => nil,
+					"arrow-sm-down" => nil,
+					"arrows-expand" => "arrows-pointing-out",
+					"badge-check" => "check-badge",
+					"ban" => "no-symbol",
+					"bookmark-alt" => "bookmark-square",
+					"cash" => "banknotes",
+					"chart-square-bar" => "chart-bar-square",
+					"chat-alt-2" => "chat-bubble-left-right",
+					"chat-alt" => "chat-bubble-left-ellipsis",
+					"chat" => "chat-bubble-oval-left-ellipsis",
+					"chip" => "cpu-chip",
+					"clipboard-check" => "clipboard-document-check",
+					"clipboard-copy" => "clipboard-document",
+					"clipboard-list" => "clipboard-document-list",
+					"cloud-download" => "cloud-arrow-down",
+					"cloud-upload" => "cloud-arrow-up",
+					"code" => "code-bracket",
+					"collection" => "rectangle-stack",
+					"color-swatch" => "swatch",
+					"cube-transparent" => nil,
+					"currency-bangladeshi" => nil,
+					"cursor-click" => "cursor-arrow-rays",
+					"database" => "circle-stack",
+					"desktop-computer" => "computer-desktop",
+					"device-mobile" => "device-phone-mobile",
+					"document-add" => "document-plus",
+					"document-download" => "document-arrow-down",
+					"document-remove" => "document-minus",
+					"document-report" => "document-chart-bar",
+					"document-search" => "document-magnifying-glass",
+					"dots-circle-horizontal" => "ellipsis-horizontal-circle",
+					"dots-horizontal" => "ellipsis-horizontal",
+					"dots-vertical" => "ellipsis-vertical",
+					"download" => "arrow-down-tray",
+					"duplicate" => "square-2-stack",
+					"emoji-happy" => "face-smile",
+					"emoji-sad" => "face-frown",
+					"exclamation" => "exclamation",
+					"external-link" => "arrow-top-right-on-square",
+					"eye-off" => "eye-slash",
+					"fast-forward" => "forward",
+					"filter" => "funnel",
+					"folder-add" => "folder-plus",
+					"folder-download" => "folder-arrow-down",
+					"folder-remove" => "folder-minus",
+					"globe" => "globe-europe-africa",
+					"hand" => "hand-raised",
+					"inbox-in" => "inbox-arrow-down",
+					"library" => "building-library",
+					"lightning-bolt" => "bolt",
+					"location-marker" => "map-pin",
+					"login" => "arrow-left-on-rectangle",
+					"logout" => "arrow-right-on-rectangle",
+					"mail-open" => "envelope-open",
+					"mail" => "envelope",
+					"menu-alt-1" => "bars-3-center-left",
+					"menu-alt-2" => "bars-3-bottom-left",
+					"menu-alt-3" => "bars-3-bottom-right",
+					"menu-alt-4" => "bars-2",
+					"menu" => "bars-3",
+					"minus-sm" => nil,
+					"music-note" => "musical-note",
+					"office-building" => "building-office",
+					"pencil-alt" => "pencil-square",
+					"phone-incoming" => "phone-arrow-down-left",
+					"phone-missed-call" => "phone-x-mark",
+					"phone-outgoing" => "phone-arrow-up-right",
+					"photograph" => "photo",
+					"plus-sm" => nil,
+					"puzzle" => "puzzle-piece",
+					"qrcode" => "qr-code",
+					"receipt-tax" => "receipt-percent",
+					"refresh" => "arrow-path",
+					"reply" => "arrow-uturn-left",
+					"rewind" => "backward",
+					"save-as" => "arrow-down-on-square-stack",
+					"save" => "arrow-down-on-square",
+					"search-circle" => "magnifying-glass-circle",
+					"search" => "magnifying-glass",
+					"selector" => "chevron-up-down",
+					"sort-ascending" => "bars-arrow-up",
+					"sort-descending" => "bars-arrow-down",
+					"speakerphone" => "megaphone",
+					"status-offline" => "signal-slash",
+					"status-online" => "signal",
+					"support" => "lifebuoy",
+					"switch-horizontal" => "arrow-right-left",
+					"switch-vertical" => "arrow-up-down",
+					"table" => "table-cells",
+					"template" => "rectangle-group",
+					"terminal" => "command-line",
+					"thumb-down" => "hand-thumb-down",
+					"thumb-up" => "hand-thumb-up",
+					"translate" => "language",
+					"trending-down" => "arrow-trending-down",
+					"trending-up" => "arrow-trending-up",
+					"upload" => "arrow-up-tray",
+					"user-add" => "user-plus",
+					"user-remove" => nil,
+					"variable" => nil,
+					"view-boards" => "view-columns",
+					"view-grid-add" => "squares-plus",
+					"view-grid" => "squares-2x2",
+					"view-list" => "bars-4",
+					"volume-off" => "speaker-x-mark",
+					"volume-up" => "speaker-wave",
+					"x" => "x-mark",
+					"zoom-in" => "magnifying-glass-plus",
+					"zoom-out" => "magnifying-glass-minus"
+				}
+				lookup_table[name] || name
+			end
 
 	end
 end

data/app/helpers/spina/pages_helper.rb

@@ -28,7 +28,7 @@ module Spina
       Current.page
     end
 
-    def current_account
+    def current_spina_account
       Current.account
     end
 

data/app/views/spina/admin/accounts/edit.html.erb

@@ -1,9 +1,12 @@
-<%= form_with model: current_account, url: spina.admin_account_path do |f| %>
+<%= form_with model: current_spina_account, url: spina.admin_account_path do |f| %>
 
   <%= render Spina::UserInterface::HeaderComponent.new do |header| %>
     <% header.actions do %>
     
-      <%= button_tag t('spina.accounts.save'), type: :submit, class: 'btn btn-primary', data: {controller: "button hotkeys", hotkeys: "command+s, ctrl+s", hotkeys_target: "button", action: "button#loading", loading_message: t("spina.ui.saving")} %>
+      <%= button_tag type: :submit, class: 'btn btn-primary', data: {controller: "button hotkeys", hotkeys: "command+s, ctrl+s", hotkeys_target: "button", action: "button#loading", loading_message: t("spina.ui.saving")} do %>
+        <%= heroicon('check', style: :mini, class: 'w-5 h-5 -ml-1 mr-1') %>
+        <%= t('spina.accounts.save') %>
+      <% end %>
       
     <% end %>
   <% end %>

data/app/views/spina/admin/attachments/_attachment.html.erb

@@ -9,18 +9,18 @@
           <%= f.file_field :file, id: "attachment_#{attachment.id}_file_field", class: 'hidden', data: {action: "loading-button#loading form#requestSubmit"} %>
           
           <button type="button" class="btn btn-default h-7 px-2 mr-2 text-xs" data-controller="delegate-click" data-action="delegate-click#click" data-loading-button-target="button" data-delegate-click-target="#attachment_<%= attachment.id %>_file_field">
-            <%= heroicon("upload", style: :solid, class: "w-4 h-4 mr-1 text-gray-600") %>
+            <%= heroicon("arrow-path", style: :mini, class: "w-4 h-4 mr-1 text-gray-600") %>
             <%=t 'spina.ui.replace' %>
           </button>
         <% end %>
         
         <%= link_to spina.edit_admin_attachment_path(attachment), class: "btn btn-default h-7 px-2 mr-2 text-xs" do %>
-          <%= heroicon('pencil', style: :solid, class: 'w-4 h-4 mr-1 text-gray-600') %>
+          <%= heroicon('pencil', style: :solid, class: 'w-3 h-3 mr-1 text-gray-600') %>
           <%=t 'spina.ui.rename' %>
         <% end %>
         
         <%= link_to file_url(attachment.file), class: "btn btn-default h-7 px-2 mr-2 text-xs" do %>
-          <%= heroicon('download', style: :solid, class: 'w-4 h-4 mr-1 text-gray-600') %>
+          <%= heroicon('download', style: :mini, class: 'w-4 h-4 mr-1 text-gray-600') %>
           <%=t 'spina.attachments.download' %>
         <% end %>
       </div>

data/app/views/spina/admin/attachments/edit.html.erb

@@ -9,7 +9,7 @@
       </div>
       
       <button type="submit" class="btn btn-default px-2">
-        <%= heroicon("check", style: :solid, class: "w-5 h-5") %>
+        <%= heroicon("check-circle", style: :mini, class: "w-6 h-6") %>
       </button>
     </div>
   <% end %>

data/app/views/spina/admin/embeds/new.html.erb

@@ -33,7 +33,7 @@
               
               <div class="w-full flex backdrop-filter backdrop-blur-lg absolute bottom-0 justify-end p-5 py-4 border-t border-gray-200">
                 <%= button_tag type: :submit, class: 'btn btn-primary' do %>
-                  <%= heroicon('plus', style: :solid, class: 'w-6 h-6 -ml-2') %>
+                  <%= heroicon('plus', style: :mini, class: 'w-4 h-4 -ml-1 mr-1') %>
                   <%=t "spina.embeds.embed_component" %>
                 <% end %>
               </div>

data/app/views/spina/admin/images/_image.html.erb

@@ -15,20 +15,20 @@
           <%= f.file_field :file, accept: "image/*", id: "image_#{image.id}_file_field", class: 'hidden', data: {action: "loading-button#loading form#requestSubmit"} %>
           
           <button type="button" class="btn btn-default h-7 px-2 mr-2 text-xs" data-controller="delegate-click" data-action="delegate-click#click" data-loading-button-target="button" data-delegate-click-target="#image_<%= image.id %>_file_field">
-            <%= heroicon("upload", style: :solid, class: "w-4 h-4 mr-1 text-gray-600") %>
+            <%= heroicon("arrow-path", style: :mini, class: "w-4 h-4 mr-1 text-gray-600") %>
             <%=t 'spina.ui.replace' %>
           </button>
         <% end %>
         
         <%= link_to spina.edit_admin_image_path(image), class: "btn btn-default h-7 px-2 mr-2 text-xs" do %>
-          <%= heroicon('pencil', style: :solid, class: 'w-4 h-4 mr-1 text-gray-600') %>
+          <%= heroicon('pencil', style: :solid, class: 'w-3 h-3 mr-1 text-gray-600') %>
           <%=t 'spina.ui.rename' %>
         <% end %>
         
         <% if @media_folders.present? %>
           <%= render Spina::UserInterface::DropdownComponent.new do |dropdown| %>
             <% dropdown.button(classes: 'btn btn-default h-7 px-2 text-xs') do %>
-              <%= heroicon('folder', style: :solid, class: 'w-4 h-4 mr-1 text-gray-600') %>
+              <%= heroicon('folder', style: :mini, class: 'w-4 h-4 mr-1 text-gray-600') %>
               <%=t 'spina.ui.move_to' %>
               <%= heroicon('chevron-down', style: :solid, class: 'w-4 h-4') %>
             <% end %>

data/app/views/spina/admin/images/edit.html.erb

@@ -9,7 +9,7 @@
       </div>
       
       <button type="submit" class="btn btn-default px-2">
-        <%= heroicon("check", style: :solid, class: "w-5 h-5") %>
+        <%= heroicon("check-circle", style: :mini, class: "w-6 h-6") %>
       </button>
     </div>
   <% end %>

data/app/views/spina/admin/layout/edit.html.erb

@@ -4,7 +4,7 @@
   
     <% if Spina::Current.theme.layout_parts.any? %>
       <%= button_tag type: :submit, form: dom_id(@account), class: 'btn btn-primary', data: {controller: "button hotkeys", hotkeys: "command+s, ctrl+s", hotkeys_target: "button", action: "button#loading", loading_message: t('spina.ui.saving')} do %>
-        <%= heroicon('check', style: :solid, class: 'w-5 h-5 mr-1 -ml-2') %>
+        <%= heroicon('check', style: :mini, class: 'w-5 h-5 -ml-1 mr-1') %>
         <%=t 'spina.layout.save' %>
       <% end %>
     <% end %>

data/app/views/spina/admin/media_folders/_media_folder.html.erb

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag dom_id(media_folder) do %>
   <div class="flex items-center h-12 hover:bg-white border-b border-gray-200 px-8">
     <%= link_to spina.admin_media_folder_images_path(media_folder), class: 'flex h-full items-center flex-1', target: "_top" do %>
-      <div class="w-8 mr-4 flex justify-center"><%= heroicon("folder", style: :solid, class: "w-7 h-7 text-spina") %></div>
+      <div class="w-8 mr-4 flex justify-center"><%= heroicon("folder", style: :solid, class: "w-6 h-6 text-spina") %></div>
       <div class="font-medium text-spina flex-1 text-sm">
         <%= media_folder.name %>
       </div>

data/app/views/spina/admin/navigation_items/_navigation_item.html.erb

@@ -14,7 +14,7 @@
       <div hidden data-reveal data-transition class="origin-top-right absolute left-0 z-10 mt-1 w-48 rounded-md shadow-lg">
         <div class="rounded-md bg-gray-700 shadow-xs py-1">
           <%= link_to spina.new_admin_navigation_navigation_item_path(@navigation, parent_id: navigation_item.id), class: "px-3 py-1 text-xs leading-5 text-gray-200 hover:bg-gray-800 hover:text-white focus:outline-none flex items-center", data: {turbo_frame: "modal", action: "reveal#hide"} do %>
-            <%= heroicon('plus', style: :outline, class: 'w-4 h-4 mr-2') %>
+            <%= heroicon('plus', style: :mini, class: 'w-4 h-4 mr-2') %>
             <%=t 'spina.navigations.add_sub_item' %>
           <% end %>
           

data/app/views/spina/admin/navigations/edit.html.erb

@@ -4,7 +4,7 @@
       <ul class="inline-flex flex-wrap w-auto rounded-md bg-white">
         <% @navigations.each do |navigation| %>
           <%= render Spina::UserInterface::TabLinkComponent.new(spina.edit_admin_navigation_path(navigation), active: @navigation == navigation) do %>
-            <%= heroicon('menu-alt-2', style: :solid, class: 'w-3 h-3 mr-1') %>
+            <%= heroicon('bars-3-bottom-left', style: :solid, class: 'w-4 h-4 mr-1') %>
             <%= navigation.label %>
           <% end %>
         <% end %>
@@ -23,8 +23,7 @@
       <%= render @navigation.navigation_items.sorted.roots %>
     </ul>
     
-    <%= link_to spina.new_admin_navigation_navigation_item_path(@navigation), class: 'btn btn-default w-56 mt-2 bg-transparent', data: {turbo_frame: "modal"} do %>
-      <%= heroicon('plus', style: :solid, class: "w-6 h-6 -ml-1 mr-1 text-gray-400") %>
+    <%= link_to spina.new_admin_navigation_navigation_item_path(@navigation), class: 'btn btn-default w-56 text-center mt-2 bg-transparent', data: {turbo_frame: "modal"} do %>
       <div class="w-full"><%=t 'spina.navigations.add_menu_item' %></div>
     <% end %>
   <% end %>

data/app/views/spina/admin/pages/_button_advanced.html.erb

@@ -1,4 +1,4 @@
 <%= render Spina::Pages::TabButtonComponent.new(tab_name: 'advanced') do %>
-  <%= heroicon('cog', style: :solid, class: 'w-4 h-4 mr-1 -ml-1 opacity-75') %>
+  <%= heroicon('cog-8-tooth', style: :solid, class: 'w-4 h-4 mr-1 -ml-1 opacity-75') %>
   <%= t("spina.pages.advanced") %>
 <% end %>

data/app/views/spina/admin/pages/_button_search_engines.html.erb

@@ -1,5 +1,5 @@
 <%= render Spina::Pages::TabButtonComponent.new(tab_name: 'search_engines') do %>
-  <%= heroicon('search', style: :solid, class: 'w-4 h-4 mr-1 -ml-1 opacity-75') %>
+  <%= heroicon('search', style: :mini, class: 'w-4 h-4 mr-1 -ml-1 opacity-75') %>
   <span class="hidden md:inline"><%= t("spina.pages.search_engines") %></span>
   <span class="md:hidden">SEO</span>
 <% end %>

data/app/views/spina/admin/pages/_form.html.erb

@@ -5,7 +5,7 @@
         <span class="text-gray-400 ml-2 text-sm">(<%= Spina::Page.human_attribute_name(:draft) %>)</span>
       <% end %>
       <%= link_to @page.materialized_path(locale: @locale), class: 'px-3 py-2 flex items-center text-gray-400 hover:text-gray-700', target: :blank, data: {turbo: false} do %>
-        <%= heroicon("external-link", style: :solid, class: "w-4 h-4") %>
+        <%= heroicon("external-link", style: :mini, class: "w-4 h-4") %>
       <% end %>
     <% end %>
     <% header.actions do %>

data/app/views/spina/admin/pages/index.html.erb

@@ -2,7 +2,7 @@
   <% header.actions do %>
     <% if @resource %>
       <%= link_to spina.edit_admin_resource_path(@resource), class: 'btn btn-default' do %>
-        <%= heroicon('cog', style: :solid, class: 'text-gray-300 w-5 h-5 -ml-1 mr-1') %>
+        <%= heroicon('cog-8-tooth', style: :solid, class: 'text-gray-300 w-5 h-5 -ml-1 mr-1') %>
         <%=t 'spina.resources.settings', label: @resource.label %>
       <% end %>
     <% end %>
@@ -36,7 +36,7 @@
 <% if @pages.any? %>
   
   <div class="my-6 md:m-8 bg-white md:rounded-lg border-l-0 border-r-0 border md:border-r md:border-l border-gray-200 border-b-0 shadow-sm">
-    <%= render Spina::Pages::ListComponent.new(pages: @pages, sortable: @resource.nil? || @resource&.order_by&.blank?) %>
+    <%= render Spina::Pages::ListComponent.new(pages: @pages, sortable: @resource.nil? || @resource&.order_by.blank?) %>
   </div>
   
 <% else %>

data/app/views/spina/admin/pages/sort_one.turbo_stream.erb

@@ -0,0 +1,9 @@
+<%= turbo_stream.replace @bottom_page do %>
+  <%= render Spina::Pages::PageComponent.new(page: @top_page, draggable: false) %>
+<% end %>
+
+<%= turbo_stream.replace @top_page do %>
+  <%= render Spina::Pages::PageComponent.new(page: @bottom_page, draggable: false) %>
+<% end %>
+
+<%= turbo_stream.update("flash", partial: "spina/admin/shared/flash") %>

data/app/views/spina/admin/parts/repeaters/_form.html.erb

@@ -23,7 +23,7 @@
         </div>
 
         <button type="button" class="text-gray-400 pl-2 hover:text-gray-900 rounded-md truncate text-sm font-medium flex items-center w-full h-10" data-action="repeater#addFields" data-fields="<%= fields %>" data-child-index="<%= repeater_content.object_id %>">
-          <%= heroicon('plus', style: :solid, class: "w-6 h-6 mr-1") %>
+          <%= heroicon('plus', style: :mini, class: "w-4 h-4 mr-2 ml-1") %>
           <%=t 'spina.ui.new_entry' %>
         </button>
       </div>

data/app/views/spina/admin/resources/edit.html.erb

@@ -3,7 +3,6 @@
     <%= render Spina::UserInterface::TranslationsComponent.new(@resource, label: @locale.upcase) %>
   
     <%= button_tag type: :submit, form: dom_id(@resource), class: 'btn btn-primary', data: {controller: "button", action: "button#loading", loading_message: t('spina.ui.saving')} do %>
-      <%= heroicon('check', style: :solid, class: 'w-5 h-5 mr-1 -ml-2') %>
       <%=t 'spina.ui.save_changes' %>
     <% end %>
   <% end %>

data/app/views/spina/admin/shared/_navigation.html.erb

@@ -30,7 +30,7 @@
 
       <%= render Spina::MainNavigation::SubNavComponent.new(:settings) do |nav| %>
         <% nav.icon do %>
-          <%= heroicon('cog', style: :solid, class: 'w-8 h-8 text-white md:mr-3') %>
+          <%= heroicon('cog-8-tooth', style: :solid, class: 'w-8 h-8 text-white md:mr-3') %>
           
           <div class="text-white font-semibold hidden md:block transform -translate-x-2 ease-in-out duration-300 absolute md:relative opacity-0 transition-all" data-navigation-target="label">
             <%= t('spina.website.settings') %>

data/app/views/spina/admin/theme/edit.html.erb

@@ -3,7 +3,10 @@
   <%= render Spina::UserInterface::HeaderComponent.new do |header| %>
     <% header.actions do %>
       
-      <%= button_tag t('spina.theme.save'), type: :submit, class: 'btn btn-primary', data: {controller: "button hotkeys", hotkeys: "command+s, ctrl+s", hotkeys_target: "button", action: "button#loading", loading_message: t("spina.ui.saving")} %>
+      <%= button_tag type: :submit, class: 'btn btn-primary', data: {controller: "button hotkeys", hotkeys: "command+s, ctrl+s", hotkeys_target: "button", action: "button#loading", loading_message: t("spina.ui.saving")} do %>
+        <%= heroicon('check', style: :mini, class: 'w-5 h-5 -ml-1 mr-1') %>
+        <%= t('spina.theme.save') %>
+      <% end %>
       
     <% end %>
   <% end %>

data/app/views/spina/admin/users/_form.html.erb

@@ -1,7 +1,7 @@
 <%= render Spina::UserInterface::HeaderComponent.new do |header| %>
   <% header.actions do %>
     <%= button_tag type: :submit, form: dom_id(@user), class: 'btn btn-primary', data: {controller: "button hotkeys", hotkeys: "command+s, ctrl+s", hotkeys_target: "button", action: "button#loading", loading_message: t('spina.ui.saving')} do %>
-      <%= heroicon('check', style: :solid, class: 'w-5 h-5 mr-1 -ml-2') %>
+      <%= heroicon('check', style: :mini, class: 'w-5 h-5 -ml-1 mr-1') %>
       <%=t 'spina.users.save' %>
     <% end %>
   <% end %>

data/app/views/spina/admin/users/_user.html.erb

@@ -9,7 +9,7 @@
   </div>
   
   <% if user.admin? %>
-    <div class="flex items-center text-green-500">
+    <div class="flex items-center text-emerald-500">
       <%= heroicon("badge-check", style: :solid, class: "w-6 h-6 mr-1") %>
       <span class="text-sm font-medium"><%= Spina::User.human_attribute_name(:admin) %></span>
     </div>

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

@@ -2,7 +2,7 @@
   <% header.after_breadcrumbs do %>
     <% if current_spina_user.admin? %>
       <%= link_to spina.new_admin_user_path, class: 'btn btn-default h-8 px-2 ml-3' do %>
-        <%= heroicon('plus', style: :solid, class: 'w-6 h-6') %>
+        <%= heroicon('plus', style: :mini, class: 'w-4 h-4') %>
       <% end %>
     <% end %>
   <% end %>

data/config/routes.rb

@@ -52,6 +52,7 @@ Spina::Engine.routes.draw do
       resource :move, controller: "move_pages"
 
       post :sort, on: :collection
+      post :sort_one, on: :member
     end
     resources :page_translations, only: [:destroy]
     resources :parent_pages

data/lib/generators/spina/templates/app/views/demo/pages/demo.html.erb

@@ -9,9 +9,9 @@
   <%= content.image_tag :image, resize_to_fill: [100, 100] %>
 <% end %>
 
-<%= current_account.content :line %>
+<%= current_spina_account.content :line %>
 
-<% repeater current_account.content(:repeater) do |repeater_content| %>
+<% repeater current_spina_account.content(:repeater) do |repeater_content| %>
   <%= repeater_content.content :line %>
 <% end %>
 

data/lib/generators/spina/templates/app/views/layouts/default/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= current_account.name %></title>
+    <title><%= current_spina_account.name %></title>
     <%= csrf_meta_tags %>
   </head>
   <body>

data/lib/generators/spina/templates/app/views/layouts/demo/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= current_account.name %></title>
+    <title><%= current_spina_account.name %></title>
     <%= csrf_meta_tags %>
   </head>
   <body>

data/lib/generators/spina/templates/config/initializers/spina.rb

@@ -9,6 +9,12 @@ Spina.configure do |config|
   # ===============
   # Specify a backend path. Defaults to /admin.
   # config.backend_path = 'admin'
+
+  # Deprecated current account method
+  # ===============
+  # Uncomment the config below to disable 'current_account'.
+  # Use this if you are having a namespace conflict with the deprecated 'current_account' method.
+  # config.disable_current_account = true
   
   # Frontend routes
   # ===============
@@ -66,9 +72,9 @@ Spina.configure do |config|
 
   # Pages Options
   # ===============
-
-  # Note that you might need to remove cached asset after changing this value
-  # config.max_page_depth = 5
+  # The limit value for resource page pagination in the admin panel. Above this limit,
+  # drag and drop sorting will be replaced by simple buttons.
+  # config.resource_pages_limit_value = 25
 
   # Transliterations
   # ===============

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "2.11.0"
+  VERSION = "2.12.0"
 end

data/lib/spina.rb

@@ -27,10 +27,12 @@ module Spina
                   :frontend_parent_controller,
                   :disable_frontend_routes,
                   :disable_decorator_load,
+                  :disable_current_account,
                   :locales,
                   :embedded_image_size,
                   :mailer_defaults,
                   :thumbnail_image_size,
+                  :resource_pages_limit_value,
                   :party_pooper,
                   :tailwind_content,
                   :tailwind_plugins,
@@ -44,11 +46,13 @@ module Spina
   self.backend_path = 'admin'
   self.disable_frontend_routes = false
   self.disable_decorator_load = false
+  self.disable_current_account = false
   self.embedded_image_size = [2000, 2000]
   self.mailer_defaults = ActiveSupport::OrderedOptions.new
   self.thumbnail_image_size = [400, 400]
   self.frontend_parent_controller = "ApplicationController"
   self.locales = [I18n.default_locale]
+  self.resource_pages_limit_value = 25
   self.party_pooper = false
   self.transliterations = %i(latin)