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

Fixing dashboard styling issues

Browse Source
revert-70aa11f8
Rasika Perera 8 years ago
parent c967fc34d0
commit 9148c3baea
2 changed files with 65 additions and 82 deletions
Show Stats Download Patch File Download Diff File

129
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs
Unescape View File

@ -26,25 +26,26 @@
{{/zone}} {{/zone}}
{{#zone "content"}} {{#zone "content"}}
<div class="wr-content"> <div class="row">
{{#if permissions.VIEW_DASHBOARD}} {{#if permissions.VIEW_DASHBOARD}}
<div class="row wr-stats-board"> <div class="col-md-3 wr-stats-board">
<div class="col-md-4"> <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">{{deviceCount}}</span>
<span id="device-count">{{device_count}}</span>
<span class="tile-stats-free"> <span class="tile-stats-free">
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/devices"> {{#if deviceCount}}
<span class="fw-stack"> <a href="{{@app.context}}/devices">
<i class="fw fw-ring fw-stack-2x"></i> <span class="fw-stack">
<i class="fw fw-view fw-stack-1x"></i> <i class="fw fw-ring fw-stack-2x"></i>
</span> <i class="fw fw-view fw-stack-1x"></i>
View </span>
</a> View
</a>
{{/if}}
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/device/enroll"> <a href="{{@app.context}}/device/enroll">
<span class="fw-stack"> <span class="fw-stack">
@ -54,20 +55,19 @@
Add Add
</a> </a>
</span> </span>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row wr-stats-board"> <div class="col-md-3 wr-stats-board">
<div class="col-md-4"> <div class="wr-stats-board-tile">
<div class="wr-stats-board-tile"> <div class="tile-name">Groups</div>
<div class="tile-name">Groups</div> <div>
<div> <div class="tile-icon"><i class="fw fw-grouping"></i></div>
<div class="tile-icon"><i class="fw fw-grouping"></i></div> <div class="tile-stats">
<div class="tile-stats"> <span id="group-count">{{groupCount}}</span>
<span id="group-count">{{group_count}}</span>
<span class="tile-stats-free"> <span class="tile-stats-free">
{{#if groupCount}}
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/groups"> <a href="{{@app.context}}/groups">
<span class="fw-stack"> <span class="fw-stack">
@ -76,6 +76,7 @@
</span> </span>
View View
</a> </a>
{{/if}}
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/group/add"> <a href="{{@app.context}}/group/add">
<span class="fw-stack"> <span class="fw-stack">
@ -85,20 +86,19 @@
Add Add
</a> </a>
</span> </span>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row wr-stats-board"> <div class="col-md-3 wr-stats-board">
<div class="col-md-4"> <div class="wr-stats-board-tile">
<div class="wr-stats-board-tile"> <div class="tile-name">Users</div>
<div class="tile-name">Users</div> <div>
<div> <div class="tile-icon"><i class="fw fw-user"></i></div>
<div class="tile-icon"><i class="fw fw-user"></i></div> <div class="tile-stats">
<div class="tile-stats"> <span id="user-count">{{userCount}}</span>
<span id="user-count">{{user_count}}</span>
<span class="tile-stats-free"> <span class="tile-stats-free">
{{#if userCount}}
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/users"> <a href="{{@app.context}}/users">
<span class="fw-stack"> <span class="fw-stack">
@ -107,6 +107,7 @@
</span> </span>
View View
</a> </a>
{{/if}}
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/user/add"> <a href="{{@app.context}}/user/add">
<span class="fw-stack"> <span class="fw-stack">
@ -116,20 +117,19 @@
Add Add
</a> </a>
</span> </span>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row wr-stats-board"> <div class="col-md-3 wr-stats-board">
<div class="col-md-4"> <div class="wr-stats-board-tile">
<div class="wr-stats-board-tile"> <div class="tile-name">Policies</div>
<div class="tile-name">Policies</div> <div>
<div> <div class="tile-icon"><i class="fw fw-policy"></i></div>
<div class="tile-icon"><i class="fw fw-policy"></i></div> <div class="tile-stats">
<div class="tile-stats"> <span id="policy-count">{{policyCount}}</span>
<span id="policy-count">{{policy_count}}</span>
<span class="tile-stats-free"> <span class="tile-stats-free">
{{#if policyCount}}
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/policies"> <a href="{{@app.context}}/policies">
<span class="fw-stack"> <span class="fw-stack">
@ -138,6 +138,7 @@
</span> </span>
View View
</a> </a>
{{/if}}
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/policy/add"> <a href="{{@app.context}}/policy/add">
<span class="fw-stack"> <span class="fw-stack">
@ -147,20 +148,19 @@
Add Add
</a> </a>
</span> </span>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row wr-stats-board"> <div class="col-md-3 wr-stats-board">
<div class="col-md-4"> <div class="wr-stats-board-tile">
<div class="wr-stats-board-tile"> <div class="tile-name">Roles</div>
<div class="tile-name">Roles</div> <div>
<div> <div class="tile-icon"><i class="fw fw-bookmark"></i></div>
<div class="tile-icon"><i class="fw fw-bookmark"></i></div> <div class="tile-stats">
<div class="tile-stats"> <span id="role-count">{{roleCount}}</span>
<span id="role-count">{{role_count}}</span>
<span class="tile-stats-free"> <span class="tile-stats-free">
{{#if roleCount}}
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a id="device-count-view-btn" href="{{@app.context}}/roles"> <a id="device-count-view-btn" href="{{@app.context}}/roles">
<span class="fw-stack"> <span class="fw-stack">
@ -169,6 +169,7 @@
</span> </span>
View View
</a> </a>
{{/if}}
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/roles/add-role"> <a href="{{@app.context}}/roles/add-role">
<span class="fw-stack"> <span class="fw-stack">
@ -178,32 +179,14 @@
Add Add
</a> </a>
</span> </span>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{{else}} {{else}}
Permission denied <h1 class="page-sub-title">
Permitted None
</h1>
{{/if}} {{/if}}
</div> </div>
<div id="qr-code-modal" data-enrollment-url="{{enrollmentURL}}" class="hidden">
<div class="content">
<div class="row">
<div class="col-lg-5 col-md-6 col-centered">
<h3>
Scan QR code to start enrollment
</h3>
<h4>
Please scan the QR code using your mobile device to retrieve enrollment URL.
</h4>
<div class="panel panel-default">
<div class="panel-body col-centered ">
<div class="qr-code"></div>
</div>
</div>
</div>
</div>
</div>
</div>
{{/zone}} {{/zone}}

18
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.js
Unescape View File

@ -32,16 +32,16 @@ function onRequest() {
return; return;
} }
var page = {}; var viewModel = {};
page.permissions = permissions; viewModel.permissions = permissions;
page.enrollmentURL = devicemgtProps.enrollmentURL; viewModel.enrollmentURL = devicemgtProps.enrollmentURL;
page.device_count = deviceModule.getDevicesCount(); viewModel.deviceCount = deviceModule.getDevicesCount();
//TODO: Enable Group Management Service API on CDMF //TODO: Enable Group Management Service API on CDMF
//page.group_count = groupModule.getGroupCount(); //page.group_count = groupModule.getGroupCount();
page.group_count = -1; viewModel.groupCount = -1;
page.user_count = userModule.getUsersCount(); viewModel.userCount = userModule.getUsersCount();
page.policy_count = policyModule.getPoliciesCount(); viewModel.policyCount = policyModule.getPoliciesCount();
page.role_count = userModule.getRolesCount(); viewModel.roleCount = userModule.getRolesCount();
return page; return viewModel;
} }
Write Preview
Loading…
Cancel
Save