From 644d755029e318ccc081c36077cf0bfeda13abf2 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Sun, 13 Dec 2015 19:40:30 +0530
Subject: [PATCH 1/3] adding api link for device type page

---
 .../type-view.hbs                                             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 d5327320b4..159ad05aba 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
@@ -6,6 +6,7 @@
 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
     <img src="{{@unit.publicUri}}/images/firealarm.png" class="img-responsive">
 </div>
+
 <div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
     <h3 class="uppercase">Ingredients</h3>
     <hr>
@@ -23,6 +24,7 @@
     </ul>
     <br>
 
+    <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin" class="btn-operations" target="_blank" ><i class="fw fw-api"></i> View API</i> &nbsp;</a>
     <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download</a>
 
     <div id="download-device-modal-content" class="hide">
@@ -39,7 +41,7 @@
                                        placeholder="Ex. Lobby_Firealarm"
                                        name="deviceName" size="60" required>
                                 <br/><br/>
-                                <input type="hidden" class="deviceType" name="deviceType" value="virtual_firealarm"/>
+                                <input type="hidden" class="deviceType" name="deviceType" value="{{@uriParams.deviceType}}"/>
                                 <input type="radio" name="sketchType" value="simple_agent" id="simple_agent" checked> <label for="simple_agent">Simple Agent</label> &nbsp;&nbsp;
                                 <input type="radio" name="sketchType" value="advanced_agent" id="advanced_agent"> <label for="advanced_agent">Advanced Agent</label>
                             </div>

From b1d59d8eda2363db61e31f5240a6b00932455b0c Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Mon, 14 Dec 2015 00:03:35 +0530
Subject: [PATCH 2/3] adding dynamic templates for device types listing

---
 .../private/conf/device-type.json             |  23 +--
 .../private/pages/device-type-details.hbs     | 151 ------------------
 .../public/templates/listing.hbs              |  21 +--
 .../private/conf/device-type.json             |   2 +-
 .../public/templates/listing.hbs              |  30 ----
 .../private/conf/device-type.json             |   2 +-
 .../public/templates/listing.hbs              |  19 +++
 .../private/conf/device-type.json             |   2 +-
 .../public/templates/listing.hbs              |  19 +++
 9 files changed, 48 insertions(+), 221 deletions(-)
 delete mode 100644 features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/pages/device-type-details.hbs
 delete mode 100644 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/public/templates/listing.hbs
 create mode 100644 features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/templates/listing.hbs
 create mode 100644 features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/templates/listing.hbs

diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/conf/device-type.json b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/conf/device-type.json
index a1bdd15a96..fd99106c1b 100644
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/conf/device-type.json
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/conf/device-type.json
@@ -1,25 +1,6 @@
 {
   "deviceType": {
-    "displayName": "Virtual Firealarm",
-    "image": "/public/cdmf.unit.device.type.virtual_firealarm/images/thumb.png",
-    "downloadBtnText": "Download",
-    "ingredients": [
-      "Raspberry Pi (Internet Enabled)",
-      "DHT11 Temperature Sensor",
-      "LED",
-      "Buzzer(3v)"
-    ],
-    "prepareSteps": [
-      "Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup.",
-      "Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.",
-      "Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS"
-    ],
-    "schematicDiagram": "/public/cdmf.unit.device.type.virtual_firealarm/images/schematicsGuide.png",
-    "quickStartup": [
-      "<b>Click on the <i>'Create DEB'</i> button above to get the download link for the FireAlarm setup files</b>",
-      "<i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>'ssh'<b> login from a remote PC)</i>",
-      "<b>Download the FireAlarm setup files using the following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'</b><br/><i>This will download a zip file named 'Agent.zip'</i>"
-    ],
-    "additionalHtml" : ""
+    "label": "Android Sense",
+    "category" : "mobile"
   }
 }
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/pages/device-type-details.hbs b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/pages/device-type-details.hbs
deleted file mode 100644
index 892b231326..0000000000
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/private/pages/device-type-details.hbs
+++ /dev/null
@@ -1,151 +0,0 @@
-<div class="col-lg-12  margin-top-double">
-    <h1 class="grey ">{{@uriParams.deviceType}} Android Sense</h1>
-    <hr>
-    <p class="margin-bottom-double light-grey ">Connect your Android Sense device
-        to the WSO2 device cloud.</p>
-</div>
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
-    <img src="/devicemgt/public/cdmf.unit.device.type.virtual_firealarm/images/thumb.png" class="img-responsive">
-</div>
-<div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
-        <h3 class="uppercase">Ingredients</h3>
-        <hr>
-        <p class="grey margin-top">Hardware Requirements </p>
-        <br>
-        <ul>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> Raspberry Pi (Internet Enabled)<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> DHT11 Temperature Sensor<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> LED<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> Buzzer(3v)<br/>
-
-        </ul>
-        <br>
-
-
-        <a href="#" class="download-link btn-operations" data-devicetype="{{@uriParams.deviceType}}" data-sketchtype="{{@uriParams.deviceType}}"><i class="fw fw-download"></i> Download</a>
-
-    <br/><br/>
-</div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
-        <h3 class="uppercase">Prepare</h3><hr>
-        <p class="grey margin-top">Get your device ready</p>
-        <br/>
-        <ul>
-            <p class="padding-top-double"><span class="circle">01</span> Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup.</p>
-            <p class="padding-top-double"><span class="circle">02</span> Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.</p>
-            <p class="padding-top-double"><span class="circle">03</span> Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS</p>
-        </ul>
-        <br>
-    </div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
-        <h3 class="uppercase">Schematic Diagram</h3><hr>
-        <p class="grey margin-top">Click on the image to zoom</p>
-        <center>
-            <a href="/public/cdmf.unit.device.type.virtual_firealarm/images/schematicsGuide.png" target="_blank">
-                <img src="/public/cdmf.unit.device.type.virtual_firealarm/images/schematicsGuide.png" class="img-responsive" style="max-width: 500px; max-height: 500px">
-            </a>
-        </center>
-        <br/>
-    </div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
-        <h3 class="uppercase">Connect (Quick Start)</h3><hr>
-        <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
-        <br/>
-        <ul>
-            <p class="padding-top-double"><span class="circle">01</span> <b>Click on the <i>'Create DEB'</i> button above to get the download link for the FireAlarm setup files</b></p>
-            <p class="padding-top-double"><span class="circle">02</span> <i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>'ssh'<b> login from a remote PC)</i></p>
-            <p class="padding-top-double"><span class="circle">03</span> <b>Download the FireAlarm setup files using the following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'</b><br/><i>This will download a zip file named 'Agent.zip'</i></p>
-        </ul>
-        <br>
-    </div>
-
-</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>
-
-<script type="text/javascript">
-
-    $(document).ready(function(){
-        toggleEnrollment();
-    });
-
-
-    function toggleEnrollment(){
-        $(".modalpopup-content").html($("#qr-code-modal").html());
-        generateQRCode(".modalpopup-content .qr-code");
-        showPopup();
-    }
-
-</script>
-<style type="text/css">
-    .circle {
-        background: none repeat scroll 0 0 #191919;
-        border-radius: 50px;
-        height: 50px;
-        padding: 10px;
-        width: 50px;
-        color: #fff;
-    }
-    .padding-top-double {
-        padding-top: 20px;
-    }
-    .padding-double {
-        padding: 20px;
-    }
-    .grey {
-        color: #333;
-    }
-    hr {
-        display: block;
-        height: 1px;
-        border: 0;
-        border-top: 1px solid #7f7f7f;
-        margin: 1em 0;
-        padding: 0;
-        opacity: 0.2;
-    }
-    .light-grey {
-        color: #7c7c7c;
-    }
-    .uppercase {
-        text-transform: uppercase;
-    }
-    .grey-bg {
-        background-color: #f6f4f4;
-    }
-</style>
\ No newline at end of file
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/templates/listing.hbs b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/templates/listing.hbs
index 78eb9238ae..f4fac14e68 100644
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/templates/listing.hbs
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/templates/listing.hbs
@@ -1,14 +1,13 @@
-<tr data-type="selectable" data-deviceid="{{deviceType.id}}" data-devicetype="{{deviceType.name}}">
+<tr data-type="selectable" data-deviceid="{{deviceTypeId}}" data-devicetype="{{deviceTypeName}}">
     <td class="remove-padding icon-only content-fill">
         <div class="thumbnail icon">
-            <!--<i class="square-element text fw fw-mobile"></i>-->
-            <img class="square-element text fw" src="{{../imageLocation}}{{deviceType.name}}.type-view/images/thumb.png" />
+            <i class="square-element text fw fw-android"></i>
         </div>
     </td>
-    <td class="fade-edge remove-padding-top" data-search="{{deviceType.name}}" data-display="{{deviceType.name}}"
-        data-grid-label="Type">{{deviceType.name}}</td>
+    <td class="fade-edge remove-padding-top" data-search="{{deviceTypeLabel}}" data-display="{{deviceTypeLabel}}"
+        data-grid-label="Type">{{deviceTypeLabel}}</td>
     <td class="text-right content-fill text-left-on-grid-view no-wrap">
-        <a href="{{../appContext}}/device/{{deviceType.name}}/enroll"
+        <a href="{{appContext}}/device/{{deviceTypeName}}/enroll"
            data-click-event="remove-form" class="btn padding-reduce-on-grid-view">
                             <span class="fw-stack">
                                 <i class="fw fw-ring fw-stack-2x"></i>
@@ -17,14 +16,4 @@
             <span class="hidden-xs hidden-on-grid-view">View</span>
         </a>
     </td>
-    <td class="text-right content-fill text-left-on-grid-view no-wrap">
-        <a href="{{../appContext}}/device/{{deviceType.name}}/enroll"
-           data-click-event="remove-form" class="btn padding-reduce-on-grid-view">
-                            <span class="fw-stack">
-                                <i class="fw fw-ring fw-stack-2x"></i>
-                                <i class="fw fw-view fw-stack-1x"></i>
-                            </span>
-            <span class="hidden-xs hidden-on-grid-view">Hide</span>
-        </a>
-    </td>
 </tr>
\ No newline at end of file
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/private/conf/device-type.json 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/private/conf/device-type.json
index f4df5ca45b..d73c4d64ec 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/private/conf/device-type.json
+++ 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/private/conf/device-type.json
@@ -1,6 +1,6 @@
 {
   "deviceType": {
-    "displayName": "Virtual Firealarm",
+    "label": "Virtual Firealarm",
     "category": "iot",
     "downloadAgentUri": "https://localhost:9443/virtual_firealarm/VirtualFireAlarmDeviceManager/manager/device/virtual_firealarm/download",
     "downloadAgentLinkGenUri" : "https://localhost:9443/virtual_firealarm/VirtualFireAlarmDeviceManager/manager/device/virtual_firealarm/generate_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/public/templates/listing.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/public/templates/listing.hbs
deleted file mode 100644
index 78eb9238ae..0000000000
--- 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/public/templates/listing.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-<tr data-type="selectable" data-deviceid="{{deviceType.id}}" data-devicetype="{{deviceType.name}}">
-    <td class="remove-padding icon-only content-fill">
-        <div class="thumbnail icon">
-            <!--<i class="square-element text fw fw-mobile"></i>-->
-            <img class="square-element text fw" src="{{../imageLocation}}{{deviceType.name}}.type-view/images/thumb.png" />
-        </div>
-    </td>
-    <td class="fade-edge remove-padding-top" data-search="{{deviceType.name}}" data-display="{{deviceType.name}}"
-        data-grid-label="Type">{{deviceType.name}}</td>
-    <td class="text-right content-fill text-left-on-grid-view no-wrap">
-        <a href="{{../appContext}}/device/{{deviceType.name}}/enroll"
-           data-click-event="remove-form" class="btn padding-reduce-on-grid-view">
-                            <span class="fw-stack">
-                                <i class="fw fw-ring fw-stack-2x"></i>
-                                <i class="fw fw-view fw-stack-1x"></i>
-                            </span>
-            <span class="hidden-xs hidden-on-grid-view">View</span>
-        </a>
-    </td>
-    <td class="text-right content-fill text-left-on-grid-view no-wrap">
-        <a href="{{../appContext}}/device/{{deviceType.name}}/enroll"
-           data-click-event="remove-form" class="btn padding-reduce-on-grid-view">
-                            <span class="fw-stack">
-                                <i class="fw fw-ring fw-stack-2x"></i>
-                                <i class="fw fw-view fw-stack-1x"></i>
-                            </span>
-            <span class="hidden-xs hidden-on-grid-view">Hide</span>
-        </a>
-    </td>
-</tr>
\ No newline at end of file
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json
index b6586ddde5..3601ecb510 100644
--- a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json
+++ b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json
@@ -1,6 +1,6 @@
 {
   "deviceType": {
-    "displayName": "Android",
+    "label": "Android",
     "category" : "mobile"
   }
 }
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/templates/listing.hbs b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/templates/listing.hbs
new file mode 100644
index 0000000000..f4fac14e68
--- /dev/null
+++ b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/templates/listing.hbs
@@ -0,0 +1,19 @@
+<tr data-type="selectable" data-deviceid="{{deviceTypeId}}" data-devicetype="{{deviceTypeName}}">
+    <td class="remove-padding icon-only content-fill">
+        <div class="thumbnail icon">
+            <i class="square-element text fw fw-android"></i>
+        </div>
+    </td>
+    <td class="fade-edge remove-padding-top" data-search="{{deviceTypeLabel}}" data-display="{{deviceTypeLabel}}"
+        data-grid-label="Type">{{deviceTypeLabel}}</td>
+    <td class="text-right content-fill text-left-on-grid-view no-wrap">
+        <a href="{{appContext}}/device/{{deviceTypeName}}/enroll"
+           data-click-event="remove-form" class="btn padding-reduce-on-grid-view">
+                            <span class="fw-stack">
+                                <i class="fw fw-ring fw-stack-2x"></i>
+                                <i class="fw fw-view fw-stack-1x"></i>
+                            </span>
+            <span class="hidden-xs hidden-on-grid-view">View</span>
+        </a>
+    </td>
+</tr>
\ No newline at end of file
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json
index 6f2b0650e8..33823e6653 100644
--- a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json
+++ b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json
@@ -1,6 +1,6 @@
 {
   "deviceType": {
-    "displayName": "Windows",
+    "label": "Windows",
     "category" : "mobile"
   }
 }
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/templates/listing.hbs b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/templates/listing.hbs
new file mode 100644
index 0000000000..3070b1e144
--- /dev/null
+++ b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/templates/listing.hbs
@@ -0,0 +1,19 @@
+<tr data-type="selectable" data-deviceid="{{deviceTypeId}}" data-devicetype="{{deviceTypeName}}">
+    <td class="remove-padding icon-only content-fill">
+        <div class="thumbnail icon">
+            <i class="square-element text fw fw-windows"></i>
+        </div>
+    </td>
+    <td class="fade-edge remove-padding-top" data-search="{{deviceTypeLabel}}" data-display="{{deviceTypeLabel}}"
+        data-grid-label="Type">{{deviceTypeLabel}}</td>
+    <td class="text-right content-fill text-left-on-grid-view no-wrap">
+        <a href="{{appContext}}/device/{{deviceTypeName}}/enroll"
+           data-click-event="remove-form" class="btn padding-reduce-on-grid-view">
+                            <span class="fw-stack">
+                                <i class="fw fw-ring fw-stack-2x"></i>
+                                <i class="fw fw-view fw-stack-1x"></i>
+                            </span>
+            <span class="hidden-xs hidden-on-grid-view">View</span>
+        </a>
+    </td>
+</tr>
\ No newline at end of file

From f29d41a270d7b7c8a882eb256a37d128dbac934f Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Mon, 14 Dec 2015 00:48:06 +0530
Subject: [PATCH 3/3] styling for device type select

---
 .../public/templates/listing.hbs                            | 6 +++---
 .../public/templates/listing.hbs                            | 6 +++---
 .../public/templates/listing.hbs                            | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/templates/listing.hbs b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/templates/listing.hbs
index f4fac14e68..2563f03ced 100644
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/templates/listing.hbs
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/templates/listing.hbs
@@ -8,12 +8,12 @@
         data-grid-label="Type">{{deviceTypeLabel}}</td>
     <td class="text-right content-fill text-left-on-grid-view no-wrap">
         <a href="{{appContext}}/device/{{deviceTypeName}}/enroll"
-           data-click-event="remove-form" class="btn padding-reduce-on-grid-view">
+           data-click-event="remove-form" class="btn col-md-12">
                             <span class="fw-stack">
                                 <i class="fw fw-ring fw-stack-2x"></i>
-                                <i class="fw fw-view fw-stack-1x"></i>
+                                <i class="fw fw-check fw-stack-1x"></i>
                             </span>
-            <span class="hidden-xs hidden-on-grid-view">View</span>
+            <span>Select</span>
         </a>
     </td>
 </tr>
\ No newline at end of file
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/templates/listing.hbs b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/templates/listing.hbs
index f4fac14e68..2563f03ced 100644
--- a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/templates/listing.hbs
+++ b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/templates/listing.hbs
@@ -8,12 +8,12 @@
         data-grid-label="Type">{{deviceTypeLabel}}</td>
     <td class="text-right content-fill text-left-on-grid-view no-wrap">
         <a href="{{appContext}}/device/{{deviceTypeName}}/enroll"
-           data-click-event="remove-form" class="btn padding-reduce-on-grid-view">
+           data-click-event="remove-form" class="btn col-md-12">
                             <span class="fw-stack">
                                 <i class="fw fw-ring fw-stack-2x"></i>
-                                <i class="fw fw-view fw-stack-1x"></i>
+                                <i class="fw fw-check fw-stack-1x"></i>
                             </span>
-            <span class="hidden-xs hidden-on-grid-view">View</span>
+            <span>Select</span>
         </a>
     </td>
 </tr>
\ No newline at end of file
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/templates/listing.hbs b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/templates/listing.hbs
index 3070b1e144..c50b827052 100644
--- a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/templates/listing.hbs
+++ b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/templates/listing.hbs
@@ -8,12 +8,12 @@
         data-grid-label="Type">{{deviceTypeLabel}}</td>
     <td class="text-right content-fill text-left-on-grid-view no-wrap">
         <a href="{{appContext}}/device/{{deviceTypeName}}/enroll"
-           data-click-event="remove-form" class="btn padding-reduce-on-grid-view">
+           data-click-event="remove-form" class="btn col-md-12">
                             <span class="fw-stack">
                                 <i class="fw fw-ring fw-stack-2x"></i>
-                                <i class="fw fw-view fw-stack-1x"></i>
+                                <i class="fw fw-check fw-stack-1x"></i>
                             </span>
-            <span class="hidden-xs hidden-on-grid-view">View</span>
+            <span>Select</span>
         </a>
     </td>
 </tr>
\ No newline at end of file