spina 2.13.1 → 2.14.0

data/config/initializers/importmap.rb

@@ -10,3 +10,9 @@ Spina.config.importmap.draw do
   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
+
+Spina.config.importmap.cache_sweeper watches: Spina::Engine.root.join("app/assets/javascripts")
+
+ActiveSupport.on_load(:action_controller_base) do
+  before_action { Spina.config.importmap.cache_sweeper.execute_if_updated }
+end

data/config/locales/en.yml

@@ -277,6 +277,7 @@ en:
       save_draft: Save draft
       saved: Page saved
       saving: Saving...
+      select_page: Select page
       couldnt_be_saved: Page couldn't be saved
       search_engines: Search engines
       show_in_menu: invisible

data/config/locales/nl.yml

@@ -1,5 +1,17 @@
 nl:
+  activemodel:
+    attributes:
+      spina/embeds/youtube:
+        url: youtube.com/watch?v=...
+      spina/embeds/vimeo:
+        url: vimeo.com/...
   activerecord:
+    errors:
+      models:
+        spina/page:
+          attributes:
+            title:
+              blank: Titel is verplicht
     attributes:
       spina/account:
         address: Adres
@@ -94,6 +106,15 @@ nl:
       spina/user:
         one: Gebruiker
         other: Gebruikers
+  helpers:
+    label:
+      spina/embeds/button:
+        url: URL
+        label: Button label
+      spina/embeds/youtube:
+        url: Youtube URL
+      spina/embeds/vimeo:
+        url: Vimeo URL
   spina:
     accounts:
       contact_details: Contactgegevens
@@ -106,6 +127,7 @@ nl:
     attachments:
       choose_attachment: Kies een bijlage
       delete_confirmation_html: Weet je het zeker? Het kan zijn dat dit document in gebruik is op een pagina.
+      download: Download
       insert: Document toevoegen
       insert_multiple: Documenten toevoegen
       upload: Upload documenten
@@ -117,6 +139,9 @@ nl:
     delete_confirmation: Weet je zeker dat je <strong>%{subject}</strong> wilt verwijderen?
     edit: Bewerken
     edit_website: Bewerk je website
+    embeds:
+      embed_a_component: Embed een onderdeel
+      embed_component: Embed onderdeel
     forgot_password:
       expired: Je wachtwoord reset is verlopen
       mail_subject: Stel je wachtwoord opnieuw in
@@ -140,6 +165,7 @@ nl:
       insert_photo: Afbeelding invoegen
       insert_photos: Afbeeldingen invoegen
       link: Link
+      missing_image: Ontbrekende afbeelding
       new_folder: Nieuwe folder
       organize: Herindelen
       remove_image: Verwijder afbeelding
@@ -218,6 +244,7 @@ nl:
       change_view_template: Wijzig pagina template
       change_view_template_confirmation: Weet je zeker dat je de pagina template wil veranderen? Inhoud die niet op de nieuwe pagina past gaat verloren.
       concept: concept
+      couldnt_be_saved: Pagina kon niet worden opgeslagen
       create: Maak pagina
       create_page: "%{template} invullen"
       delete: Verwijder pagina
@@ -251,6 +278,7 @@ nl:
       save_draft: Concept opslaan
       saved: Pagina opgeslagen
       saving: "<i></i> Opslaan..."
+      select_page: Kies pagina
       search_engines: Zoekmachines
       show_in_menu: onzichtbaar
       skip_to_first_child: doorsturen naar 1<sup>e</sup> subpagina
@@ -306,8 +334,10 @@ nl:
     save: Opslaan
     search: Zoeken...
     settings:
+      general: Algemeen
       save: Voorkeuren opslaan
       title: Voorkeuren
+      users: Gebruikers
     theme:
       save: Thema opslaan
       saved: Thema opgeslagen
@@ -326,6 +356,16 @@ nl:
       replace: Vervangen
       save_changes: Wijzigingen opslaan
       saving: Opslaan...
+    user_mailer:
+      forgot_password:
+        button: Reset je wachtwoord
+        introduction: Je hebt recent aangegeven dat je je wachtwoord bent vergeten voor je Spina CMS-account. Deze wachtwoord-reset is geldig voor 2 uur. Klik op de link of plak de URL in je browser.
+        introduction_html: "Je hebt recent aangegeven dat je je wachtwoord bent vergeten voor je Spina CMS-account. Gebruik de knop hieronder. <strong>Deze wachtwoord-reset is 2 uur geldig.</strong>"
+        preheader: Gebruik deze link om je wachtwoord te resetten. Deze is 2 uur geldig
+        request_origin: Beveiliging, dit is aangevraagd vanaf een %{platform}-apparaat via %{browser}. Als je geen wachtwoord-reset hebt aangevraagd, negeer deze e-mail dan.
+        salutation: Hoi, %{name}
+        subject: Stel je wachtwoord opnieuw in
+        trouble: Als bovenstaande knop niet werkt, kopieer en plak deze onderstaande link dan in de browser
     users:
       authorization: Autorisatie
       authorization_description: Admins kunnen gebruikers beheren. Normale gebruikers niet.
@@ -343,6 +383,7 @@ nl:
     visit_page: Bekijk pagina
     website:
       all_pages: Alle pagina's
+      content: Content
       documents: Documenten
       images: Afbeeldingen
       main: Pagina's
@@ -351,6 +392,8 @@ nl:
       pages: Pagina's
       pages_description: Alle pagina's op je website
       photos: Afbeeldingen
+      settings: Instellingen
+      theme: Thema
       title: Je website
     wysiwyg:
       heading_1: Kop 1

data/config/routes.rb

@@ -46,12 +46,17 @@ Spina::Engine.routes.draw do
         get :edit_content
         get :edit_template
         get :children
+        post :sort_one
+      end
+      
+      collection do
+        post :sort
       end
 
       resource :move, controller: "move_pages"
-
-      post :sort, on: :collection
-      post :sort_one, on: :member
+    end
+    resources :page_select_options, only: [:show, :index] do
+      post :search, on: :collection
     end
     resources :page_translations, only: [:destroy]
     resources :parent_pages

data/db/migrate/16_add_ancestry_cache_columns_to_spina_pages.rb

@@ -0,0 +1,6 @@
+class AddAncestryCacheColumnsToSpinaPages < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spina_pages, :ancestry_depth, :integer, default: 0
+    add_column :spina_pages, :ancestry_children_count, :integer
+  end
+end

data/lib/spina/attr_json_spina_parts_model.rb

@@ -14,7 +14,7 @@ module AttrJson
       end
 
       def spina_parts_lookup
-        @spina_parts_lookup ||= Spina::PARTS.map(&:to_type).map do |type|
+        @spina_parts_lookup = Spina::PARTS.map(&:to_type).map do |type|
           [type.model.name, type]
         end.to_h
       end

data/lib/spina/engine.rb

@@ -37,7 +37,8 @@ module Spina
         Spina::Parts::ImageCollection,
         Spina::Parts::Repeater,
         Spina::Parts::Option,
-        Spina::Parts::Attachment
+        Spina::Parts::Attachment,
+        Spina::Parts::PageLink
       )
     end
   end

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "2.13.1"
+  VERSION = "2.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.14.0
 platform: ruby
 authors:
 - Bram Jetten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -282,20 +282,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: CMS
 email:
 - bram@denkgroot.com
@@ -1218,6 +1204,8 @@ files:
 - app/assets/javascripts/spina/controllers/media_picker_modal_controller.js
 - app/assets/javascripts/spina/controllers/modal_controller.js
 - app/assets/javascripts/spina/controllers/navigation_controller.js
+- app/assets/javascripts/spina/controllers/page_collapse_controller.js
+- app/assets/javascripts/spina/controllers/page_select_controller.js
 - app/assets/javascripts/spina/controllers/parent_pages_controller.js
 - app/assets/javascripts/spina/controllers/repeater_controller.js
 - app/assets/javascripts/spina/controllers/reveal_controller.js
@@ -1232,6 +1220,7 @@ files:
 - app/assets/javascripts/spina/controllers/unique_id_controller.js
 - app/assets/javascripts/spina/libraries/canvas-confetti.js
 - app/assets/javascripts/spina/libraries/canvas-confetti@1.3.2.js
+- app/assets/javascripts/spina/libraries/debounce.js
 - app/assets/javascripts/spina/libraries/form-request-submit-polyfill.js
 - app/assets/javascripts/spina/libraries/form-request-submit-polyfill@2.0.0.js
 - app/assets/javascripts/spina/libraries/hotkeys.js
@@ -1250,6 +1239,8 @@ files:
 - app/components/spina/forms/label_component.rb
 - app/components/spina/forms/password_field_component.html.erb
 - app/components/spina/forms/password_field_component.rb
+- app/components/spina/forms/search_component.html.erb
+- app/components/spina/forms/search_component.rb
 - app/components/spina/forms/switch_component.html.erb
 - app/components/spina/forms/switch_component.rb
 - app/components/spina/forms/text_field_component.html.erb
@@ -1310,6 +1301,7 @@ files:
 - app/controllers/spina/admin/move_pages_controller.rb
 - app/controllers/spina/admin/navigation_items_controller.rb
 - app/controllers/spina/admin/navigations_controller.rb
+- app/controllers/spina/admin/page_select_options_controller.rb
 - app/controllers/spina/admin/page_translations_controller.rb
 - app/controllers/spina/admin/pages_controller.rb
 - app/controllers/spina/admin/parent_pages_controller.rb
@@ -1339,6 +1331,7 @@ files:
 - app/jobs/spina/resource_pages_update_job.rb
 - app/mailers/spina/application_mailer.rb
 - app/mailers/spina/user_mailer.rb
+- app/models/concerns/spina/attachable.rb
 - app/models/concerns/spina/gravatar.rb
 - app/models/concerns/spina/partable.rb
 - app/models/concerns/spina/translated_content.rb
@@ -1363,6 +1356,7 @@ files:
 - app/models/spina/parts/line.rb
 - app/models/spina/parts/multi_line.rb
 - app/models/spina/parts/option.rb
+- app/models/spina/parts/page_link.rb
 - app/models/spina/parts/repeater.rb
 - app/models/spina/parts/repeater_content.rb
 - app/models/spina/parts/text.rb
@@ -1406,6 +1400,8 @@ files:
 - app/views/spina/admin/navigations/_navigation.html.erb
 - app/views/spina/admin/navigations/edit.html.erb
 - app/views/spina/admin/navigations/index.html.erb
+- app/views/spina/admin/page_select_options/index.html.erb
+- app/views/spina/admin/page_select_options/show.html.erb
 - app/views/spina/admin/pages/_button_advanced.html.erb
 - app/views/spina/admin/pages/_button_page_content.html.erb
 - app/views/spina/admin/pages/_button_search_engines.html.erb
@@ -1414,6 +1410,7 @@ files:
 - app/views/spina/admin/pages/_form_page_content.html.erb
 - app/views/spina/admin/pages/_form_search_engines.html.erb
 - app/views/spina/admin/pages/_new_page_form.html.erb
+- app/views/spina/admin/pages/children.html.erb
 - app/views/spina/admin/pages/edit.html.erb
 - app/views/spina/admin/pages/edit_content.html.erb
 - app/views/spina/admin/pages/edit_template.html.erb
@@ -1429,6 +1426,7 @@ files:
 - app/views/spina/admin/parts/lines/_form.html.erb
 - app/views/spina/admin/parts/multi_lines/_form.html.erb
 - app/views/spina/admin/parts/options/_form.html.erb
+- app/views/spina/admin/parts/page_links/_form.html.erb
 - app/views/spina/admin/parts/repeaters/_fields.html.erb
 - app/views/spina/admin/parts/repeaters/_form.html.erb
 - app/views/spina/admin/parts/texts/_form.html.erb
@@ -1486,6 +1484,7 @@ files:
 - db/migrate/13_add_json_attributes_to_spina_accounts.rb
 - db/migrate/14_add_json_attributes_to_spina_pages.rb
 - db/migrate/15_add_slug_to_spina_resources.rb
+- db/migrate/16_add_ancestry_cache_columns_to_spina_pages.rb
 - db/migrate/1_create_spina_tables.rb
 - db/migrate/2_create_spina_translation_tables.rb
 - db/migrate/3_create_spina_navigations.rb
@@ -1544,7 +1543,9 @@ metadata:
   documentation_uri: https://www.spinacms.com/docs
   changelog_uri: https://github.com/SpinaCMS/Spina/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/SpinaCMS/Spina
-post_install_message: 
+post_install_message: "\n    Spina v2.14 includes a new migration, don't forget to
+  run spina:install:migrations.\n    \n    For details on this specific release, refer
+  to the CHANGELOG file.\n  "
 rdoc_options: []
 require_paths:
 - lib