spina 1.0.3 → 1.1.0

data/app/views/spina/admin/images/_form.html.haml

@@ -1,5 +1,5 @@
 = form_for [:admin, Spina::Image.new], id: 'new_image', class: 'new_image', data: {remote: true} do |f|
   = f.submit style: 'display: none'
-  = hidden_field_tag :media_library, value: true
+  = hidden_field_tag :media_library, @media_folder.try(:id)
   = f.label :file, t('spina.images.upload')
   = f.file_field :files, multiple: true, accept: "image/*", data: {direct_upload_url: main_app.rails_direct_uploads_url, customfileinput: true}

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

@@ -1,10 +1,8 @@
-.item.image{class: ('selected' if image.id.to_s.try(:in?, params[:selected_ids].to_a))}
+.item.image{class: ('selected' if image.id.to_s.try(:in?, params[:selected_ids].to_a)), data: {action: "click->gallery-select#select", image_id: image.id}}
   - unless defined?(simple) && simple
     .overlay
       = link_to admin_image_path(image), method: :delete, class: 'icon-only delete-photo-link', data: {confirm: t('spina.images.delete_confirmation')} do
         = t('spina.images.delete')
       %span.photo-name= truncate(image.name, length: 125)
-    = radio_button_tag :image_id, image.id
-    = check_box_tag 'image_ids[]', image.id, image.id.to_s.try(:in?, params[:selected_ids].to_a)
-    
-  = image_tag main_app.url_for(image.variant(resize: '300x300^', crop: "300x300+0+0"))
+
+  = image_tag variant(image.file, resize: '300x300^', crop: "300x300+0+0")

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

@@ -3,6 +3,6 @@
     - if media_folder.images.any?
       = image_tag variant(media_folder.images.last.file, resize: '144x144^', crop: "144x144+0+0")
     - else
-      = image_tag 'spina/media_folder_placeholder.png'
+      = image_tag 'spina/media_folder_placeholder.svg'
     .media-folder-shadow
-  .media-folder-name= media_folder.name
+  .media-folder-name= media_folder.name

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

@@ -6,7 +6,7 @@
     .item
       = form_with model: [:admin, Spina::Image.new], id: 'new_image', class: 'new_image' do |f|
         = f.submit style: 'display: none'
-        = hidden_field_tag :media_library, value: @media_folder.id
+        = hidden_field_tag :media_library, @media_folder.id
         = f.label :file, t('spina.images.upload')
         = f.file_field :files, multiple: true, data: {direct_upload_url: main_app.rails_direct_uploads_url, customfileinput: true}
 

data/app/views/spina/admin/media_picker/_modal.html.haml

@@ -1,26 +1,63 @@
 .modal.modal-large
-  %section
-    .gallery-select.gallery{data: {multiselect: defined?(multiple) && multiple}}
-      .item.item-small.item-uploader.new-image-form
-        = render partial: 'spina/admin/images/form'
+  %section{style: "display: flex"}
+    .gallery-select-container{data: {controller: "gallery-select"}}
+      .gallery-select.gallery.gallery-prepend-image{data: {multiselect: defined?(multiple) && multiple}}
+        .item.item-small.item-uploader.new-image-form
+          = render partial: 'spina/admin/images/form'
 
-      = form_with url: admin_media_picker_path, class: 'gallery-prepend-image' do
-        = hidden_field_tag :hidden_field_id, params[:hidden_field_id]
-        = hidden_field_tag :trix_editor_id, params[:trix_editor_id]
-        = check_box_tag :multiple, true, defined?(multiple) && multiple, style: 'display: none'
+        - if @media_folder.present?
+          = link_to spina.admin_media_picker_path(request.query_parameters.merge(media_folder_id: nil)), class: 'item media-folder', data: {remote: true} do
+            .media-folder-thumbnail
+              = image_tag 'spina/media_folder_placeholder.svg'
+              .media-folder-shadow
+            .media-folder-name=t "spina.images.back"
+        - else
+          - @media_folders.each do |media_folder|
+            = link_to spina.admin_media_picker_path({media_folder_id: media_folder.id}.merge(request.query_parameters)), class: 'item media-folder', data: {remote: true} do
+              .media-folder-thumbnail{data: {badge: media_folder.images.count}}
+                - if media_folder.images.any?
+                  = image_tag variant(media_folder.images.last.file, resize: '144x144^', crop: "144x144+0+0")
+                - else
+                  = image_tag 'spina/media_folder_placeholder.svg'
+                .media-folder-shadow
+              .media-folder-name= media_folder.name
 
         .infinite-scroll
           = render partial: 'spina/admin/images/image', collection: @images
 
-        .infinite-pagination{data: {controller: 'infinite-scroll'}}= link_to_next_page @images, 'Next', params: params, remote: true, data: {target: "infinite-scroll.link"}
+        .infinite-pagination{data: { controller: 'infinite-scroll' } }
+          = link_to_next_page @images, 'Next', params: params, remote: true,
+            data: { target: 'infinite-scroll.link' }
+          %span{ data: { target: 'infinite-scroll.link' } }
+
+      .gallery-select-sidebar
+        = form_with url: admin_media_picker_path, html: {'data-remote': true} do
+          .gallery-select-form-fields
+            = hidden_field_tag :image_id, params[:selected_ids]&.first, data: {target: 'gallery-select.singleImage'}
+            = hidden_field_tag :image_ids, params[:selected_ids]&.join("-"), data: {target: 'gallery-select.multipleImages'}
+            = hidden_field_tag :hidden_field_id, params[:hidden_field_id]
+            = hidden_field_tag :trix_toolbar_id, params[:trix_toolbar_id]
+            = check_box_tag :multiple, true, defined?(multiple) && multiple, style: 'display: none', data: {target: 'gallery-select.multiple'}
+
+            - if params[:trix_toolbar_id].present?
+              .form-group
+                .form-label Alt text
+                .form-control= text_field_tag :alt, nil, placeholder: "Alt"
+
+              .form-group
+                .form-label Link to URL
+                .form-control= text_field_tag :link_to_url, nil, placeholder: "URL"
 
-        - if defined?(multiple) && multiple
           .gallery-select-action-bar
-            .pull-right
-              = link_to t('spina.cancel'), "#", class: 'button button-link', data: {dismiss: 'modal'}
-              = button_tag type: 'submit', class: 'button button-primary button-large', style: 'margin-bottom: 0px' do
+            = link_to t('spina.cancel'), "#", class: 'button button-link', data: {dismiss: 'modal'}
+            = button_tag type: 'submit', class: 'button button-primary button-large', style: 'margin-bottom: 0px' do
+
+              - if defined?(multiple) && multiple
                 = icon('plus')
                 = t('spina.images.choose_images')
-                %span.gallery-select-counter
+                %span.gallery-select-counter{data: {target: "gallery-select.counter"}}
                   - if params[:selected_ids].try(:any?)
                     (#{ params[:selected_ids].count })
+              - else
+                = icon('check')
+                =t 'spina.images.choose_image'

data/app/views/spina/admin/media_picker/select.js.erb

@@ -7,8 +7,10 @@ hidden_input.val("");
   hidden_input.val("<%= @image.id %>");
 
   // Trix editor
-  $('#<%= params[:trix_editor_id] %>').trigger('image-insert', '<%= main_app.url_for(@image.variant(resize: "800x800")) %>');
-  $.hideModal();
+  <% if params[:trix_toolbar_id].present? %>
+    $('trix-editor[toolbar="<%= params[:trix_toolbar_id] %>"]').trigger('image-insert', ["<%= main_app.url_for(@image.file) %>", "<%= params[:alt] %>", "<%= params[:link_to_url] %>"]);
+     $.hideModal();
+  <% end %>
 <% end %>
 
 <% if @images.present? %>

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

@@ -24,7 +24,7 @@
               %ul#locales
                 - Spina.config.locales.each do |locale|
                   %li
-                    = link_to t("languages.#{locale}"), "?locale=#{locale}", style: ('font-weight: 600' if @locale.to_s == locale.to_s)
+                    = link_to t("languages.#{locale}"), "?locale=#{locale}", style: ('font-weight: 600' if @locale.to_s == locale.to_s).to_s
 
         = link_to @page.materialized_path, target: :blank, class: 'button button-hollow button-small', style: 'margin-left: 0' do
           %i.icon.icon-export{style: 'margin: 0'}

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

@@ -0,0 +1,4 @@
+%ol.dd-list
+  - @children.each do |child|
+    %li.dd-item
+      .dd-item-inner= render partial: "page", object: child

data/app/views/spina/admin/partables/lines/_form.html.haml

@@ -2,4 +2,4 @@
   = f.object.title
 .horizontal-form-content
   = f.fields_for :partable, f.object.partable do |ff|
-    = ff.text_field :content, placeholder: "#{t 'spina.pages.page_part'} #{f.object.name.downcase}"
+    = ff.text_field :content, value: ff.object.content(fallback: false, default: nil)

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

@@ -2,4 +2,7 @@
   = f.object.title
 .horizontal-form-content
   = f.fields_for :partable, f.object.partable do |ff|
-    = render 'spina/admin/shared/rich_text_field', f: ff, field: :content
+    - object_id = (ff.object.persisted? ? ff.object.object_id : "new_association_#{ff.object.object_id}").to_s + "_content"
+    = ff.hidden_field :content, id: "#{object_id}_input", value: ff.object.content(fallback: false, default: nil)
+    %trix-editor.text-input.trix-content{ input: "#{object_id}_input" }
+

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

@@ -1,5 +1,5 @@
 = form_for @user, url: spina.admin_password_reset_path(params[:id]), html: {id: "login_wrapper"} do |f|
-  = image_tag 'spina/spina-large.png', class: 'animated fadeInDown'
+  = image_tag 'spina/spina.svg', class: 'animated fadeInDown', width: 72, height: 54
   - if @user.errors.any?
     .failed-to-login.animated.fadeInDown
       .icon.icon-cross

data/app/views/spina/admin/password_resets/new.html.haml

@@ -1,5 +1,5 @@
 = form_tag spina.admin_password_resets_path, method: :post, id: "login_wrapper" do
-  = image_tag 'spina/spina-large.png'
+  = image_tag 'spina/spina.svg', width: 72, height: 54
   - if flash[:alert].present?
     .failed-to-login.animated.fadeInDown
       .icon.icon-cross

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

@@ -46,4 +46,4 @@
           = Spina::Resource.human_attribute_name :parent_page
         .horizontal-form-content
           .select-dropdown
-            = f.select :parent_page_id, page_ancestry_options(f.object), include_blank: Spina::Resource.human_attribute_name(:no_parent)
+            = 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,6 +9,16 @@
 .well
   .dd#pages_list
     %ol.dd-list
-      - @resource.pages.each do |page|
-        %li.dd-item
-          .dd-item-inner= render partial: 'spina/admin/pages/page', object: page
+      - (@resource.parent_page.try(:children) || @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?
+              = button_tag class: 'collapse-link', data: {action: "page-collapse#expand", target: 'page-collapse.expandLink'} do
+                = icon('plus')
+
+              = button_tag class: 'collapse-link', style: 'display: none', data: {action: "page-collapse#collapse", target: 'page-collapse.collapseLink'} do
+                = icon('min')
+
+            = render partial: 'spina/admin/pages/page', object: page
+
+          %div{data: {target: 'page-collapse.list'}}

data/app/views/spina/admin/sessions/new.html.haml

@@ -1,5 +1,5 @@
 = form_tag spina.admin_sessions_path, id: "login_wrapper" do
-  = image_tag 'spina/spina-large.png', class: 'animated fadeInDown'
+  = image_tag 'spina/spina.svg', class: 'animated fadeInDown', width: 72, height: 54
   - if flash[:alert].present?
     .failed-to-login.animated.fadeInDown
       .icon.icon-cross

data/app/views/spina/admin/shared/_primary_navigation.html.haml

@@ -65,4 +65,4 @@
     %li.bottom
       = link_to spina.admin_logout_path, data: {turbolinks: false} do
         = icon('power-off')
-        =t 'spina.logout'
+        =t 'spina.logout'

data/app/views/spina/admin/shared/_rich_text_field.html.haml

@@ -1,35 +1,4 @@
 
 - object_id = (f.object.persisted? ? f.object.object_id : "new_association_#{f.object.object_id}").to_s + "_#{field}"
 = f.hidden_field field, id: "#{object_id}_input"
-
-%trix-toolbar.clearfix{ id: "#{object_id}_toolbar", data: { trix_editor_id: "#{object_id}_editor" }}
-  .button-groups
-    .button-group.pull-left
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Bold', data: { trix_attribute: 'bold', trix_key: 'b' }}
-        .icon.icon-bold
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Italic', data: { trix_attribute: 'italic', trix_key: 'i' }}
-        .icon.icon-italic
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Bullets', data: { trix_attribute: 'bullet' }}
-        .icon.icon-list-ul
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Link', data: { trix_action: 'link', trix_attribute: 'href', trix_key: 'k' }}
-        .icon.icon-link
-      %button.button.button-small.js-trix-image{ type: 'button', tabindex: -1, title: 'Image', data: { trix_action: 'image', trix_attribute: 'image' }}
-        .icon.icon-picture-o
-
-    .button-group.pull-left
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h1', data: { trix_attribute: 'heading1' }} H1
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h2', data: { trix_attribute: 'heading2' }} H2
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h3', data: { trix_attribute: 'heading3' }} H3
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h4', data: { trix_attribute: 'heading4' }} H4
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h5', data: { trix_attribute: 'heading5' }} H5
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h6', data: { trix_attribute: 'heading6' }} H6
-
-  .trix-dialogs{data: {trix_dialogs: true}}
-    .trix-dialog.trix-dialog--link{ data: { trix_dialog_attribute: 'href', trix_dialog: 'href'}}
-      .trix-dialog__link-fields
-        %input.trix-input.trix-input--dialog{type: 'text', name: 'href', placeholder: 'Enter a URL…', required: true, data: {trix_input: true}}
-        .button-group
-          %input.button{type: 'button', tabindex: -1, value: 'Link', data: { trix_method: 'setAttribute'}}
-          %input.button{type: 'button', tabindex: -1, value: 'Unlink', data: { trix_method: 'removeAttribute'}}
-
-%trix-editor.text-input{input: "#{object_id}_input", toolbar: "#{object_id}_toolbar", id: "#{object_id}_editor"}
+%trix-editor.text-input.trix-content{ input: "#{object_id}_input" }

data/app/views/spina/shared/_admin_bar.html.haml

@@ -1,4 +1,4 @@
 - if current_spina_user.present?
   #admin_bar
-    = link_to t('spina.edit_website'), spina.admin_root_url, data: {icon: 'q', :"no-turbolink" => true}, class: 'button button-hollow button-round button-small'
+    = link_to t('spina.edit_website'), spina.admin_root_url, data: {icon: 'q', turbolinks: false}, class: 'button button-hollow button-round button-small'
     = link_to t('spina.logout'), spina.admin_logout_path, data: {icon: 'h'}, class: 'button button-hollow button-round button-small'

data/app/views/spina/shared/_social.html.haml

@@ -1,5 +1,5 @@
 - if current_account.facebook.present?
-  = link_to "", current_account.facebook, class: 'facebook-button', data: {:"no-turbolink" => true}
+  = link_to "", current_account.facebook, class: 'facebook-button', data: {turbolinks: false}
 
 - if current_account.twitter.present?
-  = link_to "", current_account.twitter, class: 'twitter-button', data: {:"no-turbolink" => true}
+  = link_to "", current_account.twitter, class: 'twitter-button', data: {turbolinks: false}

data/config/locales/de.yml

@@ -161,6 +161,9 @@ de:
         facebook: Facebook
         twitter: Twitter
         google_plus: Google+
+        instagram: Instagram
+        youtube: YouTube
+        linkedin: LinkedIn
 
       spina/attachment:
         created_at: Erstellt am

data/config/locales/en.yml

@@ -102,6 +102,7 @@ en:
       choose_images: Choose images
       choose_image: Choose image
       remove_image: Remove image
+      back: Back
 
     wysiwyg:
       paragraph: Paragraph
@@ -173,6 +174,9 @@ en:
         facebook: Facebook
         twitter: Twitter
         google_plus: Google+
+        instagram: Instagram
+        youtube: YouTube
+        linkedin: LinkedIn
 
       spina/attachment:
         created_at: Created at

data/config/locales/es.yml

@@ -160,6 +160,9 @@ es:
         facebook: Facebook
         twitter: Twitter
         google_plus: Google+
+        instagram: Instagram
+        youtube: YouTube
+        linkedin: LinkedIn
 
       spina/attachment:
         created_at: Creado en

data/config/locales/fr.yml

@@ -162,6 +162,9 @@ fr:
         facebook: Facebook
         twitter: Twitter
         google_plus: Google+
+        instagram: Instagram
+        youtube: YouTube
+        linkedin: LinkedIn
 
       spina/attachment:
         created_at: Créé le

data/config/locales/it.yml

@@ -135,6 +135,9 @@ it:
         facebook: Facebook
         twitter: Twitter
         google_plus: Google+
+        instagram: Instagram
+        youtube: YouTube
+        linkedin: LinkedIn
 
       spina/attachment:
         created_at: Creato il

data/config/locales/nl.yml

@@ -48,6 +48,7 @@ nl:
       upload: kies een bestand
       choose_image: Kies afbeelding
       remove_image: Verwijder afbeelding
+      back: Terug
 
     forgot_password:
       new: Wachtwoord vergeten
@@ -165,6 +166,9 @@ nl:
         facebook: Facebook
         twitter: Twitter
         google_plus: Google+
+        instagram: Instagram
+        youtube: YouTube
+        linkedin: LinkedIn
 
       spina/attachment:
         created_at: Aangemaakt op

data/config/locales/pt-BR.yml

@@ -48,6 +48,7 @@ pt-BR:
       media_library_description: "Aqui é onde você vai encontrar todas as suas imagens e documentos"
       documents: Documentos
       photos: Imagens
+      images: Imagens
 
     pages:
       new: Nova página
@@ -92,8 +93,22 @@ pt-BR:
       delete_folder: Excluir pasta
       delete: Excluir
 
+    images:
+      delete_confirmation: "Tem certeza que deseja remover esta <strong>imagem</strong>?"
+      insert_photos: Inserir imagens
+      choose_images: Escolher imagens
+      insert_photo: Inserir imagem
+      link: "URL da sua imagem:"
+      cannot_be_created: "Imagem não pôde ser processada:"
+      upload_image: "Enviar uma imagem"
+      organize: Organizar imagens
+      done_organizing: Concluir organização
+      new_folder: Nova pasta
+      delete_folder: Excluir pasta
+      delete: Excluir
+
     wysiwyg:
-      paragraph: Paragráfo
+      paragraph: Parágrafo
       heading_1: Cabeçalho 1
       heading_2: Cabeçalho 2
       heading_3: Cabeçalho 3
@@ -125,6 +140,7 @@ pt-BR:
 
     media_library:
       photos: Imagens
+      images: Imagens
       attachments: Documentos
 
   activerecord:
@@ -162,6 +178,9 @@ pt-BR:
         facebook: Facebook
         twitter: Twitter
         google_plus: Google+
+        instagram: Instagram
+        youtube: YouTube
+        linkedin: LinkedIn
 
       spina/attachment:
         created_at: Criado em

data/config/locales/ru.yml

@@ -147,6 +147,9 @@ ru:
         facebook: Facebook
         twitter: Twitter
         google_plus: Google+
+        instagram: Instagram
+        youtube: YouTube
+        linkedin: LinkedIn
 
       spina/attachment:
         created_at: Создан в

data/config/locales/tr.yml

@@ -135,6 +135,9 @@ tr:
         facebook: Facebook
         twitter: Twitter
         google_plus: Google+
+        instagram: Instagram
+        youtube: YouTube
+        linkedin: LinkedIn
 
       spina/attachment:
         created_at: Oluşturulma zamanı

data/config/locales/zh-CN.yml

@@ -152,6 +152,9 @@ zh-CN:
         facebook: Facebook
         twitter: Twitter
         google_plus: Google+
+        instagram: Instagram
+        youtube: YouTube
+        linkedin: LinkedIn
 
       spina/attachment:
         created_at: 创建于

data/config/routes.rb

@@ -28,6 +28,7 @@ Spina::Engine.routes.draw do
     get 'media_library' => 'images#index', as: "media_library"
 
     resources :pages do
+      get :children, on: :member
       post :sort, on: :collection
     end