inosh
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

Browse Source
revert-dabc3590
kamidu 8 years ago
parent 8af596702b 6ee128fe17
commit 51dac16206
6 changed files with 107 additions and 136 deletions
Show Stats Download Patch File Download Diff File

41
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
Unescape View File

@ -24,11 +24,9 @@
<i class="fw fw-security fw-stack-2x"></i> <i class="fw fw-security fw-stack-2x"></i>
</span> </span>
Encryption Settings Encryption Settings
<span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
class="fw fw-ok"></i></span>
<span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span> <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
<span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i class="fw fw-error"></i></span>
class="fw fw-error"></i></span>
</a> </a>
<a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)"> <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
<span class="wr-hidden-operations-icon fw-stack"> <span class="wr-hidden-operations-icon fw-stack">
@ -63,8 +61,7 @@
<i class="fw fw-block fw-stack-2x"></i> <i class="fw fw-block fw-stack-2x"></i>
</span> </span>
Application Restrictions Application Restrictions
<span id="app-restriction-configured" class="has-configured status-icon hidden"><i <span id="app-restriction-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
class="fw fw-ok"></i></span>
<span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span> <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
<span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span> <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
</a> </a>
@ -105,8 +102,7 @@
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
This configuration can be used to set a passcode policy to an Android Device. 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 Once this configuration profile is installed on a device, corresponding users will not be able
able
to modify these settings on their devices. to modify these settings on their devices.
</div> </div>
</div> </div>
@ -259,8 +255,7 @@
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
This configurations can be used to restrict certain settings on an Android device. 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 Once this configuration profile is installed on a device, corresponding users will not be able
able
to modify these settings on their devices. to modify these settings on their devices.
</div> </div>
</div> </div>
@ -662,8 +657,7 @@
<div> <div>
<ul class="message message-info"> <ul class="message message-info">
<i class="icon fw fw-info"></i> <i class="icon fw fw-info"></i>
<a id="policy-listing-status-msg">Below restrictions will be applied on devices with Android <a id="policy-listing-status-msg">Below restrictions will be applied on devices with Android version 6.0 Marshmallow onwards only.</a>
version 6.0 Marshmallow onwards only.</a>
</ul> </ul>
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
@ -697,10 +691,8 @@
</label> </label>
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
This configuration can be used to encrypt data on an Android device, when the device is This configuration can be used to encrypt data on an Android device, when the device is locked and
locked and make it readable when the passcode is entered. Once this configuration profile is installed on a device,
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. corresponding users will not be able to modify these settings on their devices.
</div> </div>
</div> </div>
@ -744,8 +736,7 @@
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
This configurations can be used to configure Wi-Fi access on an Android device. 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 Once this configuration profile is installed on a device, corresponding users will not be able
able
to modify these settings on their devices. to modify these settings on their devices.
</div> </div>
</div> </div>
@ -1018,8 +1009,7 @@
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
This configurations can be used to configure VPN settings on an Android device. 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 Once this configuration profile is installed on a device, corresponding users will not be able
able
to modify these settings on their devices. to modify these settings on their devices.
</div> </div>
</div> </div>
@ -1179,10 +1169,9 @@
</div> </div>
</div> </div>
</div> </div>
<!-- cosu-system-update-policy --> <!-- cosu-system-update-policy -->
<div class="wr-hidden-operation hidden hide" data-operation="cosu-system-update-policy"> <div class="wr-hidden-operation hidden hide" data-operation="cosu-system-update-policy">
<div class="panel panel-default operation-data" data-operation="cosu-system-update-policy" <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy-body"
data-operation-code="SYSTEM_UPDATE_POLICY"> data-operation-code="SYSTEM_UPDATE_POLICY">
<div id="cosu-system-update-policy-heading" class="panel-heading" role="tab"> <div id="cosu-system-update-policy-heading" class="panel-heading" role="tab">
<h2 class="sub-title panel-title"> <h2 class="sub-title panel-title">
@ -1196,8 +1185,7 @@
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
This configuration can be used to set a passcode policy to an Android Device. 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 Once this configuration profile is installed on a device, corresponding users will not be able
able
to modify these settings on their devices. to modify these settings on their devices.
</div> </div>
</div> </div>
@ -1326,7 +1314,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- cosu-whitelist-applications --> <!-- cosu-whitelist-applications -->
<div class="wr-hidden-operation hidden hide" data-operation="cosu-whitelisted-applications"> <div class="wr-hidden-operation hidden hide" data-operation="cosu-whitelisted-applications">
<div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications" <div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
@ -1343,8 +1330,7 @@
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
This configuration can be used to set a passcode policy to an Android Device. 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 Once this configuration profile is installed on a device, corresponding users will not be able
able
to modify these settings on their devices. to modify these settings on their devices.
</div> </div>
</div> </div>
@ -1367,7 +1353,6 @@
<i class="fw fw-add fw-stack-1x"></i> <i class="fw fw-add fw-stack-1x"></i>
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
</span> </span>
Add Application Add Application
</a> </a>
</label> </label>

12
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
Unescape View File

@ -524,8 +524,7 @@ validateStep["policy-profile"] = function () {
"erroneousFeature": operation "erroneousFeature": operation
}; };
continueToCheckNextInputs = false; continueToCheckNextInputs = false;
} } else {
else {
childInputCount = 0; childInputCount = 0;
childInputArray = []; childInputArray = [];
emptyChildInputCount = 0; emptyChildInputCount = 0;
@ -565,8 +564,8 @@ validateStep["policy-profile"] = function () {
// If empty child inputs are present // If empty child inputs are present
validationStatus = { validationStatus = {
"error": true, "error": true,
"subErrorMsg": "One or more package names of " + "subErrorMsg": "One or more package names of applications are" +
"applications are empty.", " empty.",
"erroneousFeature": operation "erroneousFeature": operation
}; };
continueToCheckNextInputs = false; continueToCheckNextInputs = false;
@ -574,8 +573,7 @@ validateStep["policy-profile"] = function () {
// If duplicate input is present // If duplicate input is present
validationStatus = { validationStatus = {
"error": true, "error": true,
"subErrorMsg": "Duplicate values exist with " + "subErrorMsg": "Duplicate values exist with for package names.",
"for package names.",
"erroneousFeature": operation "erroneousFeature": operation
}; };
continueToCheckNextInputs = false; continueToCheckNextInputs = false;
@ -2321,14 +2319,12 @@ var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) {
var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneID, valueSet) { var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneID, valueSet) {
var selectedValueOnChange = selectElement.value; var selectedValueOnChange = selectElement.value;
var i, slideDownVotes = 0; var i, slideDownVotes = 0;
for (i = 0; i < valueSet.length; i++) { for (i = 0; i < valueSet.length; i++) {
if (selectedValueOnChange == valueSet[i]) { if (selectedValueOnChange == valueSet[i]) {
slideDownVotes++; slideDownVotes++;
} }
} }
var paneSelector = "#" + paneID; var paneSelector = "#" + paneID;
if (slideDownVotes > 0) { if (slideDownVotes > 0) {
$(paneSelector).removeClass("hidden"); $(paneSelector).removeClass("hidden");

11
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
Unescape View File

@ -1314,9 +1314,7 @@
</div> </div>
</div> </div>
</div> </div>
<!-- cosu-system-update-policy --> <!-- cosu-system-update-policy -->
<!--
<div class="wr-hidden-operation" data-operation="cosu-system-update-policy"> <div class="wr-hidden-operation" data-operation="cosu-system-update-policy">
<div class="panel panel-default operation-data" data-operation="cosu-system-update-policy" <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy"
data-operation-code="SYSTEM_UPDATE_POLICY"> data-operation-code="SYSTEM_UPDATE_POLICY">
@ -1332,8 +1330,7 @@
<hr> <hr>
<div class="panel-title-description"> <div class="panel-title-description">
This configuration can be used to set system update policy to an Android Device in COSU. This configuration can be used to set system update policy to an Android Device in COSU.
Once this configuration profile is installed on a device, corresponding users will not be Once this configuration profile is installed on a device, corresponding users will not be able
able
to modify these settings on their devices. to modify these settings on their devices.
</div> </div>
</h2> </h2>
@ -1464,9 +1461,7 @@
</div> </div>
</div> </div>
</div> </div>
-->
<!-- cosu-whitelist-applications --> <!-- cosu-whitelist-applications -->
<!--
<div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications"> <div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
<div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications" <div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
data-operation-code="KIOSK_APPS"> data-operation-code="KIOSK_APPS">
@ -1482,8 +1477,7 @@
<hr> <hr>
<div class="panel-title-description"> <div class="panel-title-description">
This configuration can be used to whitelist applications in lock task mode of an Android Device in COSU. This configuration can be used to whitelist applications in lock task mode of an Android Device in COSU.
Once this configuration profile is installed on a device, corresponding users will not be Once this configuration profile is installed on a device, corresponding users will not be able
able
to modify these settings on their devices. to modify these settings on their devices.
</div> </div>
</h2> </h2>
@ -1563,6 +1557,5 @@
</div> </div>
</div> </div>
</div> </div>
-->
</div> </div>
</div> </div>

3
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
Unescape View File

@ -83,7 +83,6 @@
<span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span> <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
</a> </a>
</div> </div>
<div class="wr-hidden-operations-content col-lg-8"> <div class="wr-hidden-operations-content col-lg-8">
<!-- passcode-policy --> <!-- passcode-policy -->
<div class="wr-hidden-operation" data-operation="passcode-policy" style="display: block"> <div class="wr-hidden-operation" data-operation="passcode-policy" style="display: block">
@ -1238,7 +1237,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- cosu-system-update-policy --> <!-- cosu-system-update-policy -->
<div class="wr-hidden-operation hide" data-operation="cosu-system-update-policy"> <div class="wr-hidden-operation hide" data-operation="cosu-system-update-policy">
<div class="panel panel-default operation-data" data-operation="cosu-system-update-policy" <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy"
@ -1385,7 +1383,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- cosu-whitelist-applications --> <!-- cosu-whitelist-applications -->
<div class="wr-hidden-operation hide" data-operation="cosu-whitelisted-applications"> <div class="wr-hidden-operation hide" data-operation="cosu-whitelisted-applications">
<div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications" <div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"

Write Preview
Loading…
Cancel
Save