diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs index bbaf402251..c7de8aac7e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs @@ -86,7 +86,7 @@ {{#if deviceCount}}
-     + Loading devices . . .
@@ -196,11 +196,11 @@
Loading...
-     Assign     + Assign -    + -     Cancel     + Cancel
@@ -243,11 +243,11 @@ @@ -289,11 +289,11 @@ @@ -332,7 +332,7 @@
-     Ok     + Ok
@@ -348,7 +348,7 @@
-     Ok     + Ok
@@ -365,11 +365,11 @@
-     Add New Group     + Add New Group -    + -     Cancel     + Cancel
@@ -385,7 +385,7 @@
-     Ok     + Ok
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs index bcf105493b..fe9663f24f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs @@ -48,9 +48,9 @@
+ Add + Cancel
@@ -64,7 +64,7 @@
-     Ok     + Ok
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs index 6f686d4a5f..7ad04791e1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs @@ -106,11 +106,11 @@
-     Next     + Next -    + -     Cancel     + Cancel
@@ -127,11 +127,11 @@
Loading...
-     OK     + OK -    + -     Cancel     + Cancel
@@ -157,11 +157,11 @@
-     Yes     + Yes -    + -     Cancel     + Cancel
@@ -200,11 +200,11 @@
-     Update     + Update -    + -     Cancel     + Cancel
@@ -229,7 +229,7 @@

Bad Request. Please contact your administrator.

-     Ok     + Ok
@@ -245,7 +245,7 @@
-     Ok     + Ok
@@ -261,7 +261,7 @@
-     Ok     + Ok
@@ -277,7 +277,7 @@
-     Ok     + Ok
@@ -293,7 +293,7 @@
-     Ok     + Ok
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js index d3a5c5cc73..38df533d3e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js @@ -436,7 +436,7 @@ function generateRoleMap(groupName, groupOwner, selectedUser, allRoles) { } } str += '    '; + + '" ' + isChecked + '/>' + allRoles[i] + ''; } $('#user-roles').html(str); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js index 1bad1949b6..ae0e40fd58 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js @@ -131,14 +131,14 @@ function loadRoles() { class: "fade-edge", data: "name", render: function (name, type, row, meta) { - return '

  ' + name + ' role

'; + return '

' + name + 'role

'; } }, { class: "text-right content-fill text-left-on-grid-view no-wrap", data: null, render: function (data, type, row, meta) { - return ' ' + + return '' + '' + '' + '' + - '' + + '' + '' + - ' ' + @@ -165,16 +165,16 @@ function loadRoles() { '' + '' + '' + - '' + + '' + '' + - ' ' + '' + '' + '' + '' + - '' + + '' + ''; } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.details/details.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.details/details.hbs index 5d64021462..ae0ec631b8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.details/details.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.details/details.hbs @@ -20,7 +20,7 @@

-     + Loading Device Details . . .
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js index ea45adaf37..269f503a52 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js @@ -148,7 +148,7 @@ function loadDevices(searchType, searchParam){ '' + ' ' + - '  Quick Startup Guide'); + 'Quick Startup Guide'); } $(".icon .text").res_text(0.2); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs index 5a9a302a77..1252ce7565 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs @@ -98,9 +98,9 @@