From 0cddd896d4936521a6d4b0b286a7b5f709204636 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Thu, 16 Feb 2017 16:49:44 +0530 Subject: [PATCH] Tooltip fix --- .../pages/cdmf.page.devices/public/js/listing.js | 14 +++++++------- .../pages/cdmf.page.groups/public/js/listing.js | 10 +++++----- .../app/pages/cdmf.page.users/public/js/listing.js | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) 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 c58f718566..e7120f888e 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 @@ -315,7 +315,7 @@ function loadDevices(searchType, searchParam) { { targets: 6, data: 'status', - class: 'text-right content-fill text-left-on-grid-view no-wrap', + class: 'text-right content-fill text-left-on-grid-view no-wrap tooltip-overflow-fix', render: function (status, type, row, meta) { var deviceType = row.deviceType; var deviceIdentifier = row.deviceIdentifier; @@ -326,7 +326,7 @@ function loadDevices(searchType, searchParam) { if (analyticsEnabled(row.deviceType)) { html += '' + + ' class="btn padding-reduce-on-grid-view" data-placement="top" data-toggle="tooltip" data-original-title="Analytics">' + '' + ''; } @@ -337,7 +337,7 @@ function loadDevices(searchType, searchParam) { + 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType + '" data-devicename="' + - row.name + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Group">' + + row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Group">' + '' + ''; } @@ -345,7 +345,7 @@ function loadDevices(searchType, searchParam) { html += '' + + '" data-devicename="' + row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Edit">' + '' + '' + ''; @@ -354,7 +354,7 @@ function loadDevices(searchType, searchParam) { html += '' + + '" data-devicename="' + row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Remove from group">' + '' + '' + ''; @@ -362,7 +362,7 @@ function loadDevices(searchType, searchParam) { html += '' + + '" data-devicename="' + row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Delete">' + '' + '' + ''; @@ -919,4 +919,4 @@ function getSelectedDevices() { }); return deviceList; -} \ No newline at end of file +} 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 a3a49418b9..91333c5b5d 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 @@ -180,13 +180,13 @@ function loadGroups() { { targets: 4, data: 'id', - class: 'text-right content-fill text-left-on-grid-view no-wrap', + class: 'text-right content-fill text-left-on-grid-view no-wrap tooltip-overflow-fix', render: function (id, type, row, meta) { var html = ''; if ($.hasPermission("VIEW_GROUP_DEVICES")) { html += '' + + 'data-placement="top" data-toggle="tooltip" data-original-title="Analytics">' + '' + ''; @@ -197,7 +197,7 @@ function loadGroups() { '' + + '" data-placement="top" data-toggle="tooltip" data-original-title="Share">' + ''; } @@ -207,7 +207,7 @@ function loadGroups() { + row.name + '" ' + 'data-group-owner="' + row.owner + '" data-group-description="' + row.description + '" data-group-id="' + row.groupId - + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Edit">' + + + '" data-placement="top" data-toggle="tooltip" data-original-title="Edit">' + ''; } if ($.hasPermission("REMOVE_GROUP")) { @@ -215,7 +215,7 @@ function loadGroups() { '' + + '" data-placement="top" data-toggle="tooltip" data-original-title="Delete">' + ''; } 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 8c8689f651..0609c88c0a 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 @@ -337,31 +337,31 @@ function loadUsers() { } }, { - class: "text-right content-fill text-left-on-grid-view no-wrap", + class: "text-right content-fill text-left-on-grid-view no-wrap tooltip-overflow-fix", data: null, render: function (data, type, row, meta) { - var editbtn = ' ' + + 'class="btn padding-reduce-on-grid-view edit-user-link" data-placement="top" data-toggle="tooltip" data-original-title="Edit"> ' + ' ' + '' + '' + ''; - var resetPasswordbtn = '' + + 'class="btn padding-reduce-on-grid-view remove-user-link" data-placement="top" data-toggle="tooltip" data-original-title="Reset Password">' + '' + '' + '' + ''; - var removebtn = '' + + 'class="btn padding-reduce-on-grid-view remove-user-link" data-placement="top" data-toggle="tooltip" data-original-title="Remove">' + '' + '' + '' +