diff options
| author | Christoph Krey <c@ckrey.de> | 2018-04-16 10:45:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-16 10:45:11 +0200 |
| commit | 3a602dd133b533cc69d5986d64a00fb3ed670f75 (patch) | |
| tree | 97ff753db310a49ae7e53240b1db07fb8475679e /templates | |
| parent | 232de5f0daef98f31b28d177d991fdbfa191f195 (diff) | |
| parent | 6d4b8df25c7e942b9ad594db9444fe15bcb16be9 (diff) | |
| download | traccar-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.tar.gz traccar-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.tar.bz2 traccar-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.zip | |
Merge pull request #4 from traccar/master
upgrade to current master
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/export/events.xlsx | bin | 12336 -> 8738 bytes | |||
| -rw-r--r-- | templates/mail/maintenance.vm | 2 | ||||
| -rw-r--r-- | templates/mail/test.vm | 2 | ||||
| -rw-r--r-- | templates/sms/maintenance.vm | 2 | ||||
| -rw-r--r-- | templates/sms/test.vm | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/templates/export/events.xlsx b/templates/export/events.xlsx Binary files differindex f3151d11c..5c5633f3a 100644 --- a/templates/export/events.xlsx +++ b/templates/export/events.xlsx diff --git a/templates/mail/maintenance.vm b/templates/mail/maintenance.vm index 7f69b6c0d..c6973f97a 100644 --- a/templates/mail/maintenance.vm +++ b/templates/mail/maintenance.vm @@ -3,7 +3,7 @@ <html> <body> Device: $device.name<br> -Maintenance is required<br> +Maintenance is required: $maintenance.name<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> </body> diff --git a/templates/mail/test.vm b/templates/mail/test.vm index 8c06f96a7..93cbdc549 100644 --- a/templates/mail/test.vm +++ b/templates/mail/test.vm @@ -1,4 +1,4 @@ -#set($subject = "Traccar test message") +#set($subject = "Test message") <!DOCTYPE html> <html> <body> diff --git a/templates/sms/maintenance.vm b/templates/sms/maintenance.vm index 554b74400..621beae46 100644 --- a/templates/sms/maintenance.vm +++ b/templates/sms/maintenance.vm @@ -1 +1 @@ -$device.name maintenance is required at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone) +$device.name maintenance $maintenance.name is required at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone) diff --git a/templates/sms/test.vm b/templates/sms/test.vm index 0311b6203..d25f218ce 100644 --- a/templates/sms/test.vm +++ b/templates/sms/test.vm @@ -1 +1 @@ -Traccar test message +Test message |