inosh
/
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 #854 from milanperera/release-320

Browse Source 
Fixed wso2/product-iots#1427
revert-dabc3590
Ruwan 7 years ago committed by GitHub
parent ae827b5fef 873505dc17
commit a27f032be2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 74 deletions
Show Stats Download Patch File Download Diff File

36
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-edit/public/templates/android-policy-edit.hbs
Unescape View File

@ -473,6 +473,24 @@
</span> </span>
</label> </label>
</div> </div>
<br>
<div>
<ul class="message message-info">
<i class="icon fw fw-info"></i>
<a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is the
<b>device owner</b>.</a>
</ul>
</div>
<div class="wr-input-control">
<label class="wr-input-control checkbox">
<input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
data-key="disallowSMS"/>
<span class="helper" title="Users are restricted from sending SMS messages.">
Disallow SMS
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
</label>
</div>
<br> <br>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
@ -506,24 +524,6 @@
</span> </span>
</label> </label>
</div> </div>
<div>
<ul class="message message-info">
<i class="icon fw fw-info"></i>
<a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is the
<b>device owner</b>.</a>
</ul>
</div>
<div class="wr-input-control">
<label class="wr-input-control checkbox">
<input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
data-key="disallowSMS"/>
<span class="helper" title="Users are restricted from sending SMS messages.">
Disallow SMS
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
</label>
</div>
<br>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="volume-adjust-enabled" type="checkbox" class="operationDataKeys" <input id="volume-adjust-enabled" type="checkbox" class="operationDataKeys"

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

@ -485,7 +485,27 @@
</label> </label>
</div> </div>
<br> <br>
<div class="wr-input-control worker-profile-or-owner"> <div class="device-owner">
<ul class="message message-info device-owner">
<i class="icon fw fw-info"></i>
<a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is
the
<b>device owner</b>.</a>
</ul>
</div>
<br/>
<div class="wr-input-control device-owner">
<label class="wr-input-control checkbox">
<input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
data-key="disallowSMS"/>
<span class="helper" title="Users are restricted from sending SMS messages.">
Disallow SMS
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
</label>
</div>
<br>
<div class="wr-input-control device-owner">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys" <input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys"
data-key="ensureVerifyApps"/> data-key="ensureVerifyApps"/>
@ -496,7 +516,7 @@
</label> </label>
</div> </div>
<br> <br>
<div class="wr-input-control worker-profile-or-owner"> <div class="wr-input-control device-owner">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys" <input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys"
data-key="enableAutoTime"/> data-key="enableAutoTime"/>
@ -507,7 +527,7 @@
</label> </label>
</div> </div>
<br> <br>
<div class="wr-input-control worker-profile-or-owner"> <div class="wr-input-control device-owner">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys" <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
data-key="disableScreenCapture"/> data-key="disableScreenCapture"/>
@ -517,36 +537,6 @@
</span> </span>
</label> </label>
</div> </div>
<div class="device-owner">
<ul class="message message-info device-owner">
<i class="icon fw fw-info"></i>
<a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is
the
<b>device owner</b>.</a>
{{#unless isdeviceownerenabled}}
<p><i>Please change the configuration <b>'isDeviceOwnerEnabled'</b> to
<b>'true'</b> if you have enabled device owner for the agent.</i></p>
{{/unless}}
</ul>
</div>
<br/>
<div
{{#unless isdeviceownerenabled}}
class="testing" title="Please change the configuration 'isDeviceOwnerEnabled' to
'true' if you have enabled device owner for the agent."
{{/unless}}
>
<div class="wr-input-control device-owner">
<label class="wr-input-control checkbox">
<input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
data-key="disallowSMS"/>
<span class="helper" title="Users are restricted from sending SMS messages.">
Disallow SMS
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
</label>
</div>
<br>
<div class="wr-input-control device-owner"> <div class="wr-input-control device-owner">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="volume-adjust-enabled" type="checkbox" class="operationDataKeys" <input id="volume-adjust-enabled" type="checkbox" class="operationDataKeys"

Write Preview
Loading…
Cancel
Save