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

Release 2.0.x

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

@@ -6,9 +6,9 @@
                 <i class="square-element text fw fw-document"></i>
             </div>
         </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>
-        <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>
         <td class="text-right content-fill text-left-on-grid-view no-wrap">
             {{#unequal adminUser serialNumber }}

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

@@ -12,21 +12,21 @@
                         <i class="square-element text fw fw-mobile"></i>
                     </div>
                 </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>
                     {{#if properties.DEVICE_MODEL}}
                         <div>({{properties.VENDOR}} - {{properties.DEVICE_MODEL}})</div>
                     {{/if}}
                 </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="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.owner}}" data-display="{{enrolmentInfo.owner}}" data-grid-label="Owner">{{enrolmentInfo.owner}}</td>
+                <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 "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 "REMOVED"}}<span><i class="fw fw-delete icon-danger"></i> Removed</span>{{/equal}}
                 </td>
-                <td class="fade-edge 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="{{type}}" data-display="{{type}}" data-grid-label="Type">{{type}}</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">
                     <!--{{#equal type "TemperatureController"}}
                         {{#equal status "INACTIVE"}}

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
                 <i class="square-element text fw fw-user"></i>
             </div>
         </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">
 
             {{#unequal adminRole roleName }}

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

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

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

@@ -6,12 +6,12 @@
                 <i class="square-element text fw fw-user"></i>
             </div>
         </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>
         </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>
-        <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">
                 <i class="fw-mail"></i> {{emailAddress}}
             </a>