Add i18n for site_info.

Add always display site title.
Changes for menu in front-end

lib/parsers/parser_common.rb

@@ -3,46 +3,34 @@ module ParserCommon
 
   def menu_level(page, current, menu, edit = false)
     res = ''
-    if menu.levels > 0 && current <= menu.levels
-      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.i18n_variable[I18n.locale]}<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.ordered_and_visible_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.i18n_variable[I18n.locale]}</a>" + "</li>"
-        page.ordered_and_visible_children.each do |child|
-          res << "<li>" + menu_level(child, current + 1, menu, edit) + "</li>"
-        end
-        res << '</ul>'
+    if page.children.size > 0
+      res << "<ul class='"
+      res << menu.values["class_#{current}"] rescue nil
+      res << "'>"
+      i = nil
+      i = 1 if menu.values["li_incremental_#{current}"]
+      if menu.values['home'] && current == 1
+        res << menu_li(page, current, menu, i, edit)
       end
+      page.ordered_and_visible_children.each do |child|
+        res << menu_li(child, current, menu, i, edit)
+        i += 1 if i
+      end
+      res << "</ul>"
     end
     res
   end
   
   def menu_li(page, current, menu, i, edit)
     res = "<li class="
-    res << menu.values["li_class_#{current}"]
+    res << menu.values["li_class_#{current}"] rescue nil
     res << "_#{i}" if i
     res << ">"
-    if page.ordered_and_visible_children.size > 0 
+    res << "<a href='#{edit ? admin_page_path(page.id) : page.full_name}'><span>#{page.i18n_variable[I18n.locale]}</span></a>"
+    if page.ordered_and_visible_children.size > 0 && current <= menu.levels
+      res << "<span class='dot'></span>"
       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.i18n_variable[I18n.locale]}</a>"
-    end
+    end unless (page.is_home? rescue nil)
     res << "</li>"
   end
 
@@ -104,7 +92,7 @@ module ParserCommon
     page_menu = body.css('.page_menu').first
     home = get_homepage
     menu = page.design.layout.menu
-    fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu, edit))
+    fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 1, menu, edit))
     page_menu.swap(fragment)
   end
 
@@ -135,7 +123,7 @@ module ParserCommon
     res << @site.footer[I18n.locale]
     res << "</div>"
     fragment = Nokogiri::HTML::DocumentFragment.new(body ,res)
-    page_footer.swap(fragment)
+    page_footer.swap(fragment) rescue nil
   end
 
 end