cardboard_cms 0.1.8 → 0.2.1

data/app/views/cardboard/fields/_date.html.slim

@@ -1 +1 @@
-= f.input :value, label: f.object.label || f.object.identifier.titleize, as: :date_picker, hint: f.object.hint, placeholder: f.object.placeholder, required: f.object.required
+= f.input :value, label: field[:label] || identifier.titleize, as: :date_picker, hint: field[:hint], placeholder: field[:placeholder], required: field[:required] != false

data/app/views/cardboard/fields/_external_link.html.slim

@@ -1,2 +1,2 @@
-= f.input :value, label: false, hint: f.object.hint do
-  = link_to f.object.label || f.object.value , f.object.value
+= f.input :value, label: false, hint: field[:hint] do
+  = link_to field[:label] || field[:value] , field[:value]

data/app/views/cardboard/fields/_file.html.slim

@@ -1,8 +1,8 @@
-= f.input :value, label: f.object.identifier, hint: f.object.hint, placeholder: f.object.placeholder, required: f.object.required do
+= f.input :value, label: field[:label] || identifier.titleize, hint: field[:hint], placeholder: field[:placeholder], required: field[:required] != false do
 
-  - if f.object.value_uid.present?
-    p= link_to "#{f.object.value.name} (#{number_to_human_size f.object.value.size})", f.object.value.url, "data-skip-pjax" => true
-    - unless f.object.required
+  - if f.object.value_uid
+    p= link_to "#{f.object.value.name} (#{number_to_human_size f.object.value.size})", f.object.value.url
+    - unless field[:required]
       = f.input :remove_value, as: :boolean, inline_label: "Delete file?", label: false, :wrapper => :default
 
   = f.hidden_field :retained_value

data/app/views/cardboard/fields/_image.html.slim

@@ -1,9 +1,9 @@
-= f.input :value, label: f.object.label || f.object.identifier.titleize, hint: f.object.hint, placeholder: f.object.placeholder, required: f.object.required do
+= f.input :value, label: field[:label] || identifier.titleize, hint: field[:hint], placeholder: field[:placeholder], required: field[:required] != false do
 
   - if f.object.value_uid.present?
     = image_tag f.object.value.thumb('600x150>').url
     br
-    - unless f.object.required
+    - unless field[:required]
       = f.input :remove_value, inline_label: "Delete file?", label: false, as: :boolean, :wrapper => :default
 
   = f.input_field :value, as: :file

data/app/views/cardboard/fields/_resource_link.html.slim

@@ -1,2 +1,2 @@
-= f.input :value, label: false, hint: f.object.hint do
-  = link_to f.object.label || f.object.value , {controller: "cardboard/#{f.object.value}", action: :index}
+= f.input :value, label: false, hint: field[:hint] do
+  = link_to field[:label] || field[:value] , {controller: "cardboard/#{field[:value]}", action: :index}

data/app/views/cardboard/fields/_rich_text.html.slim

@@ -1,3 +1,3 @@
 
 
-= f.input :value, label: f.object.label || f.object.identifier.titleize, as: f.object.type, hint: f.object.hint, placeholder: f.object.placeholder, required: f.object.required
+= f.input :value, label: field[:label] || identifier.titleize, as: field[:type], hint: field[:hint], placeholder: field[:placeholder], required: field[:required] != false

data/app/views/cardboard/fields/_string.html.slim

@@ -1 +1 @@
-= f.input :value, label: f.object.label || f.object.identifier.titleize, as: f.object.type, hint: f.object.hint, placeholder: f.object.placeholder, required: f.object.required
+= f.input :value, label: field[:label] || identifier.titleize, as: field[:type], hint: field[:hint], placeholder: field[:placeholder], required: field[:required] != false

data/app/views/cardboard/pages/_error.html.slim

@@ -1,5 +1,5 @@
 
-h1 views/pages/#{missing_file}.html...
+h1 views/templates/#{missing_file}.html...
 
 p make sure to overwrite this file with your own!
 

data/app/views/cardboard/pages/_part_fields.html.slim

@@ -0,0 +1,19 @@
+.nested-fields
+  = f.hidden_field :identifier, :value => part_identifier
+
+  - if part_hash[:repeatable]
+    .right= link_to_remove_association "x", f, class: "btn btn-danger"
+
+  - part_hash[:fields].each do |field_identifier, field|
+       
+    - fields = part.fields.find{|ob|  ob.identifier ==  field_identifier}
+
+    = f.simple_fields_for :fields,  fields do |w|
+      = w.hidden_field :type, :value => "Cardboard::Field::#{field[:type].camelize}"
+      = w.hidden_field :identifier, :value => field_identifier
+     
+      - begin
+        = render "cardboard/fields/#{field[:type]}", f: w, field: field, identifier: field_identifier
+      - rescue ActionView::MissingTemplate => e
+        = render "cardboard/fields/base_input", f: w, field: field, identifier: field_identifier
+

data/app/views/cardboard/pages/_sidebar.html.slim

@@ -1,7 +1,11 @@
-.input-append
-  input id="sidebar_page_search" type="text" placeholder="Search by Title"
-  button type="submit" class="btn"
-    i.icon-search
+form class="form-inline"
+  => link_to pages_new_path, class:"btn btn-primary" do
+    i.icon-plus
+
+  .input-append style="width: 160px"
+    input id="sidebar_page_search" type="text" placeholder="Search Pages"
+    button type="submit" class="btn"
+      i.icon-search
 
 #content_pages data-update-url="#{pages_sort_path}"
   = nested_pages do |page, subpages|

data/app/views/cardboard/pages/_url_field.html.slim

@@ -1,17 +1,15 @@
-/ -# TODO: put the parent and slug side by side and name the new field URL
-/ -#       also maybe change the dropdown to an autocomplete
-/ -# f.input :parent_url, :collection => Cardboard::Page.preordered.all.inject(["/"]){|result, elm| result << elm.url unless elm.id == @page.id; result}, include_blank: false
 
 = f.input :url, required: true, wrapper_html:{class: f.object.errors.messages[:slug] ? "error" : nil}, hint: f.object.root? ? "This page is your home page" : nil do
   - if f.object.root?
     .btn(disabled)=> "/" 
     ' or
   .input-prepend style="display:inline"
-    .add-on
-      - if @page.new_record?
-        = f.select :parent_url, options_for_select(@page.parent_url_options, f.object.parent_url)
-      - else
-        = f.object.parent_url
+    = f.select :parent_url, options_for_select(@page.parent_url_options, f.object.parent_url)
+    / .add-on
+    /   - if @page.new_record?
+    /     = f.select :parent_url, options_for_select(@page.parent_url_options, f.object.parent_url)
+    /   - else
+    /     = f.object.parent_url
 
     = f.text_field :slug
 

data/app/views/cardboard/pages/edit.html.slim

@@ -1,6 +1,11 @@
 h1
   = @page.title
-  .right= link_to "Live preview", @page.url, class:"btn", target: '_blank', 'data-skip-pjax' => true
+  - unless @page.template.is_page?
+    small
+      =<> link_to page_path(@page), method: :delete, data: { confirm: 'You are about to delete this page. Are you sure?' }, class: "red" do
+        i.icon-trash
+  .right
+    = link_to "View Page", @page.url, class:"btn-large btn", target: '_blank'
 
 = simple_form_for @page, html: {:multipart => true} do |f|
   = f.error_notification
@@ -8,6 +13,10 @@ h1
 
   = render "url_field", f: f
 
+  - unless @page.template.is_page?
+    label Template
+    = @page.template.name
+
   = f.input :in_menu, label: false, inline_label: "Display in main menu?"
 
   = field_set_tag "SEO" do
@@ -19,23 +28,23 @@ h1
           = seo.input key, required: false
 
 
-  
-  - for part in @page.parts.sort_by(&:position) 
-    = f.simple_fields_for :parts, part do |g|
-
-      = field_set_tag part.identifier.titleize do
-        = g.error :base, class: "alert-error"
 
-        / sort puts nil at the end, in the case of new parts
-        - for subpart in part.subparts.sort{|a,b| a.position && b.position ? a.position <=> b.position : a.position ? -1 : 1 }
-          = g.simple_fields_for :subparts, subpart do |y|
+  - @page.template_hash.each do |part_identifier, part_hash|
 
-            = render "subpart_fields", f: y, subpart: subpart
+    = field_set_tag part_hash[:title] || part_identifier.titleize do
+      
+      - if parts = @page.parts.select{|ob|  ob.identifier ==  part_identifier}
+        - parts.sort!{|a,b| a.position && b.position ? a.position <=> b.position : a.position ? -1 : 1 } 
+     
+      - parts.each do |part|
+        = f.simple_fields_for :parts, part do |g|
+          = render "part_fields", f: g, part: part, part_hash: part_hash, part_identifier: part_identifier
         
-        - if part.repeatable?
-          .links
-            / the "links" class is important for the cocoon gem
-            = link_to_add_association "Add another #{part.identifier.singularize.titleize}", g, :subparts, :render_options => {:locals => {:subpart => part.new_subpart }}, class: "btn btn-block"
+      - if part_hash[:repeatable]
+        .links
+          / the "links" class is important for the cocoon gem
+          = link_to_add_association "Add another #{part_hash[:repeatable]}", f, :parts, render_options: {locals: {part_hash: part_hash, part: @page.parts.build(identifier: part_identifier), part_identifier: part_identifier}}, class: "btn btn-block"
+
 
   .form-actions
     = f.button :submit, "Save", class:"btn-primary"

data/app/views/cardboard/pages/new.html.slim

@@ -0,0 +1,7 @@
+h1 Create a new page
+
+= simple_form_for @page do |f|
+  / = f.input :identifier, hint: "Pick a name for this page so it can be accessed from the code"
+  = f.input :title
+  = f.input :template_id, as: :select, collection: Cardboard::Template.where(is_page: false), :include_blank => false
+  = f.submit "Create", class: "btn"

data/app/views/cardboard/pages/show.html.slim

@@ -1,9 +1,9 @@
-- if lookup_context.exists?(current_page.identifier, 'pages', false) 
+- if lookup_context.exists?(current_page.template.identifier, 'templates', false) 
 
   - content_for :seo do
     = render "cardboard/pages/seo"
 
-  = render template: "pages/#{current_page.identifier}"
+  = render template: "templates/#{current_page.template.identifier}"
   
 - elsif Rails.env.development? 
-  = render "cardboard/pages/error", missing_file: current_page.identifier
+  = render "cardboard/pages/error", missing_file: current_page.template.identifier

data/app/views/cardboard/resources/_advanced_search.html.slim

@@ -1,4 +1,4 @@
-= search_form_for @q, url: {}, :html =>{"data-pjax"=>true} do |f|
+= search_form_for @q, url: {} do |f|
   = hidden_field_tag :s, "advanced"
   - (params[:q] || {}).each do |q,v|
     = f.hidden_field q,  :value => v

data/app/views/cardboard/resources/_search_helper.html.slim

@@ -1,5 +1,5 @@
-- models = klass.pluralize
-- model_title = klass.titleize
+- models = klass.underscore.pluralize
+- model_title = klass.demodulize.titleize
 
 table#filter_search_header
   tr 
@@ -12,6 +12,6 @@ table#filter_search_header
 
     - if options[:new_button]
       td style="text-align:right"
-        = link_to(options[:new_button][:label] || "New #{model_title}", options[:new_button][:url] || {controller: "cardboard/#{models}", action: :new}, class: "btn pull-right", style:"min-width:90px;") 
+        = link_to(options[:new_button][:label] || "New #{model_title}", options[:new_button][:url] || {controller: models, action: :new}, class: "btn pull-right", style:"min-width:90px;") 
 
   

data/app/views/cardboard/resources/_simple_search.html.slim

@@ -1,4 +1,4 @@
-= search_form_for @q, url: {}, :html =>{"data-pjax"=>true} do |f|
+= search_form_for @q, url: {} do |f|
   = hidden_field_tag :s, "simple"
 
   .input-append

data/app/views/cardboard/settings/index.html.slim

@@ -2,7 +2,16 @@ h1 Settings
 
 - if @setting
   = simple_form_for @setting do |s|
-    - for field in @setting.fields
-      = s.fields_for :fields, field do |f|
-        = render "cardboard/fields/#{field.type}", f: f rescue render "cardboard/fields/base_input", f: f
+    - @setting.template.each do |field_identifier, field|
+
+      - fields = @setting.fields.find{|ob|  ob.identifier ==  field_identifier}
+      / - if fields.nil?
+      /   - fields = @setting.fields.build(type: "Cardboard::Field::#{field[:type].camelize}", identifier: field_identifier, default: field[:default] ) 
+
+      = s.fields_for :fields, fields do |f|
+        - begin
+          = render "cardboard/fields/#{field[:type]}", f: f, field: field, identifier: field_identifier
+        - rescue ActionView::MissingTemplate => e 
+          = render "cardboard/fields/base_input", f: f, field: field, identifier: field_identifier
+
     = s.button :submit

data/app/views/cardboard/super_user/index.html.slim

@@ -4,7 +4,7 @@
   - for part in page.parts
     .indent
       h3= part.identifier
-      - for field in part.subparts.first.fields
+      - for field in part.fields
         .indent= field.identifier
 
   = content_tag(:div, subpages, class: "indent") if subpages.present?

data/app/views/layouts/cardboard/_main_sidebar.html.slim

@@ -1,6 +1,6 @@
 #menu
   - if Cardboard.used_as_cms? && cardboard_user_can_manage?(:pages)
-    = main_sidebar_nav_link "Pages", pages_path, id: "nav_dashboard_link", "data-skip-pjax" => true
+    = main_sidebar_nav_link "Pages", pages_path, id: "nav_dashboard_link"
 
 
   - Cardboard.resource_controllers.reject{|x|x.menu == false}.sort! { |a,b| a.menu[:priority] <=> b.menu[:priority] }.each do |controller|

data/app/views/layouts/cardboard/_main_topbar.html.slim

@@ -28,5 +28,5 @@
 
       ul.dropdown-menu
         li= link_to "Account", my_account_path 
-        li= link_to "Logout", main_app.send(Cardboard.application.logout_link_path), :method => :delete, "data-skip-pjax" => true
+        li= link_to "Logout", main_app.send(Cardboard.application.logout_link_path), :method => :delete
 

data/app/views/layouts/cardboard/application.html.slim

@@ -20,7 +20,7 @@ html lang=I18n.locale
       #content_sidebar class="#{'toggle' if params[:controller] =~ /pages/}"
         #pages_sidebar= render 'cardboard/pages/sidebar'
 
-      #content.container-fluid(data-pjax-container  class="#{'toggle' if params[:controller] =~ /pages/}")
+      #content.container-fluid  class="#{'toggle' if params[:controller] =~ /pages/}"
         = render 'layouts/cardboard/flash_message'
         = yield
 

data/cardboard.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'dragonfly', '~> 1.0'
   s.add_dependency 'chronic'
   s.add_dependency 'ransack', '>= 1.0.0'
-  s.add_dependency 'rack-pjax'
+  s.add_dependency 'turbolinks'
   s.add_dependency 'decorators'
   s.add_dependency 'jquery-ui-rails'
   s.add_dependency 'select2-rails'

data/config/routes.rb

@@ -4,8 +4,10 @@ Cardboard::Engine.routes.draw do
   get "my_account", to: "my_account#edit"
   patch "my_account", to: "my_account#update"
 
+  get "pages/new", to: "pages#new"
   post "pages/sort", to: "pages#sort"
   get "pages/:id", to: "pages#edit"
+  
   resources :pages
 
   get "/yoda", to: "super_user#index"

data/db/migrate/1_create_cardboard.rb

@@ -0,0 +1,63 @@
+class CreateCardboard < ActiveRecord::Migration
+  def change
+    #Fields
+    create_table :cardboard_fields do |t|
+      t.string :identifier
+      t.string :type
+      t.text :value_uid
+      t.integer :object_with_field_id
+      t.string :object_with_field_type
+
+      t.timestamps
+    end
+    add_index :cardboard_fields, :identifier
+    add_index :cardboard_fields, [:object_with_field_id, :object_with_field_type], :name => 'parent_object'
+
+    #Page Parts
+    create_table :cardboard_page_parts do |t|
+      t.string :identifier
+      t.integer :position
+      t.belongs_to :page
+
+      t.timestamps
+    end
+    add_index :cardboard_page_parts, :page_id
+    add_index :cardboard_page_parts, :identifier
+
+    #Pages
+    create_table :cardboard_pages do |t|
+      t.string :title
+      t.string :path
+      t.string :slug
+      t.text :slugs_backup
+      t.integer :position
+      t.text :meta_seo
+      t.boolean :in_menu, default: true
+      t.string :identifier, unique: true
+      t.belongs_to :template
+
+      t.timestamps
+    end
+    add_index :cardboard_pages, [:path, :slug], :unique => true
+    add_index :cardboard_pages, :identifier, :unique => true
+
+    #Settings
+    create_table :cardboard_settings do |t|
+      t.string :name
+      t.text :value
+      t.text :default_value
+      t.text :template
+
+    end
+    add_index :cardboard_settings, :name
+
+    #Templates
+    create_table :cardboard_templates do |t|
+      t.string :name
+      t.text :fields
+      t.string :identifier
+      t.boolean :is_page
+      t.timestamps
+    end
+  end
+end

data/lib/cardboard/engine.rb

@@ -15,7 +15,7 @@ require 'slim'
 require 'ransack'
 require 'kaminari'
 require 'kaminari-bootstrap'
-require 'rack-pjax'
+require 'turbolinks'
 require 'jquery-ui-rails'
 require 'decorators'
 require 'bootstrap-wysihtml5-rails'
@@ -55,12 +55,6 @@ module Cardboard
 
       # Load custom resource controllers in development (already loaded in production)
       Cardboard.set_resource_controllers
-      # if Rails.env.development?
-      #   Dir[Rails.root.join('app/controllers/cardboard/*_controller.rb')].map.each do |controller|
-      #     require_dependency controller
-      #   end
-      # end
-      # Cardboard.resource_controllers = Cardboard::AdminController.descendants
     end
 
     initializer "precompile hook", :group => :all do |app|
@@ -72,10 +66,6 @@ module Cardboard
       Dragonfly.app.fetch_file_whitelist.push(/app\/assets\/files/)
     end
 
-    initializer "pjax hook" do |app|
-      app.config.middleware.use Rack::Pjax
-    end
-
     rake_tasks do
       Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
     end

data/lib/cardboard/helpers/seed.rb

@@ -5,41 +5,44 @@ module Cardboard
   module Seed
     extend ActiveSupport::Concern
 
-    def self.populate_pages(filehash = nil)
-      pages = filehash ? filehash[:pages] : {}
-      pages.each do |id, page|
+    def self.populate_templates(templates)
+      templates ||= {}
+      templates.each do |id, template|
+        db_template = Cardboard::Template.where(identifier: id.to_s).first_or_initialize
+        db_template.update_attributes!(name: template[:title] || template[:name] || id.to_s, fields: template[:parts], is_page: false) 
+      end
+    end
+
+    def self.populate_pages(pages)
+      pages ||= {}
 
+      # add the page
+      pages.each do |id, page|
+        # create the template
+        db_template = Cardboard::Template.where(identifier: id.to_s).first_or_initialize
+        db_template.update_attributes!(name: page[:title] || page[:name] || id.to_s, fields: page[:parts], is_page: true) 
+      
         db_page = Cardboard::Page.where(identifier: id.to_s).first_or_initialize
         db_page.position_position = page[:position] || :last
+        db_page.template = db_template
         db_page.update_attributes!(page.slice(:title, :parent_id)) 
 
         self.populate_parts(page[:parts], db_page)
       end
-
-      for remove_page in Cardboard::Page.all.map(&:identifier) - pages.map{|k,v|k.to_s}
-        Cardboard::Page.where(identifier: remove_page).first.destroy
-      end
-
-      Cardboard::Page.create(identifier: "index", path: "/") if Cardboard::Page.root.nil?
     end
 
-
     def self.populate_parts(page_parts, db_page)
+      # called from the page controller
       page_parts ||= {}
       page_parts.each do |id, part|
-        db_part = db_page.parts.where(identifier: id.to_s).first_or_initialize
-        db_part.part_position_position = part[:position] || :last
-        db_part.update_attributes!(:repeatable => part[:repeatable])
-        
-        db_part.subparts.first_or_create! 
 
-        db_part.subparts.each do |db_part|
-          self.populate_fields(part[:fields], db_part)
-        end
-      end
-      for remove_part in db_page.parts.map(&:identifier) - page_parts.map{|k,v|k.to_s}
-        db_page.parts.where(identifier: remove_part).first.destroy
+        db_part = db_page.parts.where(identifier: id.to_s).first_or_create
+
+        self.populate_fields(part[:fields], db_part)
       end
+      # for remove_part in db_page.parts.map(&:identifier) - page_parts.map{|k,v|k.to_s}
+      #   db_page.parts.where(identifier: remove_part).first.destroy
+      # end
     end
 
     def self.populate_fields(fields, object)
@@ -48,9 +51,8 @@ module Cardboard
         db_field = Field.where(identifier: id.to_s, object_with_field: object).first_or_initialize
         db_field.type = "Cardboard::Field::#{(field[:type] || "string").camelize}"
         db_field.seeding = true
-        db_field.position_position = field[:position] || :last
         begin
-          db_field.update_attributes!(field.reject{|k,v| ["type", "position"].include?(k)}) 
+          db_field.update_attributes!(field.select{|k,v| ["default", "value"].include?(k)}) 
         rescue Exception => e
           # Output validation errors
           puts "-- ERROR --"
@@ -61,19 +63,18 @@ module Cardboard
       end
 
       #remove fields no longer in the seed file
-      for remove_field in object.fields.map(&:identifier) - fields.map{|k,v|k.to_s}
-        object.fields.where(identifier: remove_field).first.destroy
-      end
+      # for remove_field in object.fields.map(&:identifier) - fields.map{|k,v|k.to_s}
+      #   object.fields.where(identifier: remove_field).first.destroy
+      # end
     end
 
-    def self.populate_settings(filehash = nil)
-      settings = filehash ? filehash[:settings] : nil
+    def self.populate_settings(settings)
       if settings
         db_settings = Cardboard::Setting.first_or_create
+        db_settings.update_attributes!(template: settings)
         self.populate_fields(settings, db_settings)
       end
-      Cardboard::Setting.add("company_name", type: "string", default:  Cardboard.application.site_title, position: 0)
-      # Cardboard::Setting.add("google_analytics", type: "string", position: 1)
+      Cardboard::Setting.add("company_name", type: "string", default:  Cardboard.application.site_title, seeding: true)
     end
     
   end

data/lib/cardboard/version.rb

@@ -1,3 +1,3 @@
 module Cardboard
-  VERSION = "0.1.8"
+  VERSION = "0.2.1"
 end

data/lib/cardboard_cms.rb

@@ -7,6 +7,10 @@ module Cardboard
 
     attr_accessor :application, :resource_controllers
 
+    def resource_controllers
+      @resource_controllers ||= Cardboard::ResourceController.descendants
+    end
+
     def application
       @application ||= ::Cardboard::Application.new
     end
@@ -17,15 +21,15 @@ module Cardboard
     end
 
     def used_as_cms?
-      @used_as_cms = Cardboard::Page.count > 0 if @used_as_cms.nil? #handle false
+      @used_as_cms = Cardboard::Template.count > 0 if @used_as_cms.nil? #handle false
       @used_as_cms
     end
 
     def set_resource_controllers
+      # might not be needed in production
       Dir[Rails.root.join('app/controllers/cardboard/*_controller.rb')].map.each do |controller|
         require_dependency controller
       end
-      Cardboard.resource_controllers = Cardboard::ResourceController.descendants
     end
 
     # Gets called within the initializer

data/lib/generators/cardboard/install/install_generator.rb

@@ -50,7 +50,7 @@ module Cardboard
 
       def setup_directory
         empty_directory "app/controllers/cardboard"
-        empty_directory "app/views/pages"
+        empty_directory "app/views/templates"
       end
 
       def setup_routes
@@ -63,20 +63,12 @@ module Cardboard
         generate "cardboard:assets"
       end
 
-      def create_migrations
-        p "Copying over migrations..."
-        Dir["#{self.class.source_root}/migrations/*.rb"].sort.each do |filepath|
-          name = File.basename(filepath)
-          migration_template "migrations/#{name}", "db/migrate/#{name.gsub(/^\d+_/,'')}"
-          sleep 1
+      def install_migrations
+        puts "Copying over migrations..."
+        Dir.chdir(Rails.root) do
+          `rake cardboard:install:migrations`
         end
       end
-      # def install_migrations
-      #   puts "Copying over migrations..."
-      #   Dir.chdir(Rails.root) do
-      #     `rake cardboard:install:migrations`
-      #   end
-      # end
 
     protected
 

data/lib/tasks/cardboard_tasks.rake

@@ -14,9 +14,11 @@ task 'cardboard:seed' => :environment do
     puts "Error: You must first create a cardboard.yml file in your application config folder"
   end
 
-
-  Cardboard::Seed.populate_pages(file_hash)
-  Cardboard::Seed.populate_settings(file_hash) 
+  if file_hash
+    Cardboard::Seed.populate_pages(file_hash[:pages]) 
+    Cardboard::Seed.populate_templates(file_hash[:templates]) 
+    Cardboard::Seed.populate_settings(file_hash[:settings]) 
+  end
 
 end
 

data/test/dummy/app/views/templates/home.html.slim

@@ -0,0 +1,5 @@
+h1 This is the home page
+
+| which was edited
+
+= current_page.get("intro.text1")

data/test/dummy/config/cardboard.yml

@@ -1,5 +1,5 @@
 
-pages:
+templates:
   #---
   home:
     title: Welcome