Bug 441977 - Interactive Cloud Foundry deployment - change styles to match OS Orionorigin/Bug441977

3 files changed, 28 insertions, 41 deletions

diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/cfUtil.js b/bundles/org.eclipse.orion.client.cf/web/cfui/cfUtil.js
index e41f849..0a61ec9 100644
--- a/bundles/org.eclipse.orion.client.cf/web/cfui/cfUtil.js
+++ b/bundles/org.eclipse.orion.client.cf/web/cfui/cfUtil.js
@@ -43,6 +43,9 @@ define(['orion/Deferred', 'orion/URITemplate', 'orion/PageLinks'], function(Defe
 				}
 			);
 			return deferred;
+		},
+	getLoginMessage: function(manageUrl){
+			return "Please enter your IBM id below to authorize deployment to Cloud Foundry.";
 		}
 	};
 });
\ No newline at end of file
diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/css/deployInteractive.css b/bundles/org.eclipse.orion.client.cf/web/cfui/css/deployInteractive.css
index 7e184cd..676f576 100644
--- a/bundles/org.eclipse.orion.client.cf/web/cfui/css/deployInteractive.css
+++ b/bundles/org.eclipse.orion.client.cf/web/cfui/css/deployInteractive.css
@@ -85,18 +85,30 @@ select{
 	position: absolute;
 	text-align: center;
 	width: 100%;
+    box-shadow: 0 2px 0 rgba(0, 0, 0, 0.1);
+    background-color: #dff0d8;
+    border-bottom-left-radius: 5px;
+    border-bottom-right-radius: 5px;
+    margin-left: 10%;
+    margin-right: auto;
+    width: 80%;
+    padding-bottom: 5px;
+    padding-left: 5px;
+    padding-top: 5px;
 }
 
 .messageContainer.showing {
 	display: block;	
+	transition: top 0.7s ease 0s;
 }
 
 .messageLabel {
-	background-color: #DBEB8F;
-	border-radius: 5px;
-	color: black;
-	display: inline-block;
-	padding: 4px 5px;
+    color: #468847;
+    float: left;
+    max-height: 1000px;
+    overflow: hidden;
+    padding-left: 5px;
+    text-align: center;
 }
 
 .manifestInformation {
@@ -114,44 +126,16 @@ select{
     right: 20px;
 }
 
-.buttonRow .orionButton {
-	border: none;
-	border-radius: 5px;
-	background-color: #DFE6EB;
-	color: black;
-	cursor: pointer;
-	font-size: 9pt;
-	padding: 7.5px;
+.buttonRow .deployButton{
+	background-color: #7fa4c0 !important;
+    border: 1px solid #7fa4c0 !important;
+    color: white !important;
 }
 
 .buttonRow button:not(:last-child){
 	margin-right: 12px;	
 }
 
-.buttonRow .orionButton:hover {
-	background-color: #e9eff2;
-	box-shadow: none;
-}
-
-.buttonRow .orionButton.commandButton.disabled {
-	cursor: default;
-	opacity: 0.5;
-	background-color: #DFE6EB;
-}
-
-.buttonRow .orionButton.commandButton.deployButton.disabled {
-	background-color: #00aed1;
-}
-
-.buttonRow .deployButton.orionButton {
-	background-color: #00aed1;
-	color: white;
-}
-
-.buttonRow .deployButton.orionButton:hover {
-	background-color: #00bfe5;
-}
-
 .dialogTitle .closeDialog {
 	margin: 0;
 	cursor: pointer;
diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/deployInteractive.js b/bundles/org.eclipse.orion.client.cf/web/cfui/deployInteractive.js
index c994244..31bf1f7 100644
--- a/bundles/org.eclipse.orion.client.cf/web/cfui/deployInteractive.js
+++ b/bundles/org.eclipse.orion.client.cf/web/cfui/deployInteractive.js
@@ -685,8 +685,8 @@ define(["orion/bootstrap", "orion/xhr", 'orion/webui/littlelib', 'orion/Deferred
 	function postError(error) {
 		if(error.Message){
 			if (error.Message.indexOf("The host is taken")===0){
-				error.Message = error.Message.replace("The host is taken", "The Bluemix route");
-				error.Message += " is already in use by another application. Please check the host/domain in the manifest file.";
+//				error.Message = error.Message.replace("The host is taken", "The Bluemix route");
+				error.Message = "The host is already in use by another application. Please check the host/domain in the manifest file.";
 			}
 		}
 		
@@ -699,12 +699,12 @@ define(["orion/bootstrap", "orion/xhr", 'orion/webui/littlelib', 'orion/Deferred
 			var err = error.JsonData;
 			if (err.error_code === "CF-InvalidAuthToken" || err.error_code === "CF-NotAuthenticated"){
 				error.Retry = {
-					parameters: [{id: "user", type: "text", name: "IBM ID:"}, {id: "password", type: "password", name: "Password:"}]
+					parameters: [{id: "user", type: "text", name: "ID:"}, {id: "password", type: "password", name: "Password:"}]
 				};
 				
 				error.forceShowMessage = true;
 				error.Severity = "Info";
-				error.Message = "Please enter your IBM id below to authorize deployment to Bluemix. Note that ids are case-sensitive. If you have not registered to use Bluemix, you can do so [here](" + cloudManageUrl + ").";				
+				error.Message = mCfUtil.getLoginMessage(cloudManageUrl);				
 			
 			} else if (err.error_code === "CF-TargetNotSet"){
 				var cloudSettingsPageUrl = new URITemplate("{+OrionHome}/settings/settings.html#,category=Cloud").expand({OrionHome : PageLinks.getOrionHome()});