From 7b65c50b7eb4e652614cc48eecfd3e9c643de2de Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 Apr 2024 09:21:24 +0200
Subject: [PATCH 1/2] use own code for creating checkboxes

---
 views/bootstrap/class.Bootstrap.php | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index b228624e6..5ed68d6c3 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1216,9 +1216,29 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			case 'input':
 			default:
 				switch($value['type']) {
-				default:
-					if(!empty($value['type']) && $value['type'] == 'checkbox' && isset($value['default']) && !empty($value['name']))
+				case 'checkbox':
+					if(isset($value['default']) && !empty($value['name']))
 						echo '<input type="hidden" name="'.$value['name'].'" value="'.$value['default'].'" />';
+					echo '<label class="checkbox"><input'.
+						(!empty($value['type']) ? ' type="'.$value['type'].'"' : '').
+						(!empty($value['id']) ? ' id="'.$value['id'].'"' : '').
+						(!empty($value['name']) ? ' name="'.$value['name'].'"' : '').
+						(!empty($value['class']) ? ' class="'.$value['class'].'"' : '').
+						((isset($value['value']) && is_string($value['value'])) || !empty($value['value']) ? ' value="'.$value['value'].'"' : '').
+						(!empty($value['placeholder']) ? ' placeholder="'.$value['placeholder'].'"' : '').
+						(!empty($value['autocomplete']) ? ' autocomplete="'.$value['autocomplete'].'"' : '').
+						(isset($value['min']) ? ' min="'.$value['min'].'"' : '').
+						(!empty($value['checked']) ? ' checked' : '').
+						(!empty($value['required']) ? ' required="required"' : '');
+					if(!empty($value['attributes']) && is_array($value['attributes']))
+						foreach($value['attributes'] as $a)
+							echo ' '.$a[0].'="'.$a[1].'"';
+					echo "/>";
+					if(!empty($value['label']))
+						echo $value['label'];
+					echo "</label>";
+					break;
+				default:
 					if(!empty($value['addon']))
 						echo "<span class=\"input-append\">";
 					echo '<input'.
@@ -1934,7 +1954,7 @@ $(document).ready(function() {
 		case SeedDMS_Core_AttributeDefinition::type_boolean:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 			$content .= "<input type=\"hidden\" name=\"".$attr_name."\" value=\"\" />";
-			$content .= "<input type=\"checkbox\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"1\" ".($objvalue ? 'checked' : '')." />";
+			$content .= "<label class=\"checkbox\"><input type=\"checkbox\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"1\" ".($objvalue ? 'checked' : '')." /></label>";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_date:
 			$objvalue = $attribute ? getReadableDate((is_object($attribute) ? $attribute->getValue() : $attribute)) : '';

From bad9db377bf1e40963de4add59f5b8620a448d4b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 Apr 2024 09:21:43 +0200
Subject: [PATCH 2/2] add label to checkboxes

---
 views/bootstrap4/class.Bootstrap4.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 81f140366..b64e9509e 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1218,6 +1218,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 						foreach($value['attributes'] as $a)
 							echo ' '.$a[0].'="'.$a[1].'"';
 					echo ">";
+					echo '<label class="form-check-label" '.($value['id'] ?? 'for="'.$value['id'].'"').'>'.($value['label'] ?? $value['label']).'</label>';
 					echo "</div>";
 					break;
 				default:
@@ -1973,6 +1974,7 @@ $(document).ready(function() {
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 			$content .= "<input type=\"hidden\" name=\"".$attr_name."\" value=\"\" />";
 			$content .= "<input type=\"checkbox\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"1\" ".($objvalue ? 'checked' : '')." />";
+			$content .= '<label class="form-check-label" for="'.$attr_id.'"></label>';
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_date:
 			$objvalue = $attribute ? getReadableDate((is_object($attribute) ? $attribute->getValue() : $attribute)) : '';