spina 0.12.0 → 1.0.0

data/app/views/spina/admin/attachments/_select.html.haml

@@ -4,22 +4,14 @@
     %h3= t('spina.attachments.insert')
 
   %section
-    -# = form_for [spina, :admin, @attachment], html: {multipart: true} do |f|
-    -#   = f.file_field :file, data: {customfileinput: true}
-
-    = form_tag spina.insert_admin_attachments_path(params[:page_part_id]), remote: true, class: 'gallery-prepend-attachment', style: 'margin-bottom: 0' do
-      .table-container
-        %table.table.table-clickable
-          %thead
-            %tr
-              %th
-              %th= Spina::Attachment.human_attribute_name(:name)
-          %tbody
-            - @attachments.each do |attachment|
-              %tr
-                %td= radio_button_tag :attachment_id, attachment.id, attachment.id == @selected_attachment_id
-                %td= attachment.name
+    = form_tag spina.insert_admin_attachments_path(params[:page_part_id]), remote: true, class: 'document-select' do
+      = hidden_field_tag :hidden_field_id, @hidden_field_id
 
+      %ul
+        - @attachments.each do |attachment|
+          %li.item
+            = radio_button_tag :attachment_id, attachment.id, attachment.id == @selected_attachment_id
+            = label_tag "attachment_id_#{attachment.id}", attachment.name
       %footer
         = link_to t('spina.cancel'), "#", data: {dismiss: 'modal'}
         = button_tag t('spina.attachments.insert'), type: 'submit', class: 'primary', data: {icon: 't '}

data/app/views/spina/admin/attachments/_select_collection.html.haml

@@ -4,22 +4,15 @@
     %h3= t('spina.attachments.insert_multiple')
 
   %section
-    -# = form_for [spina, :admin, @attachment], html: {multipart: true} do |f|
-    -#   = f.file_field :file, data: {customfileinput: true}
-
-    = form_tag spina.insert_collection_admin_attachments_path(params[:page_part_id]), remote: true, class: 'gallery-prepend-attachment', style: 'margin-bottom: 0' do
+    = form_tag spina.insert_collection_admin_attachments_path(params[:page_part_id]), remote: true, class: 'document-select' do
       .table-container
-        %table.table.table-clickable
-          %thead
+        %table.table.table-clickable-tr{style: 'margin-top: 0'}
+          - @attachments.each do |attachment|
             %tr
-              %th
-              %th= Spina::Attachment.human_attribute_name(:name)
-          %tbody
-            - @attachments.each do |attachment|
-              %tr
-                %td= check_box_tag 'attachment_ids[]', attachment.id, attachment.id.in?(@selected_attachment_ids)
-                %td= attachment.name
-
+              %td
+                .form-checkbox
+                  = check_box_tag 'attachment_ids[]', attachment.id, attachment.id.in?(@selected_attachment_ids), id: "attachment_id_#{attachment.id}"
+                  = label_tag "attachment_id_#{attachment.id}", attachment.name
       %footer
         = link_to t('spina.cancel'), "#", data: {dismiss: 'modal'}
         = button_tag t('spina.attachments.insert_multiple'), type: 'submit', class: 'primary', data: {icon: 't '}

data/app/views/spina/admin/attachments/create.js.erb

@@ -1,3 +1 @@
-<% unless @attachment.new_record? %>
-  $(".table-prepend-document").prepend("<%= j render partial: 'spina/admin/attachments/attachment', object: @attachment %>");
-<% end %>
+$(".table-prepend-document").prepend("<%= j render partial: 'spina/admin/attachments/attachment', collection: @attachments %>");

data/app/views/spina/admin/attachments/index.html.haml

@@ -7,9 +7,10 @@
         %th= Spina::Attachment.human_attribute_name(:created_at)
         %th
       %tr
-        %td{colspan: 5}
-          = form_for [spina, :admin, @attachment], html: {multipart: true, class: "new_document", style: 'margin-bottom: 0'} do |f|
-            = f.file_field :file, data: {customfileinput: true}
+        %td{colspan: 4}
+          = form_with model: [:admin, Spina::Attachment.new], class: 'new_document', style: 'margin-bottom: 0' do |f|
+            = f.submit style: 'display: none'
+            = f.file_field :files, multiple: true, data: {direct_upload_url: main_app.rails_direct_uploads_url, customfileinput: true}
 
     %tbody.table-prepend-document
       = render partial: 'spina/admin/attachments/attachment', collection: @attachments

data/app/views/spina/admin/attachments/insert.js.erb

@@ -0,0 +1,5 @@
+var hidden_input = $("input[name='<%= j params[:page_part_id] %>[partable_id]'], input[name='<%= j params[:page_part_id] %>[structure_partable_id]'], input[data-hidden-field-id='<%= j params[:hidden_field_id] %>']");
+hidden_input.parents('.media_picker').find('.attachment').remove();
+hidden_input.parents('.media_picker').append("<div class='attachment'><%= @attachment.name %></div>");
+hidden_input.val("<%= @attachment.id %>");
+$.hideModal();

data/app/views/spina/admin/image_collections/_image_collection.html.haml

@@ -0,0 +1,5 @@
+- if images.present?
+  %ul.sortable-grid
+    - images.each do |image|
+      %li.image{data: {image_id: image.id}}
+        = image_tag variant(image.file, resize: '300x300^', crop: "300x300+0+0")

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

@@ -0,0 +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
+  = 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

@@ -0,0 +1,10 @@
+.item.image{class: ('selected' if image.id.to_s.try(:in?, params[:selected_ids].to_a))}
+  - 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"))

data/app/views/spina/admin/images/create.js.erb

@@ -0,0 +1,8 @@
+<% @images.each do |image| %>
+  $item = $("<%=j render partial: 'spina/admin/images/image', object: image %>");
+  $(".gallery-prepend-image .infinite-scroll").prepend($item);
+<% end %>
+
+$('.gallery .new-image-form').html("<%=j render 'form' %>").find('input[type="file"]').each(function() {
+  $(this).customFileInput();
+});

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

@@ -0,0 +1,22 @@
+- content_for(:header_actions) do
+  - if @media_folders.any?
+    = link_to '#', class: 'button organize-switch', data: {organize_images: t('spina.photos.organize'), done_organizing: t('spina.photos.done_organizing')} do
+      = icon('random')
+      = t('spina.photos.organize')
+
+  = link_to new_admin_media_folder_path, class: 'button button-primary', style: 'margin-right: 0; margin-left: 4px', data: {remote: true} do
+    = icon('plus')
+    =t 'spina.photos.new_folder'
+
+.gallery-container
+  .gallery
+    .item.new-image-form
+      = render 'form'
+
+    = render partial: 'spina/admin/media_folders/media_folder', collection: @media_folders
+
+    .gallery-prepend-image
+      .infinite-scroll
+        = render partial: 'spina/admin/images/image', collection: @images
+
+      .infinite-pagination{data: {controller: 'infinite-scroll'}}= link_to_next_page @images, 'Next', remote: true, data: {target: "infinite-scroll.link"}

data/app/views/spina/admin/images/index.js.erb

@@ -0,0 +1,7 @@
+// Append new data
+$("<%=j render partial: 'spina/admin/images/image', collection: @images %>").appendTo($(".infinite-scroll"));
+
+// Update pagination link
+$('.infinite-pagination').html("<%= j link_to_next_page @images, 'Next', remote: true, data: {target: 'infinite-scroll.link'} %>");
+
+$('.infinite-scroll .item:not(.ui-draggable)').draggable({revert: 'invalid', disabled: true});

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

@@ -0,0 +1,14 @@
+.modal
+  %header
+    = link_to '#', data: {dismiss: "modal"} do
+      = icon('cross')
+    %h3=t 'spina.photos.new_folder'
+
+  = form_for [spina, :admin, @media_folder] do |f|
+    %section
+      = f.text_field :name, placeholder: Spina::MediaFolder.human_attribute_name(:name)
+    %footer
+      = link_to t('spina.cancel'), '#', data: {dismiss: 'modal'}
+      = button_tag type: :submit, class: 'primary' do
+        %i.icon.icon-plus{style: 'margin-right: 4px'}
+        =t 'spina.photos.new_folder'

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

@@ -0,0 +1,8 @@
+= link_to [:admin, media_folder], class: 'item media-folder', data: {add_to_media_folder_url: add_to_media_folder_admin_images_url(media_folder)} 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.png'
+    .media-folder-shadow
+  .media-folder-name= media_folder.name

data/app/views/spina/admin/media_folders/new.js.erb

@@ -0,0 +1 @@
+$("<%=j render 'form' %>").modal()

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

@@ -0,0 +1,17 @@
+- content_for(:header_actions) do
+  = link_to t('spina.photos.delete_folder'), spina.admin_media_folder_path(@media_folder), class: 'button button-danger button-link', style: "margin-right: 0", data: {method: :delete, confirm: t('spina.delete_confirmation', subject: @media_folder.name)}
+
+.gallery-container
+  .gallery
+    .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
+        = 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}
+
+    .gallery-prepend-image
+      .infinite-scroll
+        = render partial: 'spina/admin/images/image', collection: @images
+
+      .infinite-pagination{data: {controller: 'infinite-scroll'}}= link_to_next_page @images, 'Next', remote: true, data: {target: "infinite-scroll.link"}

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

@@ -0,0 +1,26 @@
+.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'
+
+      = 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'
+
+        .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"}
+
+        - 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
+                = icon('plus')
+                = t('spina.images.choose_images')
+                %span.gallery-select-counter
+                  - if params[:selected_ids].try(:any?)
+                    (#{ params[:selected_ids].count })

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

@@ -0,0 +1,5 @@
+// Append new data
+$("<%=j render partial: 'spina/admin/images/image', collection: @images %>").appendTo($(".infinite-scroll"));
+
+// Update pagination link
+$('.infinite-pagination').html("<%= j link_to_next_page @images, 'Next', params: params.slice(:selected_photo_id).permit(:selected_photo_id), remote: true, data: {target: 'infinite-scroll.link'} %>")

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

@@ -0,0 +1,28 @@
+let hidden_input = $("input[data-hidden-field-id='<%= j params[:hidden_field_id] %>']");
+hidden_input.parents('.media_picker').find('.image').remove();
+
+<% if @image.present? %>
+  hidden_input.parents('.media_picker').append("<%=j render partial: 'spina/admin/images/image', object: @image, locals: {simple: true} %>");
+  hidden_input.val("<%= @image.id %>");
+
+  // Trix editor
+  $('#<%= params[:trix_editor_id] %>').trigger('image-insert', '<%= main_app.url_for(@image.variant(resize: "800x800")) %>');
+  $.hideModal();
+<% end %>
+
+<% if @images.present? %>
+  let image_collection = $("<%= j render partial: 'spina/admin/image_collections/image_collection', locals: {images: @images} %>");
+  hidden_input.parents('.horizontal-form-content').find('.image-collection').html(image_collection);
+  hidden_input.val("<%= @images.map(&:id).join(',') %>");
+<% end %>
+
+$('.sortable-grid').sortable().bind('sortupdate', function(e) {
+  position_array = [];
+  $(e.target).find('li.image').each(function(index) {
+    position_array.push($(this).data('image-id'));
+  });
+  $(e.target).parents('.horizontal-form-content').find('.images-positions').val(position_array.join(","));
+});
+$('.sortable-grid').trigger('sortupdate');
+
+$.hideModal();

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

@@ -0,0 +1 @@
+$("<%=j render partial: 'modal', locals: {multiple: params[:multiple]} %>").modal();

data/app/views/spina/admin/navigations/_page.html.haml

@@ -4,5 +4,5 @@
       = check_box_tag 'navigation[page_ids][]', page.id, @navigation.page_ids.include?(page.id)
       = label_tag page.title
 
-- if page.children.any?
-  = render partial: 'page', collection: page.children.sorted
+- if page.children.regular_pages.any?
+  = render partial: 'page', collection: page.children.sorted.regular_pages

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

@@ -10,7 +10,7 @@
   .well
     .table-container
       %table.table.table-clickable
-        %tbody= render partial: 'page', collection: Spina::Page.sorted.roots
+        %tbody= render partial: 'page', collection: Spina::Page.sorted.roots.regular_pages
 
   .well
     .horizontal-form

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

@@ -10,18 +10,24 @@
 
 = form_for [spina, :admin, @page], html: {id: 'page_form', autocomplete: "off"} do |f|
   %header#header
-    .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
-    - unless @page.new_record?
-      - if Spina.config.locales.size > 1
-        %div{style: 'display: inline-block; margin-left: 12px; position: absolute', data: {dropdown: true}}
-          = link_to '#', class: 'button button-link button-round button-small', data: {trigger: 'dropdown', target: '#locales'} do
-            = icon('comment')
-            = @locale.upcase
-
-          %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)
+    .breadcrumbs
+      = render_breadcrumbs separator: '<div class="divider"></div>'
+      %span{style: 'margin-left: 10px'}
+        - unless @page.new_record?
+          - if Spina.config.locales.size > 1
+            %div{style: "display: inline-block", data: {dropdown: true}}
+              = link_to '#', class: 'button button-hollow button-small', style: 'margin-left: 0; margin-right: 0', data: {trigger: 'dropdown', target: '#locales'} do
+                = icon('comment')
+                =t "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("languages.#{locale}"), "?locale=#{locale}", style: ('font-weight: 600' if @locale.to_s == locale.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'}
 
     #header_actions
       %button.button.button-primary{type: 'submit', style: 'margin-right: 0', data: {disable_with: t('spina.pages.saving')}}
@@ -36,9 +42,9 @@
 
   = hidden_field_tag :locale, @locale
 
-  - Globalize.with_locale(@locale) do
+  - Mobility.with_locale(@locale) do
     - @tabs.each do |tab|
       = render "spina/admin/pages/form_#{tab}", f: f
 
-    - unless @page.new_record? || !@page.deletable
-      .pull-right= link_to t('spina.permanently_delete'), spina.admin_page_path(@page), method: :delete, data: {confirm: t('spina.pages.delete_confirmation', subject: @page.menu_title)}, class: 'button button-link button-danger'
+  - unless @page.new_record? || !@page.deletable
+    .pull-right= link_to t('spina.permanently_delete'), spina.admin_page_path(@page), method: :delete, data: {confirm: t('spina.pages.delete_confirmation', subject: @page.menu_title)}, class: 'button button-link button-danger'

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

@@ -1,47 +1,57 @@
-#advanced.tab-content.well
+#advanced.tab-content
   .horizontal-form
-    .horizontal-form-group
-      .horizontal-form-label
-        = Spina::Page.human_attribute_name :draft
-        %small= Spina::Page.human_attribute_name :draft_description
-      .horizontal-form-content
-        = f.check_box :draft, data: {switch: true}
+    .well
+      .horizontal-form-group
+        .horizontal-form-label
+          = Spina::Page.human_attribute_name :draft
+          %small= Spina::Page.human_attribute_name :draft_description
+        .horizontal-form-content
+          = f.check_box :draft, data: {switch: true}
+      .horizontal-form-group
+        .horizontal-form-label
+          = Spina::Page.human_attribute_name :show_in_menu
+          %small= Spina::Page.human_attribute_name :show_in_menu_description
+        .horizontal-form-content
+          = f.check_box :show_in_menu, data: {switch: true}
+      .horizontal-form-group
+        .horizontal-form-label
+          = Spina::Page.human_attribute_name :menu_title
+        .horizontal-form-content
+          = f.text_field :menu_title, placeholder: Spina::Page.human_attribute_name(:show_in_menu_placeholder), value: f.object.menu_title(fallback: false, default: nil)
+      .horizontal-form-group
+        .horizontal-form-label
+          = Spina::Page.human_attribute_name :skip_to_first_child
+          %small= Spina::Page.human_attribute_name :skip_to_first_child_description
+        .horizontal-form-content
+          = f.check_box :skip_to_first_child, data: {switch: true}
 
-    .horizontal-form-group
-      .horizontal-form-label
-        = Spina::Page.human_attribute_name :skip_to_first_child
-        %small= Spina::Page.human_attribute_name :skip_to_first_child_description
-      .horizontal-form-content
-        = f.check_box :skip_to_first_child, data: {switch: true}
-    .horizontal-form-group
-      .horizontal-form-label
-        = Spina::Page.human_attribute_name :link_url
-        %small= Spina::Page.human_attribute_name :link_url_description
-      .horizontal-form-content
-        = f.text_field :link_url, placeholder: Spina::Page.human_attribute_name(:link_url_placeholder)
-    .horizontal-form-group
-      .horizontal-form-label
-        = Spina::Page.human_attribute_name :show_in_menu
-        %small= Spina::Page.human_attribute_name :show_in_menu_description
-      .horizontal-form-content
-        = f.check_box :show_in_menu, data: {switch: true}
-    .horizontal-form-group
-      .horizontal-form-label
-        = Spina::Page.human_attribute_name :menu_title
-      .horizontal-form-content
-        = f.text_field :menu_title, placeholder: Spina::Page.human_attribute_name(:show_in_menu_placeholder), value: f.object.read_attribute(:menu_title)
+    .well
+      .horizontal-form-group
+        .horizontal-form-label
+          = Spina::Page.human_attribute_name :link_url
+          %small= Spina::Page.human_attribute_name :link_url_description
+        .horizontal-form-content
+          = f.text_field :link_url, placeholder: Spina::Page.human_attribute_name(:link_url_placeholder)
 
-    .horizontal-form-group{style: ('display: none' if @page.custom_page?)}
-      .horizontal-form-label
-        = Spina::Page.human_attribute_name :view_template
-      .horizontal-form-content
-        .select-dropdown.page-template{data: {page_parts: @page.view_template_config(current_theme)[:page_parts]}}
-          - 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
+    .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)
 
-    .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
+          = Spina::Page.human_attribute_name :view_template
+        .horizontal-form-content
+          .select-dropdown.page-template{data: {page_parts: @page.view_template_config(current_theme)[:page_parts]}}
+            - 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')

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

@@ -13,4 +13,4 @@
       = ff.hidden_field :name
 
       .horizontal-form-group.page-part{data: {name: ff.object.name}}
-        = render "spina/admin/page_partables/#{ partable_type_partial_namespace(ff.object.page_partable_type) }/form", f: ff
+        = render "spina/admin/partables/#{ partable_type_partial_namespace(ff.object.page_partable_type) }/form", f: ff