From a794241315af89b06e0b43fbde9e0af14c63252f Mon Sep 17 00:00:00 2001
From: Renaud Allard <renaud@allard.it>
Date: Fri, 16 Dec 2016 15:36:51 +0100
Subject: Put the html code for degree instead of the special character as it
 cause display issues in some mail clients

---
 templates/mail/alarm.vm           | 2 +-
 templates/mail/deviceMoving.vm    | 2 +-
 templates/mail/deviceOverspeed.vm | 2 +-
 templates/mail/deviceStopped.vm   | 2 +-
 templates/mail/geofenceEnter.vm   | 2 +-
 templates/mail/geofenceExit.vm    | 2 +-
 templates/mail/ignitionOff.vm     | 2 +-
 templates/mail/ignitionOn.vm      | 2 +-
 templates/mail/maintenance.vm     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/mail/alarm.vm b/templates/mail/alarm.vm
index 1d2b4fdf8..b64b2126a 100644
--- a/templates/mail/alarm.vm
+++ b/templates/mail/alarm.vm
@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Alarm:  $position.getString("alarm")<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude&deg;, $position.longitude&deg;#{end}</a><br>
 </body>
 </html>  
diff --git a/templates/mail/deviceMoving.vm b/templates/mail/deviceMoving.vm
index a946753e4..9ad2d8bdc 100644
--- a/templates/mail/deviceMoving.vm
+++ b/templates/mail/deviceMoving.vm
@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Moving<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude&deg;, $position.longitude&deg;#{end}</a><br>
 </body>
 </html>  
diff --git a/templates/mail/deviceOverspeed.vm b/templates/mail/deviceOverspeed.vm
index 7b99c6a06..a8a58a181 100644
--- a/templates/mail/deviceOverspeed.vm
+++ b/templates/mail/deviceOverspeed.vm
@@ -12,6 +12,6 @@
 Device: $device.name<br>
 Exceeds the speed: $speedString<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude&deg;, $position.longitude&deg;#{end}</a><br>
 </body>
 </html>  
diff --git a/templates/mail/deviceStopped.vm b/templates/mail/deviceStopped.vm
index c36e6f1b6..273e1c988 100644
--- a/templates/mail/deviceStopped.vm
+++ b/templates/mail/deviceStopped.vm
@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Stopped<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude&deg;, $position.longitude&deg;#{end}</a><br>
 </body>
 </html>  
diff --git a/templates/mail/geofenceEnter.vm b/templates/mail/geofenceEnter.vm
index cef24723a..75d16617f 100644
--- a/templates/mail/geofenceEnter.vm
+++ b/templates/mail/geofenceEnter.vm
@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Has entered geofence: $geofence.name<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude&deg;, $position.longitude&deg;#{end}</a><br>
 </body>
 </html>  
diff --git a/templates/mail/geofenceExit.vm b/templates/mail/geofenceExit.vm
index e696e6556..6d4d1639d 100644
--- a/templates/mail/geofenceExit.vm
+++ b/templates/mail/geofenceExit.vm
@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Has exited geofence: $geofence.name<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude&deg;, $position.longitude&deg;#{end}</a><br>
 </body>
 </html>  
diff --git a/templates/mail/ignitionOff.vm b/templates/mail/ignitionOff.vm
index 229405cca..3a3212b12 100644
--- a/templates/mail/ignitionOff.vm
+++ b/templates/mail/ignitionOff.vm
@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Ignition OFF<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude&deg;, $position.longitude&deg;#{end}</a><br>
 </body>
 </html>  
diff --git a/templates/mail/ignitionOn.vm b/templates/mail/ignitionOn.vm
index 2aeea0132..bbe6c40f6 100644
--- a/templates/mail/ignitionOn.vm
+++ b/templates/mail/ignitionOn.vm
@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Ignition ON<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude&deg;, $position.longitude&deg;#{end}</a><br>
 </body>
 </html>  
diff --git a/templates/mail/maintenance.vm b/templates/mail/maintenance.vm
index 4184d138f..c94c35cc4 100644
--- a/templates/mail/maintenance.vm
+++ b/templates/mail/maintenance.vm
@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Maintenance is required<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude&deg;, $position.longitude&deg;#{end}</a><br>
 </body>
 </html>  
-- 
cgit v1.2.3