#204 Use leaflet to get a basic map displayed.

Still needs to be improved though. Also may not use the CDN.
merge-requests/2/head
Mike Koch 9 years ago
parent 480067381c
commit b44884a99e

@ -861,19 +861,38 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
{
echo '<span class="fa fa-lock"></span>&nbsp;';
}
$locationText = '';
if (strpos($ticket['Location'], 'N/A') === false)
{
$locationText = $hesklang['click_for_map'];
}
else
{
$locationText = $hesklang['location_unavailable'];
}
if ($modsForHesk_settings['request_location'])
{
echo '<i class="fa fa-crosshairs" data-toggle="tooltip" title="'.$locationText.'"></i>&nbsp;';
// TODO ADD LOCATION CROSSHAIR
$locationText = '';
if (strpos($ticket['latitude'], 'E') === false)
{
$locationText = $hesklang['click_for_map'];
}
else
{
$locationText = $hesklang['location_unavailable'];
}
?>
<button class="btn btn-default" data-toggle="modal" data-target=".map-modal"><?php echo $locationText; ?></button>
<div class="modal fade map-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<p>map modal!</p>
</div>
</div>
</div>
<div id="map" style="height: 150px"></div>
<script>
var map = L.map('map').setView([<?php echo $ticket['latitude']; ?>, <?php echo $ticket['longitude']; ?>], 13);
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);
L.marker([<?php echo $ticket['latitude']; ?>, <?php echo $ticket['longitude']; ?>]).addTo(map)
.bindPopup('A pretty CSS3 popup. <br> Easily customizable.');
</script>
<?php
}
echo $ticket['subject'];
?></h3>

@ -60,6 +60,7 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
<link href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css" rel="stylesheet">
<link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/octicons.css" type="text/css">
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
<script src="<?php echo HESK_PATH; ?>js/jquery-1.10.2.min.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>hesk_javascript.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap.min.js"></script>
@ -68,6 +69,7 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/iconset-fontawesome-4.3.0.js"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/iconset-octicon-2.1.2.js"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-iconpicker.js"></script>
<script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
<?php

@ -60,6 +60,7 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
<link href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css" rel="stylesheet">
<link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/octicons.css" type="text/css">
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
<script src="<?php echo HESK_PATH; ?>js/jquery-1.10.2.min.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>hesk_javascript.js"></script>
<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/modsForHesk-javascript.js"></script>
@ -68,6 +69,7 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/iconset-fontawesome-4.3.0.js"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/iconset-octicon-2.1.2.js"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-iconpicker.js"></script>
<script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
<?php
/* Prepare Javascript that browser should load on page load */

Loading…
Cancel
Save