From b55c64d55115202b2caceb4e2d99b9ee6b86f375 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Mon, 5 Dec 2016 11:49:40 +0530 Subject: [PATCH 1/2] Layout changes for device enrollment views --- .../public/css/styles.css | 12 ++++------ .../type-view.hbs | 23 ++++++++++--------- .../type-view.hbs | 4 ++-- .../type-view.hbs | 4 ++-- .../type-view.hbs | 4 ++-- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/css/styles.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/css/styles.css index 0c138185a..cdd2ea415 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/css/styles.css +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/css/styles.css @@ -56,13 +56,11 @@ hr { background-color: #f6f4f4; } -.doc-link { - background: #11375B; - padding: 20px; - color: white; - margin-top: 0; +.doc-link{ + background: none; + color: #000; + padding: 10px 0px; } - .doc-link a { - color: white; + color: #006eff; } \ No newline at end of file diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs index 64d528722..955e07b54 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs @@ -20,17 +20,15 @@
-
+
-

Click [ here ] for latest instructions and - troubleshooting.

+
-
+

What it Does

Connect an Android device to WSO2 IoT Server and visualize sensor @@ -41,24 +39,27 @@

You should have an Android Device to get started.

  • - STEP 01 + STEP 01 Go ahead and click [Enroll Device].
    • -
  • - STEP 02 +
  • + STEP 02 You can either scan the QR code or directly download Android agent.
    • -
  • - STEP 03 +
  • + STEP 03 Install Android agent into your Android Device.
    • -
  • STEP 04 +
  • STEP 04 Proceed to [Prepare] section.

Enroll Device

+

Click [ here ] for latest instructions and + troubleshooting.

diff --git a/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs b/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs index b0b790ae7..54c12b154 100644 --- a/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs +++ b/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs @@ -20,7 +20,7 @@
-
+
@@ -28,7 +28,7 @@
-
+

What it Does

Connect Arduino UNO board to WSO2 IoT Server and visualize sensor diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs index 4c9f69088..e900fbd1a 100644 --- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs @@ -20,12 +20,12 @@

-
+
-
+

What it Does

Connect a RaspberryPi to WSO2 IoT Server and manage it.

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs index 3b1496c73..fa6eaefca 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs @@ -5,12 +5,12 @@

Android Mobile

-
+
-
+

What it Does

From 446e2427e075e8d03bef93e5b365ba0b3b8aa73e Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Mon, 5 Dec 2016 12:15:29 +0530 Subject: [PATCH 2/2] Layout changes for device enrollment views commit 2 --- .../public/css/styles.css | 12 ++++------ .../type-view.hbs | 23 ++++++++----------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/css/styles.css b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/css/styles.css index 47250fc86..84a4894b7 100644 --- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/css/styles.css +++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/css/styles.css @@ -56,13 +56,11 @@ hr { background-color: #f6f4f4; } -.doc-link { - background: #11375B; - padding: 20px; - color: white; - margin-top: 0; +.doc-link{ + background: none; + color: #000; + padding: 10px 0px; } - .doc-link a { - color: white; + color: #006eff; } diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs index 1b026619e..c2ad5fe22 100644 --- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs +++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs @@ -19,15 +19,10 @@

Virtual Firealarm

-
+
-
-

Click [ here ] for latest instructions and - troubleshooting.

-
-
+

What it Does

A Virtual Device that mimics the functionality of a real Firealarm. @@ -40,15 +35,15 @@

  • - STEP 01 + STEP 01 Go ahead and [Download] the Device.
    • -
  • - STEP 02 +
  • + STEP 02 Proceed to [Prepare] section.
    • -
  • - STEP 03 +
  • + STEP 03 Read [Try Out] section to further experiment with the device.
@@ -59,7 +54,9 @@ Download Agent - +

Click [ here ] for latest instructions and + troubleshooting.