Merge branch 'master' into develop

assets/themes/buurtnatuur/buurtnatuur.json

@@ -341,7 +341,8 @@
         "nl": "Is dit gebied toegankelijk?"
       },
       "freeform": {
-        "key": "access:description"
+        "key": "access:description",
+        "addExtraTags": ["access="]
       },
       "mappings": [
         {
@@ -360,6 +361,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=yes",
               "fee="
             ]
@@ -371,6 +373,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=no",
               "fee="
             ]
@@ -382,6 +385,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=private",
               "fee="
             ]
@@ -393,6 +397,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=permissive",
               "fee="
             ]
@@ -404,6 +409,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=guided",
               "fee="
             ]
@@ -415,6 +421,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=yes",
               "fee=yes"
             ]
@@ -486,6 +493,25 @@
         ]
       }
     },
+   {
+      "#": "Non-editable description {description}",
+      "render": {
+        "nl": "Extra info: <i>{description}</i>"
+      },
+      "freeform": {
+        "key": "description"
+      }
+    },
+    {
+      "#": "Editable description {description:0}",
+      "question": "Is er extra info die je kwijt wil?<br/><span class='subtle'>De <i>naam</i> van het gebied wordt in de volgende vraag gesteld</span>",
+      "render": {
+        "nl": "Extra info via buurtnatuur.be: <i>{description:0}</i>"
+      },
+      "freeform": {
+        "key": "description:0"
+      }
+    },
     {
       "#": "Name:nl-tag",
       "render": {
@@ -537,25 +563,6 @@
           }
         }
       ]
-    },
-    {
-      "#": "Non-editable description {description}",
-      "render": {
-        "nl": "Extra info: <i>{description}</i>"
-      },
-      "freeform": {
-        "key": "description"
-      }
-    },
-    {
-      "#": "Editable description {description:0}",
-      "question": "Is er extra info die je kwijt wil?",
-      "render": {
-        "nl": "Extra info via buurtnatuur.be: <i>{description:0}</i>"
-      },
-      "freeform": {
-        "key": "description:0"
-      }
     }
   ]
 }