From e047422a3103b44a70010701ac60058765a5a449 Mon Sep 17 00:00:00 2001
From: Shabirmean <shabir_tck09@hotmail.com>
Date: Tue, 5 Jan 2016 10:09:57 +0530
Subject: [PATCH 1/4] Formatting device-type UI units and removing unnecessary
 html

---
 .../type-view.hbs                             |  3 +-
 .../type-view.hbs                             | 31 +------------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
index ae3e424aa4..c283f6d717 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
@@ -52,8 +52,7 @@
                             </div>
                         </div>
                         <div class="buttons" style="padding-bottom: 0px">
-                            <a class="btn btn-operations" onclick="downloadAgent()">Download
-                                                                                    Now</a>
+                            <a class="btn btn-operations" onclick="downloadAgent()">Download Now</a>
                             &nbsp;&nbsp;
                             <a href="#" id="download-device-download-link" class="btn btn-operations">
                                 Copy Link
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
index 1feb61b270..1d495cc70c 100644
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
+++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
@@ -56,13 +56,7 @@
                             </div>
                         </div>
                         <div class="buttons" style="padding-bottom: 0px">
-                            <a class="btn btn-operations" onclick="downloadAgent()">Download
-                                                                                    Now</a>
-                            &nbsp;&nbsp;
-                            <a href="#" id="download-device-download-link" class="btn btn-operations">
-                                Copy Link
-                            </a>
-                            &nbsp;&nbsp;
+                            <a class="btn btn-operations" onclick="downloadAgent()">Download Now</a>
                         </div>
                     </form>
                 </div>
@@ -217,29 +211,6 @@
 
 </div>
 
-<div id="qr-code-modal" data-enrollment-url="{{deviceType.enrollmentURL}}" class="hidden">
-
-    <div class="content">
-        <div class="row">
-            <div class="col-lg-5 col-md-6 col-centered">
-                <h3>
-                    Scan QR code to start enrollment
-                </h3>
-                <h4>
-                    Please scan the QR code using your mobile device to retrieve enrollment URL.
-                </h4>
-
-                <div class="panel panel-default">
-                    <div class="panel-body col-centered ">
-                        <div class="qr-code"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
 {{#zone "topCss"}}
     <style type="text/css">
         .circle {

From 1240d641ab147c098f0fe5ed37af4160af2acd48 Mon Sep 17 00:00:00 2001
From: Shabirmean <shabir_tck09@hotmail.com>
Date: Tue, 5 Jan 2016 10:20:07 +0530
Subject: [PATCH 2/4] Changing the API-Manager Server URL in
 devicemgt-config.xml to "HTTPS"

---
 .../src/main/resources/conf/devicemgt-config.xml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml
index 2afe3668aa..27fa5b5ac6 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml
@@ -58,7 +58,7 @@
     <ApiManager>
         <Enabled>true</Enabled>
         <AccessTokenURL>https://localhost:9443/oauth2/token</AccessTokenURL>
-        <ServerURL>http://localhost</ServerURL>
+        <ServerURL>https://localhost</ServerURL>
         <ServerPort>9763</ServerPort>
         <GatewayPort>8280</GatewayPort>
         <LoginURL>/api-store/site/blocks/user/login/ajax/login.jag</LoginURL>

From 98407eb7e83a6916e1ed3985ba39e0b039355048 Mon Sep 17 00:00:00 2001
From: Shabirmean <shabir_tck09@hotmail.com>
Date: Tue, 5 Jan 2016 11:25:13 +0530
Subject: [PATCH 3/4] Change to HTTPS port 9443

---
 .../src/main/resources/conf/devicemgt-config.xml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml
index 27fa5b5ac6..fc49eb4427 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml
@@ -59,7 +59,7 @@
         <Enabled>true</Enabled>
         <AccessTokenURL>https://localhost:9443/oauth2/token</AccessTokenURL>
         <ServerURL>https://localhost</ServerURL>
-        <ServerPort>9763</ServerPort>
+        <ServerPort>9443</ServerPort>
         <GatewayPort>8280</GatewayPort>
         <LoginURL>/api-store/site/blocks/user/login/ajax/login.jag</LoginURL>
         <SubscriptionListURL>/api-store/site/blocks/subscription/subscription-list/ajax/subscription-list.jag</SubscriptionListURL>

From ff4ee353290253ca47dbc8be34f990ee361da28f Mon Sep 17 00:00:00 2001
From: Shabirmean <shabir_tck09@hotmail.com>
Date: Tue, 5 Jan 2016 11:27:05 +0530
Subject: [PATCH 4/4] Changed APIM Gateway Port to 8243 to reflect HTTPS

---
 .../src/main/resources/conf/devicemgt-config.xml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml
index fc49eb4427..0b022f55a2 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml
@@ -60,7 +60,7 @@
         <AccessTokenURL>https://localhost:9443/oauth2/token</AccessTokenURL>
         <ServerURL>https://localhost</ServerURL>
         <ServerPort>9443</ServerPort>
-        <GatewayPort>8280</GatewayPort>
+        <GatewayPort>8243</GatewayPort>
         <LoginURL>/api-store/site/blocks/user/login/ajax/login.jag</LoginURL>
         <SubscriptionListURL>/api-store/site/blocks/subscription/subscription-list/ajax/subscription-list.jag</SubscriptionListURL>
         <Username>admin</Username>