modified V,C,M related with layout and have bug between layout and design

lib/parser.rb

@@ -98,7 +98,7 @@ module Parser
   
   def parse_page(page)
     if page._type == 'Page'
-      layout_content = page.layout.content 
+      layout_content = page.design.layout.content
       context = parser_context(page)
       parser = Radius::Parser.new(context, :tag_prefix => 'r')
       parser.parse(parser.parse(layout_content))
@@ -107,7 +107,7 @@ module Parser
   
   def parse_page_edit(page)
     if page._type == 'Page'
-      layout_content = page.layout.content 
+      layout_content = page.design.layout.content 
       context = parser_context_edit(page)
       parser = Radius::Parser.new(context, :tag_prefix => 'r')
       parser.parse(parser.parse(layout_content))
@@ -185,7 +185,7 @@ module Parser
   end
   
   def parse_page_code(page)
-    layout_content = page.layout.content 
+    layout_content = page.design.layout.content 
     context = parser_context_code(page)
     parser = Radius::Parser.new(context, :tag_prefix => 'r')
     parser.parse(layout_content)