- Device {{device.name}} - {{#if device.model}} - - ( {{device.vendor}} {{device.model}} ) - - {{/if}} -
+ {{#zone "device-thumbnail"}} + {{/zone}} - {{#zone "overview-section"}} -
-
-
- {{#if device.deviceIdentifier}}
-
-
+ {{#zone "device-details-header"}}
+ Device
- Overview
-
- | Device ID | -{{device.deviceIdentifier}} | -
| Name | -{{device.name}} | -
| Model | -{{device.vendor}} - {{device.model}} | -
| Status | -- {{#equal device.status "ACTIVE"}}Active{{/equal}} - {{#equal device.status "INACTIVE"}}Inactive{{/equal}} - {{#equal device.status "BLOCKED"}}Blocked{{/equal}} - {{#equal device.status "REMOVED"}}Removed{{/equal}} - {{#equal device.status "UNREACHABLE"}}Unreachable{{/equal}} - | -
| Owner | -{{device.owner}} | -
| Ownership | -{{device.ownership}} | -
| IMEI | -{{device.imei}} | -
| UDID | -{{device.udid}} | -
| Firmware Build - Date - | -{{device.osBuildDate}} | -
| Phone Number | -{{device.phoneNumber}} | -
| Last Update | -{{device.lastUpdatedTime}} | -
+ {{device.owner}}'s {{device.name}} + + + +
+ {{#if device.model}} +{{device.vendor}} {{device.model}}
+ {{/if}} +Ownership - {{device.ownership}}
+Device is + + {{#equal device.status "ACTIVE"}}Active{{/equal}} + {{#equal device.status "INACTIVE"}}Inactive{{/equal}} + {{#equal device.status "BLOCKED"}}Blocked{{/equal}} + {{#equal device.status "REMOVED"}}Removed{{/equal}} + {{#equal device.status "UNREACHABLE"}}Unreachable{{/equal}} + +
{{/zone}} - {{#zone "device-opetations"}} {{#if device.isNotRemoved}} -
- Operations
-
-
+
-
- Policy Compliance
-
-
-
-
-
- Device Location
-
-
-
-
- Installed Applications
-
-
+ {{#zone "device-details"}}
+ {{#if device.deviceInfoAvailable}}
+ {{#if device.BatteryLevel}}
+ Location
+ Applications
+ Policy Compliance
{{/zone}}
{{#zone "device-view-tab-injected-conents"}}
+
+
{{/if}}
{{/zone}}
- {{#zone "device-details-tab-injected"}}
-
+
{{unit "cdmf.unit.device.type.android.operation-bar" device=device
backendApiUri=backendApiUri autoCompleteParams=autoCompleteParams}}
Device Operations
+{{device.BatteryLevel.value}}%
+ {{/if}} + {{#if device.ramUsage}} +{{device.ramUsage.value}}%
+ {{/if}} + {{#if device.internalMemory}} +{{device.internalMemory.usage}} + GB/{{device.internalMemory.total}}GB
+ {{/if}} + {{#if device.externalMemory}} +{{device.externalMemory.usage}} + GB/{{device.externalMemory.total}}GB
+ {{/if}} + {{else}} +Battery, RAM and Storage related information are not + available yet.
+ {{/if}} {{/zone}} - {{#zone "device-details-tab-contents"}} -
-
+ {{#zone "device-details-tab-injected"}}
+
-
- - - - Device Details - - -
-Device Details
-
-
-
-
-
-
- {{#if device.deviceInfoAvailable}}
- {{#if device.BatteryLevel}}
-
-
-
- {{/if}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{#if device.ramUsage}}
-
-
-
-
- BATTERY
-
-
-
-
- {{device.BatteryLevel
- .value}} %
-
-
-
- {{/if}}
- {{#if device.internalMemory}}
-
-
-
-
- RAM Usage
-
-
-
-
- {{device.ramUsage
- .value}} %
-
-
-
- {{/if}}
- {{#if device.externalMemory}}
-
-
-
-
- Local Storage
-
-
-
-
- {{device.internalMemory
- .usage}} %
-
- TOTAL OF {{device.internalMemory
- .total}} GB
-
-
-
-
- {{/if}}
- {{else}}
-
- {{/if}}
-
-
-
-
- External Storage
-
-
-
-
- {{device.externalMemory
- .usage}} %
-
- TOTAL OF {{device.externalMemory
- .total}} GB
-
-
-
+
+
+
+
+
+
+
+
+
+
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.device-view/public/img/android_app_icon.png 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.device-view/public/img/android_app_icon.png
new file mode 100644
index 0000000000..9a84ea0706
Binary files /dev/null and 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.device-view/public/img/android_app_icon.png differ
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.device-view/public/js/device-detail.js 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.device-view/public/js/device-detail.js
index 4399b6152f..069969d267 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.device-view/public/js/device-detail.js
+++ 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.device-view/public/js/device-detail.js
@@ -23,6 +23,7 @@ var InitiateViewOption = null;
var deviceIdentifier = deviceId.data("deviceid");
var deviceType = deviceId.data("type");
var ownership = deviceId.data("ownership");
+ var devStatus = deviceId.data("status");
var payload = [deviceIdentifier];
var operationTable;
var serviceUrl;
@@ -35,7 +36,7 @@ var InitiateViewOption = null;
serviceUrl = "/api/device-mgt/android/v1.0/admin/devices/info";
serviceUrlLocal = "/api/device-mgt/android/v1.0/admin/devices/location";
}
- if (serviceUrl) {
+ if (serviceUrl && ("REMOVED" !== devStatus)) {
invokerUtil.post(
serviceUrl,
payload,
@@ -306,6 +307,8 @@ var InitiateViewOption = null;
viewModel["appContext"] = context;
var content = template(viewModel);
$("#applications-list-container").html(content);
+ var iconSource = $("#applications-list-container").data("public-uri") + "/img/android_app_icon.png";
+ $("#applications-list-container img").attr("src",iconSource);
} else {
$("#applications-list-container").html("");
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.device-view/public/templates/applications-list.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.device-view/public/templates/applications-list.hbs
index ec6029dcc2..c25f353dff 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.device-view/public/templates/applications-list.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.device-view/public/templates/applications-list.hbs
@@ -1,31 +1,9 @@
-
-
\ No newline at end of file
+{{#each applications}}
+
- {{#each applications}}
-
- {{#equal platform "android"}}{{/equal}}
- {{#equal platform "ios"}}{{/equal}}
- {{#equal platform "windows"}}{{/equal}}
- {{#equal isActive true}}
-
-
- Active
-
- {{name}}
- V:{{version}}
- {{#if memoryUsage}}
-
- Memory Usage
-
-
- ( {{memoryUsage}} Bytes )
-
- {{/if}}
- {{/equal}}
- {{#equal isActive false}}
- {{name}}
- V:{{version}}
- {{/equal}}
-
- {{/each}}
-
-
+ ![]()
+
+{{/each}}
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.device-view/public/templates/policy-compliance.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.device-view/public/templates/policy-compliance.hbs
index 8fba741a6a..61590d984b 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.device-view/public/templates/policy-compliance.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.device-view/public/templates/policy-compliance.hbs
@@ -1,63 +1,26 @@
-
+
+ {{name}}
+v{{version}}
+
-
-
-
android-plugin
org.wso2.carbon.devicemgt-plugins
- 4.0.2-SNAPSHOT
+ 4.0.5-SNAPSHOT
../pom.xml
diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml
index fa4d1ba736..8155623577 100644
--- a/components/mobile-plugins/android-plugin/pom.xml
+++ b/components/mobile-plugins/android-plugin/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
mobile-plugins
- 4.0.2-SNAPSHOT
+ 4.0.5-SNAPSHOT
../pom.xml
diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml
index de0cbff76d..e0d01625e9 100644
--- a/components/mobile-plugins/pom.xml
+++ b/components/mobile-plugins/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.devicemgt-plugins
carbon-device-mgt-plugins-parent
- 4.0.2-SNAPSHOT
+ 4.0.5-SNAPSHOT
../../pom.xml
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
index e0c9c25b5c..2627a921ea 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
@@ -21,7 +21,7 @@
windows-plugin
org.wso2.carbon.devicemgt-plugins
- 4.0.2-SNAPSHOT
+ 4.0.5-SNAPSHOT
../pom.xml
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
index 54c787db52..9793ee3ce0 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
@@ -23,13 +23,13 @@
windows-plugin
org.wso2.carbon.devicemgt-plugins
- 4.0.2-SNAPSHOT
+ 4.0.5-SNAPSHOT
../pom.xml
4.0.0
org.wso2.carbon.device.mgt.mobile.windows.ui
- 4.0.2-SNAPSHOT
+ 4.0.5-SNAPSHOT
WSO2 Carbon - Mobile Windows UI
pom
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.device-view/device-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.device-view/device-view.hbs
index 046a5ae154..937ab7c4ba 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.device-view/device-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.device-view/device-view.hbs
@@ -10,7 +10,7 @@
+ data-owner="{{device.owner}}" data-status="{{device.status}}">
Device {{device.name}}
{{#if device.model}}
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.device-view/public/js/device-detail.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.device-view/public/js/device-detail.js
index ac2a06be8b..13684afe44 100755
--- 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.device-view/public/js/device-detail.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.device-view/public/js/device-detail.js
@@ -23,6 +23,7 @@ var InitiateViewOption = null;
var deviceIdentifier = deviceId.data("deviceid");
var deviceType = deviceId.data("type");
var ownership = deviceId.data("ownership");
+ var devStatus = deviceId.data("status");
var payload = [deviceIdentifier];
var operationTable;
var serviceUrl;
@@ -34,7 +35,7 @@ var InitiateViewOption = null;
serviceUrl = "/api/device-mgt/android/v1.0/admin/devices/info";
}
- if (serviceUrl) {
+ if (serviceUrl && ("REMOVED" !== devStatus)) {
invokerUtil.post(
serviceUrl,
payload,
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
index bd594c4d72..f88797ec25 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
@@ -22,7 +22,7 @@
-
-
-
- {{policy.policyName}}
- {{deviceType}} - -
-
-
-
-
-
-
- Ownership Type : {{policy.ownershipType}}
-
-
-
-
- Compliance Type : {{policy.compliance}}
-
-
-
-
- Compliance :
- {{#equal compliance "COMPLIANT"}}
- Compliant
- {{/equal}}
- {{#equal compliance "NON-COMPLIANT"}}
- Not Compliant
- {{/equal}}
-
-
-
-
-
-
-
-
- View
-
-
+
\ No newline at end of file
+
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.policy-wizard/public/templates/android-policy-operations.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.policy-wizard/public/templates/android-policy-operations.hbs
index cc5660001c..b8b3b0467b 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.policy-wizard/public/templates/android-policy-operations.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.policy-wizard/public/templates/android-policy-operations.hbs
@@ -133,9 +133,8 @@
+ {{#equal compliance "COMPLIANT"}}
+
+ {{/equal}}
+ {{#equal compliance "NON-COMPLIANT"}}
+
+ {{/equal}}
+
+
+ {{policy.policyName}} + {{deviceType}} +
++ Compliance Type : {{policy.compliance}} + Ownership type : {{policy.ownershipType}} +
+
+
-
- This configuration can be used to set a passcode policy to an Android Device.
- Once this configuration profile is installed on a device, corresponding users will not be able
- to modify these settings on their devices.
+ Enforce a configured passcode policy on Android devices.
+ Once this profile is applied, the device owners won't be able to modify the password settings on their devices.
- This configurations can be used to restrict certain settings on an Android device.
- Once this configuration profile is installed on a device, corresponding users will not be able
- to modify these settings on their devices.
+ Restrict predefined settings on Android devices.
+ Once this profile is applied, the device owners won't be able to modify the configured settings on their devices.
- This configuration can be used to encrypt data on an Android device, when the device is locked
- and make it readable when the passcode is entered. Once this configuration profile is installed
- on a device, corresponding users will not be able to modify these settings on their devices.
+ Encrypt data on an Android device when the device is locked and make it readable when the device is unlocked.
+ Once this profile is applied, the device owners won't be able to modify the configured settings on their devices.
- This configurations can be used to configure Wi-Fi access on an Android device.
- Once this configuration profile is installed on a device, corresponding users will not be able
- to modify these settings on their devices.
+ Configure the Wi-Fi settings on Android devices.
+ Once this profile is applied, the device owners won't be able to modify the configured settings on their devices.
- This configuration can be used to create a black list or white list of applications.
+ Blacklist or whitelist mobile application for Android devices.
- This configurations can be used to configure VPN settings on an Android device.
- Once this configuration profile is installed on a device, corresponding users will not be able
- to modify these settings on their devices.
+ Configure the VPN settings on Android devices.
+ Once this profile is applied, the device owners won't be able to modify the configured settings on their devices.
- The configurations below can be applied to the devices where the agent is running in Android
- Work-Profile.
+ Configure the settings to access mobile applications via the Android Work Profile.
- This configuration can be used to set a passcode policy to an Android Device.
- Once this configuration profile is installed on a device, corresponding users will not be able
- to modify these settings on their devices.
+ Configure the settings to install system updates on single-purpose or COSU devices.