From 486e02fd71e8d22a710fcaf0eca74767ff663fdd Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Thu, 16 Feb 2017 06:11:42 +0530
Subject: [PATCH 1/3] adding ui changes to the cloud related uis

---
 .../app/pages/cdmf.page.devices/devices.hbs   | 30 ++++++++++---------
 .../cdmf.page.group.analytics/analytics.hbs   |  2 +-
 .../pages/cdmf.page.group.create/create.hbs   | 17 ++++++++---
 .../pages/cdmf.page.group.create/create.js    |  1 +
 .../public/js/group-add.js                    |  2 +-
 .../app/pages/cdmf.page.groups/groups.hbs     |  2 +-
 .../app/pages/cdmf.page.policies/policies.hbs |  2 +-
 7 files changed, 34 insertions(+), 22 deletions(-)

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 96275a89338..354c6f2bb75 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
@@ -91,7 +91,8 @@
                 <div id="device_overview">
                     <div class="media-left col-lg-2">
                         <div class="icon">
-                            <img src="/devicemgt/public/cdmf.page.groups/images/group-icon.png" style="background-color: #11375b; height: 152px;">
+                            <img src="/devicemgt/public/cdmf.page.groups/images/group-icon.png"
+                                 style="background-color: #11375b; height: 152px;">
                         </div>
                     </div>
                     <div class="media-body asset-desc add-padding-left-5x">
@@ -214,11 +215,11 @@
                             </thead>
                             <tbody id="ast-container">
 
-                            <br class="c-both" />
+                            <br class="c-both"/>
                             </tbody>
                         </table>
                     </div>
-                    <br class="c-both" />
+                    <br class="c-both"/>
                     <div id="content-filter-types" style="display: none">
                         <div class="sort-title">Sort By</div>
                         <div class="sort-options">
@@ -236,13 +237,13 @@
                                 <i class="fw fw-devices fw-3x"></i>
                             </h3>
                             <h3 class="text-muted">
-                                You don't have any device
+                                You don't have any
                                 {{#if group}}
-                                    assigned to this group
+                                    devices assigned to this group. Let's add a device!
                                 {{else}}
-                                    enrolled
+                                    enrolled devices. Let's enroll a device!
                                 {{/if}}
-                                at the moment.
+
                             </h3>
                             <h3>
                                 {{#if group}}
@@ -256,7 +257,7 @@
                                     </a>
                                 {{else}}
                                     {{#if permissions.enroll}}
-                                    <!--suppress HtmlUnknownTarget -->
+                                        <!--suppress HtmlUnknownTarget -->
                                         <a href="{{@app.context}}/device/enroll" class="btn-operations btn-default">
                                             <span class="fw-stack">
                                                 <i class="fw fw-circle-outline fw-stack-2x"></i>
@@ -427,7 +428,7 @@
                                     <div class="row">
                                         <div class="col-lg-5 col-md-6 col-centered">
                                             <h3>Exception at backend. Try Later.</h3>
-                                            <br />
+                                            <br/>
                                             <div class="buttons">
                                                 <a href="#" id="device-400-link" class="btn-operations">
                                                     Ok
@@ -443,7 +444,7 @@
                                     <div class="row">
                                         <div class="col-lg-5 col-md-6 col-centered">
                                             <h3>Operation not permitted.</h3>
-                                            <br />
+                                            <br/>
                                             <div class="buttons">
                                                 <a href="#" id="device-403-link" class="btn-operations">
                                                     Ok
@@ -458,9 +459,10 @@
                                 <div class="modal-content">
                                     <div class="row">
                                         <div class="col-lg-5 col-md-6 col-centered">
-                                            <h3>You don't have any groups to add this device. Please add group
-                                                first.</h3>
-                                            <br />
+                                            <h3>
+                                                You don't have any device group to add this device. Let's add a new
+                                                device group!</h3>
+                                            <br/>
                                             <div class="buttons">
                                                 <a href="{{@app.context}}/group/add" class="btn-operations">
                                                     Add New Group
@@ -480,7 +482,7 @@
                                     <div class="row">
                                         <div class="col-lg-5 col-md-6 col-centered">
                                             <h3>Device does not exist.</h3>
-                                            <br />
+                                            <br/>
                                             <div class="buttons">
                                                 <a href="#" id="remove-device-409-link" class="btn-operations">
                                                     Ok
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 a54926eb394..8b81fdd2122 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
@@ -65,7 +65,7 @@
             {{else}}
                 <div id="ast-container" class="ast-container list-view">
                     <div class="ctrl-info-panel col-centered text-center wr-login">
-                        <h2>You don't have any device assigned to this group to view analytics.</h2>
+                        <h2>You don't have any device assigned to this group to view analytics. Let's add a new device group!</h2>
                         <br/>
                         <p class="text-center">
                             <a href="{{@app.context}}/devices" class="wr-btn">
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 9d9edd0c534..85cc52f6b66 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
@@ -25,10 +25,17 @@
 
             <p class="page-sub-title">Add New Group</p>
 
-            <p>Create new device group on IoT Server</p>
+            <p>Create new device group on
+                {{#if isCloud}}
+                    Device Cloud
+                {{else}}
+                    IoT Server
+                {{/if}}
+                .
+            </p>
 
             <!-- validation -->
-        <span class="wr-validation-summary hidden center-block col-centered">
+            <span class="wr-validation-summary hidden center-block col-centered">
 		    <strong class="label label-danger col-centered"></strong>
 		</span>
 
@@ -51,9 +58,11 @@
 
                 <div class="wr-input-control">
                     <button class="wr-btn" id="add-group-btn">
-                        Add</button>
+                        Add
+                    </button>
                     <button class="wr-btn" onclick="window.location = '{{@app.context}}/groups';return false;">
-                        Cancel</button>
+                        Cancel
+                    </button>
                 </div>
             </div>
         </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.js
index 350d245d1fb..b268e560fde 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.js
@@ -25,6 +25,7 @@
 function onRequest(context) {
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var page = {};
+    page["isCloud"] = devicemgtProps.isCloud;
     page["groupNameJSRegEx"] = devicemgtProps.groupValidationConfig.groupNameJSRegEx;
     page["groupNameRegExViolationErrorMsg"] = devicemgtProps.groupValidationConfig.groupNameRegExViolationErrorMsg;
     page["groupNameHelpMsg"] = devicemgtProps.groupValidationConfig.groupNameHelpMsg;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
index a4fcc5ab258..1ba4c545dcc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
@@ -45,7 +45,7 @@ $(function () {
 
             var successCallback = function (jqXHR, status, resp) {
                 if (resp.status == 201) {
-                    $('.wr-validation-summary strong').text("Group created. You will be redirected to groups");
+                    $('.wr-validation-summary strong').text("Successfully created the group! You will be redirected to the group management page.");
                     $('.wr-validation-summary').removeClass("hidden");
                     $('.wr-validation-summary strong').removeClass("label-danger");
                     $('.wr-validation-summary strong').addClass("label-success");
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 282e6024fa5..71aa91766ad 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
@@ -82,7 +82,7 @@
                             <h3 class="text-muted">
                                 <i class="fw fw-group fw-3x"></i>
                             </h3>
-                            <h3 class="text-muted">You don't have any group registered at the moment</h3>
+                            <h3 class="text-muted">You don't have any device group. Let's add a new device group!</h3>
                             {{#if permissions.ADD_GROUP}}
                                 <h3>
                                     <!--suppress HtmlUnknownTarget -->
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 ad28493c616..18198319125 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
@@ -91,7 +91,7 @@
                 <h3 class="text-muted">
                     <i class="fw fw-policy fw-3x"></i>
                 </h3>
-                <h3 class="text-muted">You do not have any device policy at the moment</h3>
+                <h3 class="text-muted">You don't have any device policies. Let's add a new policy!</h3>
                 {{#if permissions.ADD_ADMIN_POLICY}}
                     <h3>
                         <!--suppress HtmlUnknownTarget -->

From 4725eb3c3b2a89042897d3795d60b2381e56021f Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Thu, 16 Feb 2017 11:59:47 +0530
Subject: [PATCH 2/3] chenge the group creating steps

---
 .../pages/cdmf.page.group.create/create.hbs   | 24 +++++++++++++++++--
 .../public/js/group-add.js                    |  9 ++-----
 2 files changed, 24 insertions(+), 9 deletions(-)

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 85cc52f6b66..ad7cc1bbeb9 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
@@ -21,7 +21,7 @@
 
 {{#zone "content"}}
     <div class="container container-bg  white-bg">
-        <div class="col-md-12 col-lg-6 col-centered wr-content wr-login col-centered sign-panel">
+        <div class="col-md-12 col-lg-6 col-centered wr-content wr-login col-centered sign-panel" id="group-create-form">
 
             <p class="page-sub-title">Add New Group</p>
 
@@ -40,7 +40,7 @@
 		</span>
 
             <hr/>
-            <div class="form-login-box">
+            <div class="form-login-box" >
                 <label class="wr-input-label">Group Name</label>
 
                 <div class="form-group wr-input-control">
@@ -66,6 +66,26 @@
                 </div>
             </div>
         </div>
+
+        <div id="group-created-msg" class="container col-centered wr-content hidden">
+            <div class="wr-form">
+                <p class="page-sub-title">Group was created successfully.</p>
+
+                <br>Please click <b>"Add Another Group"</b>, if you wish to add another group or click
+                <b>"View Group List"</b> to complete the process and go back to the group list.
+                <hr/>
+                <button class="wr-btn" onclick="window.location.href='{{@app.context}}/groups'">View User List
+                </button>
+                <a href="{{@app.context}}/group/add" class="cu-btn-inner">
+                        <span class="fw-stack">
+                            <i class="fw fw-circle-outline fw-stack-2x"></i>
+                            <i class="fw fw-add fw-stack-1x"></i>
+                        </span>
+                    Add Another Group
+                </a>
+            </div>
+        </div>
+
     </div>
 {{/zone}}
 {{#zone "bottomJs"}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
index 1ba4c545dcc..f6dac69f298 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
@@ -45,13 +45,8 @@ $(function () {
 
             var successCallback = function (jqXHR, status, resp) {
                 if (resp.status == 201) {
-                    $('.wr-validation-summary strong').text("Successfully created the group! You will be redirected to the group management page.");
-                    $('.wr-validation-summary').removeClass("hidden");
-                    $('.wr-validation-summary strong').removeClass("label-danger");
-                    $('.wr-validation-summary strong').addClass("label-success");
-                    setTimeout(function () {
-                        window.location = "../groups";
-                    }, 1500);
+                    $("#group-create-form").addClass("hidden");
+                    $("#group-created-msg").removeClass("hidden");
                 } else {
                     displayErrors(resp.status);
                 }

From 0cddd896d4936521a6d4b0b286a7b5f709204636 Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Thu, 16 Feb 2017 16:49:44 +0530
Subject: [PATCH 3/3] 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 c58f7185663..e7120f888e2 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 += '<a href="' + context + '/device/' + deviceType + '/analytics?deviceId=' +
                                 deviceIdentifier + '&deviceName=' + row.name + '" ' + 'data-click-event="remove-form"' +
-                                ' class="btn padding-reduce-on-grid-view" data-placement="bottom" data-toggle="tooltip" data-original-title="Analytics"><span class="fw-stack">' +
+                                ' class="btn padding-reduce-on-grid-view" data-placement="top" data-toggle="tooltip" data-original-title="Analytics"><span class="fw-stack">' +
                                 '<i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>' +
                                 '<span class="hidden-xs hidden-on-grid-view">Analytics</span>';
                     }
@@ -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"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>' +
+                                row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Group"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>' +
                                 '<i class="fw fw-group fw-stack-1x"></i></span>' +
                                 '<span class="hidden-xs hidden-on-grid-view">Group</span></a>';
                     }
@@ -345,7 +345,7 @@ function loadDevices(searchType, searchParam) {
                     html +=
                             '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view edit-device-link" '
                             + 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
-                            + '" data-devicename="' + row.name + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Edit">'
+                            + '" data-devicename="' + row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Edit">'
                             + '<span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>'
                             + '<i class="fw fw-edit fw-stack-1x"></i></span>'
                             + '<span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
@@ -354,7 +354,7 @@ function loadDevices(searchType, searchParam) {
                         html +=
                                 '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view remove-device-link" '
                                 + 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
-                                + '" data-devicename="' + row.name + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Remove from group">'
+                                + '" data-devicename="' + row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Remove from group">'
                                 + '<span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>'
                                 + '<i class="fw fw-delete fw-stack-1x"></i></span>'
                                 + '<span class="hidden-xs hidden-on-grid-view">Remove from group</span>';
@@ -362,7 +362,7 @@ function loadDevices(searchType, searchParam) {
                         html +=
                                 '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view remove-device-link" '
                                 + 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
-                                + '" data-devicename="' + row.name + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Delete">'
+                                + '" data-devicename="' + row.name + '" data-placement="top" data-toggle="tooltip" data-original-title="Delete">'
                                 + '<span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>'
                                 + '<i class="fw fw-delete fw-stack-1x"></i></span>'
                                 + '<span class="hidden-xs hidden-on-grid-view">Delete</span>';
@@ -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 a3a49418b9e..91333c5b5d9 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 += '<a href="group/' + row.groupId
                             + '/analytics" data-click-event="remove-form" class="btn padding-reduce-on-grid-view" ' +
-                            'data-placement="bottom" data-toggle="tooltip" data-original-title="Analytics">' +
+                            'data-placement="top" data-toggle="tooltip" data-original-title="Analytics">' +
                             '<span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>'
                             +
                             '<span class="hidden-xs hidden-on-grid-view">Analytics</span></a>';
@@ -197,7 +197,7 @@ function loadGroups() {
                                 '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view share-group-link" data-group-id="'
                                 + row.groupId + '" ' +
                                 'data-group-owner="' + row.owner
-                                + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Share"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-share fw-stack-1x"></i></span>'
+                                + '" data-placement="top" data-toggle="tooltip" data-original-title="Share"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-share fw-stack-1x"></i></span>'
                                 +
                                 '<span class="hidden-xs hidden-on-grid-view">Share</span></a>';
                     }
@@ -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"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>' +
+                                + '" data-placement="top" data-toggle="tooltip" data-original-title="Edit"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>' +
                                 '<i class="fw fw-edit fw-stack-1x"></i></span><span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
                     }
                     if ($.hasPermission("REMOVE_GROUP")) {
@@ -215,7 +215,7 @@ function loadGroups() {
                                 '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view remove-group-link" data-group-id="'
                                 + row.groupId + '" ' +
                                 'data-group-owner="' + row.owner
-                                + '" data-placement="bottom" data-toggle="tooltip" data-original-title="Delete"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-delete fw-stack-1x"></i>'
+                                + '" data-placement="top" data-toggle="tooltip" data-original-title="Delete"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-delete fw-stack-1x"></i>'
                                 +
                                 '</span><span class="hidden-xs hidden-on-grid-view">Delete</span></a>';
                     }
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 8c8689f6510..0609c88c0a5 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 = '<a data-toggle="tooltip" data-placement="bottom" title="Edit User"href="' + context +
+                var editbtn = '<a data-toggle="tooltip" data-placement="top" title="Edit User"href="' + context +
                     '/user/edit?username=' + encodeURIComponent(data.filter) + '" data-username="' + data.filter + '" ' +
                     'data-click-event="edit-form" ' +
-                    'class="btn padding-reduce-on-grid-view edit-user-link" data-placement="bottom" data-toggle="tooltip" data-original-title="Edit"> ' +
+                    'class="btn padding-reduce-on-grid-view edit-user-link" data-placement="top" data-toggle="tooltip" data-original-title="Edit"> ' +
                     '<span class="fw-stack"> ' +
                     '<i class="fw fw-circle-outline fw-stack-2x"></i>' +
                     '<i class="fw fw-edit fw-stack-1x"></i>' +
                     '</span><span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
 
-                var resetPasswordbtn = '<a data-toggle="tooltip" data-placement="bottom" title="Reset Password" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
+                var resetPasswordbtn = '<a data-toggle="tooltip" data-placement="top" title="Reset Password" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
                     'data-click-event="edit-form" ' +
                     'onclick="javascript:resetPassword(\'' + data.filter + '\')" ' +
-                    'class="btn padding-reduce-on-grid-view remove-user-link" data-placement="bottom" data-toggle="tooltip" data-original-title="Reset Password">' +
+                    'class="btn padding-reduce-on-grid-view remove-user-link" data-placement="top" data-toggle="tooltip" data-original-title="Reset Password">' +
                     '<span class="fw-stack">' +
                     '<i class="fw fw-circle-outline fw-stack-2x"></i>' +
                     '<i class="fw fw-key fw-stack-1x"></i>' +
                     '</span><span class="hidden-xs hidden-on-grid-view">Reset Password</span></a>';
 
-                var removebtn = '<a data-toggle="tooltip" data-placement="bottom" title="Remove User" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
+                var removebtn = '<a data-toggle="tooltip" data-placement="top" title="Remove User" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
                     'data-click-event="remove-form" ' +
                     'onclick="javascript:removeUser(\'' + data.filter + '\')" ' +
-                    'class="btn padding-reduce-on-grid-view remove-user-link" data-placement="bottom" data-toggle="tooltip" data-original-title="Remove">' +
+                    'class="btn padding-reduce-on-grid-view remove-user-link" data-placement="top" data-toggle="tooltip" data-original-title="Remove">' +
                     '<span class="fw-stack">' +
                     '<i class="fw fw-circle-outline fw-stack-2x"></i>' +
                     '<i class="fw fw-delete fw-stack-1x"></i>' +