Device enrollment page revampl

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java

@@ -56,7 +56,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "android_sense", description = "")
+                @Tag(name = "android_sense,device_management", description = "")
         }
 )
 @Scopes(

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/impl/ArduinoService.java

@@ -40,7 +40,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "arduino", description = "")
+                @Tag(name = "arduino,device_management", description = "")
         }
 )
 @Scopes(

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiService.java

@@ -39,7 +39,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "raspberrypi", description = "")
+                @Tag(name = "raspberrypi,device_management", description = "")
         }
 )
 @Scopes(

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java

@@ -45,7 +45,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "virtual_firealarm", description = "")
+                @Tag(name = "virtual_firealarm,device_management", description = "")
         }
 )
 @Scopes(

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java

@@ -58,7 +58,7 @@ import java.util.List;
                 }
         ),
         tags = {
-                @Tag(name = "android", description = "")
+                @Tag(name = "android,device_management", description = "")
         }
 )
 @Path("/admin/devices")

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementService.java

@@ -56,7 +56,7 @@ import java.util.List;
                 }
         ),
         tags = {
-                @Tag(name = "android", description = "")
+                @Tag(name = "android,device_management", description = "")
         }
 )
 @Api(value = "Android Device Management",

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceTypeConfigurationService.java

@@ -55,7 +55,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "android", description = "")
+                @Tag(name = "android,device_management", description = "")
         }
 )
 @Api(value = "Android Configuration Management", description = "This API carries all the resource used to mange the Android platform configurations.")

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/EventReceiverService.java

@@ -53,7 +53,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "android", description = "")
+                @Tag(name = "android,device_management", description = "")
         }
 )
 @Api(value = "Event Receiver", description = "Event publishing/retrieving related APIs. To enable event publishing/retrieving you need to" +

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.device-view/device-view.hbs

@@ -336,16 +336,18 @@
                             <div id="device-location"
                                  data-lat="{{device.location.latitude}}"
                                  data-long="{{device.location.longitude}}"
-                                 data-locations = "{{device.locationHistory}}">
+                                 data-locations="{{device.locationHistory}}">
                             </div>
                             <br/>
-                            <a class="padding-left" target="_blank"
+                            {{#unless isCloud}}
-                               href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
+                                <a class="padding-left" target="_blank"
+                                   href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
                                 <span class="fw-stack">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
                                     <i class="fw fw-map-location fw-stack-1x"></i>
-                                </span>  Add Geo Fencing
+                                </span> Add Geo Fencing
-                            </a>
+                                </a>
+                            {{/unless}}
                         {{else}}
                             <div id="map-error" class="message message-warning">
                                 <h4 class="remove-margin">

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.device-view/device-view.js

@@ -213,6 +213,7 @@ function onRequest(context) {
     deviceViewData["autoCompleteParams"] = autoCompleteParams;
 
     deviceViewData["portalUrl"] = devicemgtProps['portalURL'];
+    deviceViewData["isCloud"] = devicemgtProps['isCloud'];
     deviceViewData["anchor"] = encodeURI(JSON.stringify({ "device" : { "id" : deviceId, "type" : deviceType}}));
     return deviceViewData;
 }

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.device-view/public/js/load-map.js

@@ -28,7 +28,7 @@ function loadLeafletMap() {
         zoomLevel = 13,
         tileSet = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
         attribution = "&copy; <a href='https://openstreetmap.org/copyright'>OpenStreetMap</a> contributors";
-    if (locations) {
+    if (locations && locations.locations.length > 0) {
 
         var locationSets = locations.locations;
         map = L.map(container).setView([locationSets[0].lat, locationSets[0].lng], zoomLevel);

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

@@ -10,14 +10,15 @@
 </div>
 
 <div class="row">
-    <div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 add-padding-top-2x">
+    <!--<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 add-padding-top-2x">
         <img src="{{@unit.publicUri}}/images/android-icon.png" class="img-responsive">
-    </div>
+    </div>-->
-    <div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 add-padding-top-2x">
+    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 add-padding-top-2x">
         <h3 class="text-center">Scan QR Code to connect your device</h3>
         <div class="enrollment-qr-container text-center"></div>
-        <p class="text-center">or</p>
+        <h3 class="text-center add-margin-bottom-2x add-margin-top-2x">or</h3>
-        <div class="text-center"><a href="{{host}}/android-web-agent/public/mdm.page.enrollments.android.download-agent/asset/android-agent.apk" class="btn-operations remove-margin">
+        <div class="text-center"><a href="{{host}}/android-web-agent/public/mdm.page.enrollments.android.download-agent/asset/android-agent.apk"
+                                    class="btn-operations remove-margin download_agent">
             <i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a></div>
 
         <!--<p class="doc-link">Please scan the QR code to download the APK on to your android device or click
@@ -37,27 +38,28 @@
 
 <div class="row grey-bg">
     <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
-        <h5>Step 1</h5>
+        <h5><strong>Step 1</strong></h5>
         <p>Install the downloaded application in to the device to proceed.</p>
         <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
     </div>
     <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
-        <h5>Step 2</h5>
+        <h5><strong>Step 2</strong></h5>
         <p>Tap Skip to proceed with the default enrollment process.</p>
         <img src="{{@unit.publicUri}}/images/set_profile.png" class="img-responsive">
     </div>
     <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
-        <h5>Step 3</h5>
+        <h5><strong>Step 3</strong></h5>
         <p>Enter the server address based on your environment, in the text box provided.</p>
         <img src="{{@unit.publicUri}}/images/registration.png" class="img-responsive">
     </div>
     <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
-        <h5>Step 4</h5>
+        <h5><strong>Step 4</strong></h5>
         <p>Enter your credentials on to the provided fields and tap Register. </p>
         <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
     </div>
 </div>
 
+<<<<<<< HEAD
 <!--<div class="row">
     <div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double ">
         <h3 class="uppercase">What You Need</h3>
@@ -76,6 +78,16 @@
         <br>
     </div>
 </div>
+=======
+    <a href="javascript:toggleEnrollment()" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>
+    <a href="{{host}}/android-web-agent/public/mdm.page.enrollments.android.download-agent/asset/android-agent.apk" class="btn-operations"><i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a>
+    {{#unless isCloud}}
+    <a href="javascript:toggleEmailInvite()" class="btn-operations"><i class="fw fw-mail fw-inverse fw-lg add-margin-1x"></i> Invite by Email</a>
+    {{/unless}}
+    {{#if displayStatus}}
+        <a href="javascript:artifactUpload()" class="btn-operations"><i class="fw fw-upload fw-inverse fw-lg add-margin-1x"></i> Deploy Analytics Artifacts</a>
+    {{/if}}
+>>>>>>> 32c50e0ef78961ec90a3ed9b44c8237adb40a41e
 
 <div class="row">
     <div class="col-xs-12 col-sm-8 col-md-9 col-lg-9">

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.js

@@ -34,6 +34,7 @@ function onRequest(context){
 	//		//do nothing.
 	//	}
 	//);
+    viewModel["isCloud"] = devicemgtProps["isCloud"];
     viewModel["hostName"] = devicemgtProps["httpsURL"];
     viewModel["enrollmentURL"] = devicemgtProps["generalConfig"]["host"] + devicemgtProps["androidEnrollmentDir"];
     return viewModel;

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/ConfigurationMgtService.java

@@ -62,7 +62,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "windows", description = "")
+                @Tag(name = "windows,device_management", description = "")
         }
 )
 @Api(value = "Windows Configuration Management",

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java

@@ -55,7 +55,7 @@ import java.util.List;
                 }
         ),
         tags = {
-                @Tag(name = "windows", description = "")
+                @Tag(name = "windows,device_management", description = "")
         }
 )
 @Api(value = "Windows Device Management Administrative Service",

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/authbst/BSTProvider.java

@@ -51,7 +51,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "windows", description = "")
+                @Tag(name = "windows,device_management", description = "")
         }
 )
 @Api(value = "Windows Binary Security Token Service",