aboutsummaryrefslogtreecommitdiff
path: root/templates/mail
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-12-17 18:16:37 +1300
committerGitHub <noreply@github.com>2016-12-17 18:16:37 +1300
commit98133819e0ea1b3126f142026aac1f624d2b1497 (patch)
tree0002d99b7809b4cd033aeef18bb327df4b6d4f30 /templates/mail
parent41164f46409fbc1765694a269b186705493bf581 (diff)
parenta794241315af89b06e0b43fbde9e0af14c63252f (diff)
downloadtrackermap-server-98133819e0ea1b3126f142026aac1f624d2b1497.tar.gz
trackermap-server-98133819e0ea1b3126f142026aac1f624d2b1497.tar.bz2
trackermap-server-98133819e0ea1b3126f142026aac1f624d2b1497.zip
Merge pull request #2696 from renaudallard/master
Put the html code for degree instead of the special character
Diffstat (limited to 'templates/mail')
-rw-r--r--templates/mail/alarm.vm2
-rw-r--r--templates/mail/deviceMoving.vm2
-rw-r--r--templates/mail/deviceOverspeed.vm2
-rw-r--r--templates/mail/deviceStopped.vm2
-rw-r--r--templates/mail/geofenceEnter.vm2
-rw-r--r--templates/mail/geofenceExit.vm2
-rw-r--r--templates/mail/ignitionOff.vm2
-rw-r--r--templates/mail/ignitionOn.vm2
-rw-r--r--templates/mail/maintenance.vm2
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>