spina 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18550031d6f530e50c842bd6d5b6f892040439d4
-  data.tar.gz: 4eb48f489fcbc4b805629953e09903107f12d459
+  metadata.gz: 7f6490ad94233191e21aa0c5b2046015e13506e2
+  data.tar.gz: 476f5f09ef0b432217f44f8dc962496fde5f1850
 SHA512:
-  metadata.gz: 488a30be0435ac0fb60a84a70669f725f892ea9c0d16d3fe04d185c70f414c79229e92a217d998a4f0c9aae43b259a04ca0b156027ac09d85b652b4ec541f0cc
-  data.tar.gz: 330492cb94e6fbe7cef0be0529bb42856e04afe4b55968560cec153eee3de99efa9a74ffecf7acc73110fff5743ae29a0fddc83e22e45389a8ce46fda0a45e80
+  metadata.gz: 550674f6bb65a39444201cc739c82f6623e00f0d1582420347e249aaff95e00e76681f49afa07ada5e93eae90f209305343ecbbdc2afb79f5774408c4141e4fe
+  data.tar.gz: e55c2700c2e32a2521d383eddc2857770204f9bfdbc90d673c1960bb325c96a4e787c9ea7f5f9ad9aa83a785250c96759c04c8336b4093852e60172a000effe0

data/app/assets/javascripts/spina/admin/application.js

@@ -3,7 +3,9 @@
 //= require turbolinks
 //= require spina
 //= require ./aviary
-//= require ./pages
 //= require ./account
 //= require ./confirm_delete
+//= require ./pages
 //= require ./spina.trix
+//= require ./spina.infinite_scroll
+//= require ./spina.scaffold

data/app/assets/javascripts/spina/admin/spina.infinite_scroll.coffee

@@ -0,0 +1,20 @@
+class Spina.InfiniteScroll
+  @init: (link) ->
+    $(window).off('scroll.infiniteScroll')
+
+    $link = $(link)
+    if (url = $link.find('a').attr('href'))
+      $(window).on 'scroll.infiniteScroll', => @loadNextPage($link)
+      $(window).scroll()
+
+  @loadNextPage: ($link) ->
+    if ($(window).scrollTop() > $link.offset().top - $(window).height() - 500)
+      $(window).off('scroll.infiniteScroll')
+      $.rails.disableElement($link.find('a'))
+      $.getScript($link.find('a').attr('href'))
+
+$.fn.infiniteScroll = () ->
+  Spina.InfiniteScroll.init(this)
+
+$(document).on 'page:change', ->
+  $(window).off('scroll.infiniteScroll')

data/app/assets/javascripts/spina/admin/spina.scaffold.coffee

@@ -0,0 +1,15 @@
+class Spina.Scaffold
+
+  @init = ->
+    $(document).enhance()
+
+  @enhance = (el) ->
+    $el = $(el)
+
+    $el.find('.infinite-pagination').infiniteScroll()
+
+$.fn.enhance = () ->
+  Spina.Scaffold.enhance(this)
+
+$(document).on 'page:change', ->
+  Spina.Scaffold.init()

data/app/assets/javascripts/spina/admin/spina.trix.js.coffee

@@ -1,6 +1,8 @@
 window.Spina = {}
 
 Trix.config.blockAttributes = $.extend Trix.config.blockAttributes, {
+  default:
+    tagName: 'p'
   h1:
     tagName: 'h1'
     singleLine: true

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

@@ -9,7 +9,7 @@ module Spina
 
       def index
         add_breadcrumb I18n.t('spina.website.photos'), spina.admin_photos_path
-        @photos = Photo.sorted
+        @photos = Photo.sorted.page(params[:page])
         @photo = Photo.new
       end
 
@@ -40,15 +40,29 @@ module Spina
       end
 
       def photo_select
-        @photos = Photo.sorted
+        selected = params[:selected_photo_id] || Array.new
+        @photos = Photo.order_by_ids(selected).sorted.page(params[:page])
+        @selected_photo = Photo.find(selected)
         @photo = Photo.new
-        @selected_photo = Photo.find(params[:selected_photo_id]) if params[:selected_photo_id]
+
+        if params[:page].present?
+          render :single_picker_infinite_scroll
+        else
+          render :photo_select
+        end
       end
 
       def photo_collection_select
-        @photos = Photo.sorted
+        selected = params[:selected_photo_ids] || Array.new
+        @photos = Photo.order_by_ids(selected).sorted.page(params[:page])
+        @selected_photos = Photo.where(id: selected)
         @photo = Photo.new
-        @selected_photos = params[:selected_photo_ids] ? Photo.where(id: params[:selected_photo_ids]) : Photo.none
+
+        if params[:page].present?
+          render :multi_picker_infinite_scroll
+        else
+          render :photo_collection_select
+        end
       end
 
       def insert_photo
@@ -64,8 +78,14 @@ module Spina
       end
 
       def wysihtml5_select
-        @photos = Photo.sorted
+        @photos = Photo.sorted.page(params[:page])
         @photo = Photo.new
+
+        if params[:page].present?
+          render :wysihtml5_infinite_scroll
+        else
+          render :wysihtml5_select
+        end
       end
 
       private

data/app/controllers/spina/application_controller.rb

@@ -1,7 +1,8 @@
 module Spina
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
-    
+    helper_method :current_theme, :current_user, :current_account
+
     include ApplicationHelper
 
     private
@@ -13,16 +14,13 @@ module Spina
     def current_theme
       @current_theme = ::Spina.themes.detect{|theme| theme.name == current_account.theme }
     end
-    helper_method :current_theme
 
     def current_user
       @current_user ||= User.where(id: session[:user_id]).first if session[:user_id]
     end
-    helper_method :current_user
 
     def current_account
       @current_account ||= Account.first
     end
-    helper_method :current_account
   end
 end

data/app/controllers/spina/inquiries_controller.rb

@@ -1,5 +1,5 @@
 module Spina
-  class InquiriesController < ApplicationController
+  class InquiriesController < Spina::ApplicationController
 
     before_filter :setup_negative_captcha, only: [:create]
 
@@ -27,4 +27,4 @@ module Spina
     end
 
   end
-end
+end

data/app/controllers/spina/pages_controller.rb

@@ -1,5 +1,5 @@
 module Spina
-  class PagesController < ApplicationController
+  class PagesController < Spina::ApplicationController
     before_action :rewrite_page, only: [:show]
     before_action :current_user_can_view_page?, except: [:robots]
 
@@ -27,7 +27,7 @@ module Spina
       end
 
       def page
-        @page ||= (action_name == 'homepage') ? Page.find_by(name: 'homepage') : Page.find_by(materialized_path: "/" + params[:id])
+        @page ||= (action_name == 'homepage') ? Page.find_by!(name: 'homepage') : Page.find_by!(materialized_path: "/" + params[:id])
       end
       helper_method :page
 

data/app/controllers/spina/sitemaps_controller.rb

@@ -1,5 +1,5 @@
 module Spina
-  class SitemapsController < ApplicationController
+  class SitemapsController < Spina::ApplicationController
     def show
       @pages = Page.live.sorted
     end

data/app/models/spina/account.rb

@@ -36,17 +36,17 @@ module Spina
     end
 
     def find_or_create_custom_pages(theme)
-      theme.config.custom_pages.each do |page| 
-        Page.where(name: page[:name], deletable: false).first_or_create(title: page[:title], view_template: page[:view_template]).activate!
+      theme.config.custom_pages.each do |page|
+        Page.where(name: page[:name]).first_or_create(title: page[:title]).update_attributes(view_template: page[:view_template], deletable: page[:deletable])
       end
     end
 
     def deactivate_unused_view_templates(theme)
-      Page.where.not(view_template: theme.config.view_templates.map{|t|t[0]}).each &:deactivate!
+      Page.where.not(view_template: theme.config.view_templates.keys).update_all(active: false)
     end
 
     def activate_used_view_templates(theme)
-      Page.where(view_template: theme.config.view_templates.map{|t|t[0]}).each &:activate!
+      Page.where(view_template: theme.config.view_templates.keys).update_all(active: true)
     end
 
     def self.serialized_attr_accessor(*args)

data/app/models/spina/page.rb

@@ -72,16 +72,6 @@ module Spina
       self.siblings.where('position > ?', self.position).sorted.first
     end
 
-    def deactivate!
-      self.active = false
-      self.save
-    end
-
-    def activate!
-      self.active = true
-      self.save
-    end
-
     def set_materialized_path
       self.old_path = materialized_path
       self.materialized_path = generate_materialized_path

data/app/models/spina/photo.rb

@@ -19,6 +19,11 @@ module Spina
     def content
       self
     end
+
+    def self.order_by_ids(ids)
+      sql = sanitize_sql_for_conditions({id: ids})
+      order("CASE WHEN #{sql} THEN 0 ELSE 1 END")
+    end
     
   end
 end

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

@@ -10,16 +10,17 @@ module Spina
       include ActionView::Helpers::UrlHelper
       include ActiveSupport::Configurable
 
-      config_accessor :list_tag, :list_wrapper, :list_item_tag, :list_item_css, :selected_css, :current_css, :first_css, :last_css
+      config_accessor :list_tag, :list_class, :li, :list_wrapper, :list_item_tag, :list_item_css, :selected_css, :current_css, :first_css, :last_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 = :selected
-      self.current_css = :current
-      self.first_css = :first
-      self.last_css = :last
+      self.selected_css = 'active'
+      self.current_css = 'current'
+      self.first_css = 'first'
+      self.last_css = 'last'
 
       attr_accessor :context, :collection, :current_menu_item
       delegate :output_buffer, :output_buffer=, to: :context
@@ -50,7 +51,7 @@ module Spina
       end
 
       def render_menu_items(menu_items)
-        content_tag(list_tag) do
+        content_tag(list_tag, class: list_class) do
           menu_items.each_with_index.inject(ActiveSupport::SafeBuffer.new) do |buffer, (item, index)|
             buffer << render_menu_item(item, index, menu_items.length)
           end

data/app/uploaders/spina/photo_uploader.rb

@@ -8,7 +8,7 @@ module Spina
     end
 
     version :thumb do
-      process resize_to_fill: [240, 135]
+      process resize_to_fill: [150, 150]
     end
 
     def too_large?(new_file)

data/app/views/spina/admin/inquiries/inbox.html.haml

@@ -22,7 +22,7 @@
 
             %td.nowrap
               = link_to t('spina.inquiries.mark_as_read'), spina.mark_as_read_admin_inquiry_path(inquiry), method: :patch, class: 'button button-link button-small', data: {icon: 'k'}
-              = link_to "Verwijderen", spina.admin_inquiry_path(inquiry), method: :delete, class: 'button button-danger button-link button-small', data: {confirm: t('spina.inquiries.delete_confirmation', subject: inquiry.name)}
+              = link_to t('spina.delete'), spina.admin_inquiry_path(inquiry), method: :delete, class: 'button button-danger button-link button-small', data: {confirm: t('spina.inquiries.delete_confirmation', subject: inquiry.name)}
       
       - else
         %tr

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

@@ -20,4 +20,4 @@
   - if @inquiry.spam
     = link_to t('spina.inquiries.no_spam'), spina.unmark_spam_admin_inquiry_path(@inquiry), method: :patch, class: 'button', data: {icon: 'v'}
 
-  = link_to t('spina.cancel'), spina.admin_inquiry_path(@inquiry), method: :delete, class: 'button button-danger button-link', data: {confirm: t('spina.inquiries.delete_confirmation', subject: @inquiry.name)}
+  = link_to t('spina.delete'), spina.admin_inquiry_path(@inquiry), method: :delete, class: 'button button-danger button-link', data: {confirm: t('spina.inquiries.delete_confirmation', subject: @inquiry.name)}

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

@@ -1,9 +1,7 @@
 .item
   .overlay
-    = radio_button_tag :photo_id, photo.id
-    = check_box_tag 'photo_ids[]', photo.id
-    = link_to admin_photo_path(photo), class: 'icon-only', data: {aviary: true} do
-      = icon('brush')
-    = link_to spina.admin_photo_path(photo), method: :delete, class: 'icon-only', data: {confirm: t('spina.photos.delete_confirmation')} do
-      = icon('trash')
+    = link_to admin_photo_path(photo), class: 'icon-only edit-photo-link', data: {aviary: true} do
+      =t('spina.photos.edit')
+    = 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')
   = image_tag photo.file.thumb.url, id: "photo_#{photo.id}", data: {posturl: spina.enhance_admin_photo_path(photo), image: photo.file.url}

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

@@ -1,22 +1,23 @@
 .modal.modal-large
-  %header
-    = link_to "", "#", class: 'close_modal', data: {dismiss: 'modal', icon: 'm'}
-    %h3=t 'spina.photos.insert_photos'
-
   %section
-    .gallery-select.gallery{data: {multiselect: true}}
-      .item.item-small
+    .gallery-select.gallery-select-multiple.gallery{data: {multiselect: true}}
+      .item.item-small.item-uploader
         = form_for [spina, :admin, @photo], html: {multipart: true} do |f|
+          = f.label :file, t('spina.photos.upload_image')
           = f.file_field :file, data: {customfileinput: true}
           
       = form_tag spina.insert_photo_collection_admin_photos_path(params[:page_part_id]), remote: true, class: 'gallery-prepend-image' do
-        - @photos.each do |photo|
-          .item{class: ('selected' if @selected_photos.include?(photo))}
-            .overlay= check_box_tag 'photo_ids[]', photo.id, @selected_photos.include?(photo)
-            = image_tag photo.file.thumb
+        .infinite-scroll
+          = render partial: 'spina/admin/photos/photo_multi_picker', collection: @photos
+
+        .infinite-pagination= link_to_next_page @photos, 'Next', params: {selected_photo_ids: @selected_photos.ids}, remote: true
 
-        %footer
-          = link_to t('spina.cancel'), "#", data: {dismiss: 'modal'}
-          = button_tag type: 'submit', class: 'primary' do
-            %i.icon.icon-plus
-            = t('spina.photos.insert_photos')
+        .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.photos.choose_images')
+              %span.gallery-select-counter
+                - if @selected_photos.any?
+                  (#{@selected_photos.count})

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

@@ -0,0 +1,3 @@
+.item{class: ('selected' if @selected_photos.include?(photo_multi_picker))}
+  = check_box_tag 'photo_ids[]', photo_multi_picker.id, @selected_photos.include?(photo_multi_picker)
+  = image_tag photo_multi_picker.file.thumb.url, id: "photo_#{photo_multi_picker.id}"

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

@@ -1,22 +1,13 @@
 .modal.modal-large
-  %header
-    = link_to "", "#", class: 'close_modal', data: {dismiss: 'modal', icon: 'm'}
-    %h3=t 'spina.photos.insert_photo'
-
   %section
     .gallery-select.gallery
-      .item.item-small
+      .item.item-small.item-uploader
         = form_for [spina, :admin, @photo], html: {multipart: true} do |f|
+          = f.label :file, t('spina.photos.upload_image')
           = f.file_field :file, data: {customfileinput: true}
 
       = form_tag spina.insert_photo_admin_photos_path(params[:page_part_id]), remote: true, class: 'gallery-prepend-image' do
-        - @photos.each do |photo|
-          .item{class: ('selected' if photo == @selected_photo)}
-            .overlay= radio_button_tag :photo_id, photo.id, photo == @selected_photo
-            = image_tag photo.file.thumb
+        .infinite-scroll
+          = render partial: 'spina/admin/photos/photo_single_picker', collection: @photos
 
-        %footer
-          = link_to t('spina.cancel'), "#", data: {dismiss: 'modal'}
-          = button_tag type: 'submit', class: 'primary' do
-            %i.icon.icon-plus
-            = t('spina.photos.insert_photo')
+        .infinite-pagination= link_to_next_page @photos, 'Next', params: {selected_photo_id: @selected_photo.try(:id)}, remote: true

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

@@ -0,0 +1,3 @@
+.item{class: ('selected' if @selected_photo == photo_single_picker)}
+  = radio_button_tag :photo_id, photo_single_picker.id, photo_single_picker == @selected_photo
+  = image_tag photo_single_picker.file.thumb.url, id: "photo_#{photo_single_picker.id}"

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

@@ -0,0 +1,4 @@
+.item
+  = radio_button_tag :photo_id, photo_uploaded.id
+  = check_box_tag 'photo_ids[]', photo_uploaded.id
+  = image_tag photo_uploaded.file.thumb.url, id: "photo_#{photo_uploaded.id}"

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

@@ -1,20 +1,13 @@
 .modal.modal-large
-  %header
-    = link_to "", "#", class: 'close_modal', data: {dismiss: 'modal', icon: 'm'}
-    %h3=t 'spina.photos.insert_photo'
-
   %section
     .gallery-select.gallery
-      .item
+      .item.item-uploader
         = form_for [spina, :admin, @photo], html: {multipart: true} do |f|
+          = f.label :file, t('spina.photos.upload_image')
           = f.file_field :file, data: {customfileinput: true}
 
       = form_tag spina.wysihtml5_insert_admin_photos_path(params[:object_id]), remote: true, class: 'gallery-prepend-image' do
-        - @photos.each do |photo|
-          .item
-            .overlay= radio_button_tag :photo_id, photo.id
-            = image_tag photo.file.thumb
+        .infinite-scroll
+          = render partial: 'spina/admin/photos/photo_single_picker', collection: @photos
 
-        %footer
-          = link_to t('spina.cancel'), "#", data: {dismiss: 'modal'}
-          = button_tag t('spina.photos.insert_photo'), type: 'submit', class: 'primary', data: {icon: 't '}
+        .infinite-pagination= link_to_next_page @photos, 'Next', remote: true

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

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