spina 0.9.0 → 0.10.0

data/app/models/spina/photo_collection.rb

@@ -1,5 +1,5 @@
 module Spina
-  class PhotoCollection < ActiveRecord::Base
+  class PhotoCollection < ApplicationRecord
     
     has_one :page_part, as: :page_partable
     has_many :photo_collections_photos, autosave: true

data/app/models/spina/photo_collections_photo.rb

@@ -1,5 +1,5 @@
 module Spina
-  class PhotoCollectionsPhoto < ActiveRecord::Base
+  class PhotoCollectionsPhoto < ApplicationRecord
     belongs_to :photo
     belongs_to :photo_collection
   end

data/app/models/spina/rewrite_rule.rb

@@ -1,5 +1,5 @@
 module Spina
-  class RewriteRule < ActiveRecord::Base
+  class RewriteRule < ApplicationRecord
     validates :old_path, uniqueness: true
   end
 end

data/app/models/spina/structure.rb

@@ -1,5 +1,5 @@
 module Spina
-  class Structure < ActiveRecord::Base
+  class Structure < ApplicationRecord
     has_one :page_part, as: :page_partable
     has_many :structure_items
 

data/app/models/spina/structure_item.rb

@@ -1,15 +1,20 @@
 module Spina
-  class StructureItem < ActiveRecord::Base
+  class StructureItem < ApplicationRecord
+    before_validation :ensure_position
     belongs_to :structure
     has_many :structure_parts, dependent: :destroy
 
     scope :sorted_by_structure, -> { order('position') }
 
+    validates_presence_of :position
     accepts_nested_attributes_for :structure_parts, allow_destroy: true
 
     def content(structure_part)
-      structure_part = structure_parts.where(name: structure_part).first
-      structure_part.try(:content)
+      structure_parts.find_by(name: structure_part).try(:content)
+    end
+
+    def ensure_position
+      self.position ||= Time.now.to_i
     end
   end
-end
+end

data/app/models/spina/structure_part.rb

@@ -1,5 +1,5 @@
 module Spina
-  class StructurePart < ActiveRecord::Base
+  class StructurePart < ApplicationRecord
     include Part
 
     belongs_to :structure_item

data/app/models/spina/text.rb

@@ -1,5 +1,5 @@
 module Spina
-  class Text < ActiveRecord::Base
+  class Text < ApplicationRecord
     translates :content
     
     has_many :page_parts, as: :page_partable

data/app/models/spina/user.rb

@@ -1,5 +1,5 @@
 module Spina
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
     has_secure_password
 
     validates_presence_of :name, :email

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

@@ -0,0 +1,102 @@
+# require 'active_support/core_ext/string'
+require 'active_support/configurable'
+require 'action_view/helpers/tag_helper'
+require 'action_view/helpers/url_helper'
+
+module Spina
+  module Pages
+    class Breadcrumb
+      include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::UrlHelper
+      include ActiveSupport::Configurable
+
+      config_accessor :list_tag, :list_class, :li, :list_wrapper, :list_item_tag, :list_item_css, :last_item_css
+
+      self.list_tag = :ul
+      self.list_class = 'breadcrumb'
+      self.list_item_tag = :li
+      self.list_item_css = nil
+      self.last_item_css = 'active'
+      self.list_wrapper = false
+
+      attr_accessor :context, :current_page, :include_homepage, :breadcrumb_items, :homepage
+      delegate :output_buffer, :output_buffer=, to: :context
+
+      def initialize(page, context, include_homepage = true)
+        @current_page = page
+        @include_homepage = include_homepage
+        @context = context
+        @breadcrumb_items = Array.new()
+        @homepage = Page.find_by(name: :homepage)
+
+        build_breadcrumb(page) unless @homepage.id == @current_page.id
+      end
+
+      def to_html
+        render_breadcrumb_wrapper(@breadcrumb_items)
+      end
+
+      private
+
+      def build_breadcrumb(page)
+        if !page.nil?
+          @breadcrumb_items.push(page)
+
+          build_breadcrumb(page.parent)
+        else
+          # Manually insert homepage and reverse the breadcrumb items once you hit the latest parent
+          @breadcrumb_items.push(homepage) if @include_homepage
+          @breadcrumb_items = @breadcrumb_items.reverse unless @breadcrumb_items.empty?
+        end
+      end
+
+      def render_breadcrumb_wrapper(items)
+        if items.any?
+          if list_wrapper
+            content_tag(:div) do
+              render_breadcrumb_items(items)
+            end
+          else
+            render_breadcrumb_items(items)
+          end
+        end
+      end
+
+      def render_breadcrumb_items(items)
+        content_tag(list_tag, class: breadcrumb_list_css) do
+          items.each_with_index.inject(ActiveSupport::SafeBuffer.new) do |buffer, (item, index)|
+            buffer << render_breadcrumb_item(item, index, items.length)
+          end
+        end
+      end
+
+      def render_breadcrumb_item(item, index, items_length)
+        content_tag(list_item_tag, class: breadcrumb_item_css(item, index, items_length)) do
+          buffer = ActiveSupport::SafeBuffer.new
+          if index + 1 == items_length
+            buffer << item.title
+          else
+            buffer << link_to(item.title, item.full_materialized_path)
+          end
+          buffer
+        end
+      end
+
+      def breadcrumb_list_css
+        css = []
+        css << list_class
+
+        css.reject(&:blank?).presence
+      end
+
+      def breadcrumb_item_css(item, index, items_length)
+        css = []
+        css << list_item_css
+        css << last_item_css if index + 1 == items_length
+
+        css.reject(&:blank?).presence
+      end
+
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ 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
+      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
 
       self.list_tag = :ul
       self.list_class = 'nav'
@@ -21,6 +21,8 @@ module Spina
       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
@@ -51,7 +53,7 @@ module Spina
       end
 
       def render_menu_items(menu_items)
-        content_tag(list_tag, class: list_class) do
+        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)
           end
@@ -59,21 +61,30 @@ module Spina
       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)) do
+        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].materialized_path)
+          buffer << link_to(menu_item[0].menu_title, menu_item[0].full_materialized_path)
           buffer << render_list_wrapper(menu_item[1])
           buffer
         end
       end
 
-      def menu_item_css(menu_item, index, menu_items_length)
+      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

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

@@ -0,0 +1,31 @@
+!!!
+%html{lang: I18n.locale}
+  %head
+    %meta{charset: 'utf-8'}
+    %meta{name: 'viewport', content: 'initial-scale=1.0, user-scalable=no'}
+    = csrf_meta_tags
+
+    %title Spina
+
+    / Stylesheet
+    = stylesheet_link_tag 'spina/admin/application', data: {turbolinks_track: true}
+
+    /[if lt IE 9]
+      = javascript_include_tag '//html5shiv.googlecode.com/svn/trunk/html5.js', data: {turbolinks_track: true}
+
+    / JavaScript
+    = javascript_include_tag 'spina/admin/application', data: {turbolinks_track: true}
+    = yield(:plugin_stylesheets)
+
+  %body
+    = render 'spina/admin/shared/primary_navigation'
+
+    %section#main
+      = yield(:permanent_notice)
+
+      = render 'spina/admin/shared/notifications'
+
+      = content_for?(:application) ? yield(:application) : yield
+
+      = link_to 'http://www.spinacms.com', class: 'spina-logo', target: :blank do
+        = image_tag('spina/spina.png')

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

@@ -1,12 +1,14 @@
-- content_for(:tertiary_navigation) do
-  %nav.tabs
-    %ul
-      %li{class: ('active' if controller_name == 'photos')}
-        = link_to Spina::Photo.model_name.human(count: 2), spina.admin_photos_path
-      %li{class: ('active' if controller_name == 'attachments')}
-        = link_to Spina::Attachment.model_name.human(count: 2), spina.admin_attachments_path
+- content_for :application do
+  %header#header
+    = render partial: 'spina/admin/shared/breadcrumbs'
+
+    %nav#secondary.tabs
+      %ul
+        %li{class: ('active' if controller_name == 'photos')}
+          = link_to t('spina.media_library.photos'), spina.admin_photos_path
+        %li{class: ('active' if controller_name == 'attachments')}
+          = link_to t('spina.media_library.attachments'), spina.admin_attachments_path
 
-- content_for :website do
   = yield
 
-= render template: 'layouts/spina/admin/website'
+= render template: "layouts/spina/admin/admin"

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

@@ -1,42 +1,48 @@
 = form_for [spina, :admin, current_account] do |f|
-  .table-container
-    %table.table.table-form
-      %tr
-        %td
+  %header#header
+    = render partial: 'spina/admin/shared/breadcrumbs'
+
+    #header_actions
+      %button.button.button-primary{type: 'submit'}
+        = icon('check')
+        = t('spina.preferences.account_save')
+
+  .well
+    .horizontal-form
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:name)
-        %td
+        .horizontal-form-content
           = f.text_field :name, placeholder: Spina::Account.human_attribute_name(:name)
 
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:address)
-        %td
+        .horizontal-form-content
           = f.text_field :address, placeholder: Spina::Account.human_attribute_name(:address)
 
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:postal_code)
-        %td
+        .horizontal-form-content
           = f.text_field :postal_code, placeholder: Spina::Account.human_attribute_name(:postal_code)
 
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:city)
-        %td
+        .horizontal-form-content
           = f.text_field :city, placeholder: Spina::Account.human_attribute_name(:city)
 
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:phone)
-        %td
+        .horizontal-form-content
           = f.text_field :phone, placeholder: Spina::Account.human_attribute_name(:phone)
 
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:email)
-        %td
+        .horizontal-form-content
           = f.text_field :email, placeholder: Spina::Account.human_attribute_name(:email)
 
-  %button.button.button-primary{type: 'submit'}
-    = icon('check')
-    = t('spina.preferences.account_save')
+  

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

@@ -1,22 +1,26 @@
 = form_for [spina, :admin, current_account] do |f|
-  .table-container
-    %table.table.table-form
-      %tr
-        %td
+  %header#header
+    = render partial: 'spina/admin/shared/breadcrumbs'
+
+    #header_actions
+      %button.button.button-primary{type: 'submit'}
+        = icon('check')
+        = t('spina.preferences.analytics_save')
+
+  .well
+    .horizontal-form
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:robots_allowed)
-        %td
+        .horizontal-form-content
           = f.check_box :robots_allowed, data: {switch: true}
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:google_analytics)
-        %td
+        .horizontal-form-content
           = f.text_field :google_analytics, placeholder: Spina::Account.human_attribute_name(:google_analytics)
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:google_site_verification)
-        %td
+        .horizontal-form-content
           = f.text_field :google_site_verification, placeholder: Spina::Account.human_attribute_name(:google_site_verification)
-
-  %button.button.button-primary{type: 'submit'}
-    = icon('check')
-    = t('spina.preferences.analytics_save')

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

@@ -1,24 +1,28 @@
 = form_for [spina, :admin, current_account] do |f|
-  .table-container
-    %table.table.table-form
-      %tr
-        %td
+  %header#header
+    = render partial: 'spina/admin/shared/breadcrumbs'
+
+    #header_actions
+      %button.button.button-primary{type: 'submit'}
+        = icon('check')
+        = t('spina.preferences.social_media_save')
+
+  .well
+    .horizontal-form
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:facebook)
-        %td
+        .horizontal-form-content
           = f.text_field :facebook, placeholder: Spina::Account.human_attribute_name(:facebook)
 
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:twitter)
-        %td
+        .horizontal-form-content
           = f.text_field :twitter, placeholder: Spina::Account.human_attribute_name(:twitter)
 
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:google_plus)
-        %td
+        .horizontal-form-content
           = f.text_field :google_plus, placeholder: Spina::Account.human_attribute_name(:google_plus)
-
-  %button.button.button-primary{type: 'submit'}
-    = icon('check')
-    = t('spina.preferences.social_media_save')