spina 1.1.2 → 2.0.0.beta

data/app/views/spina/admin/parts/texts/_form.html.haml

@@ -0,0 +1,6 @@
+.page-form-label= f.object.title
+.page-form-content
+  .page-form-rich-text
+    = f.hidden_field :content, id: "#{f.object.object_id}_input"
+    %trix-editor.text-input.trix-content{ input: "#{f.object.object_id}_input" }
+

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

@@ -1,6 +1,6 @@
 - if @resource.errors.any?
   - content_for :notifications do
-    .notification.notification-danger.animated.fadeInRight
+    .notification.notification-danger.animated.fadeInLeft
       = icon('exclamation')
       .notification-message
         =t 'spina.notifications.alert'
@@ -9,21 +9,44 @@
         = icon('cross')
 
 = form_with model: @resource, url: spina.admin_resource_path(@resource) do |f|
+  = hidden_field_tag :locale, @locale
+
   %header#header
-    .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
+    .breadcrumbs
+      = render_breadcrumbs separator: '<div class="divider"></div>'
+      %span{style: 'margin-left: 10px'}
+        - if Spina.config.locales.size > 1
+          %div{style: "display: inline-block", data: {dropdown: true}}
+            = link_to '#', class: 'button button-default button-small', style: 'margin-left: 0; margin-right: 0', data: {trigger: 'dropdown', target: '#locales'} do
+              = icon('comment')
+              =t "spina.languages.#{@locale}"
+              %i.icon.icon-chevron-down{style: 'font-size: 9px; margin-right: 0'}
+
+            %ul#locales
+              - Spina.config.locales.each do |locale|
+                %li
+                  = link_to t("spina.languages.#{locale}"), "?locale=#{locale}", style: ('font-weight: 600' if @locale.to_s == locale.to_s).to_s
 
     #header_actions
       %button.button.button-primary{type: 'submit', style: 'margin-right: 0'}
         = icon('check')
         =t 'spina.save'
 
-  .well
-    .horizontal-form
+  .horizontal-form
+    %div{style: "margin: 40px 0"}
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Resource.human_attribute_name :label
         .horizontal-form-content
-          = f.text_field :label, placeholder: Spina::Resource.human_attribute_name(:label)
+          .page-form-control
+            = f.text_field :label, placeholder: Spina::Resource.human_attribute_name(:label)
+
+      .horizontal-form-group
+        .horizontal-form-label
+          = Spina::Resource.human_attribute_name :slug
+        .horizontal-form-content
+          .page-form-control
+            = f.text_field :slug, placeholder: Spina::Resource.human_attribute_name(:slug), value: f.object.slug(locale: @locale)&.parameterize
 
       .horizontal-form-group
         .horizontal-form-label
@@ -40,10 +63,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

@@ -1,15 +1,18 @@
 - content_for(:header_actions) do
   
-  = link_to spina.edit_admin_resource_path(@resource), class: 'button' do
-    = t('spina.resources.edit')
+  = link_to spina.edit_admin_resource_path(@resource), class: 'button button-default' do
+    .button-content
+      = icon('pencil')
+      = t('spina.resources.edit')
 
   = link_to spina.new_admin_page_path(params: {resource_id: @resource.id, view_template: @resource.view_template.presence || 'show'}), class: 'button button-primary icon-only', style: 'margin-right: 0' do
     = icon('plus')
+    = t('spina.pages.new')
 
 .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/app/views/spina/admin/shared/_notifications.html.haml

@@ -1,6 +1,6 @@
 %aside#notifications
   - if flash[:notice]
-    .notification.animated.fadeInRight
+    .notification.animated.fadeInLeft
       = icon('info')
       .notification-message
         = flash[:notice].html_safe
@@ -9,7 +9,7 @@
         = icon('cross')
 
   - if flash[:alert]
-    .notification.notification-danger.animated.fadeInRight
+    .notification.notification-danger.animated.fadeInLeft
       = icon('exclamation')
       .notification-message
         = flash[:alert].html_safe
@@ -18,8 +18,8 @@
         = icon('cross')
 
   - if flash[:success]
-    .notification.notification-success.animated.fadeInRight
-      = icon('large-check')
+    .notification.notification-success.animated.fadeInLeft
+      = icon('check')
       .notification-message
         = flash[:success].html_safe
         %small= flash[:success_small].try(:html_safe)

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: เปลี่ยนออเดอร์
@@ -194,6 +203,7 @@ th:
       link: 'URL รูปภาพของคุณ:'
       new_folder: โฟลเดอร์ใหม่
       organize: จัดระเบียบรูปภาพ
+      rename_folder: 
       select_images: เลือกรูปภาพ
       upload_image: อัปโหลดรูปภาพ
     preferences:

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: Смяна на подредба
@@ -194,6 +203,7 @@ bg:
       link: 'URL на изображението:'
       new_folder: Нова папка
       organize: Организиране на изображения
+      rename_folder: 
       select_images: 
       upload_image: Качване на изображение
     preferences:

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
@@ -194,6 +203,7 @@ de:
       link: 'URL des Bildes:'
       new_folder: Neuer Ordner
       organize: Organisiere Bilder
+      rename_folder: 
       select_images: 
       upload_image: Bild hochladen
     preferences:

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
@@ -194,6 +203,7 @@ en:
       link: 'URL of your image:'
       new_folder: New folder
       organize: Organize images
+      rename_folder: Rename folder
       select_images: Select images
       upload_image: Upload an image
     preferences:

data/config/locales/es.yml

@@ -37,7 +37,7 @@ es:
         pages_description: Seleccione las páginas que quiere usar en esta navegación
       spina/page:
         ancestry: Página padre
-        created_at: 
+        created_at: Creada el
         description: Meta description
         description_description: Esta descripción se mostrará en los resultados de búsqueda
         description_placeholder: Descripción corta de tu página
@@ -58,11 +58,14 @@ 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: 
-        order_by: 
-        parent_page: 
+        label: Etiqueta
+        order_by: Ordenar por
+        parent_page: Página padre
         view_template: 
       spina/user:
         admin: Administrador
@@ -91,8 +94,9 @@ es:
         one: Usuario
         other: Usuarios
   spina:
-    ago: ago
+    ago: atrás
     attachments:
+      choose_attachment: 
       insert: Insertar documento
       insert_multiple: Insertar documentos
     cancel: Cancelar
@@ -111,32 +115,35 @@ es:
       success: Puede utilizar su nueva contraseña
       unknown_user: Este usuario no existe
     images:
-      back: 
-      cannot_be_created: 
-      choose_image: 
-      choose_images: 
-      delete: 
-      delete_confirmation: 
-      delete_folder: 
+      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_photo: 
-      insert_photos: 
-      link: 
-      new_folder: 
-      organize: 
-      remove_image: 
-      upload: 
-      upload_image: 
+      insert_image: 
+      insert_photo: Insertar foto
+      insert_photos: Insertar fotos
+      link: Enlace
+      new_folder: Nueva carpeta
+      organize: Organizar
+      remove_image: Eliminar imagen
+      upload: Subir imáneges
+      upload_image: Subir imagen
     languages:
       bg: 
-      de: 
+      de: Alemán
       en: Inglés
-      es: 
-      fr: 
+      es: Español
+      fr: Francés
       id: 
-      it: 
+      it: Italiano
       nl: Holandés
-      pl: 
+      pl: Polaco
       pt-BR: 
       ro: 
       ru: 
@@ -149,7 +156,7 @@ es:
     main_menu: Menú principal
     media_library:
       attachments: Documentos
-      images: 
+      images: Imágenes
       photos: Imágenes
     modal:
       agree: Si, estoy seguro
@@ -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
@@ -185,7 +194,7 @@ es:
     photos:
       cannot_be_created: 'Tu imagen no puede ser procesada:'
       choose_images: Seleccionar imágenes
-      delete: 
+      delete: Borrar
       delete_confirmation: Seguro que deseas eliminar ésta <strong>imagen</strong>?
       delete_folder: Borrar carpeta
       done_organizing: Terminar la organización
@@ -194,6 +203,7 @@ es:
       link: 'URL de tu imagen:'
       new_folder: Nueva carpeta
       organize: Organizar imágenes
+      rename_folder: Renombrar carpeta
       select_images: 
       upload_image: Subir una imagen
     preferences:
@@ -228,11 +238,11 @@ es:
       delete_confirmation: Estás seguro que deseas eliminar al usuario <strong>%{user}</strong>?
       new: Nuevo usuario
       save: Guardar usuario
-    visit_page: 
+    visit_page: Visitar página
     website:
       all_pages: Todas las páginas
       documents: Documentos
-      images: 
+      images: Imágenes
       media_library: Biblioteca de medios
       media_library_description: Aquí encontrarás todas tus imágenes y documentos
       pages: Páginas