aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-04-16 09:41:22 +1200
committerGitHub <noreply@github.com>2018-04-16 09:41:22 +1200
commite4d7d815fe0d05aa7753c2752a99fa4c7cc7a326 (patch)
tree772381d37eb1d2e69c2052eb9695aeffc5eefa3c /templates
parent994efc29d550e3f4a69f65ee60aa51816f352d45 (diff)
parent30ae3d104e9b0446364ebc316dc10d0f811e1480 (diff)
downloadtrackermap-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.xlsxbin12336 -> 8738 bytes
-rw-r--r--templates/mail/maintenance.vm2
-rw-r--r--templates/sms/maintenance.vm2
3 files changed, 2 insertions, 2 deletions
diff --git a/templates/export/events.xlsx b/templates/export/events.xlsx
index f3151d11c..5c5633f3a 100644
--- a/templates/export/events.xlsx
+++ b/templates/export/events.xlsx
Binary files differ
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&deg;, $position.longitude&deg;#{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)