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

Merge pull request #374 from saadsahibjan/master

Browse Source 
Remove blank line space - AFW COSU
revert-dabc3590
inoshperera 8 years ago committed by GitHub
parent 9d62731a1c 6f0b7cb5b7
commit e7f8f0363d
6 changed files with 50 additions and 84 deletions
Show Stats Download Patch File Download Diff File

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

@ -535,16 +535,13 @@ validateStep["policy-profile"] = function () {
// Updating validationStatusArray with validationStatus // Updating validationStatusArray with validationStatus
validationStatusArray.push(validationStatus); validationStatusArray.push(validationStatus);
} }
if ($.inArray(androidOperationConstants["KIOSK_APPS_CODE"], configuredOperations) != -1) { if ($.inArray(androidOperationConstants["KIOSK_APPS_CODE"], configuredOperations) != -1) {
//If COSU whitelisting applications configured //If COSU whitelisting applications configured
operation = androidOperationConstants["KIOSK_APPS"]; operation = androidOperationConstants["KIOSK_APPS"];
// Initializing continueToCheckNextInputs to true // Initializing continueToCheckNextInputs to true
continueToCheckNextInputs = true; continueToCheckNextInputs = true;
var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input"; var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
if (continueToCheckNextInputs) { if (continueToCheckNextInputs) {
if ($(whitelistedApplicationsGridChildInputs).length == 0) { if ($(whitelistedApplicationsGridChildInputs).length == 0) {
validationStatus = { validationStatus = {
@ -609,20 +606,16 @@ validateStep["policy-profile"] = function () {
}; };
continueToCheckNextInputs = false; continueToCheckNextInputs = false;
} }
} }
} }
if (continueToCheckNextInputs) { if (continueToCheckNextInputs) {
validationStatus = { validationStatus = {
"error": false, "error": false,
"okFeature": operation "okFeature": operation
}; };
} }
// Updating validationStatusArray with validationStatus // Updating validationStatusArray with validationStatus
validationStatusArray.push(validationStatus); validationStatusArray.push(validationStatus);
} }
} }
} }
@ -2550,14 +2543,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");

5
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

@ -1201,14 +1201,12 @@
to modify these settings on their devices. to modify these settings on their devices.
</div> </div>
</div> </div>
<div id="cosu-system-update-policy-body hidden" class="panel-collapse panel-body collapse" role="tabpanel" <div id="cosu-system-update-policy-body hidden" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-system-update-policy-body"> aria-labelledby="cosu-system-update-policy-body">
<hr/> <hr/>
<div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert"> <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label"> <label class="wr-input-label">
System Update System Update
@ -1242,7 +1240,6 @@
</span> </span>
</label> </label>
</div> </div>
<div id="cosu-system-update-policy-window-select" class="hidden"> <div id="cosu-system-update-policy-window-select" class="hidden">
<div> <div>
<ul class="message message-info"> <ul class="message message-info">
@ -1326,7 +1323,6 @@
</select> </select>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -1352,7 +1348,6 @@
to modify these settings on their devices. to modify these settings on their devices.
</div> </div>
</div> </div>
<div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-whitelisted-applications-body"> aria-labelledby="cosu-whitelisted-applications-body">
<hr/> <hr/>

6
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

@ -515,9 +515,7 @@ validateStep["policy-profile"] = function () {
operation = androidOperationConstants["KIOSK_APPS"]; operation = androidOperationConstants["KIOSK_APPS"];
// Initializing continueToCheckNextInputs to true // Initializing continueToCheckNextInputs to true
continueToCheckNextInputs = true; continueToCheckNextInputs = true;
var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input"; var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
if (continueToCheckNextInputs) { if (continueToCheckNextInputs) {
if ($(whitelistedApplicationsGridChildInputs).length == 0) { if ($(whitelistedApplicationsGridChildInputs).length == 0) {
validationStatus = { validationStatus = {
@ -582,20 +580,16 @@ validateStep["policy-profile"] = function () {
}; };
continueToCheckNextInputs = false; continueToCheckNextInputs = false;
} }
} }
} }
if (continueToCheckNextInputs) { if (continueToCheckNextInputs) {
validationStatus = { validationStatus = {
"error": false, "error": false,
"okFeature": operation "okFeature": operation
}; };
} }
// Updating validationStatusArray with validationStatus // Updating validationStatusArray with validationStatus
validationStatusArray.push(validationStatus); validationStatusArray.push(validationStatus);
} }
} }
} if (policy["platform"] == platformTypeConstants["WINDOWS"]) { } if (policy["platform"] == platformTypeConstants["WINDOWS"]) {

5
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

@ -1334,14 +1334,12 @@
</div> </div>
</h2> </h2>
</div> </div>
<div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-system-update-policy-body"> aria-labelledby="cosu-system-update-policy-body">
<div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert"> <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label"> <label class="wr-input-label">
System Update System Update
@ -1375,7 +1373,6 @@
</span> </span>
</label> </label>
</div> </div>
<div id="cosu-system-update-policy-window-select" class="hidden"> <div id="cosu-system-update-policy-window-select" class="hidden">
<div> <div>
<ul class="message message-info"> <ul class="message message-info">
@ -1486,14 +1483,12 @@
</div> </div>
</h2> </h2>
</div> </div>
<div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-whitelisted-applications-body"> aria-labelledby="cosu-whitelisted-applications-body">
<div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert"> <div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="cosu-whitelisted-applications"> <label class="wr-input-label" for="cosu-whitelisted-applications">
Whitelisted Applications to enter Lock Task Mode Whitelisted Applications to enter Lock Task Mode

2
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/js/view.js
Unescape View File

@ -1954,14 +1954,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");

7
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

@ -1260,14 +1260,11 @@
</div> </div>
</h2> </h2>
</div> </div>
<div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-system-update-policy-body"> aria-labelledby="cosu-system-update-policy-body">
<div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert"> <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label"> <label class="wr-input-label">
System Update System Update
@ -1301,7 +1298,6 @@
</span> </span>
</label> </label>
</div> </div>
<div id="cosu-system-update-policy-window-select" class="hidden"> <div id="cosu-system-update-policy-window-select" class="hidden">
<div> <div>
<ul class="message message-info"> <ul class="message message-info">
@ -1385,7 +1381,6 @@
</select> </select>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -1412,14 +1407,12 @@
</div> </div>
</h2> </h2>
</div> </div>
<div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-whitelisted-applications-body"> aria-labelledby="cosu-whitelisted-applications-body">
<div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert"> <div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="cosu-whitelisted-applications"> <label class="wr-input-label" for="cosu-whitelisted-applications">
Whitelisted Applications to enter Lock Task Mode Whitelisted Applications to enter Lock Task Mode

Write Preview
Loading…
Cancel
Save