From 8226745f126f461239f0ddb70a62fd85978ee763 Mon Sep 17 00:00:00 2001
From: M1dgard <M1dgard@users.noreply.github.com>
Date: Sun, 8 Jan 2017 23:14:29 +0100
Subject: [PATCH] Add universal email field, make fax universal

Fixes #3710
---
 data/presets.yaml              | 5 +++++
 data/presets/fields.json       | 8 ++++++++
 data/presets/fields/email.json | 7 +++++++
 data/presets/fields/fax.json   | 3 ++-
 dist/locales/en.json           | 4 ++++
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 data/presets/fields/email.json

diff --git a/data/presets.yaml b/data/presets.yaml
index cb0f7463d..8d1c56983 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -418,6 +418,11 @@ en:
       elevation:
         # ele=*
         label: Elevation
+      email:
+        # email=*
+        label: Email
+        # email field placeholder
+        placeholder: example@example.com
       emergency:
         # emergency=*
         label: Emergency
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 3a35f2386..06c1ccef3 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -581,6 +581,13 @@
             "universal": true,
             "label": "Elevation"
         },
+        "email": {
+            "key": "email",
+            "type": "email",
+            "placeholder": "example@example.com",
+            "universal": true,
+            "label": "Email"
+        },
         "emergency": {
             "key": "emergency",
             "type": "check",
@@ -600,6 +607,7 @@
             "key": "fax",
             "type": "tel",
             "label": "Fax",
+            "universal": true,
             "placeholder": "+31 42 123 4567"
         },
         "fee": {
diff --git a/data/presets/fields/email.json b/data/presets/fields/email.json
new file mode 100644
index 000000000..392820199
--- /dev/null
+++ b/data/presets/fields/email.json
@@ -0,0 +1,7 @@
+{
+    "key": "email",
+    "type": "email",
+    "placeholder": "example@example.com",
+    "universal": true,
+    "label": "Email"
+}
diff --git a/data/presets/fields/fax.json b/data/presets/fields/fax.json
index 817661cf7..6d7228543 100644
--- a/data/presets/fields/fax.json
+++ b/data/presets/fields/fax.json
@@ -2,5 +2,6 @@
     "key": "fax",
     "type": "tel",
     "label": "Fax",
+    "universal": true,
     "placeholder":"+31 42 123 4567"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 529ae0498..a63273124 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1083,6 +1083,10 @@
                 "elevation": {
                     "label": "Elevation"
                 },
+                "email": {
+                    "label": "Email",
+                    "placeholder": "example@example.com"
+                },
                 "emergency": {
                     "label": "Emergency"
                 },