move override/devolved checkbox outside of hidden/revealed div

This checkbox should not only be revealed if the send method is not email, because it potentially applies all the time

1 files changed, 12 insertions, 12 deletions

diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html
index 4d2b5cc98..e35ede50c 100644
--- a/templates/web/default/admin/body-form.html
+++ b/templates/web/default/admin/body-form.html
@@ -179,31 +179,31 @@
     <div class="admin-hint">
       <p>
         [% loc(
-          "Enable this <strong>contact can override</strong> setting if one or more contacts have a 
-          different endpoint (and send method) from the body's. For example, if reports for some categories of
-          problem must be emailed, while others can be sent over Open311."
+          "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in 
+          its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.
+          Check that your cobrand supports this feature before switching it on."
         ) %]
       </p>
     </div>
     <p>
-        <input type="checkbox" id="can_be_devolved" name="can_be_devolved"[% ' checked' IF body.can_be_devolved %]>
-        <label for="can_be_devolved" class="inline">Contacts' own endpoint can override the body's endpoint</label>
+        <input type="checkbox" id="send_extended_statuses" name="send_extended_statuses"[% ' checked' IF conf.send_extended_statuses %]>
+        <label for="send_extended_statuses" class="inline">Send extended Open311 statuses with service request updates</label>
     </p>
-
+    </div>
+    
     <div class="admin-hint">
       <p>
         [% loc(
-          "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in 
-          its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.
-          Check that your cobrand supports this feature before switching it on."
+          "Enable this <strong>contact can override</strong> setting if one or more contacts have a 
+          different endpoint (and send method) from the body's. For example, if reports for some categories of
+          problem must be emailed, while others can be sent over Open311."
         ) %]
       </p>
     </div>
     <p>
-        <input type="checkbox" id="send_extended_statuses" name="send_extended_statuses"[% ' checked' IF conf.send_extended_statuses %]>
-        <label for="send_extended_statuses" class="inline">Send extended Open311 statuses with service request updates</label>
+        <input type="checkbox" id="can_be_devolved" name="can_be_devolved"[% ' checked' IF body.can_be_devolved %]>
+        <label for="can_be_devolved" class="inline">Contacts' own endpoint can override the body's endpoint</label>
     </p>
-    </div>
     
     <p>
     <input type="hidden" name="posted" value="body">