Improve label handling for checkboxes (CFM-446, CFM-403)

app/resources/locales/en_US/field.po

@@ -496,10 +496,10 @@ msgid "Groups.group_type"
 msgstr "Group Type"
 
 msgid "Groups.nesting_mode_all"
-msgstr "Require All for Nested Memberships"
+msgstr "Nesting Mode: All"
 
 msgid "Groups.nesting_mode_all.desc"
-msgstr "When enabled, a Person must be found in ALL nested groups to be included as a member. When disabled, a Person found in ANY nested group will be included. (Note that People in negated nested groups are always excluded.)"
+msgstr "When checked, a Person must be found in ALL nested groups to be included as a member of this group. Otherwise, a Person found in ANY nested group will be included."
 
 msgid "Groups.open"
 msgstr "Open"

app/src/View/Helper/FieldHelper.php

@@ -443,6 +443,13 @@ public function formField(string $fieldName,
     if(empty($fieldSelectOptions) && $fieldType === 'select') {
       $fieldType = '';
     }
+
+    // Checkbox labels need special handling
+    if($fieldType == 'boolean') {
+      [$cbLabel] = $this->calculateLabelAndDescription($fieldName);
+      $fieldLabel = $fieldLabel ?? $cbLabel;
+    }
+
     // Generate the form control or pass along the markup generated in a wrapper function
     return match($fieldType) {
       // A boolean field is a checkbox. Set the label and class to improve rendering

app/templates/Groups/fields.inc

@@ -35,7 +35,8 @@ if($vv_obj->isOwners()) {
 foreach(['name',
           'description',
           'status',
-          'open',] as $field) {
+          'open',
+          'nesting_mode_all'] as $field) {
   print $this->element('form/listItem', [
     'arguments' => [
       'fieldName' => $field,
@@ -44,12 +45,6 @@ foreach(['name',
   ]);
 }
 
-print $this->element('form/listItem', [
-  'arguments' => [
-    'fieldName' => 'nesting_mode_all',
-  ]
-]);
-
 if($vv_action != 'add') {
   print $this->element('form/listItem', [
     'arguments' => [

app/webroot/css/co-base.css

@@ -1595,8 +1595,12 @@ ul.form-list .field-suppliment {
 ul.form-list li.info-title {
   border: none;
 }
-.checkbox label input {
+.checkbox label input[type="checkbox"] {
+  position: relative;
+  top: -0.12em;
   margin-right: 0.5em;
+  width: 1.24em;
+  height: 1.24em;
 }
 .checkbox .subfield {
   margin-left: 1.5em;