spina 0.10.0 → 0.11.0

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

@@ -0,0 +1,60 @@
+module Spina
+  module Admin
+    class NavigationsController < AdminController
+      layout 'spina/admin/pages'
+
+      before_action :set_breadcrumb, except: [:show]
+
+      load_and_authorize_resource class: Navigation
+
+      def show
+        add_breadcrumb t('spina.website.pages')
+      end
+
+      def edit
+        add_breadcrumb @navigation.label, spina.admin_navigation_path(@navigation)
+        add_breadcrumb t('spina.edit')
+        render layout: 'spina/admin/admin'
+      end
+
+      def update
+        if @navigation.update_attributes(navigation_params)
+          redirect_to spina.admin_navigation_path(@navigation)
+        else
+          render :edit
+        end
+      end
+
+      def sort
+        params[:list].each_pair do |parent_pos, parent_node|
+          update_child_pages_position(parent_node)
+          update_navigation_item_position(parent_node[:id], parent_pos, nil)
+        end
+        render nothing: true
+      end
+
+      private
+
+        def update_navigation_item_position(navigation_item_id, position, parent_id = nil)
+          Spina::NavigationItem.update(navigation_item_id, position: position.to_i + 1, parent_id: parent_id )
+        end
+
+        def update_child_pages_position(node)
+          if node[:children].present?
+            node[:children].each_pair do |child_pos, child_node|
+              update_child_pages_position(child_node) if child_node[:children].present?
+              update_navigation_item_position(child_node[:id], child_pos, node[:id])
+            end
+          end
+        end
+
+        def set_breadcrumb
+          add_breadcrumb t('spina.website.pages'), spina.admin_pages_path
+        end
+
+        def navigation_params
+          params.require(:navigation).permit(:auto_add_pages, page_ids: [])
+        end
+    end
+  end
+end

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

@@ -1,7 +1,6 @@
 module Spina
   module Admin
     class PagesController < AdminController
-
       before_action :set_breadcrumb
       before_action :set_tabs, only: [:new, :create, :edit, :update]
       before_action :set_locale
@@ -19,7 +18,8 @@ module Spina
           @page.view_template = params[:view_template]
         end
         add_breadcrumb I18n.t('spina.pages.new')
-        @page_parts = current_theme.page_parts.map { |page_part| @page.page_part(page_part) }
+        @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.page_part(part) }
+        render layout: 'spina/admin/admin'
       end
 
       def create
@@ -29,22 +29,23 @@ module Spina
           redirect_to spina.edit_admin_page_url(@page)
         else
           @page_parts = @page.page_parts
-          render :new
+          render :new, layout: 'spina/admin/admin'
         end
       end
 
       def edit
         @page = Page.find(params[:id])
         add_breadcrumb @page.title
-        @page_parts = current_theme.page_parts.map { |page_part| @page.page_part(page_part) }
+        @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.page_part(part) }
+        render layout: 'spina/admin/admin'
       end
 
       def update
         I18n.locale = params[:locale] || I18n.default_locale
         @page = Page.find(params[:id])
-        add_breadcrumb @page.title
         respond_to do |format|
           if @page.update_attributes(page_params)
+            add_breadcrumb @page.title
             @page.touch
             I18n.locale = I18n.default_locale
             format.html { redirect_to spina.edit_admin_page_url(@page, params: {locale: @locale}) }
@@ -52,7 +53,7 @@ module Spina
           else
             format.html do
               @page_parts = @page.page_parts
-              render :edit
+              render :edit, layout: 'spina/admin/admin'
             end
           end
         end

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

@@ -18,13 +18,24 @@ module Spina
       end
 
       def create
-        @photo = Photo.create!(photo_params)
-        respond_to do |format|
-          format.js do
-            render params[:media_library] ? :create : :create_and_select
+        if photo_params[:files].present?
+          @photos = photo_params[:files].map do |file|
+            Photo.create!(file: file)
           end
-          format.json do
-            render json: { file_url: @photo.file_url }
+          respond_to do |format|
+            format.js do
+              render :create_multiple
+            end
+          end
+        else
+          @photo = Photo.create!(photo_params)
+          respond_to do |format|
+            format.js do
+              render params[:media_library] ? :create : :create_and_select
+            end
+            format.json do
+              render json: { file_url: @photo.file_url }
+            end
           end
         end
       end
@@ -100,7 +111,7 @@ module Spina
       end
 
       def photo_params
-        params.require(:photo).permit(:file)
+        params.require(:photo).permit(:file, files: [])
       end
 
     end

data/app/controllers/spina/application_controller.rb

@@ -17,12 +17,12 @@ module Spina
     helper_method :current_theme
 
     def current_user
-      @current_user ||= Spina::User.where(id: session[:user_id]).first if session[:user_id]
+      @current_user ||= ::Spina::User.where(id: session[:user_id]).first if session[:user_id]
     end
     helper_method :current_user
 
     def current_account
-      @current_account ||= Account.first
+      @current_account ||= ::Spina::Account.first
     end
     helper_method :current_account
 

data/app/controllers/spina/pages_controller.rb

@@ -1,70 +1,25 @@
 module Spina
   class PagesController < Spina::ApplicationController
+    include Spina::Frontend
+
     rescue_from ActiveRecord::RecordNotFound, with: :render_404
 
-    before_action :set_locale
-    before_action :rewrite_page, only: [:show]
     before_action :current_user_can_view_page?, except: [:robots]
 
-    def homepage
-      render_with_template(page)
-    end
-
-    def show
-      if should_skip_to_first_child?
-        redirect_to first_live_child.try(:materialized_path) and return
-      elsif page.link_url.present?
-        redirect_to page.link_url and return
-      end
+    helper_method :page
 
+    def homepage
       render_with_template(page)
     end
 
     private
 
-      def set_locale
-        I18n.locale = params[:locale] || I18n.default_locale
-      end
-
-      def rewrite_page
-        if page.nil? && rule = RewriteRule.find_by(old_path: "/" + params[:id])
-          redirect_to rule.new_path, status: :moved_permanently
-        end
-      end
-
-      def page_by_locale(locale)
-        Page.with_translations(locale).find_by(materialized_path: spina_request_path)
-      end
-
-      def page
-        current_page = page_by_locale(I18n.locale) || page_by_locale(I18n.default_locale)
-        @page ||= (action_name == 'homepage') ? Page.find_by!(name: 'homepage') : current_page
-      end
-      helper_method :page
-
-      def spina_request_path
-        segments = ['/', params[:locale], params[:id]].compact
-        File.join(*segments)
-      end
-
       def current_user_can_view_page?
         raise ActiveRecord::RecordNotFound if page.nil? || !page.live?
 
         current_user.present?
       end
 
-      def should_skip_to_first_child?
-        page.skip_to_first_child && first_live_child
-      end
-
-      def first_live_child
-        page.children.sorted.live.first
-      end
-
-      def render_with_template(page)
-        render layout: "#{current_theme.name.parameterize.underscore}/#{page.layout_template || 'application'}", template: "#{current_theme.name.parameterize.underscore}/pages/#{page.view_template || 'show'}"
-      end
-
       def render_404
         render file: "#{Rails.root}/public/404.html", status: 404
       end

data/app/helpers/spina/admin/pages_helper.rb

@@ -1,20 +1,20 @@
 module Spina
   module Admin
     module PagesHelper
-      def link_to_add_fields(f, association, &block)
+      def link_to_add_structure_item_fields(f, association, &block)
         new_object = f.object.send(association).klass.new
         id = new_object.object_id
         fields = f.fields_for(association, new_object, child_index: id) do |builder|
           build_structure_parts(f.object.page_part.name, new_object) if structure_item?(new_object)
           render("spina/admin/#{ partable_partial_namespace(new_object) }/fields", f: builder)
         end
-        link_to '#', class: "#{add_fields_class(new_object)} button button-link", data: {id: id, fields: fields.gsub("\n", "")} do
+        link_to '#', class: "#{add_structure_item_fields_class(new_object)} button button-link", data: {id: id, fields: fields.gsub("\n", "")} do
           block.yield
         end
       end
 
-      def add_fields_class(object)
-        structure_item?(object) ? 'add_structure' : 'add_fields'
+      def add_structure_item_fields_class(object)
+        structure_item?(object) ? 'add_structure' : 'add_structure_item_fields'
       end
 
       def structure_item?(object)
@@ -23,9 +23,14 @@ module Spina
 
       def build_structure_parts(name, item)
         structure = current_theme.structures.find { |structure| structure[:name] == name }
-        structure[:structure_parts].each do |part|
-          part = item.structure_parts.build(part)
-          part.structure_partable = part.structure_partable_type.constantize.new
+        return item.structure_parts unless structure.present?
+        structure[:structure_parts].map do |structure_part|
+          part = item.structure_parts.where(name: structure_part[:name]).first
+          if part.nil?
+            part = item.structure_parts.build(structure_part)
+            part.structure_partable = structure_part[:partable_type].constantize.new
+          end
+          part
         end
       end
 

data/app/helpers/spina/application_helper.rb

@@ -1,35 +1,6 @@
 module Spina
   module ApplicationHelper
 
-    def markdown(text)
-      sha = Digest::SHA1.hexdigest(text.to_s)
-      Rails.cache.fetch sha do
-        renderer = Redcarpet::Render::HTML.new(hard_wrap: true, filter_html: false)
-        options = {
-          autolink: true,
-          no_intra_emphasis: true,
-          fenced_code_blocks: true,
-          lax_spacing: true,
-          strikethrough: true,
-          superscript: true
-        }
-        html = Redcarpet::Markdown.new(renderer, options).render(text.to_s)
-
-        html.gsub!(/\[vimeo\s+(\d*)\]/, '<figure class="video"><iframe src="http://player.vimeo.com/video/\1?portrait=0&title=0&byline=0" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></figure>')
-        html.gsub!(/\[button\s+(.*)\](.*)\[\/button\]/, '<a href="\1" class="button">\2</a>')
-        html.html_safe
-      end
-    end
-
-    def link_to_add_fields(name, f, association)
-      new_object = f.object.send(association).klass.new
-      id = new_object.object_id
-      fields = f.fields_for(association, new_object, child_index: id) do |builder|
-        render(association.to_s.singularize + "_fields", f: builder)
-      end
-      link_to(name, '#', class: "add_fields button button-primary button-link", data: {id: id, fields: fields.gsub("\n", ""), icon: '&'})
-    end
-
     def current_account
       @current_account ||= Account.first
     end

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

@@ -17,7 +17,7 @@ module Spina
     end
 
     def content
-      self.partable.try(:content) || self.partable
+      self.partable.try(:content)
     end
 
     def partable_attributes=(attributes)

data/app/models/spina/navigation.rb

@@ -0,0 +1,11 @@
+module Spina
+  class Navigation < ApplicationRecord
+    has_many :navigation_items, dependent: :destroy
+    has_many :pages, through: :navigation_items
+
+    scope :sorted, -> { order(:position) }
+
+    validates :name, :label, presence: true
+    validates :name, uniqueness: true
+  end
+end

data/app/models/spina/navigation_item.rb

@@ -0,0 +1,17 @@
+module Spina
+  class NavigationItem < ApplicationRecord
+    belongs_to :navigation
+    belongs_to :page
+
+    has_ancestry orphan_strategy: :adopt
+
+    scope :sorted, -> { order('spina_navigation_items.position') }
+    scope :live, -> { joins(:page).where(spina_pages: {draft: false, active: true}) }
+    scope :in_menu, -> { joins(:page).where(spina_pages: {show_in_menu: true}) }
+    scope :active, -> { joins(:page).where(spina_pages: {active: true}) }
+
+    validates :page, uniqueness: {scope: :navigation}
+
+    delegate :menu_title, :materialized_path, to: :page
+  end
+end

data/app/models/spina/page.rb

@@ -9,12 +9,15 @@ module Spina
     has_ancestry orphan_strategy: :adopt # i.e. added to the parent of deleted node
 
     has_many :page_parts, dependent: :destroy, inverse_of: :page
+    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
     after_save :save_children
     after_save :rewrite_rule
+    after_create :add_to_navigation
 
     accepts_nested_attributes_for :page_parts, allow_destroy: true
     validates_presence_of :title
@@ -94,6 +97,10 @@ module Spina
       theme.view_templates.find { |template| template[:name] == view_template_name }
     end
 
+    def view_template_page_parts(theme)
+      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
@@ -128,5 +135,9 @@ module Spina
       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
+
   end
 end

data/app/models/spina/page_part.rb

@@ -3,7 +3,7 @@ module Spina
     include Part
 
     belongs_to :page, inverse_of: :page_parts
-    belongs_to :page_partable, polymorphic: true
+    belongs_to :page_partable, polymorphic: true, optional: true
 
     accepts_nested_attributes_for :page_partable, allow_destroy: true
 

data/app/models/spina/photo_collection.rb

@@ -1,13 +1,18 @@
 module Spina
   class PhotoCollection < ApplicationRecord
-    
+
     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

data/app/models/spina/structure.rb

@@ -4,5 +4,9 @@ module Spina
     has_many :structure_items
 
     accepts_nested_attributes_for :structure_items, allow_destroy: true
+
+    def content
+      self
+    end
   end
 end

data/app/models/spina/structure_item.rb

@@ -1,7 +1,7 @@
 module Spina
   class StructureItem < ApplicationRecord
     before_validation :ensure_position
-    belongs_to :structure
+    belongs_to :structure, optional: true
     has_many :structure_parts, dependent: :destroy
 
     scope :sorted_by_structure, -> { order('position') }
@@ -9,6 +9,10 @@ module Spina
     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

data/app/models/spina/structure_part.rb

@@ -2,8 +2,8 @@ module Spina
   class StructurePart < ApplicationRecord
     include Part
 
-    belongs_to :structure_item
-    belongs_to :structure_partable, polymorphic: true
+    belongs_to :structure_item, optional: true
+    belongs_to :structure_partable, polymorphic: true, optional: true
 
     accepts_nested_attributes_for :structure_partable, allow_destroy: true
 
@@ -13,5 +13,18 @@ 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
+end

data/app/views/layouts/spina/admin/admin.html.haml

@@ -2,8 +2,9 @@
 %html{lang: I18n.locale}
   %head
     %meta{charset: 'utf-8'}
-    %meta{name: 'viewport', content: 'initial-scale=1.0, user-scalable=no'}
+    %meta{name: 'viewport', content: 'initial-scale=1.0'}
     = csrf_meta_tags
+    %meta{name: 'turbolinks-cache-control', content: 'no-preview'}
 
     %title Spina
 
@@ -17,6 +18,12 @@
     = javascript_include_tag 'spina/admin/application', data: {turbolinks_track: true}
     = yield(:plugin_stylesheets)
 
+    / Plugins
+    - Spina::Plugin.all.each do |plugin|
+      - if current_theme.plugins.include? plugin.name
+        - if lookup_context.exists? "spina/admin/hooks/#{ plugin.namespace }/_head"
+          = render "spina/admin/hooks/#{ plugin.namespace }/head"
+
   %body
     = render 'spina/admin/shared/primary_navigation'
 

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

@@ -0,0 +1,30 @@
+- content_for(:permanent_notice) do
+  - unless current_account.robots_allowed?
+    .permanent-notice.permanent-notice-info
+      = icon('search')
+      %p
+        =t 'spina.pages.invisible_to_search_engines'
+        %small=t 'spina.pages.invisible_to_search_engines_description'
+
+- content_for :application do
+  %header#header
+    #header_actions
+      = link_to '#pages_list', class: 'button sort-switch', data: {change_order: t('spina.pages.change_order'), done_changing_order: t('spina.pages.done_changing_order')} do
+        = icon('random')
+        = t('spina.pages.change_order')
+
+      = yield(:header_actions) if content_for?(:header_actions)
+
+    .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
+
+    %nav#secondary.tabs
+      %ul
+        %li{class: ('active' if controller_name == 'pages')}
+          = link_to t('spina.website.all_pages'), spina.admin_pages_path
+
+        - Spina::Navigation.sorted.each do |navigation|
+          %li{class: ('active' if controller_name == 'navigations' && @navigation == navigation)}= link_to navigation.label, spina.admin_navigation_path(navigation)
+
+  = yield
+
+= render template: "layouts/spina/admin/admin"

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

@@ -1,4 +1,4 @@
-= form_for [spina, :admin, current_account] do |f|
+= form_for [spina, :admin, current_account], url: spina.admin_account_path do |f|
   %header#header
     = render partial: 'spina/admin/shared/breadcrumbs'
 

data/app/views/spina/admin/accounts/analytics.html.haml

@@ -1,4 +1,4 @@
-= form_for [spina, :admin, current_account] do |f|
+= form_for [spina, :admin, current_account], url: spina.admin_account_path do |f|
   %header#header
     = render partial: 'spina/admin/shared/breadcrumbs'
 

data/app/views/spina/admin/accounts/social.html.haml

@@ -1,4 +1,4 @@
-= form_for [spina, :admin, current_account] do |f|
+= form_for [spina, :admin, current_account], url: spina.admin_account_path do |f|
   %header#header
     = render partial: 'spina/admin/shared/breadcrumbs'
 

data/app/views/spina/admin/accounts/style.html.haml

@@ -1,4 +1,4 @@
-= form_for [spina, :admin, current_account] do |f|
+= form_for [spina, :admin, current_account], url: spina.admin_account_path do |f|
   %header#header
     = render partial: 'spina/admin/shared/breadcrumbs'
 

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

@@ -0,0 +1,7 @@
+%li.dd-item{data: {id: navigation_item_nested_list.id}}
+  %div.dd-item-inner
+    = render partial: 'spina/admin/pages/page', object: navigation_item_nested_list.page
+
+  - if navigation_item_nested_list.children.present?
+    %ol.dd-list
+      = render partial: 'navigation_item_nested_list', collection: navigation_item_nested_list.children.sorted

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

@@ -0,0 +1,8 @@
+%tr
+  %td{style: "padding-left: #{20 * page.depth + 16}px"}
+    .form-checkbox
+      = 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

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

@@ -0,0 +1,22 @@
+= form_for [:admin, @navigation] do |f|
+  = hidden_field_tag 'navigation[page_ids][]', nil
+
+  %header#header
+    #header_actions
+      = button_tag t('spina.save'), class: 'button button-primary'
+    .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
+  
+
+  .well
+    .table-container
+      %table.table.table-clickable
+        %tbody= render partial: 'page', collection: Spina::Page.sorted.roots
+
+  .well
+    .horizontal-form
+      .horizontal-form-group
+        .horizontal-form-label
+          = Spina::Navigation.human_attribute_name :auto_add_pages
+          %small= Spina::Navigation.human_attribute_name :auto_add_pages_description
+        .horizontal-form-content
+          = f.check_box :auto_add_pages, data: {switch: true}

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

@@ -0,0 +1,7 @@
+- content_for(:header_actions) do
+  = link_to t('spina.edit', label: @navigation.label), spina.edit_admin_navigation_path(@navigation), class: 'button'
+
+.well
+  .dd#pages_list{data: {:"sort-url" => spina.sort_admin_navigation_url(@navigation) }}
+    %ol.dd-list
+      = render partial: 'navigation_item_nested_list', collection: @navigation.navigation_items.roots

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

@@ -3,7 +3,7 @@
 .horizontal-form-content
   = f.fields_for :page_partable, f.object.page_partable do |ff|
     = link_to select_collection_admin_attachments_path(ff.object_name, selected_attachment_ids: ff.object.attachment_ids), remote: true, class: 'media_picker clearfix' do
-      .placeholder.pull-right
+      .placeholder
         %span.button.button-small.button-round
           %i.icon.icon-dots
           = t('spina.choose_from_library')

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

@@ -2,7 +2,7 @@
   = f.object.title
 .horizontal-form-content
   = link_to select_admin_attachments_path(f.object_name, selected_attachment_id: f.object.page_partable.try(:id)), remote: true, class: 'media_picker clearfix' do
-    .placeholder.pull-right
+    .placeholder
       %span.button.button-small.button-round
         %i.icon.icon-dots
         = t('spina.choose_from_library')

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

@@ -3,7 +3,7 @@
 .horizontal-form-content
   = f.fields_for :page_partable, f.object.page_partable do |ff|
     = link_to spina.photo_collection_select_admin_photos_path(ff.object_name, selected_photo_ids: ff.object.photo_ids), remote: true, class: 'media_picker clearfix' do
-      .placeholder.pull-right
+      .placeholder
         %span.button.button-small.button-round
           %i.icon.icon-dots
           =t 'spina.pages.photos_picker'