From 8d0efd3289b233dc358a13c422b221071ab6d32c Mon Sep 17 00:00:00 2001
From: megala21 <ktumegala@yahoo.com>
Date: Mon, 8 May 2017 13:58:59 +0530
Subject: [PATCH 1/2] Adding request new device type button for cloud

---
 .../devicemgt/app/conf/config.json            |  1 +
 .../pages/cdmf.page.device.enroll/enroll.hbs  | 14 +++++++++
 .../pages/cdmf.page.device.enroll/enroll.js   | 31 +++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.js

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 5caf20f31fa..b4c73ba9096 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
@@ -1,6 +1,7 @@
 {
   "appContext": "/devicemgt/",
   "isCloud": false,
+  "cloudType" : "device_cloud",
   "httpsURL": "https://%iot.gateway.host%:%iot.gateway.https.port%",
   "httpURL": "http://%iot.gateway.host%:%iot.gateway.http.port",
   "wssURL": "https://%iot.analytics.host%:%iot.analytics.https.port%",
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.hbs
index 71d4a935232..cab8dffe4a7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.hbs
@@ -40,6 +40,20 @@
     </li>
 {{/zone}}
 
+{{#zone "navbarActions"}}
+    {{#if isCloud}}
+        <li>
+            <a href="{{contact_form_url}}" class="cu-btn">
+            <span class="icon fw-stack">
+                <i class="fw fw-mail fw-stack-1x"></i>
+                <i class="fw fw-circle-outline fw-stack-2x"></i>
+            </span>
+                Request new device type
+            </a>
+        </li>
+    {{/if}}
+{{/zone}}
+
 {{#zone "content"}}
     <div class="wr-device-list row">
         <div class="wr-hidden-operations wr-advance-operations"></div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.js
new file mode 100644
index 00000000000..f35c1aba339
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Returns the dynamic state to be populated by device-enrollment page.
+ *
+ * @param context Object that gets updated with the dynamic state of this page to be presented
+ * @returns {*} A context object that returns the dynamic state of this page to be presented
+ */
+function onRequest(context) {
+    var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
+    var page = {};
+    page["isCloud"] = devicemgtProps.isCloud;
+    page["contact_form_url"] = "https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/contact-us.jag?cloudType=" + devicemgtProps.cloudType + "&subject=Requesting for a new device type";
+    return page;
+}
\ No newline at end of file

From f14e2c2d6a42c0fd9e66717e1b8e2eec4fe76e54 Mon Sep 17 00:00:00 2001
From: megala21 <ktumegala@yahoo.com>
Date: Mon, 8 May 2017 15:19:51 +0530
Subject: [PATCH 2/2] Removing cloud_type from config.json

---
 .../main/resources/jaggeryapps/devicemgt/app/conf/config.json   | 1 -
 .../devicemgt/app/pages/cdmf.page.device.enroll/enroll.js       | 2 +-
 2 files changed, 1 insertion(+), 2 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 b4c73ba9096..5caf20f31fa 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
@@ -1,7 +1,6 @@
 {
   "appContext": "/devicemgt/",
   "isCloud": false,
-  "cloudType" : "device_cloud",
   "httpsURL": "https://%iot.gateway.host%:%iot.gateway.https.port%",
   "httpURL": "http://%iot.gateway.host%:%iot.gateway.http.port",
   "wssURL": "https://%iot.analytics.host%:%iot.analytics.https.port%",
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.js
index f35c1aba339..cfda9029dee 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.enroll/enroll.js
@@ -26,6 +26,6 @@ function onRequest(context) {
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var page = {};
     page["isCloud"] = devicemgtProps.isCloud;
-    page["contact_form_url"] = "https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/contact-us.jag?cloudType=" + devicemgtProps.cloudType + "&subject=Requesting for a new device type";
+    page["contact_form_url"] = "https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/contact-us.jag?cloud-type=device_cloud&subject=Requesting for a new device type";
     return page;
 }
\ No newline at end of file