osh.silva
/
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
thusithakalugamage 8 years ago
parent 606ee9a5a4 0456c741e9
commit dc7bc22aa0
3 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File

86
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
Unescape View File

@ -19,15 +19,15 @@
{{unit "cdmf.unit.lib.qrcode"}} {{unit "cdmf.unit.lib.qrcode"}}
{{unit "mdm.unit.device.qr-modal"}} {{unit "mdm.unit.device.qr-modal"}}
{{#zone "content"}} {{#zone "content"}}
{{#if permissions.LIST_DEVICES}} {{#if permissions.LIST_DEVICES}}
<div class="row "> <div class="row ">
<div class="col-md-3 wr-stats-board"> <div class="col-md-3 wr-stats-board">
<div class="wr-stats-board-tile"> <div class="wr-stats-board-tile">
<div class="tile-name">Devices</div> <div class="tile-name">Devices</div>
<div> <div>
<div class="tile-icon"><i class="fw fw-mobile"></i></div> <div class="tile-icon"><i class="fw fw-mobile"></i></div>
<div class="tile-stats"> <div class="tile-stats">
<span id="device-count" data-device-count="true">Loading...</span> <span id="device-count" data-device-count="true">Loading...</span>
<span class="tile-stats-free"> <span class="tile-stats-free">
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a id="device-count-view-btn" href="{{@app.context}}/devices"> <a id="device-count-view-btn" href="{{@app.context}}/devices">
@ -37,27 +37,29 @@
</span> </span>
View View
</a> </a>
<a href="javascript:toggleEnrollment()"> {{#if permissions.ENROLL_DEVICE)}}
<a href="javascript:toggleEnrollment()">
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-add fw-stack-1x"></i> <i class="fw fw-add fw-stack-1x"></i>
</span> </span>
Add Add
</a> </a>
{{/if}}
</span> </span>
</div>
</div> </div>
</div> </div>
</div> </div>
{{/if}} </div>
{{# if permissions.LIST_POLICIES}} {{/if}}
<div class="col-md-3 wr-stats-board"> {{# if permissions.LIST_POLICIES}}
<div class="wr-stats-board-tile"> <div class="col-md-3 wr-stats-board">
<div class="tile-name">Policies</div> <div class="wr-stats-board-tile">
<div> <div class="tile-name">Policies</div>
<div class="tile-icon"><i class="fw fw-policy"></i></div> <div>
<div class="tile-stats"> <div class="tile-icon"><i class="fw fw-policy"></i></div>
<span id="policy-count" data-policy-count="true">Loading...</span> <div class="tile-stats">
<span id="policy-count" data-policy-count="true">Loading...</span>
<span class="tile-stats-free"> <span class="tile-stats-free">
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a id="policy-count-view-btn" href="{{@app.context}}/policies/"> <a id="policy-count-view-btn" href="{{@app.context}}/policies/">
@ -78,19 +80,19 @@
</a> </a>
{{/if}} {{/if}}
</span> </span>
</div>
</div> </div>
</div> </div>
</div> </div>
{{/if}} </div>
{{# if permissions.LIST_USERS}} {{/if}}
<div class="col-md-3 wr-stats-board"> {{# if permissions.LIST_USERS}}
<div class="wr-stats-board-tile"> <div class="col-md-3 wr-stats-board">
<div class="tile-name">Users</div> <div class="wr-stats-board-tile">
<div> <div class="tile-name">Users</div>
<div class="tile-icon"><i class="fw fw-user"></i></div> <div>
<div class="tile-stats"> <div class="tile-icon"><i class="fw fw-user"></i></div>
<span id="user-count" data-user-count="true">Loading...</span> <div class="tile-stats">
<span id="user-count" data-user-count="true">Loading...</span>
<span class="tile-stats-free"> <span class="tile-stats-free">
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a id="user-count-view-btn" href="{{@app.context}}/users/"> <a id="user-count-view-btn" href="{{@app.context}}/users/">
@ -111,19 +113,19 @@
</a> </a>
{{/if}} {{/if}}
</span> </span>
</div>
</div> </div>
</div> </div>
</div> </div>
{{/if}} </div>
{{# if permissions.LIST_ROLES}} {{/if}}
<div class="col-md-3 wr-stats-board"> {{# if permissions.LIST_ROLES}}
<div class="wr-stats-board-tile"> <div class="col-md-3 wr-stats-board">
<div class="tile-name">Roles</div> <div class="wr-stats-board-tile">
<div> <div class="tile-name">Roles</div>
<div class="tile-icon"><i class="fw fw-bookmark"></i></div> <div>
<div class="tile-stats"> <div class="tile-icon"><i class="fw fw-bookmark"></i></div>
<span id="role-count" data-role-count="true">Loading...</span> <div class="tile-stats">
<span id="role-count" data-role-count="true">Loading...</span>
<span class="tile-stats-free"> <span class="tile-stats-free">
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a id="device-count-view-btn" href="{{@app.context}}/roles"> <a id="device-count-view-btn" href="{{@app.context}}/roles">
@ -144,12 +146,12 @@
</a> </a>
{{/if}} {{/if}}
</span> </span>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{{/if}} </div>
{{/if}}
{{/zone}} {{/zone}}
{{#zone "bottomJs"}} {{#zone "bottomJs"}}
{{js "js/dashboard.js"}} {{js "js/dashboard.js"}}

3
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
Unescape View File

@ -29,6 +29,9 @@ function onRequest(context) {
permissions.ADD_POLICY = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage"); permissions.ADD_POLICY = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage");
permissions.ADD_ROLE = userModule.isAuthorized("/permission/admin/device-mgt/roles/manage"); permissions.ADD_ROLE = userModule.isAuthorized("/permission/admin/device-mgt/roles/manage");
permissions.ADD_USER = userModule.isAuthorized("/permission/admin/device-mgt/users/manage"); permissions.ADD_USER = userModule.isAuthorized("/permission/admin/device-mgt/users/manage");
if (userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/ios") | userModule.isAuthorized("/permission/admin/devices/enroll/android") | userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/windows") ){
permissions.ENROLL_DEVICE = true;
}
viewModel.permissions = permissions; viewModel.permissions = permissions;
//TODO: Move enrollment URL into app-conf.json //TODO: Move enrollment URL into app-conf.json
viewModel.enrollmentURL = mdmProps.generalConfig.host + mdmProps.enrollmentDir; viewModel.enrollmentURL = mdmProps.generalConfig.host + mdmProps.enrollmentDir;

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

@ -110,7 +110,7 @@ function loadOperationBar(deviceType) {
var successCallback = function (data) { var successCallback = function (data) {
var permittedOperations = []; var permittedOperations = [];
var i; var i;
var permissionList = JSON.parse($("#operations-mod").data("permissions")); var permissionList = $("#operations-mod").data("permissions");
var totalFeatures = JSON.parse(data); var totalFeatures = JSON.parse(data);
for (i = 0; i < permissionList[deviceType].length; i++) { for (i = 0; i < permissionList[deviceType].length; i++) {
var j; var j;

Write Preview
Loading…
Cancel
Save