Page form with drop down. Modifications for Designs

lib/parser.rb

@@ -89,11 +89,12 @@ module Parser
         end
       end
       c.define_tag 'layout_part' do |tag|
-        ret = ''
-        ret << "<div id='#{tag.attr['name']}'>"
-        ret << page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }.content rescue ''
-        ret << tag.expand
-        ret << '</div>'
+        part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
+        if part
+          part.content
+        else
+          tag.expand
+        end
       end
       c.define_tag 'link' do |tag|
         item = Item.first(:conditions => { :full_name => tag.attr['name'] })
@@ -107,7 +108,7 @@ module Parser
   
   def parse_page(page)
     if page._type == 'Page'
-      layout_content = page.design.layout.content
+      layout_content = page.design.layout.content.force_encoding('UTF-8')
       context = parser_context(page)
       parser = Radius::Parser.new(context, :tag_prefix => 'r')
       parser.parse(parser.parse(layout_content))
@@ -116,7 +117,7 @@ module Parser
   
   def parse_page_edit(page)
     if page._type == 'Page'
-      layout_content = page.design.layout.content 
+      layout_content = page.design.layout.content.force_encoding('UTF-8')
       context = parser_context_edit(page)
       parser = Radius::Parser.new(context, :tag_prefix => 'r')
       parser.parse(parser.parse(layout_content))
@@ -184,17 +185,20 @@ module Parser
       end
       c.define_tag 'layout_part' do |tag|
         part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
-        ret = ''
-        ret << "<div id='#{tag.attr['name']}'"
-        ret << " part_id='#{part.id}'" if part
-        ret << " class='editable'" if part
-        ret << " style='border:solid 1px; margin:5px; padding:5px;'>"
-        ret << "<div class='edit_link' style='display:none'>" if part
-        ret << " <a href='#{edit_admin_page_part_path(part.id)}' class='nav'>#{t(:edit)}</a>" if part
-        ret << '</div>' if part
-        ret << part.i18n_variable[I18n.locale.to_s] rescue ''
-        ret << tag.expand
-        ret << '</div>'
+        if part
+          ret = ''
+          ret << "<div id='#{tag.attr['name']}'"
+          ret << " part_id='#{part.id}'"
+          ret << " class='editable'"
+          ret << " style='border:solid 1px; margin:5px; padding:5px;'>"
+          ret << "<div class='edit_link' style='display:none'>"
+          ret << " <a href='#{edit_admin_page_part_path(part.id)}' class='nav'>#{t(:edit)}</a>"
+          ret << '</div>'
+          ret << part.i18n_variable[I18n.locale.to_s] rescue ''
+          ret << '</div>'
+        else
+          tag.expand
+        end
       end
       c.define_tag 'link' do |tag|
         item = Item.first(:conditions => { :full_name => tag.attr['name'] })
@@ -210,7 +214,7 @@ module Parser
   
   #=============
   def parse_layout_layout_part(layout)
-    content = layout.content
+    content = layout.content.force_encoding('UTF-8')
     context = parser_layout_layout_part(layout)
     parser = Radius::Parser.new(context, :tag_prefix => 'r')
     parser.parse(content)
@@ -226,8 +230,9 @@ module Parser
         data={}
         data[:class_tag]=tag.attr['class'].to_s
         data[:id_tag]=tag.attr['id'].to_s
-        data[:name_tag]=tag.attr['name'].to_s
-        data[:editable_tag]=tag.attr['editable'].to_s
+        data[:name]=tag.attr['name'].to_s
+        data[:editable]=tag.attr['editable'].to_s
+        data[:content] = tag.expand.force_encoding('UTF-8') if !(tag.attr['editable'].eql?('true'))
         layout.layout_parts.create(data)
       end
     end