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

Merge remote-tracking branch 'upstream/master'

Browse Source
revert-dabc3590
Megala 8 years ago
parent 588f75cef5 cc0ae4444d
commit 9f75c3a9a9
5 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File

6
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
Unescape View File

@ -311,10 +311,10 @@ var InitiateViewOption = null;
$(document).ready(function () { $(document).ready(function () {
$(".device-detail-body").removeClass("hidden"); $(".device-detail-body").removeClass("hidden");
$("#loading-content").remove(); $("#loading-content").remove();
if ($("#tabs").data("status") !== false) { if ($("#tabs").data("status")) {
loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE);
}
loadOperationsLog(false); loadOperationsLog(false);
}
loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE);
loadApplicationsList(); loadApplicationsList();
loadPolicyCompliance(); loadPolicyCompliance();

5
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
Unescape View File

@ -156,17 +156,19 @@
</a> </a>
</li> </li>
{{/if}} {{/if}}
{{#if deviceView.isNotRemoved}}
<li role="presentation" class="list-group-item"> <li role="presentation" class="list-group-item">
<a href="#event_log_tab" role="tab" data-toggle="tab" aria-controls="event_log_tab"> <a href="#event_log_tab" role="tab" data-toggle="tab" aria-controls="event_log_tab">
<i class="icon fw fw-text"></i><span class="hidden-sm">Operations Log</span> <i class="icon fw fw-text"></i><span class="hidden-sm">Operations Log</span>
</a> </a>
</li> </li>
{{/if}}
</ul> </ul>
</div> </div>
{{#defineZone "device-detail-properties"}} {{#defineZone "device-detail-properties"}}
<div class="media-body add-padding-left-5x remove-padding-xs"> <div class="media-body add-padding-left-5x remove-padding-xs">
<div class="panel-group tab-content remove-padding" id="tabs" role="tablist" <div class="panel-group tab-content remove-padding" id="tabs" role="tablist"
aria-multiselectable="true"> data-status="{{deviceView.isNotRemoved}}" aria-multiselectable="true">
<div class="arrow-left hidden-xs"></div> <div class="arrow-left hidden-xs"></div>
{{#if deviceView.isNotWindows}} {{#if deviceView.isNotWindows}}
@ -428,7 +430,6 @@
</div> </div>
<div class="panel-heading display-none-xs"> <div class="panel-heading display-none-xs">
Operations Log Operations Log
&nbsp;&nbsp;
<span> <span>
<a href="javascript:void(0);" id="refresh-operations"> <a href="javascript:void(0);" id="refresh-operations">
<i class="fw fw-refresh"></i> <i class="fw fw-refresh"></i>

11
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

@ -925,7 +925,10 @@
<br> <br>
</label> </label>
<select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType"> <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType">
<option value="black-list" selected="selected">Black List</option> <option value="" selected="selected">
None
</option>
<option value="black-list">Black List</option>
<option value="white-list">White List</option> <option value="white-list">White List</option>
</select> </select>
@ -935,8 +938,9 @@
<span class="helper" title="Add an application to restrict."> <span class="helper" title="Add an application to restrict.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
<br> </label>
<a href="#restricted-applications-grid" class="grid-input-add" data-click-event="add-form"> <br/>
<a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add " data-click-event="add-form">
<span class="icon fw-stack"> <span class="icon fw-stack">
<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>
@ -944,7 +948,6 @@
&nbsp; &nbsp;
Add Application Add Application
</a> </a>
</label>
<div id="restricted-applications" <div id="restricted-applications"
class="operationDataKeys grouped-array-input multi-column-key-value-pair-array" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
data-key="restrictedApplications" data-column-count="2"> data-key="restrictedApplications" data-column-count="2">

17
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.hbs
Unescape View File

@ -62,7 +62,7 @@
<i class="fw fw-application fw-stack-1x"></i> <i class="fw fw-application fw-stack-1x"></i>
<i class="fw fw-block fw-stack-2x"></i> <i class="fw fw-block fw-stack-2x"></i>
</span> </span>
Applications 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>
@ -941,6 +941,13 @@
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>
</div> </div>
<label class="wr-input-label" for="app-restriction-type">
Select type
<span class="helper" title="Select a type to proceed.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
<br>
</label>
<select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType"> <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType">
<option value="" selected="selected"> <option value="" selected="selected">
None None
@ -951,12 +958,13 @@
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="restricted-applications"> <label class="wr-input-label" for="restricted-applications">
Restricted Application List <br><br>Restricted Application List
<span class="helper" title="Add an application to restrict."> <span class="helper" title="Add an application to restrict.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
<br> </label>
<a href="#restricted-applications-grid" class="grid-input-add" data-click-event="add-form"> <br/>
<a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add " data-click-event="add-form">
<span class="icon fw-stack"> <span class="icon fw-stack">
<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>
@ -964,7 +972,6 @@
&nbsp; &nbsp;
Add Application Add Application
</a> </a>
</label>
<div id="restricted-applications" <div id="restricted-applications"
class="operationDataKeys grouped-array-input multi-column-key-value-pair-array" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
data-key="restrictedApplications" data-column-count="2"> data-key="restrictedApplications" data-column-count="2">

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

@ -911,13 +911,13 @@
<br> <br>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="restricted-applications"> <label class="wr-input-label" for="restricted-applications">
Restricted Application List <br><br>Restricted Application List
<span class="helper" title="Add an application to restrict."> <span class="helper" title="Add an application to restrict.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
<br> </label>
<br> <br/>
<a href="#restricted-applications-grid" class="grid-input-add hidden" data-click-event="add-form"> <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add hidden" data-click-event="add-form">
<span class="icon fw-stack"> <span class="icon fw-stack">
<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>
@ -925,7 +925,6 @@
&nbsp; &nbsp;
Add Application Add Application
</a> </a>
</label>
<div id="restricted-applications" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array" data-key="restrictedApplications" data-column-count="2"> <div id="restricted-applications" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array" data-key="restrictedApplications" data-column-count="2">
<table class="table table-responsive table-striped"> <table class="table table-responsive table-striped">
<thead> <thead>

Write Preview
Loading…
Cancel
Save