Modifications in Layout

In the layout file we can have "contents" (for editable content) and
"layout_parts" (for when the layout is created from scratch)

app/models/design/design.rb

@@ -70,12 +70,15 @@ class Design
   end
   
   def procs_embedded_objects
-    [[self.layout], self.javascripts, self.images].each do |objects|
+    [self.javascripts, self.images].each do |objects|
       objects.each do |object|
         process_object(object)
       end
     end
-    self.layout.parse_urls
+    if self.layout.to_save
+      self.layout.save
+      self.layout.parse_urls
+    end
     self.themes.each do |theme|
       to_parse_url = theme.to_save ? true : false
       process_object(theme)

app/models/design/layout.rb

@@ -12,19 +12,20 @@ class Layout < DesignFile
   after_save :parse_layout
 
   def content
-    self.file.read
+    self.file.read.force_encoding("UTF-8")
   end
 
   def self.exist_one?
     Layout.count > 0
   end
 
-  def parse_layout  
-    parse_layout_layout_part(self)
+  def parse_layout 
+    debugger
+    parse_layout_contents(self)
   end
   
   def parse_urls
-    orig_content = content = self.file.read.force_encoding("UTF-8")
+    orig_content = content = self.content
     self.remove_file!
     self.remove_file_orig!
     names = []
@@ -52,7 +53,7 @@ class Layout < DesignFile
       temp_file.write content.force_encoding("UTF-8")
       self.file = temp_file
       
-      Layout.without_callback(:save) do
+      Layout.without_callback(:save, :after, :parse_layout) do
         self.save
       end
     }  

app/models/design/layout_part.rb

@@ -5,14 +5,14 @@ class LayoutPart
 
   field :name
   field :id_tag
-  field :editable
+  field :editable, :type => Boolean
   field :class_tag
   field :content
 
   embedded_in :layout
   
   def editable?
-    self.editable.eql?('true')
+    self.editable
   end
 
 end