From 572010ded12659c9bb176017fadb7275c77b466b Mon Sep 17 00:00:00 2001
From: Aditya Bist <adbist@microsoft.com>
Date: Thu, 4 Apr 2019 15:32:04 -0700
Subject: [PATCH] fixed azure extension issues (#4859)

---
 extensions/azurecore/package.json             | 19 ++++++++++++++-----
 extensions/azurecore/package.nls.json         |  2 +-
 .../azurecore/resources/dark/add_inverse.svg  |  1 +
 extensions/azurecore/resources/light/add.svg  |  1 +
 4 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 extensions/azurecore/resources/dark/add_inverse.svg
 create mode 100644 extensions/azurecore/resources/light/add.svg

diff --git a/extensions/azurecore/package.json b/extensions/azurecore/package.json
index fce48c4e21..4253da56a3 100644
--- a/extensions/azurecore/package.json
+++ b/extensions/azurecore/package.json
@@ -60,6 +60,14 @@
 				"title": "%accounts.clearTokenCache%",
 				"category": "Azure Accounts"
 			},
+			{
+				"command": "azure.resource.signin",
+				"title": "%azure.resource.signin.title%",
+				"icon": {
+					"dark": "resources/dark/add_inverse.svg",
+					"light": "resources/light/add.svg"
+				}
+			},
 			{
 				"command": "azure.resource.refreshall",
 				"title": "%azure.resource.refreshall.title%",
@@ -76,10 +84,6 @@
 					"light": "resources/light/refresh.svg"
 				}
 			},
-			{
-				"command": "azure.resource.signin",
-				"title": "%azure.resource.signin.title%"
-			},
 			{
 				"command": "azure.resource.selectsubscriptions",
 				"title": "%azure.resource.selectsubscriptions.title%",
@@ -116,9 +120,14 @@
 		"menus": {
 			"view/title": [
 				{
-					"command": "azure.resource.refreshall",
+					"command": "azure.resource.signin",
 					"when": "view == azureResourceExplorer",
 					"group": "navigation@1"
+				},
+				{
+					"command": "azure.resource.refreshall",
+					"when": "view == azureResourceExplorer",
+					"group": "navigation@2"
 				}
 			],
 			"view/item/context": [
diff --git a/extensions/azurecore/package.nls.json b/extensions/azurecore/package.nls.json
index 1f248cfe25..f759dfd72f 100644
--- a/extensions/azurecore/package.nls.json
+++ b/extensions/azurecore/package.nls.json
@@ -10,7 +10,7 @@
 	"azure.resource.refresh.title": "Refresh",
 	"azure.resource.signin.title": "Sign In",
 	"azure.resource.selectsubscriptions.title": "Select Subscriptions",
-	"azure.resource.connectsqlserver.title": "Connect",
+	"azure.resource.connectsqlserver.title": "Add to Servers",
 	"azure.resource.connectsqldb.title": "Connect",
 
 	"accounts.clearTokenCache": "Clear Azure Account Token Cache",
diff --git a/extensions/azurecore/resources/dark/add_inverse.svg b/extensions/azurecore/resources/dark/add_inverse.svg
new file mode 100644
index 0000000000..7d3fd77ffd
--- /dev/null
+++ b/extensions/azurecore/resources/dark/add_inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#c5c5c5;}</style></defs><title>add</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,16H0V0H16Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14,6v4H10v4H6V10H2V6H6V2h4V6Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M13,7V9H9v4H7V9H3V7H7V3H9V7Z"/></g></svg>
\ No newline at end of file
diff --git a/extensions/azurecore/resources/light/add.svg b/extensions/azurecore/resources/light/add.svg
new file mode 100644
index 0000000000..2b679663e8
--- /dev/null
+++ b/extensions/azurecore/resources/light/add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}</style></defs><title>add</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,16H0V0H16Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14,6v4H10v4H6V10H2V6H6V2h4V6Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M13,7V9H9v4H7V9H3V7H7V3H9V7Z"/></g></svg>
\ No newline at end of file