From 186d5639618308cf2994e7d5506271533e965e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Wed, 26 Oct 2016 12:00:01 +0200
Subject: [PATCH] forms: add <span> to radiobuttons/checkboxes widgets (#13754)

---
 wcs/qommon/form.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/wcs/qommon/form.py b/wcs/qommon/form.py
index 43a22e5..f197844 100644
--- a/wcs/qommon/form.py
+++ b/wcs/qommon/form.py
@@ -216,23 +216,26 @@ class RadiobuttonsWidget(quixote.form.RadiobuttonsWidget):
             options = self.options_with_attributes
             include_disabled = True
 
-        tags = []
-        for option in options:
+        r = TemplateIO(html=True)
+        for i, option in enumerate(options):
             object, description, key = option[:3]
-            label_tag = htmltext('<label>')
+            r += htmltext('<label>')
             html_attrs = self.attrs.copy()
             if self.is_selected(object):
                 html_attrs['checked'] = 'checked'
             if self.options_with_attributes and option[-1].get('disabled'):
                 html_attrs['disabled'] = 'disabled'
                 label_tag = htmltext('<label class="disabled">')
-            r = htmltag("input", xml_end=True,
+            r += htmltag("input", xml_end=True,
                         type="radio",
                         name=self.name,
                         value=key,
                         **html_attrs)
-            tags.append(label_tag + r + htmlescape(description) + htmltext('</label>'))
-        return htmlescape(self.delim).join(tags)
+            r += htmltext('<span>%s</span>') % description
+            r += htmltext('</label>')
+            if i != len(options) - 1:
+                r += htmltext(self.delim)
+        return r.getvalue()
 
 def checkbox_render_content(self):
     attrs = {'id': 'form_' + self.name}
@@ -1203,7 +1206,7 @@ class CheckboxesWidget(CompositeWidget):
                     r += htmltext('<input type="hidden" name="%s" value="yes" >') % widget.name
                 widget.name = widget.name + 'xx'
             r += widget.render_content()
-            r += widget.title
+            r += htmltext('<span>%s</span>') % widget.title
             r += htmltext('</label>')
             r += htmltext('</li>')
         r += htmltext('</ul>')
-- 
2.10.1