Merge branch 'design_team' into ldap

Conflicts:
	config/environments/development.rb

lib/parsers/parser_back_end.rb

@@ -29,9 +29,10 @@ module ParserBackEnd
     public_r_tags = parse_content_edits(body, page, id)
     parse_images(body, page)
     parse_footer(body, page, true)
+    parse_sub_menu(body, page, true)
 
     public_r_tags.each do |tag|
-      send("parse_#{tag}s", body, page,id)
+      send("parse_#{tag}s", body, page, id, true)
     end
 
     body.to_html

lib/parsers/parser_common.rb

@@ -1,7 +1,7 @@
 module ParserCommon
  include ActionView::Helpers::TagHelper
 
-  def menu_level(page, current, menu, edit = false)
+  def menu_level(page, current_page, current, menu, edit = false)
     res = ''
     if page.ordered_and_visible_children.size > 0
       res << "<ul class='"
@@ -10,10 +10,10 @@ module ParserCommon
       i = nil
       i = 1 if menu.values["li_incremental_#{current}"]
       if menu.values['home'] && current == 1
-        res << menu_li(page, current, menu, i, edit)
+        res << menu_li(page, current_page, current, menu, i, edit)
       end
       page.ordered_and_visible_children.each do |child|
-        res << menu_li(child, current, menu, i, edit)
+        res << menu_li(child, current_page, current, menu, i, edit)
         i += 1 if i
       end
       res << "</ul>"
@@ -21,28 +21,40 @@ module ParserCommon
     res
   end
   
-  def menu_li(page, current, menu, i, edit)
-    res = "<li class="
+  def menu_li(page, current_page, current, menu, i, edit)
+    res = "<li class='"
     res << menu.values["li_class_#{current}"] rescue nil
     res << "_#{i}" if i
-    res << ">"
-    res << "<a href='#{edit ? admin_page_path(page.id) : page.full_name}'><span>#{page.i18n_variable[I18n.locale]}</span></a>"
+    res << " active" if (current_page.id.eql?(page.id) || current_page.ancestor_ids.include?(page.id))
+    res << "'>"
+    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)
+      res << menu_level(page, current_page, current + 1, menu, edit)
     end unless (page.is_home? rescue nil)
     res << "</li>"
   end
 
   # ad_banners
-  def parse_ad_banners(body = nil, page = nil, id = nil)
+  def parse_ad_banners(body = nil, page = nil, id = nil, edit=nil)
     body.css('ad_banner').each do |banner|
       res = ''
       ad_banner = AdBanner.find(banner["id"]) rescue nil
       if ad_banner
         res << "<script type='text/javascript'>
-                $(document).ready(function(){ $('#slideshow-#{ad_banner.title.dehumanize}').cycle({delay: -1000, fx: '#{ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx}', timeoutFn: getTimeout }); });
+                $(document).ready(function(){
+                  $('#slideshow-#{ad_banner.title.dehumanize}').cycle({
+                    delay: -1000,
+                    fx: '#{ad_banner.ad_fx.nil? ? 'fade': ad_banner.ad_fx}',
+                    timeoutFn: getTimeout,
+                    pager: '#banner_nav',
+                    pagerAnchorBuilder: function(idx, slide) {
+                      return \"<li><a href='#'>sfdsfsf</a></li>\";
+                    }
+                  });
+                });
                 </script>"
+        res << "<ul id='banner_nav' class='clear'></ul>"
         res << "<div id='slideshow-#{ad_banner.title.dehumanize}'>"
         printable_ad_images = []
         ad_banner.ad_images.each do |ad_image|
@@ -55,7 +67,7 @@ module ParserCommon
         printable_ad_images.shuffle!
         printable_ad_images.each  do |ad_image|  #TODO Need Reflact
           res << "<img src='#{ad_image.file}' "
-          res << "alt='#{ad_image.title || ' '}' "
+          res << "alt='#{ad_image.title[I18n.locale] || ' '}' "
           res << "time_to_next='#{ad_banner.transition_msec}' "
           res << "link_open='#{ad_image.link_open}' "
           # res << "link_url='#{(ad_image.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' "
@@ -70,7 +82,7 @@ module ParserCommon
   end
 
   # page_images
-  def parse_images(body, page)
+  def parse_images(body, page, id = nil, 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
@@ -92,38 +104,59 @@ 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, 1, menu, edit))
+    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, id = nil)
+  def parse_sub_menus(body = nil, page = nil, id = nil, edit=nil)
     body.css('sub_menu').each do |sub_menu|
+      menu_page = Page.find(sub_menu['id']) rescue nil
       res = ''
-      res << "<div class='category_list'>"
-      res << "<h3 class='h3'>#{page.i18n_variable[I18n.locale]}</h3>"
-      res << "<ul class='list'>"
-      page.ordered_and_visible_children.each do |child|
-        res << "<li>"
-        res << "<a href='#{child.full_name}'>#{child.i18n_variable[I18n.locale]}</a>"
-        res << "</li>"
+      if menu_page && menu_page.ordered_and_visible_children.size > 0
+        res << "<div class='category_list'>"
+        res << "<h3 class='h3'>#{menu_page.i18n_variable[I18n.locale]}</h3>"
+        res << "<ul class='list'>"
+        menu_page.ordered_and_visible_children.each do |child|
+          res << "<li class='#{page.id.eql?(child.id) ? 'active' : nil}'>"
+          res << "<a href='/#{edit ? admin_page_path(child.id) : child.full_name}'>#{child.i18n_variable[I18n.locale]}</a>"
+          res << "</li>"
+        end
+        res << "</ul>"
+        res << "</h3>"
+        res << "</div>"
       end
-      res << "</ul>"
-      res << "</h3>"
-      res << "</div>"
       fragment = Nokogiri::HTML::DocumentFragment.new(body, res)
       sub_menu.swap(fragment)
     end
   end
 
-  # page_menu
+  # page_footer
   def parse_footer(body, page, edit=nil)
     page_footer = body.css('.page_footer').first
-    res = "<div, id='footer', class='footer'>"
-    res << @site.footer[I18n.locale]
-    res << "</div>"
-    fragment = Nokogiri::HTML::DocumentFragment.new(body ,res)
-    page_footer.swap(fragment) rescue nil
+    if page_footer
+      res = "<div id='#{page_footer['id']}', class='#{page_footer['class']}'>"
+      res << @site.footer[I18n.locale] rescue nil
+      res << "</div>"
+      fragment = Nokogiri::HTML::DocumentFragment.new(body ,res)
+      page_footer.swap(fragment) rescue nil
+    else
+      ''
+    end
+  end
+
+  # page_sub_menu
+  def parse_sub_menu(body, page, edit=nil)
+    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']}'>"
+      res << @site.sub_menu[I18n.locale] rescue nil
+      res << "</div>"
+      fragment = Nokogiri::HTML::DocumentFragment.new(body ,res)
+      page_sub_menu.swap(fragment) rescue nil
+    else
+      ''
+    end
   end
 
 end

lib/parsers/parser_front_end.rb

@@ -26,7 +26,8 @@ module ParserFrontEnd
     parse_menu(body, page)
     public_r_tags = parse_contents(body, page, id,params[:preview])
     parse_images(body, page)
-    parse_footer(body, page, true)
+    parse_footer(body, page)
+    parse_sub_menu(body, page)
 
     public_r_tags.each do |tag|
       send("parse_#{tag}s", body, page,id)