From b946eeae74e1f69aea670fabb3fc0510959a424c Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Thu, 9 Feb 2017 23:24:15 +0530
Subject: [PATCH] fix url issues in the config.json

---
 .../jaggeryapps/devicemgt/app/conf/config.json         |  2 +-
 .../cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
index 1a98afd88fb..4c385b0123d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
@@ -14,7 +14,7 @@
     "apiCloudWalkthroughURL": "https://api.clouddev.wso2.com/publisher?interactiveTutorial=true",
     "profileURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag",
     "changePasswordURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag",
-    "logoutURL": "https://api.clouddev.wso2.com/publisher/site/pages/logout.jag",
+    "logoutURL": "https://devicemgt.cloud.wso2.com/devicemgt/logout",
     "apiCloudURL": "",
     "appCloudURL": "",
     "deviceCloudURL": "",
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
index b28e0ae5dfd..8c7d88c0634 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
@@ -229,17 +229,17 @@
     <div id="popover-content" class="hide">
         <div class="cloud-apps">
 
-            <a href="{{apiCloudURL}}https://api.cloud.wso2.com/publisher" target="_self" class="cloud-block add-padding-top-3x">
+            <a href="{{apiCloudURL}}" target="_self" class="cloud-block add-padding-top-3x">
                 <i class="fw fw-api fw-3x"></i>
                 <div class="cloud-name">API Cloud</div>
             </a>
 
-            <a href="{{appCloudURL}}https://apps.cloud.wso2.com/appmgt" target="_self" class="cloud-block add-padding-top-3x">
+            <a href="{{appCloudURL}}" target="_self" class="cloud-block add-padding-top-3x">
                 <i class="fw fw-application fw-3x"></i>
                 <div class="cloud-name">App Cloud</div>
             </a>
 
-            <a href="{{deviceCloudURL}}https://devicemgt.cloud.wso2.com/devicemgt" target="_self" class="cloud-block add-padding-top-3x">
+            <a href="{{deviceCloudURL}}" target="_self" class="cloud-block add-padding-top-3x">
                 <i class="fw fw-mobile fw-3x"></i>
                 <div class="cloud-name">Device Cloud</div>
             </a>
@@ -249,12 +249,12 @@
         <div class="cloud-actions">
             <h3>Manage your cloud</h3>
 
-            <a href="{{oraganizationURL}}https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/organization.jag" target="_self" class="cloud-block-invert add-padding-top-3x">
+            <a href="{{oraganizationURL}}" target="_self" class="cloud-block-invert add-padding-top-3x">
                 <i class="fw fw-organization  fw-3x"></i>
                 <div class="cloud-name">Organization</div>
             </a>
 
-            <a href="{{membersURL}}https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/user.jag" target="_self" class="cloud-block-invert add-padding-top-3x">
+            <a href="{{membersURL}}" target="_self" class="cloud-block-invert add-padding-top-3x">
                 <i class="fa fa-users  fa-3x"></i>
                 <div class="cloud-name">Members</div>
             </a>