From 3230a4e2698e2f03450270438d9674ad190aceeb Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Wed, 11 Jan 2017 11:11:33 +0530 Subject: [PATCH 1/4] Updating font wso2 to version 1.2.1 --- .../cdmf.page.certificate.create/create.hbs | 2 +- .../cdmf.page.certificates/certificates.hbs | 2 +- .../public/templates/certificate-listing.hbs | 2 +- .../pages/cdmf.page.dashboard/dashboard.hbs | 20 +- .../public/templates/device-listing.hbs | 2 +- .../app/pages/cdmf.page.devices/devices.hbs | 16 +- .../cdmf.page.devices/public/js/listing.js | 10 +- .../cdmf.page.group.analytics/analytics.hbs | 2 +- .../app/pages/cdmf.page.groups/groups.hbs | 10 +- .../cdmf.page.groups/public/js/listing.js | 8 +- .../app/pages/cdmf.page.policies/policies.hbs | 16 +- .../pages/cdmf.page.role.create/create.hbs | 2 +- .../cdmf.page.roles/public/js/role-listing.js | 6 +- .../public/templates/role-listing.hbs | 6 +- .../app/pages/cdmf.page.roles/roles.hbs | 2 +- .../pages/cdmf.page.user.create/create.hbs | 2 +- .../app/pages/cdmf.page.user.edit/edit.hbs | 2 +- .../app/pages/cdmf.page.user.view/view.hbs | 2 +- .../cdmf.page.users/public/js/listing.js | 10 +- .../public/templates/listing.hbs | 6 +- .../app/pages/cdmf.page.users/users.hbs | 2 +- .../operation-bar.hbs | 4 +- .../public/js/invite-modal.js | 4 +- .../qr-modal.hbs | 2 +- .../units/cdmf.unit.device.type.view/view.hbs | 2 +- .../listing.hbs | 2 +- .../public/templates/listing.hbs | 2 +- .../public/templates/policy-compliance.hbs | 2 +- .../public/templates/policy-list.hbs | 4 +- .../service-invoker-utility.hbs | 2 +- .../public/templates/notification-listing.hbs | 4 +- .../units/cdmf.unit.policy.create/create.hbs | 2 +- .../app/units/cdmf.unit.policy.edit/edit.hbs | 2 +- .../cdmf.unit.policy.priority/priority.hbs | 2 +- .../permission.hbs | 2 +- .../app/units/cdmf.unit.role.edit/edit.hbs | 2 +- .../user-menu.hbs | 2 +- .../app/units/cdmf.unit.ui.modal/modal.hbs | 4 +- .../public/css/custom-desktop.css | 4 +- .../right.hbs | 2 +- .../lib/font-wso2_1.2/css/font-wso2.css | 1478 +++++++---- .../lib/font-wso2_1.2/css/font-wso2.min.css | 15 + .../lib/font-wso2_1.2/fonts/font-wso2.eot | Bin 81188 -> 62120 bytes .../lib/font-wso2_1.2/fonts/font-wso2.svg | 2227 +++++++++++++++-- .../lib/font-wso2_1.2/fonts/font-wso2.ttf | Bin 81016 -> 61944 bytes .../lib/font-wso2_1.2/fonts/font-wso2.woff | Bin 81092 -> 123392 bytes .../lib/font-wso2_1.2/fonts/font-wso2.woff2 | Bin 0 -> 33168 bytes 47 files changed, 3046 insertions(+), 854 deletions(-) create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/font-wso2_1.2/css/font-wso2.min.css create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/font-wso2_1.2/fonts/font-wso2.woff2 diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs index 230d57d161..004dc69f7d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs @@ -77,7 +77,7 @@ - + Add Another Certificate diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs index a8b0b2946c..276bc83048 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs @@ -36,7 +36,7 @@
  • - + Add Certificate diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/templates/certificate-listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/templates/certificate-listing.hbs index e2aa6cc2ec..8097c3e987 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/templates/certificate-listing.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/templates/certificate-listing.hbs @@ -17,7 +17,7 @@ data-click-event="remove-form" onclick="javascript:removeCertificate('{{serialNumber}}')" class="btn padding-reduce-on-grid-view remove-user-link"> - + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs index a294732b26..a3c30107a8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs @@ -40,7 +40,7 @@ {{#if deviceCount}} - + View @@ -49,7 +49,7 @@ - + Add @@ -71,7 +71,7 @@ - + View @@ -80,7 +80,7 @@ - + Add @@ -102,7 +102,7 @@ - + View @@ -111,7 +111,7 @@ - + Add @@ -133,7 +133,7 @@ - + View @@ -142,7 +142,7 @@ - + Add @@ -164,7 +164,7 @@ - + View @@ -173,7 +173,7 @@ - + Add diff --git a/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 b/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 index 30b5f71e5f..4fd4390096 100644 --- a/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 +++ b/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 @@ -32,7 +32,7 @@ {{#equal status "INACTIVE"}} - + 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 e585fea5fe..fda8e3f5aa 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 @@ -52,7 +52,7 @@ - + Assign from My Devices @@ -61,7 +61,7 @@ - + View Analytics @@ -72,7 +72,7 @@ - + Enroll Device @@ -185,7 +185,7 @@ class="btn square-element add-devices-to-group-link" data-toggle="modal" data-target="#modalDemo"> - + Add to Group @@ -198,7 +198,7 @@ class="btn square-element remove-device-link" data-toggle="modal" data-target="#modalDemo"> - + {{#if group}} @@ -249,7 +249,7 @@ - + Assign from My Devices @@ -259,7 +259,7 @@ - + Enroll New Device @@ -276,7 +276,7 @@

    - + Device Grouping diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js index 978d85e804..144d85d8d6 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js @@ -327,7 +327,7 @@ function loadDevices(searchType, searchParam) { html += '' + - '' + + '' + ''; } @@ -337,7 +337,7 @@ function loadDevices(searchType, searchParam) { + 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType + '" data-devicename="' + - row.name + '">' + + row.name + '">' + '' + ''; } @@ -346,7 +346,7 @@ function loadDevices(searchType, searchParam) { '' - + '' + + '' + '' + ''; var groupOwner = $('#group_owner').text(); @@ -355,7 +355,7 @@ function loadDevices(searchType, searchParam) { '' - + '' + + '' + '' + ''; } else { @@ -363,7 +363,7 @@ function loadDevices(searchType, searchParam) { '' - + '' + + '' + '' + ''; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs index c7cfdffad3..a54926eb39 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs @@ -70,7 +70,7 @@

    - + Assign from My Devices 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 198890e4ba..9e3c054129 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 @@ -41,7 +41,7 @@ - + Add Group @@ -88,7 +88,7 @@ - + Add New Group @@ -104,7 +104,7 @@

    - + Group Sharing @@ -146,7 +146,7 @@

    - + Group Sharing Role @@ -263,7 +263,7 @@

    - + Update Group 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 8d66e8ea33..212bec7521 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 @@ -182,7 +182,7 @@ function loadGroups() { if ($.hasPermission("VIEW_GROUP_DEVICES")) { html += '' + - '' + '' + ''; } @@ -192,7 +192,7 @@ function loadGroups() { ''; } @@ -202,7 +202,7 @@ function loadGroups() { + row.name + '" ' + 'data-group-owner="' + row.owner + '" data-group-description="' + row.description + '" data-group-id="' + row.groupId - + '">' + + + '">' + ''; } if ($.hasPermission("REMOVE_GROUP")) { @@ -210,7 +210,7 @@ function loadGroups() { '' + + '">' + ''; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs index 4f20b3f2c0..f4b147cfa2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs @@ -49,7 +49,7 @@ - + Add New Policy @@ -63,7 +63,7 @@ - + Policy Priority @@ -74,7 +74,7 @@ - + Apply Changes To Devices @@ -97,7 +97,7 @@ - + Add New Policy @@ -146,7 +146,7 @@ - + Remove @@ -157,7 +157,7 @@ - + Publish @@ -167,7 +167,7 @@ - + Unpublish @@ -244,7 +244,7 @@ data-click-event="remove-form" class="btn padding-reduce-on-grid-view policy-update-link"> - + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs index 0bfdfe1d8f..befe1a7d1c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.create/create.hbs @@ -126,7 +126,7 @@ - + Add Another Role 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 91d3d358d0..5b5b835d5b 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 @@ -144,7 +144,7 @@ function loadRoles() { 'data-click-event="edit-form" ' + 'class="btn padding-reduce-on-grid-view edit-role-link">' + '' + - '' + + '' + '' + '' + '' + @@ -158,7 +158,7 @@ function loadRoles() { 'data-click-event="edit-form" ' + 'class="btn padding-reduce-on-grid-view edit-permission-link">' + '' + - '' + + '' + '' + '' + '' + @@ -171,7 +171,7 @@ function loadRoles() { 'data-click-event="remove-form" ' + 'class="btn padding-reduce-on-grid-view remove-role-link">' + '' + - '' + + '' + '' + '' + '' + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/templates/role-listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/templates/role-listing.hbs index d67a1fad49..3f752a185a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/templates/role-listing.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/templates/role-listing.hbs @@ -14,7 +14,7 @@ data-click-event="edit-form" class="btn padding-reduce-on-grid-view edit-role-link" title="Edit Role"> - + @@ -29,7 +29,7 @@ data-click-event="edit-form" class="btn padding-reduce-on-grid-view edit-permission-link" title="Edit Role Permissions"> - + @@ -44,7 +44,7 @@ - + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs index 6ae9e0c2d6..e92009887d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs @@ -40,7 +40,7 @@ - + Add Role diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs index 3ce1a6ece4..6c152b07ee 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs @@ -143,7 +143,7 @@ - + Add Another User diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.hbs index 6e762ff506..18f0c91235 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.hbs @@ -130,7 +130,7 @@ - + View Updated User diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs index 43ca9e5ee0..01acd48ffa 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs @@ -146,7 +146,7 @@ class="cu-btn-inner policy-view-link" data-id="{{deviceIdentifier}}"> - + View diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js index 3e3c64781f..2658b7fe8d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js @@ -89,7 +89,7 @@ $("a#invite-user-link").click(function () { }); }, function () { - modalDialog.header(' Unexpected Error !'); modalDialog.content('An unexpected error occurred. Try again later.'); modalDialog.footer('
    Reset Password'); modalDialog.content($("#modal-content-reset-password").html()); modalDialog.footer('
    Save ' + @@ -341,7 +341,7 @@ function loadUsers() { 'data-click-event="edit-form" ' + 'class="btn padding-reduce-on-grid-view edit-user-link"> ' + ' ' + - '' + + '' + '' + ''; @@ -350,7 +350,7 @@ function loadUsers() { 'onclick="javascript:resetPassword(\'' + data.filter + '\')" ' + 'class="btn padding-reduce-on-grid-view remove-user-link">' + '' + - '' + + '' + '' + ''; @@ -359,7 +359,7 @@ function loadUsers() { 'onclick="javascript:removeUser(\'' + data.filter + '\')" ' + 'class="btn padding-reduce-on-grid-view remove-user-link">' + '' + - '' + + '' + '' + ''; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/templates/listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/templates/listing.hbs index 6d1a95f2a2..3fc0078c99 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/templates/listing.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/templates/listing.hbs @@ -22,7 +22,7 @@ - + @@ -36,7 +36,7 @@ data-click-event="remove-form" onclick="removeUser('{{username}}', '{{userid}}')" class="btn padding-reduce-on-grid-view remove-user-link"> - + @@ -50,7 +50,7 @@ data-click-event="edit-form" onclick="resetPassword('{{username}}')" class="btn padding-reduce-on-grid-view remove-user-link"> - + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs index 5741aab8aa..fad118d1a4 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs @@ -40,7 +40,7 @@ - + Add User diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs index fe87cb7896..343098c3d7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs @@ -54,7 +54,7 @@

    - + {{name}} @@ -105,7 +105,7 @@

    - +
    diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js index 35faba2df6..4a29eae7b2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js @@ -9,7 +9,7 @@ function toggleEmailInvite(){ modalDialog.header('

    ' + '' + '' + - '' + + '' + '' + 'Send Invites

    '); modalDialog.content($("#invite-by-email-body").html()); @@ -73,7 +73,7 @@ function sendInvites(){ }); }, function () { - modalDialog.header(' Unexpected Error !'); modalDialog.content('An unexpected error occurred. Try again later.'); modalDialog.footer('
    - + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.view/view.hbs index e3e4eeec86..158f706af9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.view/view.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.view/view.hbs @@ -80,7 +80,7 @@