community
/
device-mgt-core
12
0
Fork 47
Code Issues Pull Requests 26 Packages Projects Releases Wiki Activity

Merge pull request #461 from DimalChandrasiri/release-2.0.x

Browse Source 
Release 2.0.x
merge-requests/7/head
Charitha Goonetilleke 8 years ago committed by GitHub
parent 22990087a0 f8d03e992e
commit ce144baec9
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/templates/certificate-listing.hbs
Unescape View File

@ -6,9 +6,9 @@
<i class="square-element text fw fw-document"></i> <i class="square-element text fw fw-document"></i>
</div> </div>
</td> </td>
<td class="fade-edge remove-padding-top" data-search="{{serialNumber}}" data-display="{{serialNumber}}"><i <td class="remove-padding-top" data-search="{{serialNumber}}" data-display="{{serialNumber}}"><i
class="fw-mobile"></i> {{serialNumber}}</td> class="fw-mobile"></i> {{serialNumber}}</td>
<td class="fade-edge remove-padding-top" data-search="{{subject}}" data-display="{{subject}}"><i <td class="remove-padding-top" data-search="{{subject}}" data-display="{{subject}}"><i
class="fw-policy"></i> {{subject}}</td> class="fw-policy"></i> {{subject}}</td>
<td class="text-right content-fill text-left-on-grid-view no-wrap"> <td class="text-right content-fill text-left-on-grid-view no-wrap">
{{#unequal adminUser serialNumber }} {{#unequal adminUser serialNumber }}

10
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/public/templates/device-listing.hbs
Unescape View File

@ -12,21 +12,21 @@
<i class="square-element text fw fw-mobile"></i> <i class="square-element text fw fw-mobile"></i>
</div> </div>
</td> </td>
<td class="fade-edge" data-search="{{properties.DEVICE_MODEL}},{{properties.VENDOR}}" data-display="{{properties.DEVICE_MODEL}}"> <td data-search="{{properties.DEVICE_MODEL}},{{properties.VENDOR}}" data-display="{{properties.DEVICE_MODEL}}">
<h4>Device {{name}}</h4> <h4>Device {{name}}</h4>
{{#if properties.DEVICE_MODEL}} {{#if properties.DEVICE_MODEL}}
<div>({{properties.VENDOR}} - {{properties.DEVICE_MODEL}})</div> <div>({{properties.VENDOR}} - {{properties.DEVICE_MODEL}})</div>
{{/if}} {{/if}}
</td> </td>
<td class="fade-edge remove-padding-top" data-search="{{enrolmentInfo.owner}}" data-display="{{enrolmentInfo.owner}}" data-grid-label="Owner">{{enrolmentInfo.owner}}</td> <td class="remove-padding-top" data-search="{{enrolmentInfo.owner}}" data-display="{{enrolmentInfo.owner}}" data-grid-label="Owner">{{enrolmentInfo.owner}}</td>
<td class="fade-edge remove-padding-top" data-search="{{enrolmentInfo.status}}" data-display="{{enrolmentInfo.status}}" data-grid-label="Status"> <td class="remove-padding-top" data-search="{{enrolmentInfo.status}}" data-display="{{enrolmentInfo.status}}" data-grid-label="Status">
{{#equal enrolmentInfo.status "ACTIVE"}}<span><i class="fw fw-ok icon-success"></i> Active</span>{{/equal}} {{#equal enrolmentInfo.status "ACTIVE"}}<span><i class="fw fw-ok icon-success"></i> Active</span>{{/equal}}
{{#equal enrolmentInfo.status "INACTIVE"}}<span><i class="fw fw-warning icon-warning"></i> Inactive</span>{{/equal}} {{#equal enrolmentInfo.status "INACTIVE"}}<span><i class="fw fw-warning icon-warning"></i> Inactive</span>{{/equal}}
{{#equal enrolmentInfo.status "BLOCKED"}}<span><i class="fw fw-remove icon-danger"></i> Blocked</span>{{/equal}} {{#equal enrolmentInfo.status "BLOCKED"}}<span><i class="fw fw-remove icon-danger"></i> Blocked</span>{{/equal}}
{{#equal enrolmentInfo.status "REMOVED"}}<span><i class="fw fw-delete icon-danger"></i> Removed</span>{{/equal}} {{#equal enrolmentInfo.status "REMOVED"}}<span><i class="fw fw-delete icon-danger"></i> Removed</span>{{/equal}}
</td> </td>
<td class="fade-edge remove-padding-top" data-search="{{type}}" data-display="{{type}}" data-grid-label="Type">{{type}}</td> <td class="remove-padding-top" data-search="{{type}}" data-display="{{type}}" data-grid-label="Type">{{type}}</td>
<td class="fade-edge remove-padding-top" data-search="{{enrolmentInfo.ownership}}" data-display="{{enrolmentInfo.ownership}}" data-grid-label="Ownership">{{enrolmentInfo.ownership}}</td> <td class="remove-padding-top" data-search="{{enrolmentInfo.ownership}}" data-display="{{enrolmentInfo.ownership}}" data-grid-label="Ownership">{{enrolmentInfo.ownership}}</td>
<td class="text-right content-fill text-left-on-grid-view no-wrap"> <td class="text-right content-fill text-left-on-grid-view no-wrap">
<!--{{#equal type "TemperatureController"}} <!--{{#equal type "TemperatureController"}}
{{#equal status "INACTIVE"}} {{#equal status "INACTIVE"}}

10
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
Unescape View File

@ -265,7 +265,7 @@ function loadDevices(searchType, searchParam) {
{ {
targets: 1, targets: 1,
data: 'name', data: 'name',
class: 'fade-edge', class: '',
render: function (name, type, row, meta) { render: function (name, type, row, meta) {
var model = getPropertyValue(row.properties, 'DEVICE_MODEL'); var model = getPropertyValue(row.properties, 'DEVICE_MODEL');
var vendor = getPropertyValue(row.properties, 'VENDOR'); var vendor = getPropertyValue(row.properties, 'VENDOR');
@ -279,12 +279,12 @@ function loadDevices(searchType, searchParam) {
{ {
targets: 2, targets: 2,
data: 'user', data: 'user',
class: 'fade-edge remove-padding-top', class: 'remove-padding-top',
}, },
{ {
targets: 3, targets: 3,
data: 'status', data: 'status',
class: 'fade-edge remove-padding-top', class: 'remove-padding-top',
render: function (status, type, row, meta) { render: function (status, type, row, meta) {
var html; var html;
switch (status) { switch (status) {
@ -307,7 +307,7 @@ function loadDevices(searchType, searchParam) {
{ {
targets: 4, targets: 4,
data: 'deviceType', data: 'deviceType',
class: 'fade-edge remove-padding-top', class: 'remove-padding-top',
render: function (status, type, row, meta) { render: function (status, type, row, meta) {
return getDeviceTypeLabel(row.deviceType); return getDeviceTypeLabel(row.deviceType);
} }
@ -315,7 +315,7 @@ function loadDevices(searchType, searchParam) {
{ {
targets: 5, targets: 5,
data: 'ownership', data: 'ownership',
class: 'fade-edge remove-padding-top', class: 'remove-padding-top',
render: function (status, type, row, meta) { render: function (status, type, row, meta) {
if (getDeviceTypeCategory(row.deviceType) == 'mobile') { if (getDeviceTypeCategory(row.deviceType) == 'mobile') {
return row.ownership; return row.ownership;

6
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
Unescape View File

@ -135,17 +135,17 @@ function loadGroups() {
{ {
targets: 1, targets: 1,
data: 'name', data: 'name',
class: 'fade-edge' class: ''
}, },
{ {
targets: 2, targets: 2,
data: 'owner', data: 'owner',
class: 'fade-edge remove-padding-top', class: 'remove-padding-top',
}, },
{ {
targets: 3, targets: 3,
data: 'description', data: 'description',
class: 'fade-edge remove-padding-top', class: 'remove-padding-top',
}, },
{ {
targets: 4, targets: 4,

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

@ -187,7 +187,7 @@
<i class="fw fw-{{deviceTypeIcon}}" style="font-size: 59px"></i> <i class="fw fw-{{deviceTypeIcon}}" style="font-size: 59px"></i>
</div> </div>
</td> </td>
<td class="fade-edge" <td
data-search="{{name}}" data-search="{{name}}"
data-display="{{name}}"> data-display="{{name}}">
<h4>{{name}}</h4> <h4>{{name}}</h4>
@ -205,35 +205,35 @@
<span><i class="fw fw-error icon-danger"></i> Inactive</span> <span><i class="fw fw-error icon-danger"></i> Inactive</span>
{{/equal}} {{/equal}}
</td> </td>
<td class="fade-edge remove-padding-top" <td class="remove-padding-top"
data-search="{{platform}}" data-search="{{platform}}"
data-display="{{platform}}"> data-display="{{platform}}">
</td> </td>
<td class="fade-edge remove-padding-top" <td class="remove-padding-top"
data-search="{{ownershipType}}" data-search="{{ownershipType}}"
data-display="{{ownershipType}}" data-display="{{ownershipType}}"
data-grid-label="Ownership"> data-grid-label="Ownership">
{{ownershipType}} {{ownershipType}}
</td> </td>
<td id="policy-roles" class="fade-edge remove-padding-top" <td id="policy-roles" class="remove-padding-top"
data-search="{{roles}}" data-search="{{roles}}"
data-display="{{roles}}" data-display="{{roles}}"
data-grid-label="Role(s)"> data-grid-label="Role(s)">
{{roles}} {{roles}}
</td> </td>
<td id="policy-users" class="fade-edge remove-padding-top" <td id="policy-users" class="remove-padding-top"
data-search="{{users}}" data-search="{{users}}"
data-display="{{users}}" data-display="{{users}}"
data-grid-label="User(s)"> data-grid-label="User(s)">
{{users}} {{users}}
</td> </td>
<td class="fade-edge remove-padding-top" <td class="remove-padding-top"
data-search="{{compliance}}" data-search="{{compliance}}"
data-display="{{compliance}}" data-display="{{compliance}}"
data-grid-label="Compliance"> data-grid-label="Compliance">
{{compliance}} {{compliance}}
</td> </td>
<td id="policy-status" class="fade-edge remove-padding-top" <td id="policy-status" class="remove-padding-top"
data-search="{{status}}" data-search="{{status}}"
data-display="{{status}}"> data-display="{{status}}">
</td> </td>

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
Unescape View File

@ -128,7 +128,7 @@ function loadRoles() {
"</div>" "</div>"
}, },
{ {
class: "fade-edge", class: "",
data: "name", data: "name",
render: function (name, type, row, meta) { render: function (name, type, row, meta) {
return '<h4>' + name + '</h4>'; return '<h4>' + name + '</h4>';

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/templates/role-listing.hbs
Unescape View File

@ -5,7 +5,7 @@
<i class="square-element text fw fw-user"></i> <i class="square-element text fw fw-user"></i>
</div> </div>
</td> </td>
<td class="fade-edge remove-padding-top">{{roleName}}</td> <td class="remove-padding-top">{{roleName}}</td>
<td class="text-right content-fill text-left-on-grid-view no-wrap"> <td class="text-right content-fill text-left-on-grid-view no-wrap">
{{#unequal adminRole roleName }} {{#unequal adminRole roleName }}

6
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
Unescape View File

@ -304,7 +304,7 @@ function loadUsers() {
} }
}, },
{ {
class: "fade-edge", class: "",
data: null, data: null,
render: function (data, type, row, meta) { render: function (data, type, row, meta) {
if (!data.firstname && !data.lastname) { if (!data.firstname && !data.lastname) {
@ -315,14 +315,14 @@ function loadUsers() {
} }
}, },
{ {
class: "fade-edge remove-padding-top", class: "remove-padding-top",
data: 'filter', data: 'filter',
render: function (filter, type, row, meta) { render: function (filter, type, row, meta) {
return '<i class="fw-user"></i>' + filter; return '<i class="fw-user"></i>' + filter;
} }
}, },
{ {
class: "fade-edge remove-padding-top", class: "remove-padding-top",
data: null, data: null,
render: function (data, type, row, meta) { render: function (data, type, row, meta) {
if (!data.emailAddress) { if (!data.emailAddress) {

6
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/templates/listing.hbs
Unescape View File

@ -6,12 +6,12 @@
<i class="square-element text fw fw-user"></i> <i class="square-element text fw fw-user"></i>
</div> </div>
</td> </td>
<td class="fade-edge" data-search="{{firstname}},{{lastname}}" data-display="{{firstname}} {{lastname}}"> <td data-search="{{firstname}},{{lastname}}" data-display="{{firstname}} {{lastname}}">
<h4>{{firstname}} {{lastname}}</h4> <h4>{{firstname}} {{lastname}}</h4>
</td> </td>
<td class="fade-edge remove-padding-top" data-search="{{username}}" data-display="{{username}}"><i <td class="remove-padding-top" data-search="{{username}}" data-display="{{username}}"><i
class="fw-user"></i> {{username}}</td> class="fw-user"></i> {{username}}</td>
<td class="fade-edge remove-padding-top" data-search="{{emailAddress}}" data-display="{{emailAddress}}"> <td class="remove-padding-top" data-search="{{emailAddress}}" data-display="{{emailAddress}}">
<a href="mailto:{{emailAddress}}" class="wr-list-email"> <a href="mailto:{{emailAddress}}" class="wr-list-email">
<i class="fw-mail"></i> {{emailAddress}} <i class="fw-mail"></i> {{emailAddress}}
</a> </a>

Write Preview
Loading…
Cancel
Save