diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-04-16 09:41:22 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-16 09:41:22 +1200 |
commit | e4d7d815fe0d05aa7753c2752a99fa4c7cc7a326 (patch) | |
tree | 772381d37eb1d2e69c2052eb9695aeffc5eefa3c /templates | |
parent | 994efc29d550e3f4a69f65ee60aa51816f352d45 (diff) | |
parent | 30ae3d104e9b0446364ebc316dc10d0f811e1480 (diff) | |
download | trackermap-server-e4d7d815fe0d05aa7753c2752a99fa4c7cc7a326.tar.gz trackermap-server-e4d7d815fe0d05aa7753c2752a99fa4c7cc7a326.tar.bz2 trackermap-server-e4d7d815fe0d05aa7753c2752a99fa4c7cc7a326.zip |
Merge pull request #3842 from Abyss777/multi_maintenance
Add support of multiple Maintenances
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/sms/maintenance.vm | 2 |
3 files changed, 2 insertions, 2 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/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) |