GH-957: tidy up how we render the icons into the forms

opentech/apply/funds/forms.py

@@ -83,7 +83,8 @@ class UpdateReviewersForm(forms.ModelForm):
             self.fields[field_name] = forms.ModelChoiceField(
                 queryset=staff_reviewers,
                 widget=Select2IconWidget(attrs={
-                    'data-placeholder': 'Select a reviewer', 'role': role}),
+                    'data-placeholder': 'Select a reviewer', 'icon': role.icon
+                }),
                 required=False,
                 label=f'{role.name} Reviewer',
             )

opentech/apply/funds/templates/funds/includes/delegated_form_base.html

@@ -2,23 +2,7 @@
 <form class="form {{extra_classes}}" method="post" id="{{ form.name }}">
     {% csrf_token %}
     <div class="form__item">
-        {{ form.non_field_errors }}
-
-        {% for field in form %}
-            {{ field.errors }}
-
-            {# TODO: Add styles around icon later #}
-            {% if field.field.widget.attrs.role and field.field.widget.attrs.role.icon %}
-                {% image field.field.widget.attrs.role.icon max-20x20 %}
-            {% endif %}
-
-
-            {{ field.label_tag }} {{ field }}
-
-            {% if field.help_text %}
-                {{ field.help_text|safe }}
-            {% endif %}
-        {% endfor %}
+        {{ form }}
     </div>
 
     <input class="button button--primary button--top-space" id="{{ form.name }}-submit" name="{{ form_prefix }}{{ form.name }}" type="submit" form="{{ form.name }}" value="{{ value }}">

opentech/apply/funds/templates/funds/widgets/icon_select2.html

+{% load wagtailimages_tags %}
+{% if widget.attrs.icon %}<div>{% image widget.attrs.icon max-20x20 %}</div>{% endif %}
+{% include 'django/forms/widgets/select.html' %}

opentech/apply/funds/widgets.py

@@ -23,8 +23,10 @@ class Select2MultiCheckboxesWidget(Select2MultipleWidget):
 
 
 class Select2IconWidget(Select2Widget):
+    template_name = 'funds/widgets/icon_select2.html'
+
     def __init__(self, *args, **kwargs):
         attrs = kwargs.get('attrs', {})
-        attrs.setdefault('role', '')
+        attrs.setdefault('icon', '')
         kwargs['attrs'] = attrs
         super().__init__(*args, **kwargs)