\
\
diff -ur sunstone.orig/public/js/opennebula.js sunstone/public/js/opennebula.js
--- sunstone.orig/public/js/opennebula.js 2011-03-15 16:59:07.000000000 +0200
+++ sunstone/public/js/opennebula.js 2011-03-26 14:24:35.091221364 +0200
@@ -186,7 +186,7 @@
var request = OpenNebula.Helper.request(this.resource,"login");
$.ajax({
- url: "/login",
+ url: "login",
type: "POST",
data: {remember: remember},
beforeSend : function(req) {
@@ -220,7 +220,7 @@
var request = OpenNebula.Helper.request(this.resource,"logout");
$.ajax({
- url: "/logout",
+ url: "logout",
type: "POST",
success: function(response)
{
@@ -252,7 +252,7 @@
var request = OpenNebula.Helper.request(this.resource,"list");
$.ajax({
- url: "/config",
+ url: "config",
type: "GET",
dataType: "json",
success: function(response)
@@ -285,7 +285,7 @@
var request = OpenNebula.Helper.request(this.resource,"create", data);
$.ajax({
- url: "/host",
+ url: "host",
type: "POST",
dataType: "json",
data: JSON.stringify(data),
@@ -316,7 +316,7 @@
var request = OpenNebula.Helper.request(this.resource,"delete", id);
$.ajax({
- url: "/host/" + id,
+ url: "host/" + id,
type: "DELETE",
success: function()
{
@@ -345,7 +345,7 @@
var request = OpenNebula.Helper.request(this.resource,"list");
$.ajax({
- url: "/host",
+ url: "host",
type: "GET",
data: {timeout: timeout},
dataType: "json",
@@ -378,7 +378,7 @@
var request = OpenNebula.Helper.request(this.resource,"show", id);
$.ajax({
- url: "/host/" + id,
+ url: "host/" + id,
type: "GET",
dataType: "json",
success: function(response)
@@ -409,7 +409,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/host/" + id + "/action",
+ url: "host/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -440,7 +440,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/host/" + id + "/action",
+ url: "host/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -473,7 +473,7 @@
var request = OpenNebula.Helper.request(this.resource,"create",data);
$.ajax({
- url: "/vnet",
+ url: "vnet",
type: "POST",
dataType: "json",
data: JSON.stringify(data),
@@ -503,7 +503,7 @@
var request = OpenNebula.Helper.request(this.resource,"delete", id);
$.ajax({
- url: "/vnet/" + id,
+ url: "vnet/" + id,
type: "DELETE",
success: function()
{
@@ -532,7 +532,7 @@
var request = OpenNebula.Helper.request(this.resource,"list");
$.ajax({
- url: "/vnet",
+ url: "vnet",
type: "GET",
dataType: "json",
data: {timeout: timeout},
@@ -563,7 +563,7 @@
var request = OpenNebula.Helper.request(this.resource,"show", id);
$.ajax({
- url: "/vnet/" + id,
+ url: "vnet/" + id,
type: "GET",
dataType: "json",
success: function(response)
@@ -594,7 +594,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/vnet/" + id + "/action",
+ url: "vnet/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -625,7 +625,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/vnet/" + id + "/action",
+ url: "vnet/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -658,7 +658,7 @@
var request = OpenNebula.Helper.request(this.resource,"create",data);
$.ajax({
- url: "/vm",
+ url: "vm",
type: "POST",
dataType: "json",
data: JSON.stringify(data),
@@ -688,7 +688,7 @@
var request = OpenNebula.Helper.request(this.resource,"delete", id);
$.ajax({
- url: "/vm/" + id,
+ url: "vm/" + id,
type: "DELETE",
success: function()
{
@@ -717,7 +717,7 @@
var request = OpenNebula.Helper.request(this.resource,"list");
$.ajax({
- url: "/vm",
+ url: "vm",
type: "GET",
dataType: "json",
data: {timeout: timeout},
@@ -748,7 +748,7 @@
var request = OpenNebula.Helper.request(this.resource,"log", id);
$.ajax({
- url: "/vm/" + id + "/log",
+ url: "vm/" + id + "/log",
type: "GET",
success: function(response)
{
@@ -776,7 +776,7 @@
var request = OpenNebula.Helper.request(this.resource,"show", id);
$.ajax({
- url: "/vm/" + id,
+ url: "vm/" + id,
type: "GET",
dataType: "json",
success: function(response)
@@ -808,7 +808,7 @@
var request = OpenNebula.Helper.request(this.resource,method, [id, host]);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -839,7 +839,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -871,7 +871,7 @@
var request = OpenNebula.Helper.request(this.resource,method, [id, host]);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -903,7 +903,7 @@
var request = OpenNebula.Helper.request(this.resource,method, [id, host]);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -934,7 +934,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -965,7 +965,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -996,7 +996,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -1027,7 +1027,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -1058,7 +1058,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -1089,7 +1089,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -1129,7 +1129,7 @@
var request = OpenNebula.Helper.request(this.resource,method, [vm_id, disk_id, image_name, type]);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -1160,7 +1160,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/vm/" + id + "/action",
+ url: "vm/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -1193,7 +1193,7 @@
var request = OpenNebula.Helper.request(this.resource,"create", name);
$.ajax({
- url: "/cluster",
+ url: "cluster",
type: "POST",
dataType: "json",
data: JSON.stringify(data),
@@ -1223,7 +1223,7 @@
var request = OpenNebula.Helper.request(this.resource,"delete", id);
$.ajax({
- url: "/cluster/" + id,
+ url: "cluster/" + id,
type: "DELETE",
success: function()
{
@@ -1252,7 +1252,7 @@
var request = OpenNebula.Helper.request(this.resource,"list");
$.ajax({
- url: "/cluster",
+ url: "cluster",
type: "GET",
dataType: "json",
data: {timeout: timeout},
@@ -1288,7 +1288,7 @@
var request = OpenNebula.Helper.request(this.resource,method, [host_id, cluster_id]);
$.ajax({
- url: "/cluster/" + cluster_id + "/action",
+ url: "cluster/" + cluster_id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function(response)
@@ -1322,7 +1322,7 @@
var request = OpenNebula.Helper.request(this.resource,method, [host_id, cluster_id]);
$.ajax({
- url: "/cluster/" + cluster_id + "/action",
+ url: "cluster/" + cluster_id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function(response)
@@ -1355,7 +1355,7 @@
var request = OpenNebula.Helper.request(this.resource,"create",data);
$.ajax({
- url: "/user",
+ url: "user",
type: "POST",
dataType: "json",
data: JSON.stringify(data),
@@ -1385,7 +1385,7 @@
var request = OpenNebula.Helper.request(this.resource,"delete", id);
$.ajax({
- url: "/user/" + id,
+ url: "user/" + id,
type: "DELETE",
success: function()
{
@@ -1414,7 +1414,7 @@
var request = OpenNebula.Helper.request(this.resource,"list");
$.ajax({
- url: "/user",
+ url: "user",
type: "GET",
dataType: "json",
data: {timeout: timeout},
@@ -1450,7 +1450,7 @@
var request = OpenNebula.Helper.request(this.resource,method, passwd);
$.ajax({
- url: "/user/" + id + "/action",
+ url: "user/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function(response)
@@ -1483,7 +1483,7 @@
var request = OpenNebula.Helper.request(this.resource,"register",data);
$.ajax({
- url: "/image",
+ url: "image",
type: "POST",
dataType: "json",
data: JSON.stringify(data),
@@ -1513,7 +1513,7 @@
var request = OpenNebula.Helper.request(this.resource,"delete", id);
$.ajax({
- url: "/image/" + id,
+ url: "image/" + id,
type: "DELETE",
success: function()
{
@@ -1542,7 +1542,7 @@
var request = OpenNebula.Helper.request(this.resource,"list");
$.ajax({
- url: "/image",
+ url: "image",
type: "GET",
dataType: "json",
data: {timeout: timeout},
@@ -1573,7 +1573,7 @@
var request = OpenNebula.Helper.request(this.resource,"show", id);
$.ajax({
- url: "/image/" + id,
+ url: "image/" + id,
type: "GET",
dataType: "json",
success: function(response)
@@ -1609,7 +1609,7 @@
var request = OpenNebula.Helper.request(this.resource,method, [id, name, value]);
$.ajax({
- url: "/image/" + id + "/action",
+ url: "image/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function(response)
@@ -1644,7 +1644,7 @@
var request = OpenNebula.Helper.request(this.resource,method, [id, name]);
$.ajax({
- url: "/image/" + id + "/action",
+ url: "image/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function(response)
@@ -1675,7 +1675,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/image/" + id + "/action",
+ url: "image/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -1706,7 +1706,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/image/" + id + "/action",
+ url: "image/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -1737,7 +1737,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/image/" + id + "/action",
+ url: "image/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -1768,7 +1768,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/image/" + id + "/action",
+ url: "image/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -1799,7 +1799,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/image/" + id + "/action",
+ url: "image/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
@@ -1830,7 +1830,7 @@
var request = OpenNebula.Helper.request(this.resource,method, id);
$.ajax({
- url: "/image/" + id + "/action",
+ url: "image/" + id + "/action",
type: "POST",
data: JSON.stringify(action),
success: function()
diff -ur sunstone.orig/sunstone-server.rb sunstone/sunstone-server.rb
--- sunstone.orig/sunstone-server.rb 2011-03-15 16:59:07.000000000 +0200
+++ sunstone/sunstone-server.rb 2011-03-26 14:34:24.639221539 +0200
@@ -96,7 +96,7 @@
# HTML Requests
##############################################################################
get '/' do
- redirect '/login' unless authorized?
+ redirect 'login' unless authorized?
time = Time.now + 60
response.set_cookie("one-user",
diff -ur sunstone.orig/templates/index.html sunstone/templates/index.html
--- sunstone.orig/templates/index.html 2011-03-15 16:59:07.000000000 +0200
+++ sunstone/templates/index.html 2011-03-26 14:17:24.291221882 +0200
@@ -5,24 +5,24 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -50,7 +50,7 @@