Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js

@@ -259,6 +259,10 @@ deviceModule = function () {
             }
             return serviceInvokers.XMLHttp.get(
                 url, function (responsePayload) {
+                    if(!responsePayload["responseText"]){
+                        log.error("Error while fetching device count. API `" + url + "` returns HTTP: " + responsePayload["status"]);
+                        throw constants["ERRORS"]["UNKNOWN_ERROR"];
+                    }
                     return parse(responsePayload["responseText"])["count"];
                 },
                 function (responsePayload) {

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/constants.js

@@ -47,7 +47,8 @@ var LANGUAGE_US = "en_US";
 
 var VENDOR_APPLE = "Apple";
 var ERRORS = {
-    "USER_NOT_FOUND": "USER_NOT_FOUND"
+    "USER_NOT_FOUND": "USER_NOT_FOUND",
+    "UNKNOWN_ERROR": "Unknown Error"
 };
 
 var USER_STORES_NOISY_CHAR = "\"";

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/css/main.css

@@ -40,6 +40,7 @@
 
 .app-info h4{
     margin-bottom: 0px;
+    overflow-wrap: break-word;
 }
 
 .application i{

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs

@@ -61,7 +61,7 @@
         </div>
     {{/unless}}
 
-    <div id="" style="height: 93vh;">
+    <div id="" style="height: 63vh;">
         <!-- Sidebar -->
         <div id="map"></div>
     </div>
@@ -691,8 +691,7 @@
                     initializeGeoLocation()
                 });
                 {{#if showGeoFencingTools}}
-                    var locationItems = geoLocationLink.closest('li');
+                    var geoToolsMenu = $('#location-action-bar');
-                    var geoToolsMenu = $("<ul/>", {class: 'collapse list-group geo-tools active'}).appendTo(locationItems);
                     geoPublicUri = $("#geo-charts").data("geo-public-uri");
                     var realtTime = createGeoToolListItem('javascript:enableRealTime()',
                                                           'Return to Real Time View', 'fw fw-undo', geoToolsMenu);

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js

@@ -548,7 +548,7 @@ function clearFocus() {
 }
 
 function createGeoToolListItem(link, text, icon, menuRoot) {
-    var listItem = $("<li/>", { class: 'list-group-item'}).appendTo(menuRoot);
+    var listItem = $("<div/>", { class: 'action-btn filter'}).appendTo(menuRoot);
     var anchor = $("<a/>", {href: link, text: ' ' + text}).appendTo(listItem);
     anchor.attr('data-toggle', 'modal');
     anchor.attr('data-target', '#commonModal');