Changes to display label for checkbox/switch above the field.

modules/backend/classes/FormField.php

@@ -180,6 +180,11 @@ class FormField
      */
     public $preset;
 
+    /**
+     * @var bool Should the field's label for checkbox/switch fields be displayed above the field.
+     */
+    public $showLabels;
+
     /**
      * Constructor.
      * @param string $fieldName The name of the field
@@ -282,6 +287,7 @@ protected function evalConfig($config)
         $applyConfigValues = [
             'commentHtml',
             'placeholder',
+            'showLabels',
             'dependsOn',
             'required',
             'readOnly',

modules/backend/widgets/Form.php

@@ -1156,7 +1156,7 @@ protected function getFieldDepends($field)
     protected function showFieldLabels($field)
     {
         if (in_array($field->type, ['checkbox', 'switch', 'section'])) {
-            return false;
+            return $field->showLabels ?? false;
         }
 
         if ($field->type === 'widget') {

modules/backend/widgets/form/partials/_field_checkbox.php

@@ -5,6 +5,7 @@
         name="<?= $field->getName() ?>"
         value="0"
         <?= $this->previewMode ? 'disabled="disabled"' : '' ?>>
+
     <input
         type="checkbox"
         id="<?= $field->getId() ?>"
@@ -14,10 +15,13 @@
         <?= $field->isSelected() ? 'checked="checked"' : '' ?>
         <?= $field->getAttributes() ?>>
 
-    <label for="<?= $field->getId() ?>">
-        <?= e(trans($field->label)) ?>
+    <label for="<?= $field->getId() ?>" class="<?= $field->showLabels ? 'show-labels' : '' ?>">
+        <?php if (!$field->showLabels): ?>
+            <?= e(trans($field->label)) ?>
+        <?php endif ?>
     </label>
-    <?php if ($field->comment): ?>
+
+    <?php if (!$field->showLabels and $field->comment): ?>
         <p class="help-block"><?= $field->commentHtml ? trans($field->comment) : e(trans($field->comment)) ?></p>
     <?php endif ?>
 </div>

modules/backend/widgets/form/partials/_field_switch.php

@@ -11,8 +11,10 @@
 <!-- Switch -->
 <div class="<?= $previewMode ? 'disabled' : '' ?>">
     <div class="field-switch">
-        <label for="<?= $field->getId() ?>"><?= e(trans($field->label)) ?></label>
-        <?php if ($field->comment): ?>
+        <?php if (!$field->showLabels): ?>
+            <label for="<?= $field->getId() ?>"><?= e(trans($field->label)) ?></label>
+        <?php endif ?>
+        <?php if (!$field->showLabels and $field->comment): ?>
             <p class="help-block"><?= $field->commentHtml ? trans($field->comment) : e(trans($field->comment)) ?></p>
         <?php endif ?>
     </div>

modules/system/assets/ui/less/form.less

@@ -124,7 +124,7 @@
 
     &.is-required {
         > label:not(.custom-switch):after,
-        > .custom-checkbox > label:after,
+        > .custom-checkbox > label:not(.show-labels):after,
         > .field-switch > label:after {
             background-color: @color-form-required-asterisk;
             width: 5px;