diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js index 9651e352b..8d28b5c24 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js @@ -48,41 +48,41 @@ var operationModule = function () { "LOCK_OPERATION_CODE": "DEVICE_LOCK", "UPGRADE_FIRMWARE": "UPGRADE_FIRMWARE", "DISALLOW_ADJUST_VOLUME": "DISALLOW_ADJUST_VOLUME", - "DISALLOW_CONFIG_BLUETOOTH": "DISALLOW_CONFIG_BLUETOOTH", - "DISALLOW_CONFIG_CELL_BROADCASTS": "DISALLOW_CONFIG_CELL_BROADCASTS", - "DISALLOW_CONFIG_CREDENTIALS": "DISALLOW_CONFIG_CREDENTIALS", - "DISALLOW_CONFIG_MOBILE_NETWORKS": "DISALLOW_CONFIG_MOBILE_NETWORKS", - "DISALLOW_CONFIG_TETHERING": "DISALLOW_CONFIG_TETHERING", - "DISALLOW_CONFIG_VPN": "DISALLOW_CONFIG_VPN", - "DISALLOW_CONFIG_WIFI": "DISALLOW_CONFIG_WIFI", - "DISALLOW_APPS_CONTROL": "DISALLOW_APPS_CONTROL", - "DISALLOW_CREATE_WINDOWS": "DISALLOW_CREATE_WINDOWS", - "DISALLOW_CROSS_PROFILE_COPY_PASTE": "DISALLOW_CROSS_PROFILE_COPY_PASTE", - "DISALLOW_DEBUGGING_FEATURES": "DISALLOW_DEBUGGING_FEATURES", - "DISALLOW_FACTORY_RESET": "DISALLOW_FACTORY_RESET", - "DISALLOW_ADD_USER": "DISALLOW_ADD_USER", - "DISALLOW_INSTALL_APPS": "DISALLOW_INSTALL_APPS", - "DISALLOW_INSTALL_UNKNOWN_SOURCES": "DISALLOW_INSTALL_UNKNOWN_SOURCES", - "DISALLOW_MODIFY_ACCOUNTS": "DISALLOW_MODIFY_ACCOUNTS", - "DISALLOW_MOUNT_PHYSICAL_MEDIA": "DISALLOW_MOUNT_PHYSICAL_MEDIA", - "DISALLOW_NETWORK_RESET": "DISALLOW_NETWORK_RESET", - "DISALLOW_OUTGOING_BEAM": "DISALLOW_OUTGOING_BEAM", - "DISALLOW_OUTGOING_CALLS": "DISALLOW_OUTGOING_CALLS", - "DISALLOW_REMOVE_USER": "DISALLOW_REMOVE_USER", - "DISALLOW_SAFE_BOOT": "DISALLOW_SAFE_BOOT", - "DISALLOW_SHARE_LOCATION": "DISALLOW_SHARE_LOCATION", - "DISALLOW_SMS": "DISALLOW_SMS", - "DISALLOW_UNINSTALL_APPS": "DISALLOW_UNINSTALL_APPS", - "DISALLOW_UNMUTE_MICROPHONE": "DISALLOW_UNMUTE_MICROPHONE", - "DISALLOW_USB_FILE_TRANSFER": "DISALLOW_USB_FILE_TRANSFER", - "ALLOW_PARENT_PROFILE_APP_LINKING": "ALLOW_PARENT_PROFILE_APP_LINKING", - "ENSURE_VERIFY_APPS": "ENSURE_VERIFY_APPS", - "AUTO_TIME": "AUTO_TIME", - "SET_SCREEN_CAPTURE_DISABLED": "SET_SCREEN_CAPTURE_DISABLED", - "SET_STATUS_BAR_DISABLED": "SET_STATUS_BAR_DISABLED", - "APPLICATION_OPERATION_CODE": "APP-RESTRICTION", - "SYSTEM_UPDATE_POLICY_CODE": "SYSTEM_UPDATE_POLICY", - "KIOSK_APPS_CODE": "KIOSK_APPS" + "DISALLOW_CONFIG_BLUETOOTH" : "DISALLOW_CONFIG_BLUETOOTH", + "DISALLOW_CONFIG_CELL_BROADCASTS" : "DISALLOW_CONFIG_CELL_BROADCASTS", + "DISALLOW_CONFIG_CREDENTIALS" : "DISALLOW_CONFIG_CREDENTIALS", + "DISALLOW_CONFIG_MOBILE_NETWORKS" : "DISALLOW_CONFIG_MOBILE_NETWORKS", + "DISALLOW_CONFIG_TETHERING" : "DISALLOW_CONFIG_TETHERING", + "DISALLOW_CONFIG_VPN" : "DISALLOW_CONFIG_VPN", + "DISALLOW_CONFIG_WIFI" : "DISALLOW_CONFIG_WIFI", + "DISALLOW_APPS_CONTROL" : "DISALLOW_APPS_CONTROL", + "DISALLOW_CREATE_WINDOWS" : "DISALLOW_CREATE_WINDOWS", + "DISALLOW_CROSS_PROFILE_COPY_PASTE" : "DISALLOW_CROSS_PROFILE_COPY_PASTE", + "DISALLOW_DEBUGGING_FEATURES" : "DISALLOW_DEBUGGING_FEATURES", + "DISALLOW_FACTORY_RESET" : "DISALLOW_FACTORY_RESET", + "DISALLOW_ADD_USER" : "DISALLOW_ADD_USER", + "DISALLOW_INSTALL_APPS" : "DISALLOW_INSTALL_APPS", + "DISALLOW_INSTALL_UNKNOWN_SOURCES" : "DISALLOW_INSTALL_UNKNOWN_SOURCES", + "DISALLOW_MODIFY_ACCOUNTS" : "DISALLOW_MODIFY_ACCOUNTS", + "DISALLOW_MOUNT_PHYSICAL_MEDIA" : "DISALLOW_MOUNT_PHYSICAL_MEDIA", + "DISALLOW_NETWORK_RESET" : "DISALLOW_NETWORK_RESET", + "DISALLOW_OUTGOING_BEAM" : "DISALLOW_OUTGOING_BEAM", + "DISALLOW_OUTGOING_CALLS" : "DISALLOW_OUTGOING_CALLS", + "DISALLOW_REMOVE_USER" : "DISALLOW_REMOVE_USER", + "DISALLOW_SAFE_BOOT" : "DISALLOW_SAFE_BOOT", + "DISALLOW_SHARE_LOCATION" : "DISALLOW_SHARE_LOCATION", + "DISALLOW_SMS" : "DISALLOW_SMS", + "DISALLOW_UNINSTALL_APPS" : "DISALLOW_UNINSTALL_APPS", + "DISALLOW_UNMUTE_MICROPHONE" : "DISALLOW_UNMUTE_MICROPHONE", + "DISALLOW_USB_FILE_TRANSFER" : "DISALLOW_USB_FILE_TRANSFER", + "ALLOW_PARENT_PROFILE_APP_LINKING" : "ALLOW_PARENT_PROFILE_APP_LINKING", + "ENSURE_VERIFY_APPS" : "ENSURE_VERIFY_APPS", + "AUTO_TIME" : "AUTO_TIME", + "SET_SCREEN_CAPTURE_DISABLED" : "SET_SCREEN_CAPTURE_DISABLED", + "SET_STATUS_BAR_DISABLED" : "SET_STATUS_BAR_DISABLED", + "APPLICATION_OPERATION_CODE" : "APP-RESTRICTION", + "SYSTEM_UPDATE_POLICY_CODE" : "SYSTEM_UPDATE_POLICY", + "KIOSK_APPS_CODE" : "KIOSK_APPS" }; // Constants to define Windows Operation Constants diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js index bcef26ec8..272be8ed2 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js @@ -47,10 +47,10 @@ var androidOperationConstants = { "WIFI_OPERATION_CODE": "WIFI", "VPN_OPERATION": "vpn", "VPN_OPERATION_CODE": "VPN", - "APPLICATION_OPERATION":"app-restriction", - "APPLICATION_OPERATION_CODE":"APP-RESTRICTION", - "KIOSK_APPS_CODE":"KIOSK_APPS", - "KIOSK_APPS":"cosu-whitelisted-applications" + "APPLICATION_OPERATION": "app-restriction", + "APPLICATION_OPERATION_CODE": "APP-RESTRICTION", + "KIOSK_APPS_CODE": "KIOSK_APPS", + "KIOSK_APPS": "cosu-whitelisted-applications" }; // Constants to define iOS Operation Constants @@ -2550,7 +2550,7 @@ var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneI } } var paneSelector = "#" + paneID; - if(slideDownVotes > 0) { + if (slideDownVotes > 0) { $(paneSelector).removeClass("hidden"); } else { $(paneSelector).addClass("hidden"); diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs index 826bff2d6..2cf3579e1 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs @@ -24,11 +24,9 @@ Encryption Settings - + - + @@ -63,8 +61,7 @@ Application Restrictions - + @@ -105,8 +102,7 @@
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 + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -259,8 +255,7 @@
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 + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -662,8 +657,7 @@
@@ -697,10 +691,8 @@
- 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, + 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.
@@ -744,8 +736,7 @@
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 + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -1018,8 +1009,7 @@
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 + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -1179,10 +1169,9 @@ - - diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js index 3e2728ca1..eacae0229 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js @@ -113,10 +113,10 @@ var androidOperationConstants = { "ENCRYPT_STORAGE_OPERATION_CODE": "ENCRYPT_STORAGE", "WIFI_OPERATION": "wifi", "WIFI_OPERATION_CODE": "WIFI", - "APPLICATION_OPERATION":"app-restriction", - "APPLICATION_OPERATION_CODE":"APP-RESTRICTION", - "KIOSK_APPS_CODE":"KIOSK_APPS", - "KIOSK_APPS":"cosu-whitelisted-applications" + "APPLICATION_OPERATION": "app-restriction", + "APPLICATION_OPERATION_CODE": "APP-RESTRICTION", + "KIOSK_APPS_CODE": "KIOSK_APPS", + "KIOSK_APPS": "cosu-whitelisted-applications" }; // Constants to define Android Operation Constants @@ -524,8 +524,7 @@ validateStep["policy-profile"] = function () { "erroneousFeature": operation }; continueToCheckNextInputs = false; - } - else { + } else { childInputCount = 0; childInputArray = []; emptyChildInputCount = 0; @@ -565,8 +564,8 @@ validateStep["policy-profile"] = function () { // If empty child inputs are present validationStatus = { "error": true, - "subErrorMsg": "One or more package names of " + - "applications are empty.", + "subErrorMsg": "One or more package names of applications are" + + " empty.", "erroneousFeature": operation }; continueToCheckNextInputs = false; @@ -574,8 +573,7 @@ validateStep["policy-profile"] = function () { // If duplicate input is present validationStatus = { "error": true, - "subErrorMsg": "Duplicate values exist with " + - "for package names.", + "subErrorMsg": "Duplicate values exist with for package names.", "erroneousFeature": operation }; continueToCheckNextInputs = false; @@ -2321,16 +2319,14 @@ var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) { var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneID, valueSet) { var selectedValueOnChange = selectElement.value; - var i, slideDownVotes = 0; for (i = 0; i < valueSet.length; i++) { if (selectedValueOnChange == valueSet[i]) { slideDownVotes++; } } - var paneSelector = "#" + paneID; - if(slideDownVotes > 0) { + if (slideDownVotes > 0) { $(paneSelector).removeClass("hidden"); } else { $(paneSelector).addClass("hidden"); diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs index ede54dec3..7a7460ecf 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs @@ -1314,9 +1314,7 @@ - - - \ No newline at end of file diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs index 78c222d47..83fb622d6 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs @@ -55,10 +55,10 @@ - - - - + + + + Applications Restrictions @@ -83,7 +83,6 @@ -
@@ -1238,7 +1237,6 @@
-
-
- - - - - - + + + + + +