diff --git a/web/Rakefile b/web/Rakefile index d120b3602..f4019acfc 100644 --- a/web/Rakefile +++ b/web/Rakefile @@ -2,7 +2,10 @@ # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. +#require 'resque/tasks' +#require 'resque/scheduler/tasks' require 'resque/tasks' +require 'resque/scheduler/tasks' require File.expand_path('../config/application', __FILE__) SampleApp::Application.load_tasks diff --git a/web/app/views/clients/_web_filter.html.erb b/web/app/views/clients/_web_filter.html.erb index 6baa9cfc7..a493402b5 100644 --- a/web/app/views/clients/_web_filter.html.erb +++ b/web/app/views/clients/_web_filter.html.erb @@ -16,7 +16,7 @@ <% else %> - <%= content_tag(:div, 'Filter By:', :class => 'filter-element desc') %> + <%= content_tag(:div, 'Order By:', :class => 'filter-element desc') %> <%= select_tag("#{filter_label}_order_by", options_for_select(Search::ORDERINGS), {:class => "#{filter_label}-order-by easydropdown"} ) %> <% end %> diff --git a/web/build b/web/build index 40175dcf2..87f8dccd9 100755 --- a/web/build +++ b/web/build @@ -1,7 +1,6 @@ #!/bin/bash set -e -set -x DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # 'target' is the output directory diff --git a/web/lib/tasks/scheduler.rake b/web/lib/tasks/scheduler.rake index 55e00cfdf..099d915dc 100644 --- a/web/lib/tasks/scheduler.rake +++ b/web/lib/tasks/scheduler.rake @@ -1,8 +1,8 @@ # Resque tasks require 'resque/tasks' -require 'resque_scheduler/tasks' +require 'resque/scheduler/tasks' require 'resque' -require 'resque_scheduler' +require 'resque-scheduler' task :scheduler => :environment do