Fixed issue in showing android device location map

revert-dabc3590
charitha 8 years ago
parent c08a2bc0a8
commit b812b6af2e

@ -336,14 +336,15 @@
<div id="device-location" <div id="device-location"
data-lat="{{device.location.latitude}}" data-lat="{{device.location.latitude}}"
data-long="{{device.location.longitude}}"> data-long="{{device.location.longitude}}">
</div>
<br/>
<a class="padding-left" <a class="padding-left"
href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}"> href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
<span class="fw-stack">
<span class="fw-fw-map-location"> <i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-map-location fw-2x"></i> <i class="fw fw-map-location fw-stack-1x"></i>
</span> View device on the map </span>View device on the map
</a> </a>
</div>
{{else}} {{else}}
<div id="map-error" class="message message-warning"> <div id="map-error" class="message message-warning">
<h4 class="remove-margin"> <h4 class="remove-margin">
@ -436,7 +437,6 @@
type="text/x-handlebars-template"></script> type="text/x-handlebars-template"></script>
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
{{js "js/device-detail.js"}} {{js "js/device-detail.js"}}
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&signed_in=true"></script>
{{js "js/load-map.js"}} {{js "js/load-map.js"}}
{{/if}} {{/if}}
{{/zone}} {{/zone}}

@ -45,7 +45,7 @@ $(document).ready(function () {
var url = $(this).prop("href"); var url = $(this).prop("href");
var hash = url.substring(url.indexOf("#") + 1); var hash = url.substring(url.indexOf("#") + 1);
if (hash == "device_location") { if (hash == "device_location_tab") {
if (!map) { if (!map) {
loadLeafletMap(); loadLeafletMap();
} }

Loading…
Cancel
Save