spina 2.11.0 → 2.13.0

data/app/presenters/spina/rich_text_presenter.rb

@@ -1,45 +1,44 @@
 module Spina
   class RichTextPresenter
     attr_reader :html, :view_context
-    
+
     EMBED_CONTENT_TYPE = "application/vnd+spina.embed+html"
-    
+
     def initialize(view_context, html)
       @view_context = view_context || Spina::Current.page&.view_context
       @html = html
     end
-    
+
     def to_s
       ActiveSupport::SafeBuffer.new(render_embeds(html))
     end
-    
+
     private
-    
-      def embed_selector
-        "figure[data-trix-content-type=\"#{EMBED_CONTENT_TYPE}\"]"
-      end
-    
-      def render_embeds(html)
-        doc = Nokogiri::HTML.fragment(html)
-        doc.css(embed_selector).each do |node|
-          node.replace render_embed(node.first_element_child)
-        end
-        doc.to_s
-      end
-      
-      def render_embed(element)
-        embeddable = element_to_embeddable(element)
-        view_context.render(embeddable)
-      end
-      
-      def element_to_embeddable(element)
-        embeddable = Spina::Embeds.constantize(element["data-embed-type"])
-        embeddable&.from_json(element["data-embed-attributes"]) || null_object
-      end
-      
-      def null_object
-        {inline: ""}
+
+    def embed_selector
+      "figure[data-trix-content-type=\"#{EMBED_CONTENT_TYPE}\"]"
+    end
+
+    def render_embeds(html)
+      doc = Nokogiri::HTML.fragment(html)
+      doc.css(embed_selector).each do |node|
+        node.replace render_embed(node.first_element_child)
       end
+      doc.to_s
+    end
+
+    def render_embed(element)
+      embeddable = element_to_embeddable(element)
+      view_context.render(embeddable)
+    end
+
+    def element_to_embeddable(element)
+      embeddable = Spina::Embeds.constantize(element["data-embed-type"])
+      embeddable&.from_json(element["data-embed-attributes"]) || null_object
+    end
 
+    def null_object
+      {inline: ""}
+    end
   end
 end

data/app/serializers/spina/api/base_serializer.rb

@@ -3,4 +3,4 @@ module Spina::Api
     include JSONAPI::Serializer
     singleton_class.include Spina::Engine.routes.url_helpers
   end
-end
+end

data/app/serializers/spina/api/image_serializer.rb

@@ -1,20 +1,20 @@
 module Spina::Api
-  class ImageSerializer < BaseSerializer    
+  class ImageSerializer < BaseSerializer
     set_type :image
-    
+
     attributes :id
-    
+
     attribute :original_url do |image, params|
       params[:view_context].main_app.url_for(image.file)
     end
-    
+
     attribute :thumbnail_url do |image, params|
       params[:view_context].main_app.url_for(image.variant(resize_to_fill: Spina.config.thumbnail_image_size))
     end
-    
+
     attribute :embedded_image_size_url do |image, params|
       resize_key = Spina.config.embedded_image_size.is_a?(Array) ? :resize_to_limit : :resize
-      params[:view_context].main_app.url_for(image.variant(Hash[resize_key, Spina.config.embedded_image_size]))
+      params[:view_context].main_app.url_for(image.variant({resize_key => Spina.config.embedded_image_size}))
     end
   end
 end

data/app/serializers/spina/api/navigation_serializer.rb

@@ -1,15 +1,14 @@
 module Spina::Api
-  class NavigationSerializer < BaseSerializer    
+  class NavigationSerializer < BaseSerializer
     set_type :navigation
-    
+
     attributes :name, :label
-    
+
     attribute :tree do |navigation|
       items_to_tree(navigation.navigation_items.sorted.roots.in_menu.live.joins(:page))
     end
-    
+
     class << self
-      
       def items_to_tree(collection)
         collection.map do |item|
           {
@@ -23,8 +22,6 @@ module Spina::Api
           }
         end
       end
-      
     end
-    
   end
 end

data/app/serializers/spina/api/page_serializer.rb

@@ -1,28 +1,25 @@
 module Spina::Api
-  class PageSerializer < BaseSerializer    
+  class PageSerializer < BaseSerializer
     set_type :page
-    
+
     attributes :title, :seo_title, :menu_title, :materialized_path, :name, :description, :view_template
-    
+
     attribute(:content) { |page| page_content(page) }
-    
+
     belongs_to :resource
 
     class << self
-      
       def page_content(page)
         return [] unless view_template(page)
-        
-        view_template(page)[:parts].map do |part| 
-          { part => page.content(part) }
+
+        view_template(page)[:parts].map do |part|
+          {part => page.content(part)}
         end
       end
-      
+
       def view_template(page)
-        Spina::Current.theme.view_templates.find{|view_template| view_template[:name] == page.view_template}
+        Spina::Current.theme.view_templates.find { |view_template| view_template[:name] == page.view_template }
       end
-      
     end
-    
   end
 end

data/app/serializers/spina/api/resource_serializer.rb

@@ -1,12 +1,12 @@
 module Spina::Api
   class ResourceSerializer < BaseSerializer
     set_type :resource
-    
+
     attributes :name, :label, :view_template, :order_by, :slug
-    
+
     has_many :pages, lazy_load_data: true, links: {
-      self: -> (object) { api_resource_path(object.id) },
-      related: -> (object) { api_resource_pages_path(object.id) }
-    }, meta: -> (resource) { {count: resource.pages.live.length} }
+      self: ->(object) { api_resource_path(object.id) },
+      related: ->(object) { api_resource_pages_path(object.id) }
+    }, meta: ->(resource) { {count: resource.pages.live.length} }
   end
 end

data/app/views/layouts/spina/admin/application.html.erb

@@ -22,6 +22,7 @@
   </head>
 
   <body>
+    <%= render "spina/admin/shared/version" %>
     <%= content_for?(:body) ? yield(:body) : yield %>
   </body>
 </html>

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/attachments/_attachment.html.erb

@@ -0,0 +1,3 @@
+<option value="<%= attachment.id %>" signed-blob-id="<%= attachment.file&.blob&.signed_id %>" filename="<%= attachment.file&.filename %>" selected>
+  <%= attachment.file&.filename %>
+</option>

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

@@ -5,5 +5,26 @@
   <%= f.hidden_field :signed_blob_id, data: {attachment_picker_target: 'signedBlobId'} %>
   <%= f.hidden_field :filename, data: {attachment_picker_target: 'filename'} %>
 
-  <%= f.select :attachment_id, Spina::Attachment.sorted.map{|attachment| [attachment.file&.filename, attachment.id, data: {signed_blob_id: attachment.file&.blob&.signed_id, filename: attachment.file&.filename}]}, {include_blank: t("spina.attachments.choose_attachment")}, {class: "form-select mt-1", data: {action: "attachment-picker#pick"}} %>
+  <div class="flex items-center space-x-3 mt-1">
+    <% select_id = dom_id(f.object, f.object.object_id) %>
+    
+    <%= f.select :attachment_id, Spina::Attachment.sorted.map{|attachment| [attachment.file&.filename, attachment.id, data: {signed_blob_id: attachment.file&.blob&.signed_id, filename: attachment.file&.filename}]}, {include_blank: t("spina.attachments.choose_attachment")}, {id: select_id, class: "form-select", data: {action: "attachment-picker#pick"}} %>
+    
+    <div class="text-gray-400 font-medium text-sm">
+      <%=t 'spina.ui.or' %>
+    </div>
+    
+    <%= form_with model: [:admin, Spina::Attachment.new], url: spina.inline_upload_admin_attachments_path, data: {controller: "form loading-button", loading_message: t('spina.media_library.uploading'), action: "turbo:submit-end->loading-button#doneLoading"} do |f| %>
+      <%= hidden_field_tag :select_id, select_id %>
+      <% file_field_id = "file_#{f.object.object_id}" %>
+      
+      <%= f.file_field :file, id: file_field_id, class: 'hidden', data: {action: "loading-button#loading form#requestSubmit"} %>
+      
+      <button type="button" class="btn btn-default" data-controller="delegate-click" data-action="delegate-click#click" data-loading-button-target="button" data-delegate-click-target="#<%= file_field_id %>">
+        <%= heroicon("upload", style: :solid, class: "w-4 h-4 -ml-1 mr-1") %>
+        <%=t 'spina.attachments.upload_one' %>
+      </button>
+    <% end %>
+
+  </div>
 </div>

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

@@ -13,6 +13,6 @@
   <% end %>
 
   <div class="text-right">
-    <%= button_tag t('spina.ui.delete'), type: :button, class: 'btn btn-default bg-transparent hover:bg-white hover:text-red-500 h-8 px-3 inline-block mt-3', data: {action: "repeater#removeFields", id: "pane_#{f.object.object_id}"} %>
+    <%= button_tag t('spina.ui.delete_item', item: item_name), type: :button, class: 'btn btn-default bg-transparent hover:bg-white hover:text-red-500 h-8 px-3 inline-block mt-3', data: {action: "repeater#removeFields", id: "pane_#{f.object.object_id}"} %>
   </div>
-</div>
+</div>

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

@@ -4,11 +4,11 @@
 
   <div class="-mt-4 flex flex-col md:flex-row" data-controller="tabs" data-tabs-active="bg-spina-dark bg-opacity-10 text-gray-900" data-tabs-inactive="text-gray-500">
     <div class="md:w-64 md:pr-6">
-      <% 
+      <%
         # Fields
         repeater_content = Spina::Parts::RepeaterContent.new(name: f.object.name, title: f.object.title)
         fields = f.fields_for(:content, [repeater_content], child_index: repeater_content.object_id) do |builder|
-          render("spina/admin/parts/repeaters/fields", f: builder)
+          render("spina/admin/parts/repeaters/fields", f: builder, item_name: f.object.item_name)
         end.gsub("\n", "")
       %>
 
@@ -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>
@@ -31,8 +31,8 @@
 
     <div class="flex-1 pl-6 md:pl-0" data-repeater-target="content">
       <%= f.fields_for :content do |ff| %>
-        <%= render 'spina/admin/parts/repeaters/fields', f: ff %>
+        <%= render 'spina/admin/parts/repeaters/fields', f: ff, item_name: f.object.item_name %>
       <% end %>
     </div>
   </div>
-</div>
+</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') %>
@@ -61,7 +61,9 @@
       <ul class="md:block">
         <li>
           <%= link_to logout_path, class: 'p-3 w-14 block flex justify-center opacity-50 hover:opacity-100 transition duration-200 ease', data: {turbo: false} do %>
-            <%= heroicon('logout', style: :solid, class: 'h-8 w-8 text-white') %>
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="currentColor" class="h-7 w-7 text-white">
+              <path fill-rule="evenodd" d="M128,256 C93.81,256 61.666,242.686 37.49,218.509 C13.315,194.334 0,162.19 0,128 C0,93.81 13.315,61.668 37.49,37.491 C43.739,31.242 53.869,31.242 60.118,37.491 C66.367,43.739 66.367,53.87 60.118,60.118 C41.985,78.25 32,102.357 32,128 C32,153.643 41.985,177.75 60.118,195.882 C78.25,214.014 102.357,224 128,224 C153.643,224 177.75,214.014 195.882,195.882 C214.015,177.75 224,153.643 224,128 C224,102.357 214.015,78.25 195.882,60.118 C189.633,53.87 189.633,43.739 195.882,37.491 C202.13,31.243 212.261,31.243 218.51,37.491 C242.686,61.668 256,93.809 256,128 C256,162.191 242.685,194.334 218.51,218.509 C194.334,242.686 162.19,256 128,256 L128,256 L128,256 Z M128,144 C136.837,144 144,136.837 144,128 L144,16 C144,7.163 136.837,0 128,0 C119.163,0 112,7.163 112,16 L112,128 C112,136.837 119.163,144 128,144 L128,144 L128,144 Z" clip-rule="evenodd" />
+            </svg>
           <% end %>
         </li>
       </ul>

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

@@ -0,0 +1,18 @@
+<% unless defined?(Spina::Pro) %>
+  <%= link_to "https://spinacms.com/pro", class: "fixed bottom-0 right-0 px-5 py-4 group text-gray-400 text-xs font-medium", target: :blank do %>
+    <div class="flex items-center justify-end">
+      <svg viewBox="0 0 100 100" class="h-3 w-3 mr-1 text-gray-400 group-hover:text-spina" xmlns="http://www.w3.org/2000/svg" fill="currentColor">
+        <path d="M48.6582924,96.1623174 L0.472662785,39.1647593 C-0.121452015,38.4619959 -0.159345587,37.4445295 0.380849751,36.699521 L20.3780861,9.12040239 C20.6765111,8.70883071 21.1204689,8.42634978 21.6197077,8.33038495 L49.1629705,3.03595601 C49.3934881,2.99164538 49.6300066,2.9882617 49.8616974,3.02595987 L78.3181435,7.65607741 C78.8410521,7.74115931 79.30884,8.0302376 79.6188319,8.45986224 L99.9955684,36.7004267 C100.533013,37.4452826 100.494021,38.460456 99.9010274,39.1618937 L51.7129756,96.1623174 C50.999859,97.0058449 49.7379497,97.1115638 48.8944223,96.3984473 C48.8092674,96.3264575 48.7302822,96.2474723 48.6582924,96.1623174 Z"></path>
+      </svg>
+      
+      Spina CMS v<%= Spina::VERSION %>
+    </div>
+    
+    <div class="mt-1">
+      Upgrade to Spina 
+      <span class="bg-gray-400 group-hover:bg-pink-500 text-white rounded px-1 py-0.5 uppercase tracking-wider" style="font-size: 10px">
+        Pro
+      </span>
+    </div>
+  <% end %>
+<% end %>

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/app/views/spina/sitemaps/show.xml.builder

@@ -19,4 +19,4 @@ xml.urlset "xmlns" => "http://www.google.com/schemas/sitemap/0.9", "xmlns:xhtml"
       xml.priority 0.9
     end
   end
-end
+end

data/config/initializers/importmap.rb

@@ -3,10 +3,10 @@ Spina.config.importmap.draw do
   pin "@hotwired/stimulus", to: "stimulus.js"
   pin "@hotwired/stimulus-loading", to: "stimulus-loading.js"
   pin "@hotwired/turbo-rails", to: "turbo.js"
-  
+
   # Spina entrypoint
   pin "application", to: "spina/application.js"
-  
+
   pin_all_from Spina::Engine.root.join("app/assets/javascripts/spina/controllers"), under: "controllers", to: "spina/controllers"
   pin_all_from Spina::Engine.root.join("app/assets/javascripts/spina/libraries"), under: "libraries", to: "spina/libraries"
-end
+end

data/config/initializers/yaml_column_permitted_classes.rb

@@ -1,12 +1,12 @@
 # CVE-2022-32224 RAILS
-# 
+#
 # There was a bug in Rails allowing YAML-serialized data to be vulnerable to RCE.
 # Spina uses the serialize method to store various preferences stored using symbols.
 # We've now changed this so preferences are stored with strings as keys instead of
-# symbols, but in order to not break existing projects we're adding 'Symbol' to the 
+# symbols, but in order to not break existing projects we're adding 'Symbol' to the
 # list of permitted classes.
 # This can be removed in the future.
-# 
+#
 # More information:
 # https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017