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

Merge pull request #436 from DimalChandrasiri/IoTS-1.0.0

Browse Source 
Merging UI fixes
revert-70aa11f8
Charitha Goonetilleke 8 years ago committed by GitHub
parent c0d1beda36 54bb91d428
commit 027498895a
3 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File

12
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/layouts/cdmf.layout.default.hbs
Unescape View File

@ -50,15 +50,17 @@ under the License. --}}
{{defineZone "header"}} {{defineZone "header"}}
<div class="navbar-wrapper">
{{defineZone "navbars"}}
</div>
{{defineZone "sidePanes"}} {{defineZone "sidePanes"}}
<!-- page-content-wrapper --> <!-- page-content-wrapper -->
<div class="page-content-wrapper"> <div class="page-content-wrapper">
{{defineZone "contentTitle"}}
<div class="navbar-wrapper">
{{defineZone "navbars"}}
</div>
{{!defineZone "contentTitle"}}
<div class="container-fluid "> <div class="container-fluid ">
<div class="body-wrapper"> <div class="body-wrapper">
{{defineZone "content"}} {{defineZone "content"}}

106
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs
Unescape View File

@ -13,61 +13,59 @@
<div class="page-content-wrapper"> <div class="page-content-wrapper">
<div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;"> <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
<div class="media"> <div class="media">
<div class="media-body asset-desc add-padding-left-5x"> <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
<div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px"> Policy Overview
Policy Overview </div>
</div> {{#defineZone "policy-detail-properties"}}
{{#defineZone "policy-detail-properties"}} <table class="table table-responsive table-striped" id="members">
<table class="table table-responsive table-striped" id="members"> <tbody>
<tbody> <tr role="row" class="even">
<tr role="row" class="even"> <td class="sorting_1" style="padding:10px 15px; width: 14%;">Platform</td>
<td class="sorting_1" style="padding:10px 15px; width: 14%;">Platform</td> <td id="policy-platform" style="padding:10px 15px;"></td>
<td id="policy-platform" style="padding:10px 15px;"></td> </tr>
</tr> <tr role="row" class="odd">
<tr role="row" class="odd"> <td class="sorting_1" style="padding:10px 15px;">Ownership</td>
<td class="sorting_1" style="padding:10px 15px;">Ownership</td> <td id="policy-assignment" style="padding:10px 15px;"></td>
<td id="policy-assignment" style="padding:10px 15px;"></td> </tr>
</tr> <tr role="row" class="even">
<tr role="row" class="even"> <td class="sorting_1" style="padding:10px 15px;">Action upon non-compliance</td>
<td class="sorting_1" style="padding:10px 15px;">Action upon non-compliance</td> <td id="policy-action" style="padding:10px 15px;"></td>
<td id="policy-action" style="padding:10px 15px;"></td> </tr>
</tr> <tr role="row" class="even">
<tr role="row" class="even"> <td class="sorting_1" style="padding:10px 15px;">Status</td>
<td class="sorting_1" style="padding:10px 15px;">Status</td> <td id="policy-status" style="padding:10px 15px;"></td>
<td id="policy-status" style="padding:10px 15px;"></td> </tr>
</tr> <tr role="row" id="users-row" class="even">
<tr role="row" id="users-row" class="even"> <td class="sorting_1" style="padding:10px 15px;">Assigned Users</td>
<td class="sorting_1" style="padding:10px 15px;">Assigned Users</td> <td id="policy-users" style="padding:10px 15px;"></td>
<td id="policy-users" style="padding:10px 15px;"></td> </tr>
</tr> <tr role="row" id="roles-row" class="even">
<tr role="row" id="roles-row" class="even"> <td class="sorting_1" style="padding:10px 15px;">Assigned Roles</td>
<td class="sorting_1" style="padding:10px 15px;">Assigned Roles</td> <td id="policy-roles" style="padding:10px 15px;"></td>
<td id="policy-roles" style="padding:10px 15px;"></td> </tr>
</tr> </tbody>
</tbody> </table>
</table> {{/defineZone}}
{{/defineZone}} <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Description
<div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Description </div>
</div> <div class="add-margin-top-4x">
<div class="add-margin-top-4x"> <div id="policy-description" class="panel-title-description"></div>
<div id="policy-description" class="panel-title-description"></div> </div>
</div> <br>
<br> <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
<div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px"> Profile Information
Profile Information </div>
<div class="add-margin-top-4x">
<div id="policy-profile-main-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div> </div>
<div class="add-margin-top-4x"> <div class="wr-advance-operations">
<div id="policy-profile-main-error-msg" class="alert alert-danger hidden" role="alert"> <div class="wr-advance-operations-init">
<i class="icon fw fw-error"></i><span></span> <br>
</div> <i class="fw fw-settings fw-spin fw-2x"></i>
<div class="wr-advance-operations"> Loading platform features . . .
<div class="wr-advance-operations-init"> <br>
<br> <br>
<i class="fw fw-settings fw-spin fw-2x"></i>
Loading platform features . . .
<br>
<br>
</div>
</div> </div>
</div> </div>
</div> </div>

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
Unescape View File

@ -3522,7 +3522,7 @@ a.btn-operations {
font-size: 13px; font-size: 13px;
color: #fff; color: #fff;
background: #11375B; background: #11375B;
padding: 10px 24px; padding: 5px 20px;
display: inline-block; display: inline-block;
margin-right: 2px; margin-right: 2px;
text-decoration: none; text-decoration: none;

Write Preview
Loading…
Cancel
Save