spina 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 414bc5f87303a017e42900d1f064457e8649f11088b3b9cfd49bccb8a327e145
-  data.tar.gz: a922eb6f603cbc71de8fe8e353aba261a4d1ce998ad2e40a100feeda27b0b881
+  metadata.gz: 6fa491e01750e620e5a4e3e3b63360fee11594caf3c773810617b5971e07ac3d
+  data.tar.gz: 7445c7cab3bfe33ae822a8a99d2956e7bec095d4b3224c79a93d2ebc1ae2d7dd
 SHA512:
-  metadata.gz: a877991a1b49ad1811f1557406835a72f80da58b326c17adc923fe2460734cebdceb467ba4b380724cbe686aa61949d20e3b6972b2517f060adf84a8b2a24363
-  data.tar.gz: 7612cd02fde4d6b3444249ff9477ba102cf7c3f87791ede3b0c0ca2e700a36c7c702f73dbb897e0a22b0a2490d7aa7781d5e3495b5dff86e4fd1983a8b8a0e41
+  metadata.gz: 0660aa6e59334da9af788a9cd15e58fde5e54f2d2426508ffc86b03cf8ff2937f7c5ac15713cc02769a0e1499f15083c8745317f15ca1038be17364f17c88e9f
+  data.tar.gz: db2025173e5dd6888ed190476fd6c844ec917370597d83f44a919e205e6ca0a92fbea4b30c8698d620c457bb50ecd3e4ae9288fa144c3cf7137052539e9f40c5

data/app/controllers/spina/admin/pages_controller.rb

@@ -13,7 +13,7 @@ module Spina
 
       def new
         @resource = Resource.find_by(id: params[:resource_id])
-        @page = Page.new(resource: @resource, parent: Page.find_by(id: params[:parent_id]) || @resource&.parent_page)
+        @page = Page.new(resource: @resource, parent: Page.find_by(id: params[:parent_id]))
         add_index_breadcrumb
         if current_theme.new_page_templates.any? { |template| template[0] == params[:view_template] }
           @page.view_template = params[:view_template]

data/app/models/spina/page.rb

@@ -28,6 +28,9 @@ module Spina
     scope :live, -> { active.where(draft: false) }
     scope :in_menu, -> { where(show_in_menu: true) }
 
+    # Copy resource from parent
+    before_save :set_resource_from_parent, if: -> { parent.present? }
+
     # Save children to update all materialized_paths
     after_save :save_children
     after_save :touch_navigations
@@ -41,7 +44,7 @@ module Spina
 
     translates :title, fallbacks: true
     translates :description, :materialized_path
-    translates :menu_title, :seo_title, default: -> { title }
+    translates :menu_title, :seo_title, :url_title, default: -> { title }
 
     def to_s
       name
@@ -51,8 +54,8 @@ module Spina
       id
     end
 
-    def url_title
-      title.try(:parameterize)
+    def slug
+      url_title&.parameterize
     end
 
     def custom_page?
@@ -97,6 +100,10 @@ module Spina
 
     private
 
+      def set_resource_from_parent
+        self.resource_id = parent.resource_id 
+      end
+
       def touch_navigations
         navigations.update_all(updated_at: Time.zone.now)
       end
@@ -115,9 +122,9 @@ module Spina
 
       def generate_materialized_path
         if root?
-          name == 'homepage' ? '' : "#{url_title}"
+          name == 'homepage' ? '' : "#{slug}"
         else
-          ancestors.collect(&:url_title).append(url_title).join('/')
+          ancestors.collect(&:slug).append(slug).join('/')
         end
       end
 

data/app/models/spina/resource.rb

@@ -2,10 +2,6 @@ module Spina
   class Resource < ApplicationRecord
     has_many :pages, dependent: :restrict_with_exception
 
-    belongs_to :parent_page, class_name: "Spina::Page", optional: true
-
-    after_save :scope_pages_to_parent_page
-
     def pages
       case order_by
       when "title"
@@ -14,14 +10,6 @@ module Spina
         super.order(created_at: :desc)
       end
     end
-
-    private
-
-      def scope_pages_to_parent_page
-        pages.roots.each do |root_page|
-          root_page.update(parent: parent_page)
-        end
-      end
-
+    
   end
 end

data/app/views/spina/admin/pages/_form_advanced.html.haml

@@ -34,12 +34,13 @@
           = f.text_field :link_url, placeholder: Spina::Page.human_attribute_name(:link_url_placeholder)
 
     .well
-      .horizontal-form-group
-        .horizontal-form-label
-          = Spina::Page.human_attribute_name :ancestry
-        .horizontal-form-content
-          .select-dropdown.ancestry
-            = f.select :parent_id, page_ancestry_options(f.object), include_blank: Spina::Page.human_attribute_name(:no_parent)
+      - unless @page.resource.present?
+        .horizontal-form-group
+          .horizontal-form-label
+            = Spina::Page.human_attribute_name :ancestry
+          .horizontal-form-content
+            .select-dropdown.ancestry
+              = f.select :parent_id, page_ancestry_options(f.object), include_blank: Spina::Page.human_attribute_name(:no_parent)
 
       .horizontal-form-group{style: ('display: none' if @page.custom_page?)}
         .horizontal-form-label
@@ -49,9 +50,10 @@
             - options = options_for_select(current_theme.view_templates.map { |template| [template[:title], template[:name], {'data-page-parts' => template[:page_parts]}] }, @page.view_template)
             = f.select :view_template, options
 
-      .horizontal-form-group
-        .horizontal-form-label
-          = Spina::Page.human_attribute_name :resource
-        .horizontal-form-content
-          .select-dropdown
-            = f.select :resource_id, Spina::Resource.order(:label).pluck(:label, :id), include_blank: t('spina.website.pages')
+      - if @page.root?
+        .horizontal-form-group
+          .horizontal-form-label
+            = Spina::Page.human_attribute_name :resource
+          .horizontal-form-content
+            .select-dropdown
+              = f.select :resource_id, Spina::Resource.order(:label).pluck(:label, :id), include_blank: t('spina.website.pages')

data/app/views/spina/admin/pages/_form_page_seo.html.haml

@@ -13,6 +13,13 @@
       .horizontal-form-content
         = f.text_field :description, placeholder: Spina::Page.human_attribute_name(:description_placeholder)
 
+    .horizontal-form-group
+      .horizontal-form-label
+        = Spina::Page.human_attribute_name :url_title
+        %small= Spina::Page.human_attribute_name :url_title_description
+      .horizontal-form-content
+        = f.text_field :url_title, placeholder: Spina::Page.human_attribute_name(:url_title_placeholder), value: f.object.url_title(fallback: false, default: nil)&.parameterize
+
     - unless @page.new_record?
       .horizontal-form-group
         .horizontal-form-label

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

@@ -40,10 +40,3 @@
           .select-dropdown
             - options = options_for_select(current_theme.view_templates.map { |template| [template[:title], template[:name]] }, @resource.view_template)
             = f.select :view_template, options, include_blank: true
-
-      .horizontal-form-group
-        .horizontal-form-label
-          = Spina::Resource.human_attribute_name :parent_page
-        .horizontal-form-content
-          .select-dropdown
-            = f.select :parent_page_id, page_ancestry_options(Spina::Page.new), include_blank: Spina::Resource.human_attribute_name(:no_parent)

data/app/views/spina/admin/resources/show.html.haml

@@ -9,7 +9,7 @@
 .well
   .dd#pages_list
     %ol.dd-list
-      - (@resource.parent_page.try(:children) || @resource.pages.roots).each do |page|
+      - @resource.pages.roots.each do |page|
         %li.dd-item{data: {controller: "page-collapse", url: spina.children_admin_page_path(page)}}
           .dd-item-inner
             - if page.children.any?

data/config/locales/TH.yml

@@ -58,6 +58,9 @@ th:
         skip_to_first_child_description: ส่งต่อไปยังหน้าแรก
         title: ชื่อเรื่อง
         title_placeholder: ชื่อเรื่องของหน้า
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: เทมเพลตของเพจ
       spina/resource:
         label: 
@@ -93,6 +96,7 @@ th:
   spina:
     ago: อายุ
     attachments:
+      choose_attachment: 
       insert: แทรกเอกสาร
       insert_multiple: แทรกเอกสาร
     cancel: ยกเลิก
@@ -111,14 +115,17 @@ th:
       success: คุณสามารถใช้รหัสผ่านใหม่ได้
       unknown_user: ไม่มีผู้ใช้รายนี้
     images:
+      all_images: 
       back: 
       cannot_be_created: 
       choose_image: 
       choose_images: 
+      confirm_selection: 
       delete: 
       delete_confirmation: 
       delete_folder: 
       done_organizing: 
+      insert_image: 
       insert_photo: 
       insert_photos: 
       link: 
@@ -159,6 +166,8 @@ th:
       information: ข้อมูล
       login: คุณต้องเข้าสู่ระบบก่อน
       wrong_username_or_password: อีเมลหรือรหัสผ่านไม่ถูกต้อง
+    options:
+      choose_option: 
     pages:
       advanced: ขั้นสูง
       change_order: เปลี่ยนออเดอร์

data/config/locales/bg.yml

@@ -58,6 +58,9 @@ bg:
         skip_to_first_child_description: Пренасочи към първата дъщерна страница
         title: Заглавие
         title_placeholder: Заглавие на страницата
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Темплейт на страницата
       spina/resource:
         label: Етикет
@@ -93,6 +96,7 @@ bg:
   spina:
     ago: преди
     attachments:
+      choose_attachment: 
       insert: Добавете документ
       insert_multiple: Добавете документи
     cancel: Спри
@@ -111,14 +115,17 @@ bg:
       success: Вече може да използвате новата си парола
       unknown_user: Този потребител не съществува
     images:
+      all_images: 
       back: 
       cannot_be_created: 
       choose_image: 
       choose_images: 
+      confirm_selection: 
       delete: 
       delete_confirmation: 
       delete_folder: 
       done_organizing: 
+      insert_image: 
       insert_photo: 
       insert_photos: 
       link: 
@@ -159,6 +166,8 @@ bg:
       information: Информация
       login: Трябва първо да влезете в системата
       wrong_username_or_password: Грешен email или парола
+    options:
+      choose_option: 
     pages:
       advanced: Разширени
       change_order: Смяна на подредба

data/config/locales/de.yml

@@ -58,6 +58,9 @@ de:
         skip_to_first_child_description: Zur ersten Seite
         title: Titel
         title_placeholder: Seiten-Titel
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Seiten-Template
       spina/resource:
         label: 
@@ -93,6 +96,7 @@ de:
   spina:
     ago: vor
     attachments:
+      choose_attachment: 
       insert: Dokument einfügen
       insert_multiple: Dokumente einfügen
     cancel: Abbrechen
@@ -111,14 +115,17 @@ de:
       success: Du kannst dein neues Passwort verwenden
       unknown_user: Dieser Nutzer existiert nicht
     images:
+      all_images: 
       back: 
       cannot_be_created: 
       choose_image: 
       choose_images: 
+      confirm_selection: 
       delete: 
       delete_confirmation: 
       delete_folder: 
       done_organizing: 
+      insert_image: 
       insert_photo: 
       insert_photos: 
       link: 
@@ -159,6 +166,8 @@ de:
       information: Information
       login: Du musst dich zuerst einloggen
       wrong_username_or_password: Falsche E-Mail oder Passwort
+    options:
+      choose_option: 
     pages:
       advanced: Erweitert
       change_order: Reihenfolge ändern

data/config/locales/en.yml

@@ -58,6 +58,9 @@ en:
         skip_to_first_child_description: Forward to first child page
         title: Title
         title_placeholder: Page title
+        url_title: Override slug
+        url_title_description: Optional
+        url_title_placeholder: Slug
         view_template: Page template
       spina/resource:
         label: Label
@@ -93,6 +96,7 @@ en:
   spina:
     ago: ago
     attachments:
+      choose_attachment: Choose attachment
       insert: Insert document
       insert_multiple: Insert documents
     cancel: Cancel
@@ -111,14 +115,17 @@ en:
       success: You can use your new password
       unknown_user: This user does not exist
     images:
+      all_images: All images
       back: Back
       cannot_be_created: Cannot be created
       choose_image: Choose image
       choose_images: Choose images
+      confirm_selection: Confirm selection
       delete: Delete
       delete_confirmation: Are you sure you want to delete this <strong>image</strong>?
       delete_folder: Delete folder
       done_organizing: Done organizing
+      insert_image: Insert image
       insert_photo: Insert photo
       insert_photos: Insert photos
       link: Link
@@ -159,6 +166,8 @@ en:
       information: Information
       login: You have to login first
       wrong_username_or_password: Wrong email or password
+    options:
+      choose_option: Choose option
     pages:
       advanced: Advanced
       change_order: Change order

data/config/locales/es.yml

@@ -58,6 +58,9 @@ es:
         skip_to_first_child_description: Reenviar a la primera página hija
         title: Título
         title_placeholder: Título de la página
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Plantilla de página
       spina/resource:
         label: Etiqueta
@@ -93,6 +96,7 @@ es:
   spina:
     ago: atrás
     attachments:
+      choose_attachment: 
       insert: Insertar documento
       insert_multiple: Insertar documentos
     cancel: Cancelar
@@ -111,14 +115,17 @@ es:
       success: Puede utilizar su nueva contraseña
       unknown_user: Este usuario no existe
     images:
+      all_images: 
       back: Regresar
       cannot_be_created: No puede ser creada
       choose_image: Elegir imagen
       choose_images: Elegir imágenes
+      confirm_selection: 
       delete: Borrar
       delete_confirmation: Esta seguro que desea borrar esta <strong>imagen</strong>?
       delete_folder: Borrar carpeta
       done_organizing: 
+      insert_image: 
       insert_photo: Insertar foto
       insert_photos: Insertar fotos
       link: Enlace
@@ -159,6 +166,8 @@ es:
       information: Información
       login: Primero debes ingresar
       wrong_username_or_password: Email o password incorrecto
+    options:
+      choose_option: 
     pages:
       advanced: Avanzado
       change_order: Cambiar orden

data/config/locales/fr.yml

@@ -58,6 +58,9 @@ fr:
         skip_to_first_child_description: Renvoyer vers la première page enfant
         title: Titre
         title_placeholder: Titre de la page
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Modèle de page
       spina/resource:
         label: 
@@ -93,6 +96,7 @@ fr:
   spina:
     ago: Il y a
     attachments:
+      choose_attachment: 
       insert: Insérer un document
       insert_multiple: Insérer des documents
     cancel: Annuler
@@ -111,14 +115,17 @@ fr:
       success: Vous pouvez utiliser votre nouveau mot de passe
       unknown_user: Cet utilisateur n'existe pas
     images:
+      all_images: 
       back: 
       cannot_be_created: 
       choose_image: 
       choose_images: 
+      confirm_selection: 
       delete: 
       delete_confirmation: 
       delete_folder: 
       done_organizing: 
+      insert_image: 
       insert_photo: 
       insert_photos: 
       link: 
@@ -159,6 +166,8 @@ fr:
       information: Information
       login: Vous devez d'abord vous identifier
       wrong_username_or_password: Mauvais email ou mot de passe
+    options:
+      choose_option: 
     pages:
       advanced: Avancé
       change_order: Changer l'ordre

data/config/locales/id.yml

@@ -58,6 +58,9 @@ id:
         skip_to_first_child_description: Maju ke halaman anak pertama
         title: Judul
         title_placeholder: Judul halaman
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Template halaman
       spina/resource:
         label: 
@@ -93,6 +96,7 @@ id:
   spina:
     ago: lalu
     attachments:
+      choose_attachment: 
       insert: Masukan dokumen
       insert_multiple: Masukan dokumen
     cancel: Batal
@@ -111,14 +115,17 @@ id:
       success: Anda dapat menggunakan sandi baru anda
       unknown_user: Pengguna ini tidak ada
     images:
+      all_images: 
       back: 
       cannot_be_created: 
       choose_image: 
       choose_images: 
+      confirm_selection: 
       delete: 
       delete_confirmation: 
       delete_folder: 
       done_organizing: 
+      insert_image: 
       insert_photo: 
       insert_photos: 
       link: 
@@ -159,6 +166,8 @@ id:
       information: Informasi
       login: Anda harus login dahulu
       wrong_username_or_password: Salah e-mail atau sandi
+    options:
+      choose_option: 
     pages:
       advanced: Lanjutan
       change_order: Ubah urutan

data/config/locales/it.yml

@@ -58,6 +58,9 @@ it:
         skip_to_first_child_description: Vai alla prima sottopagina
         title: Titolo
         title_placeholder: Titolo pagina
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Template pagina
       spina/resource:
         label: Etichetta
@@ -93,6 +96,7 @@ it:
   spina:
     ago: fa
     attachments:
+      choose_attachment: 
       insert: Inserisci documento
       insert_multiple: Inserisci documenti
     cancel: Annulla
@@ -111,14 +115,17 @@ it:
       success: Puoi usare la tua nuova password
       unknown_user: Questo utente non esiste
     images:
+      all_images: 
       back: Indietro
       cannot_be_created: Non può essere creato
       choose_image: Scegli immagine
       choose_images: Scegli immagini
+      confirm_selection: 
       delete: Cancella
       delete_confirmation: Sei sicuro di voler cancellare questa <strong> immagine </strong>?
       delete_folder: Cancella cartella
       done_organizing: Fine riordinare
+      insert_image: 
       insert_photo: Inserisci foto
       insert_photos: Inserisci foto
       link: Link
@@ -159,6 +166,8 @@ it:
       information: Informazioni
       login: Devi prima effettuare il login
       wrong_username_or_password: Email o password errata
+    options:
+      choose_option: 
     pages:
       advanced: Avanzate
       change_order: Modifica ordine

data/config/locales/nl.yml

@@ -58,6 +58,9 @@ nl:
         skip_to_first_child_description: Doorsturen naar eerste onderliggende pagina
         title: Titel
         title_placeholder: Titel van de pagina
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Pagina template
       spina/resource:
         label: Label
@@ -93,6 +96,7 @@ nl:
   spina:
     ago: geleden
     attachments:
+      choose_attachment: Kies een bijlage
       insert: Document toevoegen
       insert_multiple: Documenten toevoegen
     cancel: Annuleren
@@ -111,14 +115,17 @@ nl:
       success: Je kunt je nieuwe wachtwoord gebruiken
       unknown_user: Die gebruiker bestaat niet
     images:
+      all_images: Alle afbeeldingen
       back: Terug
       cannot_be_created: Kan niet worden aangemaakt
       choose_image: Kies afbeelding
       choose_images: Kies afbeeldingen
+      confirm_selection: Bevestig selectie
       delete: Verwijderen
       delete_confirmation: Weet je zeker dat je deze <strong>afbeelding</strong> wilt verwijderen?
       delete_folder: Verwijder folder
       done_organizing: Klaar met slepen
+      insert_image: Afbeelding invoegen
       insert_photo: Afbeelding invoegen
       insert_photos: Afbeeldingen invoegen
       link: Link
@@ -159,6 +166,8 @@ nl:
       information: Informatie
       login: Je zult eerst moeten inloggen
       wrong_username_or_password: Email of wachtwoord is onjuist
+    options:
+      choose_option: Kies een optie
     pages:
       advanced: Geavanceerd
       change_order: Volgorde wijzigen

data/config/locales/pl.yml

@@ -9,10 +9,10 @@ pl:
         google_analytics: Google Analytics
         google_plus: Google+
         google_site_verification: Google Site Verification
-        instagram: 
+        instagram: Instagram
         kvk_identifier: Chamber of commerce
         kvk_identifier_description: Chamber of commerce
-        linkedin: 
+        linkedin: LinkedIn
         logo: Logo
         name: Nazwa witryny internetowej
         phone: Telefon
@@ -22,7 +22,7 @@ pl:
         twitter: Twitter
         vat_identifier: VAT
         vat_identifier_description: VAT
-        youtube: 
+        youtube: YouTube
       spina/attachment:
         created_at: Utworzono
         name: Plik
@@ -37,7 +37,7 @@ pl:
         pages_description: Wybierz stronę, którą chcesz użyć w nawigacji
       spina/page:
         ancestry: Strona nadrzędna
-        created_at: 
+        created_at: Utworzono w
         description: Opis w Meta description
         description_description: Opis pokazywany w wynikach wyszukiwarki
         description_placeholder: Krótki opis strony
@@ -49,7 +49,7 @@ pl:
         menu_title: Tytuł nawigacji
         menu_title_placeholder: pozostaw puste jeśli chcesz użyć tytuł strony
         no_parent: Brak podrzędnych stron
-        resource: 
+        resource: Zasób
         seo_title: SEO <title>
         seo_title_placeholder: Tytuł w tagu <title>
         show_in_menu: Pokaż w nawigazji
@@ -58,12 +58,15 @@ pl:
         skip_to_first_child_description: Ustaw jako pierwszą w kolejności
         title: Tytuł
         title_placeholder: Tytuł strony
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Szablon strony
       spina/resource:
-        label: 
+        label: Etykieta
         order_by: 
         parent_page: 
-        view_template: 
+        view_template: Domyślny szablon widoku
       spina/user:
         admin: Administrator
         admin_description: Może tworzyć Użytkowników
@@ -93,6 +96,7 @@ pl:
   spina:
     ago: temu
     attachments:
+      choose_attachment: 
       insert: Wstaw dokument
       insert_multiple: Wstaw dokumenty
     cancel: Anuluj
@@ -111,14 +115,17 @@ pl:
       success: Możesz teraz używać nowe hasło
       unknown_user: Użytkownik nie istnieje
     images:
-      back: 
-      cannot_be_created: 
-      choose_image: 
-      choose_images: 
-      delete: 
-      delete_confirmation: 
-      delete_folder: 
+      all_images: Wszystkie obrazy
+      back: Powrót
+      cannot_be_created: Nie może być utworzone
+      choose_image: Wybierz obraz
+      choose_images: Wybierz obrazy
+      confirm_selection: Potwierdź wybór
+      delete: Usuń
+      delete_confirmation: Czy na pewno chcesz usunąć ten <strong>image</strong>?
+      delete_folder: Usuń folder
       done_organizing: 
+      insert_image: Wstaw obraz
       insert_photo: 
       insert_photos: 
       link: 
@@ -159,6 +166,8 @@ pl:
       information: Informacja
       login: Musisz się zalogować
       wrong_username_or_password: Nieprawidłowy email lub hasło
+    options:
+      choose_option: 
     pages:
       advanced: Zaawansowane
       change_order: Zmień kolejność

data/config/locales/pt-BR.yml

@@ -58,6 +58,9 @@ pt-BR:
         skip_to_first_child_description: Encaminhar para a primeira página filha
         title: Título
         title_placeholder: Título da página
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Modelo de página
       spina/resource:
         label: 
@@ -93,6 +96,7 @@ pt-BR:
   spina:
     ago: atrás
     attachments:
+      choose_attachment: 
       insert: Inserir documento
       insert_multiple: Inserir documentos
     cancel: Cancelar
@@ -111,14 +115,17 @@ pt-BR:
       success: Você já pode usar sua nova senha
       unknown_user: Este usuário não existe
     images:
+      all_images: 
       back: 
       cannot_be_created: 'Imagem não pôde ser processada:'
       choose_image: 
       choose_images: Escolher imagens
+      confirm_selection: 
       delete: Excluir
       delete_confirmation: Tem certeza que deseja remover esta <strong>imagem</strong>?
       delete_folder: Excluir pasta
       done_organizing: Concluir organização
+      insert_image: 
       insert_photo: Inserir imagem
       insert_photos: Inserir imagens
       link: 'URL da sua imagem:'
@@ -159,6 +166,8 @@ pt-BR:
       information: Informação
       login: Você deve estar autenticado
       wrong_username_or_password: Email ou senha incorreto(s)
+    options:
+      choose_option: 
     pages:
       advanced: Avançado
       change_order: Mudar ordem

data/config/locales/ro.yml

@@ -58,6 +58,9 @@ ro:
         skip_to_first_child_description: Redirecționează către prima pagină copil
         title: Titlu
         title_placeholder: Titlul paginii
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Template pagină
       spina/resource:
         label: 
@@ -93,6 +96,7 @@ ro:
   spina:
     ago: acum
     attachments:
+      choose_attachment: 
       insert: Inserează document
       insert_multiple: Inserează documente
     cancel: Anulare
@@ -111,14 +115,17 @@ ro:
       success: Îți poți folosi parola nouă
       unknown_user: Acest utilizator nu există
     images:
+      all_images: 
       back: 
       cannot_be_created: 
       choose_image: 
       choose_images: 
+      confirm_selection: 
       delete: 
       delete_confirmation: 
       delete_folder: 
       done_organizing: 
+      insert_image: 
       insert_photo: 
       insert_photos: 
       link: 
@@ -159,6 +166,8 @@ ro:
       information: Informație
       login: Trebuie să vă autentificați întâi
       wrong_username_or_password: Email-ul sau parola sunt greșite
+    options:
+      choose_option: 
     pages:
       advanced: Avansat
       change_order: Schimbă ordinea

data/config/locales/ru.yml

@@ -58,6 +58,9 @@ ru:
         skip_to_first_child_description: Переход на страницу ребенка
         title: Заголовок
         title_placeholder: Заголовок страницы
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Шаблон страницы
       spina/resource:
         label: 
@@ -101,6 +104,7 @@ ru:
   spina:
     ago: назад
     attachments:
+      choose_attachment: 
       insert: Вставить документ
       insert_multiple: Вставить документы
     cancel: Отмена
@@ -119,14 +123,17 @@ ru:
       success: 
       unknown_user: 
     images:
+      all_images: 
       back: 
       cannot_be_created: 
       choose_image: 
       choose_images: 
+      confirm_selection: 
       delete: 
       delete_confirmation: 
       delete_folder: 
       done_organizing: 
+      insert_image: 
       insert_photo: 
       insert_photos: 
       link: 
@@ -167,6 +174,8 @@ ru:
       information: Информация
       login: Вы должны войти
       wrong_username_or_password: Неправильная почта или пароль
+    options:
+      choose_option: 
     pages:
       advanced: Дополнительно
       change_order: Изменить порядок

data/config/locales/sv.yml

@@ -58,6 +58,9 @@ sv:
         skip_to_first_child_description: gå till första undersida
         title: Titel
         title_placeholder: Sidtitel
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Sidmall
       spina/resource:
         label: 
@@ -93,6 +96,7 @@ sv:
   spina:
     ago: sen
     attachments:
+      choose_attachment: 
       insert: Infoga dokument
       insert_multiple: Infoga dokument
     cancel: Avbryt
@@ -111,14 +115,17 @@ sv:
       success: Du kan använda ditt nya lösenord
       unknown_user: Denna användare finns inte
     images:
+      all_images: 
       back: 
       cannot_be_created: 
       choose_image: 
       choose_images: 
+      confirm_selection: 
       delete: 
       delete_confirmation: 
       delete_folder: 
       done_organizing: 
+      insert_image: 
       insert_photo: 
       insert_photos: 
       link: 
@@ -159,6 +166,8 @@ sv:
       information: Information
       login: Du måste logga in först
       wrong_username_or_password: Fel mail eller lösenord
+    options:
+      choose_option: 
     pages:
       advanced: Avancerat
       change_order: Ändra ordning

data/config/locales/tr.yml

@@ -58,6 +58,9 @@ tr:
         skip_to_first_child_description: İlk sıraya yerleştir
         title: Başlık
         title_placeholder: Sayfa başlığı
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: Sayfa şablonu
       spina/resource:
         label: 
@@ -93,6 +96,7 @@ tr:
   spina:
     ago: önce
     attachments:
+      choose_attachment: 
       insert: Belge ekle
       insert_multiple: Çoklu belge ekle
     cancel: İptal
@@ -111,14 +115,17 @@ tr:
       success: 
       unknown_user: 
     images:
+      all_images: 
       back: 
       cannot_be_created: 
       choose_image: 
       choose_images: 
+      confirm_selection: 
       delete: 
       delete_confirmation: 
       delete_folder: 
       done_organizing: 
+      insert_image: 
       insert_photo: 
       insert_photos: 
       link: 
@@ -159,6 +166,8 @@ tr:
       information: Bilgi
       login: Öncelikle giriş yapmalısınız
       wrong_username_or_password: Hatalı email ya da parola
+    options:
+      choose_option: 
     pages:
       advanced: Gelişmiş
       change_order: Sıralamayı değiştir

data/config/locales/zh-CN.yml

@@ -58,6 +58,9 @@ zh-CN:
         skip_to_first_child_description: 跳转到首个子页面
         title: 标题
         title_placeholder: 页面标题
+        url_title: 
+        url_title_description: 
+        url_title_placeholder: 
         view_template: 页面模板
       spina/resource:
         label: 
@@ -93,6 +96,7 @@ zh-CN:
   spina:
     ago: 以前
     attachments:
+      choose_attachment: 
       insert: 插入文档
       insert_multiple: 插入多个文档
     cancel: 取消
@@ -111,14 +115,17 @@ zh-CN:
       success: 
       unknown_user: 
     images:
+      all_images: 
       back: 
       cannot_be_created: 
       choose_image: 
       choose_images: 
+      confirm_selection: 
       delete: 
       delete_confirmation: 
       delete_folder: 
       done_organizing: 
+      insert_image: 
       insert_photo: 
       insert_photos: 
       link: 
@@ -159,6 +166,8 @@ zh-CN:
       information: 通知
       login: 请先登录
       wrong_username_or_password: 用户名或密码错误
+    options:
+      choose_option: 
     pages:
       advanced: 高级
       change_order: 排序

data/db/migrate/11_create_spina_resources.rb

@@ -4,12 +4,10 @@ class CreateSpinaResources < ActiveRecord::Migration[5.1]
       t.string :name, null: false, unique: true
       t.string :label
       t.string :view_template
-      t.integer :parent_page_id
       t.string :order_by
       t.timestamps
     end
     add_column :spina_pages, :resource_id, :integer, null: true
     add_index :spina_pages, :resource_id
-    add_index :spina_resources, :parent_page_id
   end
 end

data/db/migrate/12_add_url_title_to_spina_page_translations.rb

@@ -0,0 +1,5 @@
+class AddUrlTitleToSpinaPageTranslations < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spina_page_translations, :url_title, :string
+  end
+end

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Bram Jetten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -536,6 +536,7 @@ files:
 - config/routes.rb
 - db/migrate/10_create_spina_image_collections.rb
 - db/migrate/11_create_spina_resources.rb
+- db/migrate/12_add_url_title_to_spina_page_translations.rb
 - db/migrate/1_create_spina_tables.rb
 - db/migrate/2_create_spina_translation_tables.rb
 - db/migrate/3_create_spina_navigations.rb