From 95ace2cb97c9718dae90df6c94a5832b28dbc0bd Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@gmail.com>
Date: Mon, 21 Sep 2020 22:22:58 +0200
Subject: [PATCH] Fix a few bugs with the new buurtnatuur preset: move name
 after freeform description, fix access (picking an option overwrites
 access:description and vice-versa)

---
 assets/themes/buurtnatuur/buurtnatuur.json | 47 +++++++++++++---------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/assets/themes/buurtnatuur/buurtnatuur.json b/assets/themes/buurtnatuur/buurtnatuur.json
index d5653fb..bb85462 100644
--- a/assets/themes/buurtnatuur/buurtnatuur.json
+++ b/assets/themes/buurtnatuur/buurtnatuur.json
@@ -340,7 +340,8 @@
         "nl": "Is dit gebied toegankelijk?"
       },
       "freeform": {
-        "key": "access:description"
+        "key": "access:description",
+        "addExtraTags": ["access="]
       },
       "mappings": [
         {
@@ -359,6 +360,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=yes",
               "fee="
             ]
@@ -370,6 +372,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=no",
               "fee="
             ]
@@ -381,6 +384,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=private",
               "fee="
             ]
@@ -392,6 +396,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=permissive",
               "fee="
             ]
@@ -403,6 +408,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=guided",
               "fee="
             ]
@@ -414,6 +420,7 @@
         {
           "if": {
             "and": [
+              "access:description=",
               "access=yes",
               "fee=yes"
             ]
@@ -485,6 +492,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": {
@@ -536,25 +562,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"
-      }
     }
   ]
 }
\ No newline at end of file