From 425f084f390780712dfa3c75cfa127692ec0889f Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 29 Sep 2011 11:38:57 -0700
Subject: [PATCH] bug 11607: cloudStack - Make client API path and client
 Console path configurable in the UI code.

---
 ui/scripts/cloud.core.callbacks.js | 5 ++++-
 ui/scripts/cloud.core.init.js      | 2 +-
 ui/scripts/cloud.core.js           | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/scripts/cloud.core.callbacks.js b/ui/scripts/cloud.core.callbacks.js
index ce725382a05..42ebaf75209 100644
--- a/ui/scripts/cloud.core.callbacks.js
+++ b/ui/scripts/cloud.core.callbacks.js
@@ -45,12 +45,15 @@ automatically log you in.
 
 Below is a sample login attempt
 */
+
+var clientApiUrl = "/client/api";
+var clientConsoleUrl   = "/client/console";
 
 $(document).ready(function() {
 	
 	var url = $.urlParam("loginUrl");
 	if (url != undefined && url != null && url.length > 0) {
-		url = unescape("/client/api?"+url);
+		url = unescape(clientApiUrl+"?"+url);
 		$.ajax({
 			url: url,
 			dataType: "json",
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 8d343cadbd1..6b71eccd3cf 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -539,7 +539,7 @@ $(document).ready(function() {
 		
 	// Default AJAX Setup
 	$.ajaxSetup({
-		url: "/client/api",
+		url: clientApiUrl,
 		dataType: "json",
 		cache: false,
 		error: function(XMLHttpResponse) {
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 844ef16747d..bc2ad77ab15 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -950,7 +950,7 @@ function resetViewConsoleAction(jsonObj, $detailsTab) {
     $viewConsoleContainer.append($viewConsoleTemplate.show());       
 	if (jsonObj.state == 'Running') {	
 	    //console proxy thumbnail
-	    var imgUrl = "console?cmd=thumbnail&vm=" + jsonObj.id + "&w=144&h=110";		
+	    var imgUrl = clientConsoleUrl + "?cmd=thumbnail&vm=" + jsonObj.id + "&w=144&h=110";		
 		$viewConsoleTemplate.data("imgUrl", imgUrl);
 		
 		$viewConsoleContainer.bind("mouseover", function(event) {	    
@@ -963,7 +963,7 @@ function resetViewConsoleAction(jsonObj, $detailsTab) {
 		});	 
 						
 		//console proxy popup
-		$viewConsoleTemplate.data("proxyUrl", "console?cmd=access&vm=" + jsonObj.id).data("vmId",jsonObj.id).click(function(event) {				
+		$viewConsoleTemplate.data("proxyUrl", (clientConsoleUrl + "?cmd=access&vm=" + jsonObj.id)).data("vmId",jsonObj.id).click(function(event) {				
 			var proxyUrl = $(this).data("proxyUrl");				
 			//proxyUrl = "http://localhost:8080/client/" + proxyUrl;  //***** temporary hack. This line will be removed after new UI code (/ui/new/*) moves to /ui/*
 			var viewer = window.open(proxyUrl, $(this).data("vmId"),"width=820,height=640,resizable=yes,menubar=no,status=no,scrollbars=no,toolbar=no,location=no");