Merge pull request #119 from Shabirmean/IoTS-1.0.0-M1

Changing the API-Manager Server URL in devicemgt-config.xml to "HTTPS"

features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicemgt-config.xml

@@ -58,9 +58,9 @@
     <ApiManager>
         <Enabled>true</Enabled>
         <AccessTokenURL>https://localhost:9443/oauth2/token</AccessTokenURL>
-        <ServerURL>http://localhost</ServerURL>
+        <ServerURL>https://localhost</ServerURL>
-        <ServerPort>9763</ServerPort>
+        <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>

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
+                            <a class="btn btn-operations" onclick="downloadAgent()">Download Now</a>
-                                                                                    Now</a>
                             &nbsp;&nbsp;
                             <a href="#" id="download-device-download-link" class="btn btn-operations">
                                 Copy Link

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
+                            <a class="btn btn-operations" onclick="downloadAgent()">Download Now</a>
-                                                                                    Now</a>
-                            &nbsp;&nbsp;
-                            <a href="#" id="download-device-download-link" class="btn btn-operations">
-                                Copy Link
-                            </a>
-                            &nbsp;&nbsp;
                         </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 {