Modifications for design, pages, page_parts…

Move orbit_bar out of kernel.js

app/assets/javascripts/orbit_bar.js

@@ -0,0 +1,4 @@
+$(document).ready(function() {
+	$('body').prepend("<div id='orbit_bar'/>"); 
+	ajax_load_proc($('#orbit_bar'), '/load_orbit_bar');
+});

app/controllers/admin/pages_controller.rb

@@ -38,8 +38,6 @@ class Admin::PagesController < ApplicationController
   def create
     @item = Page.new(params[:page])
     if @item.save
-      @item.create_parts
-      @item.save
       flash.now[:notice] = t('admin.create_success_page')
       respond_to do |format|
         format.html { 

app/models/design/design.rb

@@ -15,7 +15,7 @@ class Design
   embeds_many :themes, :cascade_callbacks => true
   embeds_many :javascripts, :cascade_callbacks => true
   embeds_many :images, :cascade_callbacks => true
-  embeds_many :custom_images, :class_name => 'Image', :cascade_callbacks => true
+  # embeds_many :custom_images, :class_name => 'Image', :cascade_callbacks => true
   
   validates_presence_of :title
   validates_presence_of :author

app/models/design/layout.rb

@@ -7,7 +7,7 @@ class Layout < DesignFile
   embedded_in :design
   embeds_many :layout_parts
   
-  after_save :parse_layout
+  before_save :parse_layout
 
   def content
     self.file.read.force_encoding("UTF-8") rescue ''

app/models/design/layout_part.rb

@@ -4,15 +4,7 @@ class LayoutPart
   include Mongoid::Timestamps
 
   field :name
-  field :id_tag
-  field :editable, :type => Boolean
-  field :class_tag
-  field :content
 
   embedded_in :layout
-  
-  def editable?
-    self.editable
-  end
 
 end

app/models/page.rb

@@ -9,17 +9,21 @@ class Page < Item
   has_many :page_parts, :autosave => true, :dependent => :destroy
   accepts_nested_attributes_for :page_parts, :allow_destroy => true
   
-  # embeds_many :custom_images, :class_name => 'Image', as: :design_image
+  before_save :create_parts
   
-  def create_parts
-    page_design = self.design
-    page_design.layout.layout_parts.each do |p|
-      self.page_parts.create( :name => p.name, :i18n_variable => I18nVariable.create, :kind => 'text' ) if p.editable?
-    end
-  end
+  # embeds_many :custom_images, :class_name => 'Image', as: :design_image
   
   def is_home?
     self.parent ? false : true
   end
   
+  protected
+  
+  def create_parts
+    page_design = self.design
+    page_design.layout.layout_parts.each do |layout_part|
+      self.page_parts.new(:name => layout_part.name) unless self.page_parts.detect{|page_part| page_part.name.eql?(layout_part.name)}
+    end
+  end
+  
 end