From b44884a99e19e96bb947fab8996c40943ae03d7e Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 20 May 2015 00:07:04 -0400
Subject: [PATCH] #204 Use leaflet to get a basic map displayed.

Still needs to be improved though. Also may not use the CDN.
---
 admin/admin_ticket.php  | 41 ++++++++++++++++++++++++++++++-----------
 inc/header.inc.php      |  2 ++
 inc/headerAdmin.inc.php |  2 ++
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 2c306a7c..365901a0 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -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>
diff --git a/inc/header.inc.php b/inc/header.inc.php
index 19fc20ef..656049b5 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.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/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
 
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 0b8e68d6..83073a8d 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.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 */