spina 0.11.1 → 0.12.0

data/app/models/concerns/spina/partable.rb

@@ -1,9 +1,24 @@
 module Spina
   module Partable
-    def part(part)
-      part = parts.where(name: part[:name]).first || parts.build(part)
-      part.partable = part.partable_type.constantize.new unless part.partable.present?
-      part
+    extend ActiveSupport::Concern
+
+    included do
+      def part(attributes)
+        part = parts.where(name: attributes[:name]).first_or_initialize(attributes)
+        part.partable = part.partable_type.constantize.new if part.partable.blank?
+        part.options = attributes[:options]
+        part
+      end
+
+      def has_content?(name)
+        content(name).present?
+      end
+
+      def content(name)
+        part = parts.find_by(name: name)
+        part.try(:content)
+      end
+
     end
   end
-end
+end

data/app/models/concerns/spina/photo_collectable.rb

@@ -0,0 +1,24 @@
+require 'active_support/concern'
+
+module Spina
+  module PhotoCollectable
+    extend ActiveSupport::Concern
+
+    included do
+      attr_reader :photo_tokens, :photo_positions
+    end
+
+    def photo_tokens=(ids)
+      self.photo_ids = ids.split(",")
+    end
+
+    def photo_positions=(positions)
+      positions = positions.split(",")
+      self.photo_collections_photos.each do |photo|
+        photo.position = positions.index(photo.photo.try(:id).try(:to_s))
+      end
+      logger.info self.photo_collections_photos.inspect
+    end
+
+  end
+end

data/app/models/spina/account.rb

@@ -1,7 +1,8 @@
 module Spina
   class Account < ApplicationRecord
+    include Partable
+    
     serialize :preferences
-    include Spina::Partable
 
     mount_uploader :logo, LogoUploader
 
@@ -42,7 +43,10 @@ module Spina
 
     def bootstrap_website
       theme_config = ::Spina::Theme.find_by_name(theme)
-      bootstrap_pages(theme_config) if theme_config
+      if theme_config
+        bootstrap_pages(theme_config) 
+        bootstrap_navigations(theme_config)
+      end
     end
 
     def bootstrap_pages(theme)
@@ -51,20 +55,26 @@ module Spina
       activate_used_view_templates(theme)
     end
 
+    def bootstrap_navigations(theme)
+      theme.navigations.each_with_index do |navigation, index|
+        Navigation.where(name: navigation[:name]).first_or_create.update_attributes(navigation.merge(position: index))
+      end
+    end
+
     def find_or_create_custom_pages(theme)
       theme.custom_pages.each do |page|
-        Page.by_name(page[:name])
+        Page.where(name: page[:name])
             .first_or_create(title: page[:title])
-            .update_columns(view_template: page[:view_template], deletable: page[:deletable])
+            .update_attributes(view_template: page[:view_template], deletable: page[:deletable])
       end
     end
 
     def deactivate_unused_view_templates(theme)
-      Page.active.not_by_config_theme(theme).update_all(active: false)
+      Page.active.where.not(view_template: theme.view_templates.map{|h|h[:name]}).update_all(active: false)
     end
 
     def activate_used_view_templates(theme)
-      Page.not_active.by_config_theme(theme).update_all(active: true)
+      Page.where(active: false, view_template: theme.view_templates.map{|h|h[:name]}).update_all(active: true)
     end
 
   end

data/app/models/spina/layout_part.rb

@@ -1,6 +1,7 @@
 module Spina
   class LayoutPart < ApplicationRecord
     include Part
+    include Optionable
 
     belongs_to :account
     belongs_to :layout_partable, polymorphic: true

data/app/models/spina/option.rb

@@ -0,0 +1,17 @@
+module Spina
+  class Option < ApplicationRecord
+    has_one :page_part, as: :page_partable
+    has_one :layout_part, as: :layout_partable
+    has_one :structure_part, as: :structure_partable
+
+    def content
+      I18n.t(['options',part.name,value].compact.join('.'))
+    end
+
+    private
+
+    def part
+      page_part || layout_part || structure_part
+    end
+  end
+end

data/app/models/spina/page.rb

@@ -1,40 +1,38 @@
 module Spina
   class Page < ApplicationRecord
-    include Spina::Partable
-
-    translates :title, :menu_title, :seo_title, :description, :materialized_path
+    include Partable
 
+    # Stores the old path when generating a new materialized_path
     attr_accessor :old_path
 
-    has_ancestry orphan_strategy: :adopt # i.e. added to the parent of deleted node
-
+    # Page contains multiple parts called PageParts
     has_many :page_parts, dependent: :destroy, inverse_of: :page
+    alias_attribute :parts, :page_parts
+    accepts_nested_attributes_for :page_parts, allow_destroy: true
+
+    # Orphaned pages are adopted by parent pages if available, otherwise become root
+    has_ancestry orphan_strategy: :adopt
+
+    # Pages can belong to navigations (optional)
     has_many :navigation_items, dependent: :destroy
     has_many :navigations, through: :navigation_items
 
-    before_validation :ensure_title
-    before_validation :ancestry_is_nil
-    before_validation :set_materialized_path
+    scope :active, -> { where(active: true) }
+    scope :sorted, -> { order(:position) }
+    scope :live, -> { active.where(draft: false) }
+    scope :in_menu, -> { where(show_in_menu: true) }
+
+    # Save children to update all materialized_paths
     after_save :save_children
+
+    # Create a 301 redirect if materialized_path changed
     after_save :rewrite_rule
-    after_create :add_to_navigation
 
-    accepts_nested_attributes_for :page_parts, allow_destroy: true
-    validates_presence_of :title
+    before_validation :set_materialized_path
+    validates :title, presence: true
     validates :materialized_path, uniqueness: true
 
-    scope :sorted, -> { order('position') }
-    scope :custom_pages, -> { where(deletable: false) }
-    scope :live, -> { where(draft: false, active: true) }
-    scope :in_menu, -> { where(show_in_menu: true) }
-    scope :active, -> { where(active: true) }
-    scope :not_active, -> { where(active: false) }
-    scope :by_name, ->(name) { where(name: name) }
-    scope :not_by_config_theme, ->(theme) { where.not(view_template: theme.view_templates.map { |h| h[:name] }) }
-    scope :by_config_theme, ->(theme) { where(view_template: theme.view_templates.map { |h| h[:name] }) }
-
-    alias_attribute :page_part, :part
-    alias_attribute :parts, :page_parts
+    translates :title, :menu_title, :seo_title, :description, :materialized_path
 
     def to_s
       name
@@ -60,15 +58,6 @@ module Spina
       read_attribute(:seo_title).blank? ? title : read_attribute(:seo_title)
     end
 
-    def has_content?(page_part)
-      content(page_part).present?
-    end
-
-    def content(page_part)
-      page_part = page_parts.where(name: page_part).first
-      page_part.try(:content)
-    end
-
     def live?
       !draft? && active?
     end
@@ -101,43 +90,27 @@ module Spina
       theme.page_parts.select { |page_part| page_part[:name].in? view_template_config(theme)[:page_parts] }
     end
 
-    def full_materialized_path
-      File.join(Spina::Engine.routes.url_helpers.root_path, materialized_path)
-    end
-
     private
 
-    def rewrite_rule
-      RewriteRule.create(old_path: old_path, new_path: materialized_path) if old_path != materialized_path
-    end
-
-    def localized_materialized_path
-      if I18n.locale == I18n.default_locale
-        generate_materialized_path.prepend('/')
-      else
-        generate_materialized_path.prepend("/#{I18n.locale}/")
+      def rewrite_rule
+        RewriteRule.create(old_path: old_path, new_path: materialized_path) if old_path != materialized_path
       end
-    end
 
-    def generate_materialized_path
-      if root?
-        name == 'homepage' ? '' : "#{url_title}"
-      else
-        ancestors.collect(&:url_title).append(url_title).join('/')
+      def localized_materialized_path
+        if I18n.locale == I18n.default_locale
+          generate_materialized_path.prepend('/')
+        else
+          generate_materialized_path.prepend("/#{I18n.locale}/").gsub(/\/\z/, "")
+        end
       end
-    end
-
-    def ancestry_is_nil
-      self.ancestry = self.ancestry.presence
-    end
 
-    def ensure_title
-      self.title = self.name.capitalize if self.title.blank? && self.name.present?
-    end
-
-    def add_to_navigation
-      navigations << Spina::Navigation.where(auto_add_pages: true)
-    end
+      def generate_materialized_path
+        if root?
+          name == 'homepage' ? '' : "#{url_title}"
+        else
+          ancestors.collect(&:url_title).append(url_title).join('/')
+        end
+      end
 
   end
 end

data/app/models/spina/page_part.rb

@@ -1,6 +1,7 @@
 module Spina
   class PagePart < ApplicationRecord
     include Part
+    include Optionable
 
     belongs_to :page, inverse_of: :page_parts
     belongs_to :page_partable, polymorphic: true, optional: true

data/app/models/spina/photo_collection.rb

@@ -1,30 +1,18 @@
 module Spina
   class PhotoCollection < ApplicationRecord
+    include PhotoCollectable
 
     has_one :page_part, as: :page_partable
     has_many :photo_collections_photos, autosave: true
     has_many :photos, through: :photo_collections_photos
     has_many :structure_parts, as: :structure_partable
 
-    attr_reader :photo_tokens, :photo_positions
     accepts_nested_attributes_for :photos, allow_destroy: true
 
     def content
       self
     end
 
-    def photo_tokens=(ids)
-      self.photo_ids = ids.split(",")
-    end
-
-    def photo_positions=(positions)
-      positions = positions.split(",")
-      self.photo_collections_photos.each do |photo|
-        photo.position = positions.index(photo.photo.try(:id).try(:to_s))
-      end
-      logger.info self.photo_collections_photos.inspect
-    end
-
     alias_method :old_update_attributes, :update_attributes
     def update_attributes(attributes)
       self.photos.clear if attributes.reject{|key,value| key == "id" }.blank?

data/app/models/spina/structure_item.rb

@@ -1,21 +1,17 @@
 module Spina
   class StructureItem < ApplicationRecord
+    include Partable
+
     before_validation :ensure_position
     belongs_to :structure, optional: true
     has_many :structure_parts, dependent: :destroy
 
-    scope :sorted_by_structure, -> { order('position') }
+    scope :sorted_by_structure, -> { order(:position) }
 
     validates_presence_of :position
     accepts_nested_attributes_for :structure_parts, allow_destroy: true
 
-    def has_content?(structure_part)
-      content(structure_part).present?
-    end
-
-    def content(structure_part)
-      structure_parts.find_by(name: structure_part).try(:content)
-    end
+    alias_attribute :parts, :structure_parts
 
     def ensure_position
       self.position ||= Time.now.to_i

data/app/models/spina/structure_part.rb

@@ -1,6 +1,8 @@
 module Spina
   class StructurePart < ApplicationRecord
     include Part
+    include PhotoCollectable
+    include Optionable
 
     belongs_to :structure_item, optional: true
     belongs_to :structure_partable, polymorphic: true, optional: true
@@ -13,18 +15,5 @@ module Spina
     alias_attribute :partable, :structure_partable
     alias_attribute :partable_type, :structure_partable_type
     alias_method :structure_partable_attributes=, :partable_attributes=
-
-    attr_reader :photo_tokens, :photo_positions
-    def photo_tokens=(ids)
-      self.photo_ids = ids.split(",")
-    end
-
-    def photo_positions=(positions)
-      positions = positions.split(",")
-      self.photo_collections_photos.each do |photo|
-        photo.position = positions.index(photo.photo.try(:id).try(:to_s))
-      end
-      logger.info self.photo_collections_photos.inspect
-    end
   end
 end

data/app/models/spina/user.rb

@@ -1,6 +1,7 @@
 module Spina
   class User < ApplicationRecord
     has_secure_password
+    has_secure_token :password_reset_token
 
     validates_presence_of :name, :email
     validates_presence_of :password, on: :create

data/app/presenters/spina/pages/menu_presenter.rb

@@ -1,4 +1,3 @@
-# require 'active_support/core_ext/string'
 require 'active_support/configurable'
 require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/url_helper'
@@ -10,24 +9,19 @@ module Spina
       include ActionView::Helpers::UrlHelper
       include ActiveSupport::Configurable
 
-      config_accessor :list_tag, :list_class, :li, :list_wrapper, :list_item_tag, :list_item_css, :selected_css, :current_css, :first_css, :last_css, :list_tag_with_child_css, :list_item_with_child_css
+      config_accessor :list_tag, :list_class, :list_item_tag, :list_item_css, :selected_css, :current_css
 
       self.list_tag = :ul
       self.list_class = 'nav'
       self.list_item_tag = :li
       self.list_item_css = nil
-      self.list_wrapper = false
       self.selected_css = 'active'
       self.current_css = 'current'
-      self.first_css = 'first'
-      self.last_css = 'last'
-      self.list_tag_with_child_css = 'dropdown-menu'
-      self.list_item_with_child_css = 'dropdown'
 
       attr_accessor :context, :collection, :current_menu_item
       delegate :output_buffer, :output_buffer=, to: :context
 
-      def initialize(collection, context, current_menu_item=nil)
+      def initialize(collection, context, current_menu_item = nil)
         @collection = collection
         @context = context
         @current_menu_item = current_menu_item
@@ -35,59 +29,34 @@ module Spina
       end
 
       def to_html
-        render_list_wrapper(collection) if collection.present?
+        render_menu_items(collection) if collection.present?
       end
 
       private
 
-      def render_list_wrapper(menu_items)
-        if menu_items.any?
-          if list_wrapper
-            content_tag(:div) do
-              render_menu_items(menu_items)
+        def render_menu_items(menu_items)
+          content_tag(list_tag, class: list_class) do
+            menu_items.each.inject(ActiveSupport::SafeBuffer.new) do |buffer, item|
+              buffer << render_menu_item(item)
             end
-          else
-            render_menu_items(menu_items)
           end
         end
-      end
 
-      def render_menu_items(menu_items)
-        content_tag(list_tag, class: menu_items_css(menu_items)) do
-          menu_items.each_with_index.inject(ActiveSupport::SafeBuffer.new) do |buffer, (item, index)|
-            buffer << render_menu_item(item, index, menu_items.length)
+        def render_menu_item(menu_item)
+          content_tag(list_item_tag, class: menu_item_css(menu_item[0])) do
+            buffer = ActiveSupport::SafeBuffer.new
+            buffer << link_to(menu_item[0].menu_title, menu_item[0].materialized_path)
+            buffer << render_menu_items(menu_item[1]) if menu_item[1].present?
+            buffer
           end
         end
-      end
 
-      def render_menu_item(menu_item, index, menu_items_length)
-        content_tag(list_item_tag, class: menu_item_css(menu_item[0], index, menu_items_length, !menu_item[1].empty?)) do
-          buffer = ActiveSupport::SafeBuffer.new
-          buffer << link_to(menu_item[0].menu_title, menu_item[0].full_materialized_path)
-          buffer << render_list_wrapper(menu_item[1])
-          buffer
+        def menu_item_css(menu_item)
+          css = [list_item_css]
+          css << selected_css if (@selected_menu_items.present? && @selected_menu_items.include?(menu_item) )
+          css << current_css if @current_menu_item == menu_item
+          css
         end
-      end
-
-      def menu_items_css(menu_items)
-        css = []
-        css << list_class
-        css << list_tag_with_child_css if !menu_items.first[0].ancestry.nil?
-
-        css.reject(&:blank?).presence
-      end
-
-      def menu_item_css(menu_item, index, menu_items_length, has_child)
-        css = []
-        css << list_item_css
-        css << selected_css if (@selected_menu_items.present? && @selected_menu_items.include?(menu_item) )
-        css << current_css if @current_menu_item == menu_item
-        css << first_css if index == 0
-        css << last_css if index + 1 == menu_items_length
-        css << list_item_with_child_css if has_child
-
-        css.reject(&:blank?).presence
-      end
 
     end
   end

data/app/views/layouts/spina/mail.html.erb

@@ -0,0 +1 @@
+<%= yield %>

data/app/views/spina/admin/page_partables/{colors → options}/_form.html.haml

@@ -2,6 +2,5 @@
   = f.object.title
 .horizontal-form-content
   = f.fields_for :page_partable, f.object.page_partable do |ff|
-    .colorpicker
-      = ff.text_field :content, placeholder: f.object.title
-      .colorpicker-container
+    .select-dropdown
+      = ff.select :value, f.object.options[:values].map{|o| [option_label(f.object, o), o]}, prompt: true

data/app/views/spina/admin/page_partables/photo_collections/_form.html.haml

@@ -8,10 +8,10 @@
           %i.icon.icon-dots
           =t 'spina.pages.photos_picker'
 
-    .photo-collection
-      - if ff.object.photos.sorted_by_photo_collection.any?
-        = render 'spina/admin/photos/photo_collection', photos: ff.object.photos.sorted_by_photo_collection
-      - elsif ff.object.photos.any?
-        = render 'spina/admin/photos/photo_collection', photos: ff.object.photos
-    = ff.hidden_field :photo_tokens, value: ff.object.photo_ids.join(",")
-    = ff.hidden_field :photo_positions, value: ff.object.photos.sorted_by_photo_collection.pluck(:photo_id).join(","), class: 'photo-positions'
+      .photo-collection
+        - if ff.object.photos.sorted_by_photo_collection.any?
+          = render 'spina/admin/photos/photo_collection', photos: ff.object.photos.sorted_by_photo_collection
+        - elsif ff.object.photos.any?
+          = render 'spina/admin/photos/photo_collection', photos: ff.object.photos
+      = ff.hidden_field :photo_tokens, value: ff.object.photo_ids.join(",")
+      = ff.hidden_field :photo_positions, value: ff.object.photos.sorted_by_photo_collection.pluck(:photo_id).join(","), class: 'photo-positions'

data/app/views/spina/admin/page_partables/structures/_form.html.haml

@@ -4,19 +4,18 @@
       %label= f.object.title
 
       %ul
-        - unless f.object.page_partable.nil?
-          - f.object.page_partable.structure_items.sorted_by_structure.each_with_index do |structure_item, index|
-            %li{class: ('active' if index == 0), data: {structure_item_id: structure_item.id}}
-              = link_to "#structure_form_pane_#{structure_item.id}" do
-                %i.icon.icon-bars.sortable-handle
-                = structure_item.structure_parts.first.try(:structure_partable).try(:content)
+        - f.object.page_partable.structure_items.sort_by(&:position).each_with_index do |structure_item, index|
+          %li{class: ('active' if index == 0), data: {structure_item_id: structure_item.object_id}}
+            = link_to "#structure_form_pane_#{structure_item.object_id}" do
+              %i.icon.icon-bars.sortable-handle
+              = structure_item.structure_parts.first.try(:structure_partable).try(:content)
 
       = f.fields_for :page_partable do |ff|
         - ff.object.page_part = f.object
-        = link_to_add_structure_item_fields ff, :structure_items do
+        = link_to_add_structure_item_fields ff do
           = icon('plus')
 
     .structure-form-content
       = f.fields_for :page_partable do |ff|
-        = ff.fields_for :structure_items, ff.object.structure_items.sorted_by_structure do |fff|
+        = ff.fields_for :structure_items, ff.object.structure_items.sort_by(&:position) do |fff|
           = render 'spina/admin/structure_items/fields', f: fff

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

@@ -8,12 +8,12 @@
       = link_to '#', data: {close_notification: true} do
         = icon('cross')
 
-= form_for [spina, :admin, @page], html: {id: 'page_form', autocomplete: "off", data: {remote: @page.persisted?}} do |f|
+= 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; top: -4px', data: {dropdown: true}}
+        %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

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

@@ -39,9 +39,9 @@
           - 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{style: ('display: none' if @page.custom_page?)}
+    .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)
+          = f.select :parent_id, page_ancestry_options(f.object), include_blank: Spina::Page.human_attribute_name(:no_parent)

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

@@ -0,0 +1,13 @@
+= form_for @user, url: spina.admin_password_reset_path(params[:id]), html: {id: "login_wrapper"} do |f|
+  = image_tag 'spina/admin/spina.png', class: 'animated fadeInDown'
+  - if @user.errors.any?
+    .failed-to-login.animated.fadeInDown
+      .icon.icon-cross
+      = @user.errors.full_messages.join('<br />').html_safe
+
+  .login-fields
+    = f.text_field :password, placeholder: Spina::User.human_attribute_name(:password), autofocus: true, class: "animated fadeInDown"
+
+    = f.text_field :password_confirmation, placeholder: Spina::User.human_attribute_name(:password_confirmation), class: "animated fadeInDown"
+
+  = f.button t('spina.forgot_password.save'), class: 'button button-primary animated fadeInDown'

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

@@ -0,0 +1,13 @@
+= form_tag spina.admin_password_resets_path, method: :post, id: "login_wrapper" do
+  = image_tag 'spina/admin/spina.png'
+  - if flash[:alert].present?
+    .failed-to-login.animated.fadeInDown
+      .icon.icon-cross
+      = flash[:alert]
+
+  .login-fields
+    = text_field_tag :email, params[:email], placeholder: Spina::User.human_attribute_name(:email), autofocus: true
+
+  = button_tag t('spina.forgot_password.request'), class: 'button button-primary'
+
+  .login-extra-links= link_to t('spina.login'), spina.admin_login_path, class: 'button button-hollow button-block'

data/app/views/spina/admin/photos/_photo.html.haml

@@ -1,7 +1,8 @@
 .item
   .overlay
     = link_to spina.admin_photo_path(photo), method: :delete, class: 'icon-only delete-photo-link', data: {confirm: t('spina.photos.delete_confirmation')} do
-      =t('spina.photos.delete')
+      = t('spina.photos.delete')
+    %span.photo-name= truncate(photo.name, length: 125)
   = radio_button_tag :photo_id, photo.id
   = check_box_tag 'photo_ids[]', photo.id
   = image_tag photo.file.thumb.url, id: "photo_#{photo.id}"

data/app/views/spina/admin/photos/{_wysihtml5_select.html.haml → _trix_select.html.haml}

@@ -5,9 +5,7 @@
         = form_for [spina, :admin, @photo], html: {multipart: true} do |f|
           = f.label :file, t('spina.photos.upload_image')
           = f.file_field :files, multiple: true, data: {customfileinput: true}
-
-      = form_tag spina.wysihtml5_insert_admin_photos_path(params[:object_id]), remote: true, class: 'gallery-prepend-image' do
+      = form_tag spina.trix_insert_admin_photos_path(params[:object_id]), remote: true, class: 'gallery-prepend-image' do
         .infinite-scroll
           = render partial: 'spina/admin/photos/photo_single_picker', collection: @photos
-
-        .infinite-pagination= link_to_next_page @photos, 'Next', remote: true
+        .infinite-pagination= link_to_next_page @photos, 'Next', remote: true

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

@@ -1,6 +1,4 @@
-<% if @photo.new_record? %>
-  alert("<%= I18n.t 'spina.photos.cannot_be_created' %> <%= j @photo.errors.full_messages.join(', ').html_safe %>");
-<% else %>
-  $item = $("<%=j render partial: 'spina/admin/photos/photo', object: @photo %>");
+<% @photos.each do |photo| %>
+  $item = $("<%=j render partial: 'spina/admin/photos/photo', object: photo %>");
   $(".gallery-prepend-image .infinite-scroll").prepend($item);
-<% end %>
+<% end %>

data/app/views/spina/admin/photos/{wysihtml5_infinite_scroll.js.erb → trix_infinite_scroll.js.erb}

@@ -1,6 +1,4 @@
 // Append new data
 $("<%=j render partial: 'spina/admin/photos/photo_single_picker', collection: @photos %>").appendTo($(".infinite-scroll"));
-
 // Update pagination link
 $('.infinite-pagination').html("<%= j link_to_next_page @photos, 'Next', remote: true %>").infiniteScroll()
-

data/app/views/spina/admin/photos/{wysihtml5_insert.js.coffee → trix_insert.js.erb}

@@ -1,2 +1,2 @@
-$('#<%= params[:object_id] %>').trigger('photo-insert', '<%= @photo.file.url %>')
-$.hideModal()
+$('#<%= params[:object_id] %>').trigger('photo-insert', '<%= @photo.file.url %>')    
+$.hideModal()