diff --git a/lib/logstash/web/public/js/logstash.js b/lib/logstash/web/public/js/logstash.js index 7d4c5814049..655cf2c2e77 100644 --- a/lib/logstash/web/public/js/logstash.js +++ b/lib/logstash/web/public/js/logstash.js @@ -30,12 +30,12 @@ /* Check for history.pushState */ var display_query = query.replace("<", "<").replace(">", ">") - $("#querystatus, #results h1").html("Loading query '" + display_query + "' (offset:" + logstash.params.offset + ", count:" + logstash.params.count + ") ") + $("#querystatus, #results h1").html("Loading query '" + display_query + "' (offset:" + logstash.params.offset + ", count:" + logstash.params.count + ") ") //console.log(logstash.params) logstash.params.q = query; /* Load the search results */ - $("#results").load("/api/search?format=html", logstash.params, + $("#results").load("api/search?format=html", logstash.params, function(response, status, xhr) { if (status == "error") { /* We still return HTML on error, it's just an error message */ @@ -64,7 +64,7 @@ * This won't likely survive 1.0, but it's fun for now... * TODO(sissel): Replace with a 'loading' or something icon. */ - var throbber = $("
") + var throbber = $("
") throbber.attr("id", "throbber") throbber.css("margin", "-100px"); $("#visual #throbber").remove(); @@ -73,7 +73,7 @@ tries = 4; /* default tries */ } - jQuery.getJSON("/api/histogram", logstash.params, function(histogram, text, jqxhr) { + jQuery.getJSON("api/histogram", logstash.params, function(histogram, text, jqxhr) { /* Load the data into the graph */ var flot_data = []; // histogram is an array of { "key": ..., "count": ... } diff --git a/lib/logstash/web/server.rb b/lib/logstash/web/server.rb index 4cf9605f8fe..3d75859129f 100755 --- a/lib/logstash/web/server.rb +++ b/lib/logstash/web/server.rb @@ -111,7 +111,7 @@ def initialize(settings) end # /style.css get '/' do - redirect "/search" + redirect "search" end # '/' get '/*' do diff --git a/lib/logstash/web/views/header.haml b/lib/logstash/web/views/header.haml index 29cc922ac6d..f758cb7c2d2 100644 --- a/lib/logstash/web/views/header.haml +++ b/lib/logstash/web/views/header.haml @@ -1,7 +1,7 @@ .logo logstash. .search - %form.search{ :action => "/search" } + %form.search{ :action => "search" } %label{ :for => "q" } Query: %input.query{ :id => "query", :type => "text", :name => "q", :value => params[:q], :size => 60 } diff --git a/lib/logstash/web/views/layout.haml b/lib/logstash/web/views/layout.haml index 062f39ef5e0..246ec9c4348 100755 --- a/lib/logstash/web/views/layout.haml +++ b/lib/logstash/web/views/layout.haml @@ -3,10 +3,10 @@ %head %title= @title || "logstash" - %link{ :rel => "stylesheet", :href => "/style.css", :type => "text/css" } - %link{ :rel => "stylesheet", :href => "/css/smoothness/jquery-ui-1.8.5.custom.css", :type => "text/css" } - %script{ :src => "/js/jquery-1.6.1.min.js", :type => "text/javascript" } - %script{ :src => "/js/jquery-ui-1.8.13.min.js", :type => "text/javascript" } + %link{ :rel => "stylesheet", :href => "style.css", :type => "text/css" } + %link{ :rel => "stylesheet", :href => "css/smoothness/jquery-ui-1.8.5.custom.css", :type => "text/css" } + %script{ :src => "js/jquery-1.6.1.min.js", :type => "text/javascript" } + %script{ :src => "js/jquery-ui-1.8.13.min.js", :type => "text/javascript" } %script{ :src => "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js", :type => "text/javascript" } %script{ :src => "js/jquery.tmpl.min.js", :type => "text/javascript" } diff --git a/lib/logstash/web/views/main/index.haml b/lib/logstash/web/views/main/index.haml index 0c04e4ddd1e..3ef69473a62 100644 --- a/lib/logstash/web/views/main/index.haml +++ b/lib/logstash/web/views/main/index.haml @@ -1,4 +1,4 @@ -%form.search{ :action => "/search" } +%form.search{ :action => "search" } %label{ :for => "q" } %input.query{ :type => "text", :name => "q" } %input{ :type => "submit" }