spina 1.0.3 → 1.1.0

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

@@ -129,6 +129,13 @@
     opacity: 1
     transform: translateX(10px)
 
+  .collapse-link
+    color: $primary-color
+    display: inline-block
+    margin-left: -10px
+    padding: 6px 10px
+    transform: translateX(-26px)
+
 .dd-dragel
   pointer-events: none
   position: absolute

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

@@ -0,0 +1,227 @@
+trix-toolbar
+  .trix-button-group
+    border: 0
+
+    &:not(:first-child)
+      margin-left: 10px
+
+  .trix-button
+    @extend .button
+    border-bottom: 0
+    border-radius: 0
+    margin: 0
+
+    &:disabled
+      color: rgba(0, 0, 0, .6)
+
+    &:not(:first-child)
+      border-left: 0
+
+    &:first-child
+      border-top-left-radius: 3px
+      border-bottom-left-radius: 3px
+
+    &:last-child
+      border-top-right-radius: 3px
+      border-bottom-right-radius: 3px
+
+    &.trix-active
+      background: $primary-color
+      color: #fff
+
+  .trix-button--text
+    padding-left: 12px
+    padding-right: 12px
+
+  .trix-button--icon
+    padding: 18px 16px
+
+    &::before
+      background: none
+      font-family: 'Font Awesome 5 Free'
+      display: inline-block
+      font-weight: 900
+      line-height: 36px
+      opacity: 1
+      text-indent: 0
+
+    &.trix-button--icon-bold
+      &::before
+        content: "\f032"
+
+    &.trix-button--icon-italic
+      &::before
+        content: "\f033"
+
+    &.trix-button--icon-strike
+      &::before
+        content: "\f0cc"
+
+    &.trix-button--icon-link
+      &::before
+        content: "\f0c1"
+
+    &.trix-button--icon-image
+      &::before
+        content: "\f03e"
+
+    &.trix-button--icon-quote
+      &::before
+        content: "\f10e"
+
+    &.trix-button--icon-code
+      &::before
+        content: "\f121"
+
+    &.trix-button--icon-bullet-list
+      &::before
+        content: "\f0ca"
+
+    &.trix-button--icon-number-list
+      &::before
+        content: "\f0cb"
+
+    &.trix-button--icon-decrease-nesting-level
+      &::before
+        content: "\f03b"
+
+    &.trix-button--icon-increase-nesting-level
+      &::before
+        content: "\f03c"
+
+    &.trix-button--icon-undo
+      &::before
+        content: "\f2ea"
+
+    &.trix-button--icon-redo
+      &::before
+        content: "\f2f9"
+
+  .trix-dialog
+    border-top-color: $primary-color
+    border-radius: 3px
+
+trix-editor
+  line-height: 18px
+  min-height: 100px
+
+  h1, h2, h3, h4, h5, h6
+    padding-left: 24px
+    position: relative
+
+    &:after
+      color: #ccc
+      content: "H1"
+      font-size: 12px
+      font-weight: bold
+      left: 0px
+      line-height: inherit
+      position: absolute
+      top: 0px
+
+  h1, h2, h3, h4, h5, h6
+    font-size: 24px
+    font-weight: 600
+    line-height: 38px
+
+  h2
+    font-size: 22px
+    line-height: 34px
+
+  h3
+    font-size: 20px
+    line-height: 30px
+
+  h4
+    font-size: 18px
+    line-height: 26px
+
+  h5
+    font-size: 16px
+    line-height: 22px
+
+  h6
+    font-size: 14px
+    line-height: 18px
+
+  h2:after
+    content: "H2"
+
+  h3:after
+    content: "H3"
+
+  h4:after
+    content: "H4"
+
+  h5:after
+    content: "H5"
+
+  h6:after
+    content: "H6"
+
+  a
+    text-decoration: underline
+
+  p
+    margin: 0
+
+  ul
+    list-style: disc
+    padding-left: 20px
+
+  figure.attachment
+    .attachment__metadata
+      display: none
+
+  textarea
+    min-height: 0
+    border-radius: 0
+    box-shadow: none
+    font-size: 16px
+
+  .trix-attachment-spina-image
+    cursor: default
+    display: block
+    margin-bottom: 40px
+    position: relative
+
+    &[data-label=""]
+      margin-bottom: 0px
+
+      &:before
+        display: none
+
+    img
+      border-radius: 4px
+      display: block
+      max-height: 150px
+      max-width: 200px
+
+    &:before
+      background: #eee
+      border-radius: 40px
+      bottom: -36px
+      color: #666
+      content: attr(data-label)
+      display: block
+      font-size: 13px
+      font-style: italic
+      line-height: 16px
+      left: 0px
+      padding: 6px 12px
+      position: absolute
+      text-align: left
+      white-space: nowrap
+      width: auto
+
+  figure[data-trix-mutable] 
+    .trix-attachment-spina-image:before
+      background: $primary-color
+      color: white
+
+    &.attachment img
+      box-shadow: 0 0 15px rgba(0, 0, 0, .15)
+
+  .trix-button--remove
+    border: none
+    box-shadow: 0 0 5px rgba(0, 0, 0, .15) 

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

@@ -13,7 +13,7 @@ module Spina
       if should_skip_to_first_child?
         redirect_to first_live_child.try(:materialized_path) and return
       elsif page.link_url.present?
-        redirect_to Current.page.link_url and return
+        redirect_to Spina::Current.page.link_url and return
       end
 
       render_with_template(page)
@@ -26,7 +26,7 @@ module Spina
       end
 
       def set_current_page
-        Current.page = page
+        Spina::Current.page = page
       end
 
       def page_by_locale(locale)
@@ -49,11 +49,11 @@ module Spina
       end
 
       def should_skip_to_first_child?
-        Current.page.skip_to_first_child && first_live_child
+        Spina::Current.page.skip_to_first_child && first_live_child
       end
 
       def first_live_child
-        Current.page.children.sorted.live.first
+        Spina::Current.page.children.sorted.live.first
       end
 
       def redirect_or_render_404
@@ -69,7 +69,7 @@ module Spina
       end
 
       def render_with_template(page)
-        render layout: "#{current_theme.name.parameterize.underscore}/#{page.layout_template || 'application'}", template: "#{current_theme.name.parameterize.underscore}/pages/#{Current.page.view_template || 'show'}"
+        render layout: "#{current_theme.name.parameterize.underscore}/#{page.layout_template || 'application'}", template: "#{current_theme.name.parameterize.underscore}/pages/#{Spina::Current.page.view_template || 'show'}"
       end
 
   end

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

@@ -7,7 +7,7 @@ module Spina
       end
 
       def update
-        current_account.update_attributes(account_params)
+        current_account.update(account_params)
         redirect_back fallback_location: spina.edit_admin_account_path
       end
 
@@ -31,6 +31,7 @@ module Spina
         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,

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

@@ -18,7 +18,7 @@ module Spina
       def create
         @images = params[:image][:files].map do |file|
           # Create the image and attach the file
-          image = Image.create
+          image = Image.create(media_folder_id: params[:media_library])
           image.file.attach(file)
 
           # Was it not an image after all? DESTROY IT

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

@@ -1,9 +1,14 @@
 module Spina
   module Admin
     class MediaPickerController < AdminController
+      before_action :set_media_folders
 
       def show
-        @images = Image.page(params[:page])
+        if @media_folder.present?
+          @images = @media_folder.images.page(params[:page])
+        else
+          @images = Image.where(media_folder_id: nil).page(params[:page])
+        end
 
         if params[:selected_ids].present?
           ids = params[:selected_ids].map(&:to_i).join(', ')
@@ -17,12 +22,19 @@ module Spina
 
       def select
         if params[:multiple]
-          @images = Image.where(id: params[:image_ids])
+          @images = Image.where(id: params[:image_ids].split("-"))
         else 
           @image = Image.find(params[:image_id])
         end
       end
 
+      private
+
+        def set_media_folders
+          @media_folders = MediaFolder.order(:name)
+          @media_folder = MediaFolder.find(params[:media_folder_id]) if params[:media_folder_id].present?
+        end
+
     end
   end
 end

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

@@ -4,22 +4,20 @@ module Spina
       layout 'spina/admin/pages'
 
       before_action :set_breadcrumb, except: [:show]
+      before_action :set_navigation, only: [:show, :edit, :update]
 
-      def show
-        @navigation = Navigation.find(params[:id])
+      def show        
         add_breadcrumb t('spina.website.pages')
       end
 
-      def edit
-        @navigation = Navigation.find(params[:id])
+      def edit        
         add_breadcrumb @navigation.label, spina.admin_navigation_path(@navigation)
         add_breadcrumb t('spina.edit')
         render layout: 'spina/admin/admin'
       end
 
-      def update
-        @navigation = Navigation.find(params[:id])
-        if @navigation.update_attributes(navigation_params)
+      def update        
+        if @navigation.update(navigation_params)
           redirect_to spina.admin_navigation_path(@navigation)
         else
           render :edit
@@ -56,6 +54,10 @@ module Spina
         def navigation_params
           params.require(:navigation).permit(:auto_add_pages, page_ids: [])
         end
+
+        def set_navigation
+          @navigation = Navigation.find(params[:id])
+        end
     end
   end
 end

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

@@ -3,6 +3,7 @@ module Spina
     class PagesController < AdminController
       before_action :set_tabs, only: [:new, :create, :edit, :update]
       before_action :set_locale
+      before_action :set_page, only: [:edit, :update, :destroy, :children]
 
       def index
         add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
@@ -12,7 +13,7 @@ module Spina
 
       def new
         @resource = Resource.find_by(id: params[:resource_id])
-        @page = Page.new(resource: @resource, parent: @resource&.parent_page)
+        @page = Page.new(resource: @resource, parent: Page.find_by(id: params[:parent_id]) || @resource&.parent_page)
         add_index_breadcrumb
         if current_theme.new_page_templates.any? { |template| template[0] == params[:view_template] }
           @page.view_template = params[:view_template]
@@ -34,27 +35,24 @@ module Spina
         end
       end
 
-      def edit
-        @page = Page.find(params[:id])
+      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
 
-      def update
-        I18n.locale = params[:locale] || I18n.default_locale
-        @page = Page.find(params[:id])
+      def update 
         respond_to do |format|
-          if @page.update_attributes(page_params)
-            add_breadcrumb @page.title
+          Mobility.locale = @locale
+          if @page.update(page_params)
             @page.touch
-            I18n.locale = I18n.default_locale
             format.html { redirect_to spina.edit_admin_page_url(@page, params: {locale: @locale}), flash: {success: t('spina.pages.saved')} }
             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
           end
@@ -69,8 +67,12 @@ module Spina
         head :ok
       end
 
-      def destroy
-        @page = Page.find(params[:id])
+      def children
+        @children = @page.children.active.sorted
+        render layout: false
+      end
+
+      def destroy        
         @page.destroy
         redirect_to spina.admin_pages_url
       end
@@ -110,6 +112,9 @@ module Spina
         params.require(:page).permit!
       end
 
+      def set_page
+        @page = Page.find(params[:id])
+      end
     end
   end
 end