diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.hbs
new file mode 100644
index 0000000000..544dc23d75
--- /dev/null
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.hbs
@@ -0,0 +1,64 @@
+{{!
+ Copyright (c) 2016, 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.
+}}
+{{#zone "content"}}
+
+
+
+
+
+
+ Please scan the following QR code using your new Android, iPhone or Windows mobile device.
+
+
+
+
+
+ Not having a QR code scanner in your device?
+
+ Try following link
+
+ {{enrollmentURL}}
+
+ on your device's Internet browser instead.
+
+
+
+
+
+{{/zone}}
\ No newline at end of file
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.js b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.js
new file mode 100644
index 0000000000..5177e51f38
--- /dev/null
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.js
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+function onRequest() {
+ var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
+ var viewModel = {};
+ //TODO: Move enrollment URL into app-conf.json
+ viewModel["enrollmentURL"] = mdmProps["generalConfig"]["host"] + mdmProps["windowsEnrollmentDir"];
+ return viewModel;
+}
\ No newline at end of file
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.json b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.json
new file mode 100644
index 0000000000..688e939808
--- /dev/null
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.json
@@ -0,0 +1,3 @@
+{
+ "version": "1.0.0"
+}
\ No newline at end of file
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
index e4199de38a..ed4654d774 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
@@ -1,22 +1,8 @@
-{{!
- Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+{{unit "cdmf.unit.lib.qrcode"}}
+{{unit "cdmf.unit.device.type.windows.qr-modal"}}
- 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.
-}}
-
Windows Mobile
+ Windows Mobile
@@ -24,39 +10,39 @@
-
Click [ here ] for
- latest instructions and troubleshooting.
+
Click [ here ] for latest instructions and troubleshooting.
What it Does
-
-
Connect and manage your Windows device with WSO2 IoT Server.
+
+
Connect and manage your Android device with WSO2 IoT Server.
What You Need
- - STEP 01 Windows Mobile.
- - STEP 02 Go ahead and click [Enroll Device].
+
- STEP 01 Windows
+ Mobile.
- - STEP 03 Proceed to [Prepare] section.
+
- STEP 02 Go ahead
+ and click [Enroll Device].
+
+ - STEP 03 Proceed
+ to the [Prepare] section.
-
-
- Enroll Device
-
-
+
Enroll Device
+
-
Prepare
-
+
Prepare
- - 01 Scan QR code.
+ - 01 Scan QR code..
- 02 Follow instructions in wizard.
- 03 Configure your workspace account
@@ -73,40 +59,12 @@
-
-
-
-
-
-
-
-
Scan QR code to start enrollment
-
Please scan the QR code using your mobile device to retrieve enrollment URL.
-
-
-
-
-
-
-{{#zone "bottomJs"}}
-
-{{/zone}}
+
{{#zone "topCss"}}
{{css "css/styles.css"}}
+{{/zone}}
+
+{{#zone "bottomJs"}}
+ {{js "js/type-view.js"}}
{{/zone}}
\ No newline at end of file