From 6a6cba052c7d39156b24d07ae5b46dd873ad5806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Fri, 31 Aug 2018 17:37:30 +0200
Subject: [PATCH] forms: put standalone checkboxes in a <label> tag (#26002)

---
 wcs/qommon/form.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wcs/qommon/form.py b/wcs/qommon/form.py
index a9fb6579e..80ee24a0b 100644
--- a/wcs/qommon/form.py
+++ b/wcs/qommon/form.py
@@ -223,7 +223,7 @@ class RadiobuttonsWidget(quixote.form.RadiobuttonsWidget):
                 r += htmltext(self.delim)
         return r.getvalue()
 
-def checkbox_render_content(self, empty_span=True):
+def checkbox_render_content(self, standalone=True):
     attrs = {'id': 'form_' + self.name}
     if self.required:
         attrs['aria-required'] = 'true'
@@ -232,8 +232,8 @@ def checkbox_render_content(self, empty_span=True):
     checkbox = htmltag("input", xml_end=True, type="checkbox", name=self.name,
                        value="yes", checked=self.value and "checked" or None,
                        **attrs)
-    if empty_span:
-        return checkbox + htmltext('<span></span>')  # for custom style
+    if standalone:
+        return htmltext('<label>%s<span></span></label>' % checkbox)  # for custom style
     return checkbox
 CheckboxWidget.render_content = checkbox_render_content
 
@@ -1120,7 +1120,7 @@ class CheckboxesWidget(CompositeWidget):
                 if widget.value:
                     r += htmltext('<input type="hidden" name="%s" value="yes" >') % widget.name
                 widget.name = widget.name + 'xx'
-            r += widget.render_content(empty_span=False)
+            r += widget.render_content(standalone=False)
             r += htmltext('<span>%s</span>') % widget.title
             r += htmltext('</label>')
             r += htmltext('</li>')
-- 
2.19.0.rc1