minor changes in device locations UI

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

@@ -24,17 +24,9 @@
     {{css  "css/MarkerCluster.Default.css" combine=false}}
     {{css  "css/leaflet_fullscreen/leaflet.fullscreen.css" combine=false}}
     {{css  "css/leaflet/leaflet.draw.css" combine=false}}
-
     {{css  "css/d3/c3.css" combine=false}}
     {{css  "css/bootstrap-datepicker.min.css" combine=false}}
-
     {{css "css/leaflet.awesome-markers.css" combine=false}}
-
-    <style>
-        .datepicker-inline {
-            margin:0 auto;
-        }
-    </style>
 {{/zone}}
 
 
@@ -49,15 +41,12 @@
     {{js "js/leaflet/leaflet.markercluster.js" }}
     {{js "js/leaflet/L.Control.Locate.js" }}
     {{js "js/leaflet/L.Control.Focus.js" }}
-    {{js "js/leaflet/L.Control.GeoAlerts.js" }}
     {{js "js/leaflet/leaflet.groupedlayercontrol.js" }}
     {{js "js/leaflet/Leaflet.fullscreen.min.js" }}
     {{js "js/leaflet/Marker.Rotate.js" }}
     {{js "js/leaflet/leaflet.draw.js" }}
     {{js "js/leaflet.awesome-markers.js"}}
-    {{!js "js/jquery/jquery-ui.min.js" }}
     {{js "js/typeahead.bundle.min.js" }}
-    {{js "js/application_options.js"  }}
     {{js "js/geo_remote.js" }}
     {{js "js/app.js" }}
     <script type="text/javascript">

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

@@ -183,12 +183,12 @@ function handleMarkerEvents(event,extra_data,marker) {
 var devicePopupManagement= function(deviceName, deviceType, deviceIdentifier,deviceStatus,deviceOwner){
 
     var deviceMgtUrl= "/devicemgt/device/";
-    var html1='<ul>';
+    var html1='<div>';
-    var html2 = '<li><b>'+'<a href="' + deviceMgtUrl +deviceType+'?id='+deviceIdentifier+ '" target="_blank">' + deviceName + '</a>'+'</b></li>' ;
+    var html2 = '<p><h3>'+'<a href="' + deviceMgtUrl +deviceType+'?id='+deviceIdentifier+ '" target="_blank">' + deviceName + '</a>'+'</h3></p>' ;
-    var html3 = '<li>'+'Type : '+ deviceType+'</li>';
+    var html3 = '<p>'+'Type : '+ deviceType+'</p>';
-    var html4 = '<li>'+'Status : '+deviceStatus+'</li>';
+    var html4 = '<p>'+'Status : '+deviceStatus+'</p>';
-    var html5 = '<li>'+ 'Owner : ' + deviceOwner + '</li>';
+    var html5 = '<p>'+ 'Owner : ' + deviceOwner + '</p>';
-    var html6='</ul>';
+    var html6='</div>';
     var html=html1+html2+html3+html4+html5+html6;
     return html;
 };

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

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var ApplicationOptions = {
-    colors: {
-        states: {
-            NORMAL: 'blue',
-            WARNING: 'blue',
-            OFFLINE: 'grey',
-            ALERTED: 'red',
-            UNKNOWN: 'black'
-        },
-        application: {
-            header: 'grey'
-        }
-    },
-    constance:{
-        CEP_WEB_SOCKET_OUTPUT_ADAPTOR_NAME: 'iot.per.device.stream.geo.FusedSpatialEvent',
-        CEP_ON_ALERT_WEB_SOCKET_OUTPUT_ADAPTOR_NAME: 'org.wso2.geo.AlertsNotifications',
-        CEP_Traffic_STREAM_WEB_SOCKET_OUTPUT_ADAPTOR_NAME: 'DefaultWebsocketOutputAdaptorOnTrafficStream',
-        CEP_WEB_SOCKET_OUTPUT_ADAPTOR_WEBAPP_NAME: 'secured-websocket',
-        TENANT_INDEX: 't',
-        COLON : ':',
-        PATH_SEPARATOR : '/',
-        VERSION: '1.0.0',
-        SPEED_HISTORY_COUNT: 20,
-        NOTIFY_INFO_TIMEOUT: 1000,
-        NOTIFY_SUCCESS_TIMEOUT: 1000,
-        NOTIFY_WARNING_TIMEOUT: 3000,
-        NOTIFY_DANGER_TIMEOUT: 5000
-    },
-    messages:{
-        app:{
-
-        }
-    },
-    leaflet: {
-        iconUrls: {
-            //TODO path needs to be changed
-            normalMovingIcon: '/img/markers/object-types/default/moving/alerted.png',
-            alertedMovingIcon: '/img/markers/moving/arrow_alerted.png',
-            offlineMovingIcon: '/img/markers/moving/arrow_offline.png',
-            warningMovingIcon: '/img/markers/moving/arrow_warning.png',
-            defaultMovingIcon: '/img/markers/moving/arrow_normal.png',
-
-            normalNonMovingIcon: '/img/markers/non_moving/dot_normal.png',
-            alertedNonMovingIcon: '/img/markers/non_moving/dot_alerted.png',
-            offlineNonMovingIcon: '/img/markers/non_moving/dot_offline.png',
-            warningNonMovingIcon: '/img/markers/non_moving/dot_warning.png',
-            defaultNonMovingIcon: '/img/markers/non_moving/dot_normal.png',
-
-            normalPlaceIcon: '/img/markers/places/marker-icon.png',
-            alertedPlaceIcon: '/img/markers/places/redMarker.png',
-            offlinePlaceIcon: '/img/markers/places/ashMarker.png',
-            warningPlaceIcon: '/img/markers/places/pinkMarker.png',
-            defaultPlaceIcon: '/img/markers/places/marker-icon.png',
-
-            defaultIcon: '/img/markers/moving/default_icons/marker-icon.png',
-            resizeIcon: '/img/markers/resize.png',
-            stopIcon:  '/img/markers/stopIcon.png'
-        }
-    }
-};