Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

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_id, 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_id, 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_id, current, menu, i, edit)
         i += 1 if i
       end
       res << "</ul>"
@@ -21,15 +21,16 @@ module ParserCommon
     res
   end
   
-  def menu_li(page, current, menu, i, edit)
-    res = "<li class="
+  def menu_li(page, current_page_id, current, menu, i, edit)
+    res = "<li class='"
     res << menu.values["li_class_#{current}"] rescue nil
     res << "_#{i}" if i
-    res << ">"
+    res << " active" if page.id.eql?(current_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_id, current + 1, menu, edit)
     end unless (page.is_home? rescue nil)
     res << "</li>"
   end
@@ -103,7 +104,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, 1, menu, edit))
+    fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, page.id, 1, menu, edit))
     page_menu.swap(fragment)
   end
 

lib/tasks/anc_tasks.rake

@@ -1,3 +1,4 @@
+require 'resque_scheduler/tasks'
 # encoding: utf-8 
 
 namespace :anc do

lib/tasks/resque.rake

@@ -0,0 +1,39 @@
+# require "resque/tasks"
+# require 'resque/scheduler'
+#     require 'resque/scheduler'
+
+# 
+# task "resque:setup" => :environment
+# Resque tasks
+require 'resque/tasks'
+require 'resque_scheduler/tasks'
+
+namespace :resque do
+  task :setup => :environment do
+    require 'resque'
+    require 'resque_scheduler'
+    require 'resque/scheduler'
+
+    # you probably already have this somewhere
+    Resque.redis = 'localhost:6379'
+
+    # If you want to be able to dynamically change the schedule,
+    # uncomment this line.  A dynamic schedule can be updated via the
+    # Resque::Scheduler.set_schedule (and remove_schedule) methods.
+    # When dynamic is set to true, the scheduler process looks for
+    # schedule changes and applies them on the fly.
+    # Note: This feature is only available in >=2.0.0.
+    #Resque::Scheduler.dynamic = true
+
+    # The schedule doesn't need to be stored in a YAML, it just needs to
+    # be a hash.  YAML is usually the easiest.
+    Resque.schedule = YAML.load_file('config/resque_schedule.yml')
+
+    # If your schedule already has +queue+ set for each job, you don't
+    # need to require your jobs.  This can be an advantage since it's
+    # less code that resque-scheduler needs to know about. But in a small
+    # project, it's usually easier to just include you job classes here.
+    # So, someting like this:
+    #require 'jobs'
+  end
+end