spina 0.6.13 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09fedb5b12f1905604e9f97fab0054fd709ea5f8
-  data.tar.gz: 1a370c95dcaa5e420bc782b67b4bd624afb1205d
+  metadata.gz: 225db0cd71a8b63dfd9171620b3eeeea64360273
+  data.tar.gz: 638ddad8be1ad95e39e50c63d02973ccadd2ff2c
 SHA512:
-  metadata.gz: 436b5f3ffb9b1d51c1aec59ba3bec22517be2f09e6a49a0ec06fdd9d62e27a8839bb4ebe1923dd754157fcc9338f7d0a29b7a59c56c6a1ec7d9beebb8fea10ed
-  data.tar.gz: 3ee6db760b6aa74fd68d42d8c42905b2db6b02ad41ce5b2097c2b78c23d8e84b7b7629a4c22eeeb43f4e78abfc29160747cd56f917a1c6aea90e6b042d06b863
+  metadata.gz: 1fec9dc77098ec85a9d18540ce68b82a5d0cdc581e194054d1967d64b8ba37883778b66735405cea964e4ef2407ac260e58d2447ce68e830d0b7d9baf5c7ad2e
+  data.tar.gz: 75e479d1e327168023233daa5d28a98f997049023c77a732be32323475274fb5b8454ab2173757767dcab944c120272cbf14a52d0d4e52be940bd70b4a6b0417

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

@@ -9,6 +9,11 @@ ready = ->
       position_array.push $(this).data('photo-id')
     $(e.target).parents('td').find('.photo-positions').val(position_array.join(","))
 
+  $('.structure-form-menu ul').sortable().bind 'sortupdate', (e) ->
+    $(e.target).find('li').each (index) ->
+      id = $(this).data('structure-item-id')
+      $(".structure_form_pane_#{id}_position").val(index)
+
 $(document).on 'ready page:load', ready
 
 # Change templates makes page parts appear and disappear
@@ -33,6 +38,32 @@ $(document).on 'click', 'form .remove_fields', (event) ->
   $(this).closest('fieldset').slideUp()
   event.preventDefault()
 
+# Dynamically add and remove structures
+$(document).on 'click', 'form .add_structure', (event) ->
+  $structureForm = $(this).parents('.structure-form')
+
+  time = new Date().getTime()
+  regexp = new RegExp($(this).data('id'), 'g')
+  $fields = $($(this).data('fields').replace(regexp, time))
+  $(this).before($fields)
+
+  $link = $("<li><a href='#structure_form_pane_#{time}'><i data-icon='7'></i> </a></li>")
+
+  $structureForm.find('.structure-form-menu ul').append($link)
+  $fields.attr('id', "structure_form_pane_#{time}")
+
+  $link.find('a').click()
+
+  event.preventDefault()
+
+$(document).on 'click', 'form .remove-structure-item-fields', (event) ->
+  $(this).prev('input[type=hidden]').val('1')
+  $pane = $(this).closest('.structure-form-pane')
+  console.log $pane.attr('id')
+  $("a[href='##{$pane.attr('id')}']").parents('li').hide()
+  $pane.hide()
+  event.preventDefault()
+
 # Sort pages
 $(document).on 'click', '.sort-switch', (event) ->
   $($(this).attr('href') + ' .dd-item-inner').toggleClass('dd-handle')

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

@@ -11,6 +11,22 @@ module Spina
           block.yield
         end
       end
+
+      def link_to_add_structure(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|
+          current_theme.config.structures[f.object.page_part.name].each do |structure_part|
+            structure_part = new_object.structure_parts.build(structure_part)
+            structure_part.structure_partable = structure_part.structure_partable_type.constantize.new
+          end
+
+          render(association.to_s.singularize + "_fields", f: builder)
+        end
+        link_to '#', class: "add_structure button button-link", data: {id: id, fields: fields.gsub("\n", "")} do
+          block.yield
+        end
+      end
     end
   end
 end

data/app/models/spina/line.rb

@@ -2,5 +2,6 @@ module Spina
   class Line < ActiveRecord::Base
     has_many :page_parts, as: :page_partable
     has_many :layout_parts, as: :layout_partable
+    has_many :structure_parts, as: :structure_partable
   end
 end

data/app/models/spina/photo.rb

@@ -3,6 +3,7 @@ module Spina
     mount_uploader :file, PhotoUploader
 
     has_many :page_parts, as: :page_partable
+    has_many :structure_parts, as: :structure_partable
     has_many :photo_collections_photos
     has_many :photo_collections, through: :photo_collections_photos
 

data/app/models/spina/structure.rb

@@ -0,0 +1,8 @@
+module Spina
+  class Structure < ActiveRecord::Base
+    has_one :page_part, as: :page_partable
+    has_many :structure_items
+
+    accepts_nested_attributes_for :structure_items, allow_destroy: true
+  end
+end

data/app/models/spina/structure_item.rb

@@ -0,0 +1,10 @@
+module Spina
+  class StructureItem < ActiveRecord::Base
+    belongs_to :structure
+    has_many :structure_parts, dependent: :destroy
+
+    scope :sorted_by_structure, -> { order('position') }
+
+    accepts_nested_attributes_for :structure_parts, allow_destroy: true
+  end
+end

data/app/models/spina/structure_part.rb

@@ -0,0 +1,25 @@
+module Spina
+  class StructurePart < ActiveRecord::Base
+    belongs_to :structure_item
+    belongs_to :structure_partable, polymorphic: true
+
+    accepts_nested_attributes_for :structure_partable, allow_destroy: true
+
+    validates_presence_of :name, :structure_partable_type, :title
+    validates_uniqueness_of :name, scope: :structure_item_id
+
+    scope :sorted, -> { order(:position) }
+
+    def to_s
+      name
+    end
+
+    def structure_partable_attributes=(attributes)
+      if self.structure_partable.present?
+        self.structure_partable.assign_attributes(attributes)
+      else
+        self.structure_partable = self.structure_partable_type.constantize.new(attributes)
+      end
+    end
+  end
+end

data/app/models/spina/text.rb

@@ -2,5 +2,6 @@ module Spina
   class Text < ActiveRecord::Base
     has_many :page_parts, as: :page_partable
     has_many :layout_parts, as: :layout_partable
+    has_many :structure_parts, as: :structure_partable
   end
 end

data/app/views/spina/admin/page_partables/_structure_form.html.haml

@@ -0,0 +1,26 @@
+%td{colspan: 2, style: 'vertical-align: top; padding-left: 0px; padding-right: 0px'}
+  = structure_form.hidden_field :id
+  = structure_form.hidden_field :title
+  = structure_form.hidden_field :page_partable_type
+  = structure_form.hidden_field :name
+
+  .structure-form
+    .structure-form-menu
+      %label= structure_form.object.title
+
+      %ul
+        - structure_form.object.page_partable.structure_items.sorted_by_structure.each do |structure_item|
+          %li{data: {structure_item_id: structure_item.id}}
+            = link_to "#structure_form_pane_#{structure_item.id}" do
+              %i.sortable-handle{data: {icon: '7'}}
+              = structure_item.structure_parts.first.structure_partable.try(:content)
+
+    .structure-form-content
+      = structure_form.fields_for :page_partable do |form|
+        - form.object.page_part = structure_form.object
+
+        = form.fields_for :structure_items, form.object.structure_items.sorted_by_structure do |structure_item_form|
+          = render 'structure_item_fields', f: structure_item_form
+
+        = link_to_add_structure form, :structure_items do
+          %i{data: {icon: 't'}}

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

@@ -13,15 +13,18 @@
 
         = f.fields_for :page_parts, @page_parts.sort { |a,b| a.position(current_theme) <=> b.position(current_theme) } do |page_part_form|
           %tr.page-part{data: {name: page_part_form.object.name}}
-            %td
-              = page_part_form.object.title
-            %td
-              = page_part_form.hidden_field :id
-              = page_part_form.hidden_field :title
-              = page_part_form.hidden_field :page_partable_type
-              = page_part_form.hidden_field :name
-
+            - if page_part_form.object.page_partable_type == 'Spina::Structure'
               = render partial: "spina/admin/page_partables/#{page_part_form.object.page_partable_type.demodulize.underscore}_form", object: page_part_form
+            - else
+              %td
+                = page_part_form.object.title
+              %td
+                = page_part_form.hidden_field :id
+                = page_part_form.hidden_field :title
+                = page_part_form.hidden_field :page_partable_type
+                = page_part_form.hidden_field :name
+
+                = render partial: "spina/admin/page_partables/#{page_part_form.object.page_partable_type.demodulize.underscore}_form", object: page_part_form
 
   #page_seo.tab-content
     .table-container

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

@@ -0,0 +1,15 @@
+.structure-form-pane{id: "structure_form_pane_#{f.object.id}"}
+  / Hidden field
+  = f.hidden_field :position, placeholder: "Position", class: "structure_form_pane_#{f.object.id}_position"
+
+  / Strucure parts
+  = f.fields_for :structure_parts do |structure_part_form|
+    = structure_part_form.hidden_field :id
+    = structure_part_form.hidden_field :title
+    = structure_part_form.hidden_field :name
+    = structure_part_form.hidden_field :structure_partable_type
+
+    .structure-form-part= render partial: "spina/admin/structure_partables/#{structure_part_form.object.structure_partable_type.demodulize.underscore}_form", object: structure_part_form
+
+  = f.hidden_field :_destroy
+  = link_to t('spina.delete'), '#', class: 'remove-structure-item-fields button button-mini button-link pull-right'

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

@@ -1,10 +1,10 @@
-var hidden_input = $("input[name='<%= j params[:page_part_id] %>[page_partable_id]']");
-hidden_input.parents('td').find('a .image, a .placeholder').remove();
+var hidden_input = $("input[name='<%= j params[:page_part_id] %>[page_partable_id]'], input[name='<%= j params[:page_part_id] %>[structure_partable_id]']");
+hidden_input.parents('.media_picker').find('.image, .placeholder').remove();
 <% if @photo.present? %>
-  hidden_input.parents('td').find('a').prepend("<div class='placeholder pull-right'><span class='button button-small button-round' data-icon='U'><%= I18n.t('spina.pages.photo_picker') %></span></div><div class='image'><img src='<%= @photo.file.thumb %>' /></div>");
+  hidden_input.parents('.media_picker').prepend("<div class='placeholder pull-right'><span class='button button-small button-round' data-icon='U'><%= I18n.t('spina.pages.photo_picker') %></span></div><div class='image'><img src='<%= @photo.file.thumb %>' /></div>");
   hidden_input.val("<%= @photo.id %>");
 <% else %>
-  hidden_input.parents('td').find('a').prepend("<div class='placeholder'><span class='button button-small button-round' data-icon='U'><%= I18n.t('spina.pages.photo_picker') %></span></div>");
-  hidden_input.parents('td').append("<input type='hidden' type='checkbox' name='<%= j params[:page_part_id] %>[_destroy]' value='1' />")
+  hidden_input.parents('.media_picker').prepend("<div class='placeholder'><span class='button button-small button-round' data-icon='U'><%= I18n.t('spina.pages.photo_picker') %></span></div>");
+  hidden_input.parents('.media_picker').append("<input type='hidden' type='checkbox' name='<%= j params[:page_part_id] %>[_destroy]' value='1' />")
 <% end %>
 $.hideModal();

data/app/views/spina/admin/structure_partables/_line_form.html.haml

@@ -0,0 +1,2 @@
+= line_form.fields_for :structure_partable do |f|
+  = f.text_field :content, placeholder: line_form.object.title

data/app/views/spina/admin/structure_partables/_photo_form.html.haml

@@ -0,0 +1,11 @@
+= link_to spina.photo_select_admin_photos_path(photo_form.object_name, selected_photo_id: (photo_form.object.structure_partable.id if photo_form.object.structure_partable.present?)), remote: true, class: "media_picker" do
+  - if photo_form.object.structure_partable && photo_form.object.structure_partable.file.present?
+    .placeholder.pull-right
+      %span.button.button-small.button-round{data: {icon: 'U'}}=t 'spina.pages.photo_picker'
+    .image
+      = image_tag photo_form.object.structure_partable.file.thumb
+  - else
+    .placeholder
+      %span.button.button-small.button-round{data: {icon: 'U'}}=t 'spina.pages.photo_picker'
+
+  = photo_form.hidden_field :structure_partable_id

data/app/views/spina/admin/structure_partables/_text_form.html.haml

@@ -0,0 +1,21 @@
+= text_form.fields_for :structure_partable, text_form.object.structure_partable do |form|
+  .wysihtml5-container{data: {:"object-id" => text_form.object.object_id}}
+    .toolbar{id: "wysihtml5-toolbar-#{text_form.object.object_id}"}
+      = link_to "", "#", class: 'command command-bold', title: "CTRL+B", data: {:"wysihtml5-command" => "bold", icon: 'H'}
+      = link_to "", "#", class: 'command command-italic', title: "CTRL+I", data: {:"wysihtml5-command" => "italic", icon: 'G'}
+      = link_to "", "#", class: 'command command-insert-unordered-list', data: {:"wysihtml5-command" => "insertUnorderedList", icon: 'F'}
+      = link_to "", spina.wysihtml5_link_admin_page_parts_path(text_form.object.object_id), class: 'command', data: {icon: 'Y'}, remote: true
+      = link_to "", spina.wysihtml5_select_admin_photos_path(text_form.object.object_id), class: 'command', data: {icon: 'V'}, remote: true
+
+      .pull-right
+        .choose-text-type
+          %ul
+            %li= link_to t('spina.wysiwyg.paragraph'), "#", data: {:"wysihtml5-command" => "formatBlock", :"wysihtml5-command-value" => "P"}
+            %li= link_to t('spina.wysiwyg.heading_1'), "#", data: {:"wysihtml5-command" => "formatBlock", :"wysihtml5-command-value" => "h1"}
+            %li= link_to t('spina.wysiwyg.heading_2'), "#", data: {:"wysihtml5-command" => "formatBlock", :"wysihtml5-command-value" => "h2"}
+            %li= link_to t('spina.wysiwyg.heading_3'), "#", data: {:"wysihtml5-command" => "formatBlock", :"wysihtml5-command-value" => "h3"}
+            %li= link_to t('spina.wysiwyg.quote'), "#", data: {:"wysihtml5-command" => "formatBlock", :"wysihtml5-command-value" => "blockquote"}
+
+        = link_to "", "#", class: 'command action-change-view', data: {:"wysihtml5-action" => "change_view", icon: 'I'}
+
+    = form.text_area :content, placeholder: "#{t 'spina.pages.page_part'} #{text_form.object.name.downcase}", class: 'wysihtml5'

data/db/migrate/20150402144347_create_structures.rb

@@ -0,0 +1,27 @@
+class CreateStructures < ActiveRecord::Migration
+  def change
+    create_table :spina_structures do |t|
+      t.timestamps
+    end
+
+    create_table :spina_structure_items do |t|
+      t.integer :structure_id
+      t.integer :position
+      t.timestamps
+    end
+
+    add_index :spina_structure_items, :structure_id
+
+    create_table :spina_structure_parts do |t|
+      t.integer :structure_item_id
+      t.integer :structure_partable_id
+      t.string :structure_partable_type
+      t.string :name
+      t.string :title
+      t.timestamps
+    end
+
+    add_index :spina_structure_parts, :structure_item_id
+    add_index :spina_structure_parts, :structure_partable_id
+  end
+end

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "0.6.13"
+  VERSION = "0.6.14"
 end

data/test/dummy/config/initializers/spina.rb

@@ -1,7 +1,58 @@
 Spina::Engine.configure do
+  config.NEGATIVE_CAPTCHA_SECRET = 'abc'
+end
+
+module Spina
+  module DefaultTheme
+    include ActiveSupport::Configurable
+
+    config_accessor :title, :page_parts, :view_templates, :layout_parts, :custom_pages, :plugins, :structures
+
+    self.title = "Default theme"
 
-  config.default_theme = "Business"
+    self.page_parts = [{ 
+      name: 'content', 
+      title: 'Content', 
+      page_partable_type: "Spina::Text" 
+    }, { 
+      name: 'team', 
+      title: 'Team', 
+      page_partable_type: "Spina::Structure"
+    }]
 
-  config.NEGATIVE_CAPTCHA_SECRET = 'fee3b3c8b2faa53dafe0978c10c691c29f9c0fdcf12e0052d8c4f5852903707f4a1b6c14f2ac270950b06a287b0683c02a383745025ae6aa3f85091a5deccf06'
+    self.structures = {
+      'team' => [{
+        name: 'name',
+        title: 'Naam',
+        structure_partable_type: "Spina::Line"
+      }, {
+        name: 'description',
+        title: 'Omschrijving',
+        structure_partable_type: "Spina::Text"
+      }, {
+        name: 'photo',
+        title: 'Foto',
+        structure_partable_type: "Spina::Photo"  
+      }]
+    }
 
+    self.layout_parts = []
+
+    self.custom_pages = []
+    self.plugins = []
+
+    self.view_templates = {
+      'show' => {
+        title: 'Default',
+        description: 'Default template',
+        usage: 'Default page',
+        page_parts: ['content', 'team']
+      }
+    }
+  end
 end
+
+theme = Spina::Theme.new
+theme.name = "Default theme"
+theme.config = Spina::DefaultTheme.config
+Spina.register_theme(theme)

data/test/dummy/db/migrate/20150402144912_create_structures.spina.rb

@@ -0,0 +1,28 @@
+# This migration comes from spina (originally 20150402144347)
+class CreateStructures < ActiveRecord::Migration
+  def change
+    create_table :spina_structures do |t|
+      t.timestamps
+    end
+
+    create_table :spina_structure_items do |t|
+      t.integer :structure_id
+      t.integer :position
+      t.timestamps
+    end
+
+    add_index :spina_structure_items, :structure_id
+
+    create_table :spina_structure_parts do |t|
+      t.integer :structure_item_id
+      t.integer :structure_partable_id
+      t.string :structure_partable_type
+      t.string :name
+      t.string :title
+      t.timestamps
+    end
+
+    add_index :spina_structure_parts, :structure_item_id
+    add_index :spina_structure_parts, :structure_partable_id
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,12 +11,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140407095608) do
+ActiveRecord::Schema.define(version: 20150402144912) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "spina_accounts", force: true do |t|
+  create_table "spina_accounts", force: :cascade do |t|
     t.string   "name"
     t.string   "address"
     t.string   "postal_code"
@@ -25,29 +25,30 @@ ActiveRecord::Schema.define(version: 20140407095608) do
     t.string   "email"
     t.text     "preferences"
     t.string   "logo"
-    t.datetime "created_at",     null: false
-    t.datetime "updated_at",     null: false
+    t.datetime "created_at",                     null: false
+    t.datetime "updated_at",                     null: false
     t.string   "kvk_identifier"
     t.string   "vat_identifier"
+    t.boolean  "robots_allowed", default: false
   end
 
-  create_table "spina_attachment_collections", force: true do |t|
+  create_table "spina_attachment_collections", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "spina_attachment_collections_attachments", force: true do |t|
+  create_table "spina_attachment_collections_attachments", force: :cascade do |t|
     t.integer "attachment_collection_id"
     t.integer "attachment_id"
   end
 
-  create_table "spina_attachments", force: true do |t|
+  create_table "spina_attachments", force: :cascade do |t|
     t.string   "file"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "spina_inquiries", force: true do |t|
+  create_table "spina_inquiries", force: :cascade do |t|
     t.string   "name"
     t.string   "email"
     t.string   "phone"
@@ -58,7 +59,7 @@ ActiveRecord::Schema.define(version: 20140407095608) do
     t.boolean  "spam"
   end
 
-  create_table "spina_layout_parts", force: true do |t|
+  create_table "spina_layout_parts", force: :cascade do |t|
     t.string   "title"
     t.string   "name"
     t.integer  "layout_partable_id"
@@ -68,13 +69,13 @@ ActiveRecord::Schema.define(version: 20140407095608) do
     t.integer  "account_id"
   end
 
-  create_table "spina_lines", force: true do |t|
+  create_table "spina_lines", force: :cascade do |t|
     t.string   "content"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "spina_page_parts", force: true do |t|
+  create_table "spina_page_parts", force: :cascade do |t|
     t.string   "title"
     t.string   "name"
     t.datetime "created_at",         null: false
@@ -84,7 +85,7 @@ ActiveRecord::Schema.define(version: 20140407095608) do
     t.string   "page_partable_type"
   end
 
-  create_table "spina_pages", force: true do |t|
+  create_table "spina_pages", force: :cascade do |t|
     t.string   "title"
     t.string   "menu_title"
     t.string   "description"
@@ -106,29 +107,57 @@ ActiveRecord::Schema.define(version: 20140407095608) do
     t.boolean  "active",              default: true
   end
 
-  create_table "spina_photo_collections", force: true do |t|
+  create_table "spina_photo_collections", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "spina_photo_collections_photos", force: true do |t|
+  create_table "spina_photo_collections_photos", force: :cascade do |t|
     t.integer "photo_collection_id"
     t.integer "photo_id"
+    t.integer "position"
   end
 
-  create_table "spina_photos", force: true do |t|
+  create_table "spina_photos", force: :cascade do |t|
     t.string   "file"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "spina_texts", force: true do |t|
+  create_table "spina_structure_items", force: :cascade do |t|
+    t.integer  "structure_id"
+    t.integer  "position"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "spina_structure_items", ["structure_id"], name: "index_spina_structure_items_on_structure_id", using: :btree
+
+  create_table "spina_structure_parts", force: :cascade do |t|
+    t.integer  "structure_item_id"
+    t.integer  "structure_partable_id"
+    t.string   "structure_partable_type"
+    t.string   "name"
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "spina_structure_parts", ["structure_item_id"], name: "index_spina_structure_parts_on_structure_item_id", using: :btree
+  add_index "spina_structure_parts", ["structure_partable_id"], name: "index_spina_structure_parts_on_structure_partable_id", using: :btree
+
+  create_table "spina_structures", force: :cascade do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "spina_texts", force: :cascade do |t|
     t.text     "content"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "spina_users", force: true do |t|
+  create_table "spina_users", force: :cascade do |t|
     t.string   "name"
     t.string   "email"
     t.string   "password_digest"