10 files changed, 118 insertions, 11 deletions
diff --git a/templates/full/alarm.vm b/templates/full/alarm.vm
index 9fae1f13b..fb596ecde 100644
--- a/templates/full/alarm.vm
+++ b/templates/full/alarm.vm
@@ -1,9 +1,87 @@
 #set($subject = "$device.name: alarm!")
+#set($alarmName = $position.getString("alarm"))
+#if(    $alarmName == "general")
+	#set($alarmName = "General")
+#elseif($alarmName == "sos")
+	#set($alarmName = "SOS")
+#elseif($alarmName == "vibration")
+	#set($alarmName = "Vibration")
+#elseif($alarmName == "movement")
+	#set($alarmName = "Movement")
+#elseif($alarmName == "lowspeed")
+	#set($alarmName = "Low Speed")
+#elseif($alarmName == "overspeed")
+	#set($alarmName = "Overspeed")
+#elseif($alarmName == "fallDown")
+	#set($alarmName = "Fall Down")
+#elseif($alarmName == "lowPower")
+	#set($alarmName = "Low Power")
+#elseif($alarmName == "lowBattery")
+	#set($alarmName = "Low Battery")
+#elseif($alarmName == "fault")
+	#set($alarmName = "Fault")
+#elseif($alarmName == "powerOff")
+	#set($alarmName = "Power Off")
+#elseif($alarmName == "powerOn")
+	#set($alarmName = "Power On")
+#elseif($alarmName == "door")
+	#set($alarmName = "Door")
+#elseif($alarmName == "lock")
+	#set($alarmName = "Lock")
+#elseif($alarmName == "unlock")
+	#set($alarmName = "Unlock")
+#elseif($alarmName == "geofence")
+	#set($alarmName = "Geofence")
+#elseif($alarmName == "geofenceEnter")
+	#set($alarmName = "Geofence Enter")
+#elseif($alarmName == "geofenceExit")
+	#set($alarmName = "Geofence Exit")
+#elseif($alarmName == "gpsAntennaCut")
+	#set($alarmName = "GPS Antenna Cut")
+#elseif($alarmName == "accident")
+	#set($alarmName = "Accident")
+#elseif($alarmName == "tow")
+	#set($alarmName = "Tow")
+#elseif($alarmName == "idle")
+	#set($alarmName = "Idle")
+#elseif($alarmName == "highRpm")
+	#set($alarmName = "High RPM")
+#elseif($alarmName == "hardAcceleration")
+	#set($alarmName = "Hard Acceleration")
+#elseif($alarmName == "hardBraking")
+	#set($alarmName = "Hard Braking")
+#elseif($alarmName == "hardCornering")
+	#set($alarmName = "Hard Cornering")
+#elseif($alarmName == "laneChange")
+	#set($alarmName = "Lane Change")
+#elseif($alarmName == "fatigueDriving")
+	#set($alarmName = "Fatigue Driving")
+#elseif($alarmName == "powerCut")
+	#set($alarmName = "Power Cut")
+#elseif($alarmName == "powerRestored")
+	#set($alarmName = "Power Restored")
+#elseif($alarmName == "jamming")
+	#set($alarmName = "Jamming")
+#elseif($alarmName == "temperature")
+	#set($alarmName = "Temperature")
+#elseif($alarmName == "parking")
+	#set($alarmName = "Parking")
+#elseif($alarmName == "bonnet")
+	#set($alarmName = "Bonnet")
+#elseif($alarmName == "footBrake")
+	#set($alarmName = "Foot Brake")
+#elseif($alarmName == "fuelLeak")
+	#set($alarmName = "Fuel Leak")
+#elseif($alarmName == "tampering")
+	#set($alarmName = "Tampering")
+#elseif($alarmName == "removing")
+	#set($alarmName = "Removing")
+#end
 <!DOCTYPE html>
 <html>
 <body>
 Device: $device.name<br>
-Alarm: $position.getString("alarm")<br>
+Alarm: $alarmName<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&deg;, $position.longitude&deg;#{end}</a><br>
 <br>
diff --git a/templates/full/deviceExpiration.vm b/templates/full/deviceExpiration.vm
new file mode 100644
index 000000000..879b31778
--- /dev/null
+++ b/templates/full/deviceExpiration.vm
@@ -0,0 +1,7 @@
+#set($subject = "Device expiration")
+<!DOCTYPE html>
+<html>
+<body>
+Your device $device.name has expired.
+</body>
+</html>
diff --git a/templates/full/deviceExpirationReminder.vm b/templates/full/deviceExpirationReminder.vm
new file mode 100644
index 000000000..aa47ac0ed
--- /dev/null
+++ b/templates/full/deviceExpirationReminder.vm
@@ -0,0 +1,7 @@
+#set($subject = "Device expiration reminder")
+<!DOCTYPE html>
+<html>
+<body>
+Your device $device.name will expire on $dateTool.format("YYYY-MM-dd", $expiration, $locale, $timezone).
+</body>
+</html>
diff --git a/templates/full/deviceOffline.vm b/templates/full/deviceOffline.vm
index 8f2c515b2..6d2122624 100644
--- a/templates/full/deviceOffline.vm
+++ b/templates/full/deviceOffline.vm
@@ -5,7 +5,6 @@
 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><br>
 <br>
 <a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a>
 </body>
diff --git a/templates/full/deviceOnline.vm b/templates/full/deviceOnline.vm
index 81a4ccbc8..02260c4fb 100644
--- a/templates/full/deviceOnline.vm
+++ b/templates/full/deviceOnline.vm
@@ -5,7 +5,6 @@
 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><br>
 <br>
 <a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a>
 </body>
diff --git a/templates/full/deviceUnknown.vm b/templates/full/deviceUnknown.vm
index e012845e6..e99981069 100644
--- a/templates/full/deviceUnknown.vm
+++ b/templates/full/deviceUnknown.vm
@@ -5,7 +5,6 @@
 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><br>
 <br>
 <a href="$webUrl/settings/notifications?token=$token">Unsubscribe</a>
 </body>
diff --git a/templates/full/queuedCommandSent.vm b/templates/full/queuedCommandSent.vm
new file mode 100644
index 000000000..148dd2094
--- /dev/null
+++ b/templates/full/queuedCommandSent.vm
@@ -0,0 +1,11 @@
+#set($subject = "$device.name: queued command sent")
+<!DOCTYPE html>
+<html>
+<body>
+Device: $device.name<br>
+Queued command sent<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>
diff --git a/templates/full/unknown.vm b/templates/full/unknown.vm
deleted file mode 100644
index 566ce0d42..000000000
--- a/templates/full/unknown.vm
+++ /dev/null
@@ -1,7 +0,0 @@
-#set($subject = "Unknown type")
-<!DOCTYPE html>
-<html>
-<body>
-Unknown type
-</body>
-</html> 
diff --git a/templates/full/userExpiration.vm b/templates/full/userExpiration.vm
new file mode 100644
index 000000000..43fe2563e
--- /dev/null
+++ b/templates/full/userExpiration.vm
@@ -0,0 +1,7 @@
+#set($subject = "Account expiration")
+<!DOCTYPE html>
+<html>
+<body>
+Your user account has expired.
+</body>
+</html>
diff --git a/templates/full/userExpirationReminder.vm b/templates/full/userExpirationReminder.vm
new file mode 100644
index 000000000..ecdee0588
--- /dev/null
+++ b/templates/full/userExpirationReminder.vm
@@ -0,0 +1,7 @@
+#set($subject = "Account expiration reminder")
+<!DOCTYPE html>
+<html>
+<body>
+Your user account will expire on $dateTool.format("YYYY-MM-dd", $expiration, $locale, $timezone).
+</body>
+</html>