diff options
| author | casswarry0 <casswarry0@gmail.com> | 2023-01-17 17:14:53 -0700 |
|---|---|---|
| committer | casswarry0 <casswarry0@gmail.com> | 2023-01-17 17:14:53 -0700 |
| commit | 7338b8730949ed027b3f8b31d7dca20687ebbb8b (patch) | |
| tree | c2d171e6121818ab511460a786f69aab97a2a628 /templates | |
| parent | cdecd3fa4427a382c0b09f8ad9d69ec14388960a (diff) | |
| parent | 85501f9cf4918d5eee345f83aed7a31eecb26b8d (diff) | |
| download | trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.tar.gz trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.tar.bz2 trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'templates')
24 files changed, 89 insertions, 27 deletions
diff --git a/templates/export/events.xlsx b/templates/export/events.xlsx Binary files differindex a6366750c..d0120ab8e 100644 --- a/templates/export/events.xlsx +++ b/templates/export/events.xlsx diff --git a/templates/full/alarm.vm b/templates/full/alarm.vm index 8eac3930a..9fae1f13b 100644 --- a/templates/full/alarm.vm +++ b/templates/full/alarm.vm @@ -3,8 +3,10 @@ <html> <body> Device: $device.name<br> -Alarm: $position.getString("alarm")<br> +Alarm: $position.getString("alarm")<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/commandResult.vm b/templates/full/commandResult.vm index c5ceffab0..c3b62edf5 100644 --- a/templates/full/commandResult.vm +++ b/templates/full/commandResult.vm @@ -5,6 +5,8 @@ Device: $device.name<br> Result: $position.getString("result")<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> -Link: <a href="$webUrl?eventId=$event.id">$webUrl?eventId=$event.id</a> +Link: <a href="$webUrl?eventId=$event.id">$webUrl?eventId=$event.id</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/deviceFuelDrop.vm b/templates/full/deviceFuelDrop.vm index a50e8ca38..3fb9aa63c 100644 --- a/templates/full/deviceFuelDrop.vm +++ b/templates/full/deviceFuelDrop.vm @@ -5,5 +5,7 @@ Device: $device.name<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/deviceFuelIncrease.vm b/templates/full/deviceFuelIncrease.vm new file mode 100644 index 000000000..9d4474e1a --- /dev/null +++ b/templates/full/deviceFuelIncrease.vm @@ -0,0 +1,11 @@ +#set($subject = "$device.name: fuel increase") +<!DOCTYPE html> +<html> +<body> +Device: $device.name<br> +Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> +Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> +</body> +</html> diff --git a/templates/full/deviceInactive.vm b/templates/full/deviceInactive.vm index 51aead653..01fa319b5 100644 --- a/templates/full/deviceInactive.vm +++ b/templates/full/deviceInactive.vm @@ -7,6 +7,8 @@ Device: $device.name<br> Inactive<br> Last Update: $dateTool.format("YYYY-MM-dd HH:mm:ss", $lastUpdate, $locale, $timezone)<br> -Link: <a href="$webUrl?eventId=$event.id">$webUrl?eventId=$event.id</a> +Link: <a href="$webUrl?eventId=$event.id">$webUrl?eventId=$event.id</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/deviceMoving.vm b/templates/full/deviceMoving.vm index 37f3c2a93..e3941b324 100644 --- a/templates/full/deviceMoving.vm +++ b/templates/full/deviceMoving.vm @@ -6,5 +6,7 @@ Device: $device.name<br> Moving<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/deviceOffline.vm b/templates/full/deviceOffline.vm index c832ee553..8f2c515b2 100644 --- a/templates/full/deviceOffline.vm +++ b/templates/full/deviceOffline.vm @@ -5,6 +5,8 @@ Device: $device.name<br> Offline<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> -Link: <a href="$webUrl?eventId=$event.id">$webUrl?eventId=$event.id</a> +Link: <a href="$webUrl?eventId=$event.id">$webUrl?eventId=$event.id</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/deviceOnline.vm b/templates/full/deviceOnline.vm index fd17edef0..81a4ccbc8 100644 --- a/templates/full/deviceOnline.vm +++ b/templates/full/deviceOnline.vm @@ -5,6 +5,8 @@ Device: $device.name<br> Online<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> -Link: <a href="$webUrl?eventId=$event.id">$webUrl?eventId=$event.id</a> +Link: <a href="$webUrl?eventId=$event.id">$webUrl?eventId=$event.id</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/deviceOverspeed.vm b/templates/full/deviceOverspeed.vm index f796881a0..5f38b3f88 100644 --- a/templates/full/deviceOverspeed.vm +++ b/templates/full/deviceOverspeed.vm @@ -15,5 +15,7 @@ Device: $device.name<br> Exceeds the speed: $speedString#{if}($geofence) in $geofence.name#{else}#{end}<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/deviceStopped.vm b/templates/full/deviceStopped.vm index 9e1e47d12..e3246b277 100644 --- a/templates/full/deviceStopped.vm +++ b/templates/full/deviceStopped.vm @@ -6,5 +6,7 @@ Device: $device.name<br> Stopped<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/deviceUnknown.vm b/templates/full/deviceUnknown.vm index 34b3a7795..e012845e6 100644 --- a/templates/full/deviceUnknown.vm +++ b/templates/full/deviceUnknown.vm @@ -5,6 +5,8 @@ Device: $device.name<br> Status is unknown<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> -Link: <a href="$webUrl?eventId=$event.id">$webUrl?eventId=$event.id</a> +Link: <a href="$webUrl?eventId=$event.id">$webUrl?eventId=$event.id</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/driverChanged.vm b/templates/full/driverChanged.vm index e370d3eea..f9b6d0ae2 100644 --- a/templates/full/driverChanged.vm +++ b/templates/full/driverChanged.vm @@ -5,6 +5,8 @@ Device: $device.name<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> -Driver: #{if}($driver)$driver.name#{else}$event.getString("driverUniqueId")#{end} +Driver: #{if}($driver)$driver.name#{else}$event.getString("driverUniqueId")#{end}<br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/geofenceEnter.vm b/templates/full/geofenceEnter.vm index 9e00cb388..5ae14a8d3 100644 --- a/templates/full/geofenceEnter.vm +++ b/templates/full/geofenceEnter.vm @@ -6,5 +6,7 @@ Device: $device.name<br> Has entered geofence: $geofence.name<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/geofenceExit.vm b/templates/full/geofenceExit.vm index c3a300f37..08887a93a 100644 --- a/templates/full/geofenceExit.vm +++ b/templates/full/geofenceExit.vm @@ -6,5 +6,7 @@ Device: $device.name<br> Has exited geofence: $geofence.name<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/ignitionOff.vm b/templates/full/ignitionOff.vm index 8a546ed29..a43e4aabb 100644 --- a/templates/full/ignitionOff.vm +++ b/templates/full/ignitionOff.vm @@ -6,5 +6,7 @@ Device: $device.name<br> Ignition OFF<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/ignitionOn.vm b/templates/full/ignitionOn.vm index 9ae9a63e7..1ba9ef030 100644 --- a/templates/full/ignitionOn.vm +++ b/templates/full/ignitionOn.vm @@ -6,5 +6,7 @@ Device: $device.name<br> Ignition ON<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/maintenance.vm b/templates/full/maintenance.vm index 612a675f8..39ccb21bc 100644 --- a/templates/full/maintenance.vm +++ b/templates/full/maintenance.vm @@ -6,5 +6,7 @@ Device: $device.name<br> Maintenance is required: $maintenance.name<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/full/media.vm b/templates/full/media.vm new file mode 100644 index 000000000..1c94265fb --- /dev/null +++ b/templates/full/media.vm @@ -0,0 +1,13 @@ +#set($subject = "$device.name: media file received") +<!DOCTYPE html> +<html> +<body> +Device: $device.name<br> +Type: $event.getString("media")<br> +File: <a href="$webUrl/api/media/$device.uniqueId/$event.getString("file")">$event.getString("file")</a><br> +Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> +Link: <a href="$webUrl?eventId=$event.id">$webUrl?eventId=$event.id</a><br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> +</body> +</html> diff --git a/templates/full/passwordReset.vm b/templates/full/passwordReset.vm index fe692ba1d..d380790dc 100644 --- a/templates/full/passwordReset.vm +++ b/templates/full/passwordReset.vm @@ -3,6 +3,6 @@ <html> <body> To reset password please click on the following link:<br> -<a href="$webUrl?passwordReset=$token">$webUrl?passwordReset=$token</a><br> +<a href="$webUrl/reset-password?passwordReset=$token">$webUrl/reset-password?passwordReset=$token</a><br> </body> </html> diff --git a/templates/full/test.vm b/templates/full/test.vm index 93cbdc549..41e2f3ebd 100644 --- a/templates/full/test.vm +++ b/templates/full/test.vm @@ -4,4 +4,4 @@ <body> Test message </body> -</html> +</html> diff --git a/templates/full/textMessage.vm b/templates/full/textMessage.vm index a20dddbe0..fb20275e3 100644 --- a/templates/full/textMessage.vm +++ b/templates/full/textMessage.vm @@ -3,7 +3,9 @@ <html> <body> Device: $device.name<br> -Message: $event.getString("message")<br> +Message: $event.getString("message")<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)<br> +<br> +<a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a> </body> -</html> +</html> diff --git a/templates/short/deviceFuelIncrease.vm b/templates/short/deviceFuelIncrease.vm new file mode 100644 index 000000000..6a11418b1 --- /dev/null +++ b/templates/short/deviceFuelIncrease.vm @@ -0,0 +1,2 @@ +#set($subject = "$device.name: fuel increase") +$device.name fuel increase at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone) diff --git a/templates/short/media.vm b/templates/short/media.vm new file mode 100644 index 000000000..783636f3f --- /dev/null +++ b/templates/short/media.vm @@ -0,0 +1,2 @@ +#set($subject = "$device.name: media file received") +$device.name $event.getString("media") received: $event.getString("file") at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone) |