spina 1.2.0 → 2.0.2

data/app/assets/stylesheets/spina/_sortable_lists.sass

@@ -1,6 +1,9 @@
 // Sortable lists
 
 .dd
+  border: 1px solid #e2e2e2
+  border-radius: 6px
+  box-shadow: 0 1px 1px rgba(0, 0, 0, .05)
   margin: -20px
   overflow: hidden
   position: relative
@@ -39,6 +42,9 @@
   padding: 0
   position: relative
 
+  .dd-item:last-child
+    border-bottom: none
+
   .dd-placeholder
     position: relative
 
@@ -54,16 +60,13 @@
 
   .dd-list
     background: tint(#f5f5fa, 50%)
-    border-top: 1px solid #ddd
+    border-top: 1px solid #eee
 
     .dd-placeholder
       background: tint(#f5f5fa, 50%)
 
       &:after
         margin-left: 40px
-
-    .dd-item:last-child
-      border-bottom: none
     
     .dd-item
       padding-left: 20px
@@ -84,9 +87,6 @@
 .dd-collapsed .dd-list
   display: none
 
-.dd-item
-  border-bottom: 1px solid #ddd
-
 .dd-item, .dd-empty, .dd-placeholder
   margin: 0
   padding: 0
@@ -103,16 +103,21 @@
   min-height: 100px
 
 .dd-item-inner
+  align-items: center
+  display: flex
   padding: 10px 20px
   text-decoration: none
 
   a
     margin: 0
 
+  a.sortable-link
+    flex: 1
+
   a.sortable-link, a.sortable-link:hover
     color: $primary-color
     font-size: 13px
-    font-weight: 600
+    font-weight: 500
     padding-left: 0
 
     small
@@ -121,6 +126,7 @@
       margin-left: 13px
 
   .pull-right a
+    margin: 0
     opacity: 0
     transform: translateX(50px)
     transition: all .4s ease

data/app/assets/stylesheets/spina/_trix_custom.sass

@@ -1,6 +1,10 @@
 trix-toolbar
+  position: sticky
+  z-index: 2
+
   .trix-button-group
     border: 0
+    margin-bottom: 0
 
     &:not(:first-child)
       margin-left: 10px
@@ -91,10 +95,12 @@ trix-toolbar
 trix-editor
   line-height: 18px
   min-height: 100px
+  margin-top: 15px
 
   h1, h2, h3, h4, h5, h6
     padding-left: 24px
     position: relative
+    z-index: 1
 
     &:after
       color: #ccc
@@ -167,10 +173,14 @@ trix-editor
     font-size: 16px
 
   .trix-attachment-spina-image
+    background: #f5f5f5
+    border-radius: 6px
     cursor: default
     display: block
+    height: 150px
     margin-bottom: 40px
     position: relative
+    width: 200px
 
     &[data-label=""]
       margin-bottom: 0px
@@ -179,10 +189,10 @@ trix-editor
         display: none
 
     img
-      border-radius: 4px
+      border-radius: 6px
       display: block
-      max-height: 150px
-      max-width: 200px
+      height: 150px
+      width: 200px
 
     &:before
       background: #eee
@@ -201,7 +211,7 @@ trix-editor
       white-space: nowrap
       width: auto
 
-  figure[data-trix-mutable] 
+  figure[data-trix-mutable]
     .trix-attachment-spina-image:before
       background: $primary-color
       color: white
@@ -211,4 +221,4 @@ trix-editor
 
   .trix-button--remove
     border: none
-    box-shadow: 0 0 5px rgba(0, 0, 0, .15) 
+    box-shadow: 0 0 5px rgba(0, 0, 0, .15)

data/app/controllers/concerns/spina/current_methods.rb

@@ -0,0 +1,26 @@
+module Spina
+  module CurrentMethods
+    extend ActiveSupport::Concern
+    
+    included do
+      helper_method :current_theme
+      helper_method :current_spina_user
+      helper_method :current_account
+    end
+  
+    private
+    
+      def current_theme
+        @current_theme ||= Spina::Theme.find_by_name(current_account.theme)
+      end
+      
+      def current_spina_user
+        @current_spina_user ||= Spina::User.where(id: session[:user_id]).first if session[:user_id]
+      end
+    
+      def current_account
+        @current_account ||= Spina::Account.first
+      end
+        
+  end
+end

data/app/controllers/concerns/spina/frontend.rb

@@ -4,9 +4,12 @@ module Spina
 
     included do
       rescue_from ActiveRecord::RecordNotFound, with: :redirect_or_render_404
+
+      helper Spina::PagesHelper
       
       before_action :set_locale
       before_action :set_current_page
+      before_action :set_current_account
     end
 
     def show
@@ -27,6 +30,12 @@ module Spina
 
       def set_current_page
         Spina::Current.page = page
+        Spina::Current.page.view_context = view_context
+      end
+
+      def set_current_account
+        Spina::Current.account = Spina::Account.first
+        Spina::Current.account.view_context = view_context
       end
 
       def page_by_locale(locale)

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

@@ -1,6 +1,7 @@
 module Spina
   module Admin
     class AccountsController < AdminController
+      before_action :set_locale
 
       def edit
         add_breadcrumb I18n.t('spina.preferences.account'), spina.edit_admin_account_path
@@ -22,23 +23,18 @@ module Spina
       def style
         add_breadcrumb I18n.t('spina.preferences.style'), spina.style_admin_account_path
         @themes = ::Spina::Theme.all
-        @layout_parts = current_theme.layout_parts.map { |layout_part| current_account.layout_part(layout_part) }
       end
 
       private
 
-      def account_params
-        params.require(:account).permit(:address, :city, :email, :name, :phone,
-                                        :postal_code, :preferences, :google_analytics,
-                                        :google_site_verification, :facebook, :twitter, :google_plus,
-                                        :instagram, :youtube, :linkedin,
-                                        :kvk_identifier, :theme, :vat_identifier, :robots_allowed,
-                                        layout_parts_attributes:
-                                          [:id, :layout_partable_type, :layout_partable_id,
-                                            :name, :title, :position, :content, :page_id,
-                                            layout_partable_attributes:
-                                              [:content, :photo_tokens, :attachment_tokens, :id]])
-      end
+        def account_params
+          params.require(:account).permit!
+        end
+
+        def set_locale
+          @locale = params[:locale] || I18n.default_locale
+        end
+        
     end
   end
 end

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

@@ -1,6 +1,10 @@
 module Spina
   module Admin
-    class AdminController < ::Spina::ApplicationController
+    class AdminController < ActionController::Base
+      include Spina::CurrentMethods
+      
+      helper Spina::Engine.helpers
+      
       before_action :set_admin_locale
       before_action :authorize_spina_user
 

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

@@ -24,28 +24,6 @@ module Spina
         redirect_to spina.admin_attachments_url
       end
 
-      def select
-        @selected_attachment_id = Attachment.find_by(id: params[:selected_attachment_id]).try(:id)
-        @hidden_field_id = params[:hidden_field_id]
-        @attachments = Attachment.sorted
-        @attachment = Attachment.new
-      end
-
-      def insert
-        @attachment = Attachment.find(params[:attachment_id])
-        Rails.logger.info "HAHA HA HA #{@attachment.id}"
-      end
-
-      def select_collection
-        @selected_attachment_ids = Attachment.where(id: params[:selected_attachment_ids]).ids
-        @attachments = Attachment.sorted
-        @attachment = Attachment.new
-      end
-
-      def insert_collection
-        @attachments = Attachment.where(id: params[:attachment_ids])
-      end
-
       private
 
       def set_breadcrumbs

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

@@ -8,7 +8,7 @@ module Spina
       def index
         add_breadcrumb I18n.t('spina.website.images'), admin_images_path
         @media_folders = MediaFolder.order(:name)
-        @images = Image.sorted.where(media_folder_id: nil).with_attached_file.page(params[:page])
+        @images = Image.sorted.where(media_folder_id: nil).with_attached_file.page(params[:page]).per(25)
       end
 
       # There's no file validation yet in ActiveStorage

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

@@ -2,39 +2,38 @@ module Spina
   module Admin
     class MediaPickerController < AdminController
       before_action :set_media_folders
+      before_action :set_selected_images
 
       def show
-        if @media_folder.present?
-          @images = @media_folder.images.page(params[:page])
-        else
-          @images = Image.where(media_folder_id: nil).page(params[:page])
-        end
+        @images = Image.where(media_folder: @media_folder).order(created_at: :desc).page(params[:page]).per(25)
+        @mode = params[:mode]
 
-        if params[:selected_ids].present?
-          ids = params[:selected_ids].map(&:to_i).join(', ')
-          @images = @images.order(Arel.sql("CASE WHEN id IN(#{ids}) THEN 0 ELSE 1 END, created_at DESC"))
-        else
-          @images = @images.sorted
+        if selected_ids.any?
+          @images = @images.reorder(Arel.sql("CASE WHEN id IN(#{selected_ids.join(', ')}) THEN 0 ELSE 1 END, created_at DESC"))
         end
 
-        render params[:page].present? ? :infinite_scroll : :show
-      end
-
-      def select
-        if params[:multiple]
-          @images = Image.where(id: params[:image_ids].split("-"))
-        else 
-          @image = Image.find(params[:image_id])
+        respond_to do |format|
+          format.html { render layout: false }
+          format.js { render :infinite_scroll if params[:page].present? }
         end
       end
 
       private
 
         def set_media_folders
-          @media_folders = MediaFolder.order(:name)
+          @media_folders = MediaFolder.order(:name).joins(:images).uniq
           @media_folder = MediaFolder.find(params[:media_folder_id]) if params[:media_folder_id].present?
         end
 
+        def set_selected_images
+          @selected_images = Image.where(id: selected_ids).sort_by{|image| selected_ids.index(image.id)}
+        end
+
+        def selected_ids
+          params[:selected_ids].present? ? params[:selected_ids].map(&:to_i) : []
+        end
+        helper_method :selected_ids
+
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Spina
       def index
         add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
         redirect_to admin_pages_path unless current_admin_path.starts_with?('/pages')
-        @pages = Page.active.sorted.roots.regular_pages
+        @pages = Page.active.sorted.roots.regular_pages.includes(:translations)
       end
 
       def new
@@ -19,7 +19,6 @@ module Spina
           @page.view_template = params[:view_template]
         end
         add_breadcrumb I18n.t('spina.pages.new')
-        @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
         render layout: 'spina/admin/admin'
       end
 
@@ -30,7 +29,6 @@ module Spina
           @page.navigations << Spina::Navigation.where(auto_add_pages: true)
           redirect_to spina.edit_admin_page_url(@page), flash: {success: t('spina.pages.saved')}
         else
-          @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
           render :new, layout: 'spina/admin/admin'
         end
       end
@@ -38,7 +36,6 @@ module Spina
       def edit        
         add_index_breadcrumb
         add_breadcrumb @page.title
-        @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
         render layout: 'spina/admin/admin'
       end
 
@@ -51,7 +48,6 @@ module Spina
             format.js
           else
             format.html do
-              @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
               Mobility.locale = I18n.default_locale
               render :edit, layout: 'spina/admin/admin'
             end

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

@@ -1,7 +1,7 @@
 module Spina
   module Admin
     class ResourcesController < AdminController
-
+      before_action :set_locale
       before_action :set_resource, only: [:show, :edit, :update]
 
       def show        
@@ -13,8 +13,8 @@ module Spina
         add_breadcrumb t('spina.edit')
       end
 
-      def update        
-        if @resource.update(resource_params)
+      def update
+        if Mobility.with_locale(@locale) { @resource.update(resource_params) }
           redirect_to spina.admin_resource_path(@resource)
         else
           render :edit
@@ -24,12 +24,17 @@ module Spina
       private
 
         def resource_params
-          params.require(:resource).permit(:label, :view_template, :order_by, :parent_page_id)
+          params.require(:resource).permit(:label, :slug, :view_template, :order_by, :parent_page_id)
         end
 
         def set_resource
           @resource = Resource.find(params[:id])          
         end
+
+        def set_locale
+          @locale = params[:locale] || I18n.default_locale
+        end
+
     end
   end
 end

data/app/controllers/spina/application_controller.rb

@@ -1,24 +1,7 @@
-module Spina
-  class ApplicationController < ActionController::Base
-
-    protect_from_forgery with: :exception
-
-    private
-
-    def current_theme
-      @current_theme = ::Spina::Theme.find_by_name(current_account.theme)
-    end
-    helper_method :current_theme
-
-    def current_spina_user
-      @current_spina_user ||= ::Spina::User.where(id: session[:user_id]).first if session[:user_id]
-    end
-    helper_method :current_spina_user
-
-    def current_account
-      @current_account ||= ::Spina::Account.first
-    end
-    helper_method :current_account
-
-  end
+class Spina::ApplicationController < Spina.frontend_parent_controller.constantize
+  include Spina::CurrentMethods
+  
+  helper Spina::Engine.helpers
+  
+  protect_from_forgery with: :exception
 end