lib/rhosync/console/app/routes/timing.rb in rhosync-2.1.1 vs lib/rhosync/console/app/routes/timing.rb in rhosync-2.1.2

- old
+ new

@@ -1,25 +1,25 @@ require 'json' class RhosyncConsole::Server get '/timing' do if login_required - redirect url('/') + redirect url_path('/') return end @currentpage = "Statistics" @pagetitle = "Statistics" #H1 title - @initialcontent = url('/timing/usercount') + @initialcontent = url_path('/timing/usercount') @locals = { :div => "main_box", :links => [ - { :url => url('/timing/usercount'), :selected => true, :title => 'User Count' }, - { :url => url('/timing/devicecount'), :title => 'Device Count' }, - { :url => url('/timing/httptiming'), :title => 'HTTP Timing' }, - { :url => url('/timing/bysource'), :title => 'Source Timing' } + { :url => url_path('/timing/usercount'), :selected => true, :title => 'User Count' }, + { :url => url_path('/timing/devicecount'), :title => 'Device Count' }, + { :url => url_path('/timing/httptiming'), :title => 'HTTP Timing' }, + { :url => url_path('/timing/bysource'), :title => 'Source Timing' } ] } erb :content end @@ -67,11 +67,11 @@ options[:cursor] = {:zoom => true, :showTooltip => true} s['name'] = name s['data'] = [thisdata] s['options'] = options @sources << s - erb :jqplot, :layout => :false + erb :jqplot, :layout => false end get '/timing/usercount' do count_graph('timing/usercount', "User Count", "Users", "users") end @@ -154,11 +154,11 @@ @sources << s end @data = [[[1,2],[3,4],[5,6]]].to_json - erb :jqplot, :layout => :false + erb :jqplot, :layout => false end get '/timing/httptiming' do @uri = 'timing/httptiming' @@ -235,8 +235,8 @@ @sources << s end @data = [[[1,2],[3,4],[5,6]]].to_json - erb :jqplot, :layout => :false + erb :jqplot, :layout => false end end \ No newline at end of file