Only one parser for front end

Separate site map for i18n

lib/parsers/parser_common.rb

@@ -38,7 +38,7 @@ module ParserCommon
   end
 
   # ad_banners
-  def parse_ad_banners(body = nil, page = nil, edit=nil)
+  def parse_ad_banners_edit(body = nil, page = nil, edit=nil)
     body.css('ad_banner').each do |banner|
       res = ''
       ad_banner = AdBanner.find(banner["id"]) rescue nil
@@ -94,7 +94,7 @@ module ParserCommon
   end
 
   # page_images
-  def parse_images(body, page, edit=nil)
+  def parse_images_edit(body, page, edit=nil)
     body.css('.page_image').each do |page_image|
       # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) }
       # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
@@ -112,20 +112,16 @@ module ParserCommon
   end
 
   # page_menu
-  def parse_menu(body, page, edit=nil)
+  def parse_menu_edit(body, page, edit=nil)
     page_menu = body.css('.page_menu').first
-    if page_menu
-      home = get_homepage
-      menu = page.design.layout.menu
-      fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, page, 1, menu, edit))
-      page_menu.swap(fragment)
-    else
-      ''
-    end
+    home = get_homepage
+    menu = page.design.layout.menu
+    fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, page, 1, menu, edit))
+    page_menu.swap(fragment)
   end
 
   # sub_menus
-  def parse_sub_menus(body = nil, page = nil, edit=nil)
+  def parse_sub_menus_edit(body = nil, page = nil, edit=nil)
     body.css('sub_menu').each do |sub_menu|
       menu_page = Page.find(sub_menu['id']) rescue nil
       res = ''
@@ -149,7 +145,7 @@ module ParserCommon
   end
 
   # page_footer
-  def parse_footer(body, page)
+  def parse_footer_edit(body, page)
     page_footer = body.css('.page_footer').first
     if page_footer
       res = "<div id='#{page_footer['id']}', class='#{page_footer['class']}'>"
@@ -163,7 +159,7 @@ module ParserCommon
   end
 
   # page_sub_menu
-  def parse_sub_menu(body, page)
+  def parse_sub_menu_edit(body, page)
     page_sub_menu = body.css('.page_sub_menu').first
     if page_sub_menu
       res = "<div id='#{page_sub_menu['id']}', class='#{page_sub_menu['class']}'>"
@@ -177,20 +173,16 @@ module ParserCommon
   end
 
   # sitemap
-  def parse_sitemaps(body = nil, page = nil, edit=nil)
+  def parse_sitemaps_edit(body = nil, page = nil, edit=nil)
     sitemap = body.css('sitemap').first
-    if sitemap
-      url = admin_site_sitemap_frontend_path(@site)
-      options = "?inner=true"
-      fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div class='dymanic_load' path='#{url + options}'></div>")
-      sitemap.swap(fragment)
-    else
-      ''
-    end
+    url = admin_site_sitemap_frontend_path(@site)
+    options = "?inner=true"
+    fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div class='dymanic_load' path='#{url + options}'></div>")
+    sitemap.swap(fragment)
   end
 
   # page_contents
-  def parse_contents(body, page, edit=nil)
+  def parse_contents_edit(body, page, edit=nil)
     public_r_tags = []
     body.css('.page_content').each do |content|
       ret = ''
@@ -199,7 +191,6 @@ module ParserCommon
       if (content["main"] == "true" && !page.module_app.nil?)
         ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}"
         ret << "/#{params[:id]}" if params[:id] && !params[:id].eql?(page.id.to_s)
-        ret << "/#{params[:controller_action]}" if params[:controller_action] && params[:id]
         ret << "?inner=true&page_id=#{page.id}&category_id=#{category}&tag_id=#{tag}&preview=#{params[:preview]}&page_main=#{params[:page_main]}&search_query=#{params[:search_query]}&name=#{params[:name]}"
         ret << "'></div>"
       else
@@ -216,7 +207,7 @@ module ParserCommon
           ret << part.content rescue ''
         when 'module_widget'
           url = "/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true"
-          options = "&category_id=#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=#{!part[:tag].blank? ? part[:tag] : tag}&page=#{params[:page]}&search_query=#{params[:search_query]}&part_title=#{Rack::Utils.escape(part_title).gsub("+", "%20") rescue nil}&part_id=#{part.id}"
+          options = "&category_id=#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=#{!part[:tag].blank? ? part[:tag] : tag}&page=#{params[:page]}&search_query=#{params[:search_query]}&part_title=#{Rack::Utils.escape(part_title).gsub("+", "%20") rescue nil}"
           ret << "<div class='dymanic_load widget' path='#{url + options}'></div>"
         when 'public_r_tag'
           ret << "<r:#{part.public_r_tag} id='#{part.public_r_tag_object_id}'/>"