From 513f7aaa1651ffcc051d5ba36b6780154b20660d Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
Date: Mon, 31 Jan 2022 23:55:27 +0100
Subject: Fixed: <label> (#4189)

* fixed: empty/wrong for attribute

* label to div, because no for attribute possible

* useless label deleted
---
 app/views/helpers/category/update.phtml |  4 ++--
 app/views/helpers/feed/update.phtml     | 18 ++++++++----------
 app/views/subscription/add.phtml        | 12 +++++-------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml
index 291dd7fc4..4d05ed908 100644
--- a/app/views/helpers/category/update.phtml
+++ b/app/views/helpers/category/update.phtml
@@ -78,7 +78,7 @@
 		</p>
 
 		<div class="form-group">
-			<label class="group-name"><?= _t('conf.archiving.policy') ?></label>
+			<label class="group-name" for="use_default_purge_options"><?= _t('conf.archiving.policy') ?></label>
 			<div class="group-controls">
 				<label class="checkbox">
 					<input type="checkbox" name="use_default_purge_options" id="use_default_purge_options" value="1"<?= $archiving['default'] ? ' checked="checked"' : '' ?>
@@ -118,7 +118,7 @@
 			</div>
 		</div>
 		<div class="form-group archiving"<?= $archiving['default'] ? ' hidden="hidden"' : '' ?>>
-			<label class="group-name"><?= _t('conf.archiving.exception') ?></label>
+			<div class="group-name"><?= _t('conf.archiving.exception') ?></div>
 			<div class="group-controls">
 				<label class="checkbox" for="keep_favourites">
 					<input type="checkbox" name="keep_favourites" id="keep_favourites" value="1"<?= $archiving['keep_favourites'] ? ' checked="checked"' : '' ?>
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 949c6492f..a1567afc0 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -281,7 +281,7 @@
 		</p>
 
 		<div class="form-group">
-			<label class="group-name"><?= _t('conf.archiving.policy') ?></label>
+			<label class="group-name" for="use_default_purge_options"><?= _t('conf.archiving.policy') ?></label>
 			<div class="group-controls">
 				<label class="checkbox">
 					<input type="checkbox" name="use_default_purge_options" id="use_default_purge_options" value="1"<?= $archiving['default'] ? ' checked="checked"' : '' ?>
@@ -321,7 +321,7 @@
 			</div>
 		</div>
 		<div class="form-group archiving"<?= $archiving['default'] ? ' hidden="hidden"' : '' ?>>
-			<label class="group-name"><?= _t('conf.archiving.exception') ?></label>
+			<div class="group-name"><?= _t('conf.archiving.exception') ?></div>
 			<div class="group-controls">
 				<label class="checkbox" for="keep_favourites">
 					<input type="checkbox" name="keep_favourites" id="keep_favourites" value="1"<?= $archiving['keep_favourites'] ? ' checked="checked"' : '' ?>
@@ -380,7 +380,7 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="path_entries"><?= _t('sub.feed.css_cookie') ?></label>
+			<label class="group-name" for="curl_params_cookie"><?= _t('sub.feed.css_cookie') ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="curl_params_cookie" id="curl_params_cookie" class="extend" value="<?=
@@ -449,13 +449,11 @@
 		<div class="form-group">
 			<label class="group-name" for="ssl_verify"><?= _t('sub.feed.ssl_verify') ?></label>
 			<div class="group-controls">
-				<label class="checkbox" for="ssl_verify">
-					<select name="ssl_verify" id="ssl_verify">
-						<option value=""<?= $this->feed->attributes('ssl_verify') === null ? ' selected="selected"' : '' ?>><?= _t('gen.short.by_default') ?></option>
-						<option value="0"<?= $this->feed->attributes('ssl_verify') === false ? ' selected="selected"' : '' ?>><?= _t('gen.short.no') ?></option>
-						<option value="1"<?= $this->feed->attributes('ssl_verify') === true ? ' selected="selected"' : '' ?>><?= _t('gen.short.yes') ?></option>
-					</select>
-				</label>
+				<select name="ssl_verify" id="ssl_verify">
+					<option value=""<?= $this->feed->attributes('ssl_verify') === null ? ' selected="selected"' : '' ?>><?= _t('gen.short.by_default') ?></option>
+					<option value="0"<?= $this->feed->attributes('ssl_verify') === false ? ' selected="selected"' : '' ?>><?= _t('gen.short.no') ?></option>
+					<option value="1"<?= $this->feed->attributes('ssl_verify') === true ? ' selected="selected"' : '' ?>><?= _t('gen.short.yes') ?></option>
+				</select>
 			</div>
 		</div>
 
diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml
index df74b24f2..380f5434f 100644
--- a/app/views/subscription/add.phtml
+++ b/app/views/subscription/add.phtml
@@ -109,13 +109,11 @@
 			<div class="form-group">
 				<label class="group-name" for="ssl_verify"><?= _t('sub.feed.ssl_verify') ?></label>
 				<div class="group-controls">
-					<label class="checkbox" for="ssl_verify">
-						<select name="ssl_verify" id="ssl_verify">
-							<option value=""><?= _t('gen.short.by_default') ?></option>
-							<option value="0"><?= _t('gen.short.no') ?></option>
-							<option value="1"><?= _t('gen.short.yes') ?></option>
-						</select>
-					</label>
+					<select name="ssl_verify" id="ssl_verify">
+						<option value=""><?= _t('gen.short.by_default') ?></option>
+						<option value="0"><?= _t('gen.short.no') ?></option>
+						<option value="1"><?= _t('gen.short.yes') ?></option>
+					</select>
 				</div>
 			</div>
 		</details>
-- 
cgit v1.2.3