Ray's modification before redesign

lib/parsers/parser_back_end.rb

@@ -107,7 +107,7 @@ module ParserBackEnd
       c.define_tag 'menu' do |tag|
         home = get_homepage
         menu = page.design.layout.menu
-        menu_level(home, 1, menu, true)
+        menu_level(home, 0, menu, true)
       end
     end
   end

lib/parsers/parser_common.rb

@@ -1,23 +1,33 @@
 module ParserCommon
  
   def menu_level(page, current, menu, edit = false)
+    res = ''
     if current <= menu.levels
-      res = "<ul id="
-      res << menu.values["id_#{current}"]
-      res << " class="
-      res << menu.values["class_#{current}"]
-      res << ">"
-      i = nil
-      i = 1 if menu.values["li_incremental_#{current}"]
-      if current == 1 && menu.values['home'].eql?('true')
-        res << menu_li(page, current, menu, i, edit)
-        i += 1 if i
+      if current != 0
+        res << "<div class='rc_dm'>"
+        item = rand(100000)
+        res << "<a href='#{edit ? admin_page_path(page.id) : page.full_name}' class='dm_ctrl' rel='#{item}'>#{page.name}<span class='down'></span></a>"
+        if page.children.size > 0
+          res << "<div id='#{item}' class='dm_list #{menu.values['class_#{current}']}'>"
+          res << "<ul class='ini_list'>"
+          i = nil
+          i = 1 if menu.values["li_incremental_#{current}"]
+          page.children.each do |child|
+            res << menu_li(child, current, menu, i, edit)
+            i += 1 if i
+          end
+          res << "</ul>"
+        res << "</div>"
+        end
+        res << "</div>"
+      else
+        res << '<ul>'
+        res << "<li>" + "<a href='#{edit ? admin_page_path(page.id) : page.full_name}' class='dm_ctrl'>#{page.name}</a>" + "</li>"
+        page.children.each do |child|
+          res << "<li>" + menu_level(child, current + 1, menu, edit) + "</li>"
+        end
+        res << '</ul>'
       end
-      page.children.each do |child|
-        res << menu_li(child, current, menu, i, edit)
-        i += 1 if i
-      end
-      res << "</ul>"
     end
   end
   
@@ -26,8 +36,11 @@ module ParserCommon
     res << menu.values["li_class_#{current}"]
     res << "_#{i}" if i
     res << ">"
-    res << "<a href='#{edit ? admin_page_path(page.id) : page.full_name}'>#{page.name}</a>"  
-    res << menu_level(page, current + 1, menu, edit) if page.children.size > 0 && !page.is_home?
+    if page.children.size > 0 
+      res << menu_level(page, current + 1, menu, edit)
+    else
+      res << "<a href='#{edit ? admin_page_path(page.id) : page.full_name}' class='nav dm_ctrl'>#{page.name}</a>"
+    end
     res << "</li>"
   end
 

lib/parsers/parser_front_end.rb

@@ -104,7 +104,7 @@ module ParserFrontEnd
           ret << "<div id='appfrontend' class='dymanic_load' path='#{appfront_url.nil?? page.app_frontend_url : appfront_url}'></div>"
         else
           part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
-          ret << part.content
+          ret << part.content rescue nil
         end
         ret
       end
@@ -118,7 +118,7 @@ module ParserFrontEnd
       c.define_tag 'menu' do |tag|
         home = get_homepage
         menu = page.design.layout.menu
-        menu_level(home, 1, menu)
+        menu_level(home, 0, menu)
       end
     end
   end