Move chooser widget icon and classname from template overrides into context variables

wagtail/admin/templates/wagtailadmin/widgets/chooser.html

@@ -7,10 +7,10 @@
     Any element with the 'action-choose' class will open the page chooser modal
     when clicked.
 {% endcomment %}
-<div id="{{ attrs.id }}-chooser" class="chooser {% block chooser_class %}page-chooser{% endblock %} {% if not value %}blank{% endif %}" {% block chooser_attributes %}{% endblock %}>
+<div id="{{ attrs.id }}-chooser" class="chooser {% block chooser_class %}{% if classname %}{{ classname }}{% endif %}{% endblock %} {% if not value %}blank{% endif %}" {% block chooser_attributes %}{% endblock %}>
 
     <div class="chosen">
-        {% block chosen_icon %}{% endblock chosen_icon %}
+        {% block chosen_icon %}{% if icon %}{% icon name=icon %}{% endif %}{% endblock chosen_icon %}
         {% block chosen_state_view %}
             <span class="title">{{ display_title }}</span>
         {% endblock %}
@@ -31,7 +31,7 @@
     </div>
 
     <div class="unchosen">
-        {% block unchosen_icon %}{% endblock unchosen_icon %}
+        {% block unchosen_icon %}{% if icon %}{% icon name=icon %}{% endif %}{% endblock unchosen_icon %}
         <button type="button" class="button action-choose button-small button-secondary">{{ widget.choose_one_text }}</button>
     </div>
 </div>

wagtail/admin/templates/wagtailadmin/widgets/page_chooser.html

@@ -1,6 +1,3 @@
 {% extends "wagtailadmin/widgets/chooser.html" %}
-{% load wagtailadmin_tags %}
 
-{% block unchosen_icon %}{% icon name="doc-empty-inverse" %}{% endblock unchosen_icon %}
-{% block chosen_icon %}{% icon name="doc-empty-inverse" %}{% endblock chosen_icon %}
 {% block chooser_attributes %}data-chooser-url="{% url "wagtailadmin_choose_page" %}"{% endblock %}

wagtail/admin/templates/wagtailadmin/workflows/widgets/task_chooser.html

@@ -1,5 +1,4 @@
 {% extends "wagtailadmin/widgets/chooser.html" %}
-{% block chooser_class %}task-chooser{% endblock %}
 {% block chooser_attributes %}data-chooser-url="{% url "wagtailadmin_workflows:task_chooser" %}"{% endblock %}
 
 {% block chosen_state_view %}

wagtail/admin/widgets/chooser.py

@@ -180,6 +180,8 @@ class AdminPageChooser(AdminChooser):
                 ),  # only used by chooser.html to identify blank values
                 "display_title": value_data.get("display_title", ""),
                 "edit_url": value_data.get("edit_url", ""),
+                "icon": "doc-empty-inverse",
+                "classname": "page-chooser",
             },
         )
 

wagtail/admin/widgets/workflows.py

@@ -30,6 +30,7 @@ class AdminTaskChooser(AdminChooser):
                 "edit_url": reverse("wagtailadmin_workflows:edit_task", args=[task.id])
                 if task
                 else "",
+                "classname": "task-chooser",
             },
         )
 

wagtail/documents/templates/wagtaildocs/widgets/document_chooser.html

@@ -1,7 +1,3 @@
 {% extends "wagtailadmin/widgets/chooser.html" %}
-{% load wagtailadmin_tags %}
 
-{% block unchosen_icon %}{% icon name="doc-full-inverse" %}{% endblock unchosen_icon %}
-{% block chosen_icon %}{% icon name="doc-full-inverse" %}{% endblock chosen_icon %}
-{% block chooser_class %}document-chooser{% endblock %}
 {% block chooser_attributes %}data-chooser-url="{% url "wagtaildocs:chooser" %}"{% endblock %}

wagtail/documents/widgets.py

@@ -51,6 +51,8 @@ class AdminDocumentChooser(AdminChooser):
                 ),  # only used by chooser.html to identify blank values
                 "display_title": value_data.get("title", ""),
                 "edit_url": value_data.get("edit_url", ""),
+                "icon": "doc-full-inverse",
+                "classname": "document-chooser",
             },
         )
 

wagtail/images/templates/wagtailimages/widgets/image_chooser.html

@@ -1,10 +1,7 @@
 {% extends "wagtailadmin/widgets/chooser.html" %}
-{% load wagtailadmin_tags wagtailimages_tags %}
 
-{% block unchosen_icon %}{% icon name="image" %}{% endblock unchosen_icon %}
-{# Image chooser doesn't have a chosen icon. It shows an preview of the chosen image instead .#}
+{# Image chooser doesn't have a chosen icon. It shows an preview of the chosen image instead. #}
 {% block chosen_icon %}{% endblock chosen_icon %}
-{% block chooser_class %}image-chooser{% endblock %}
 {% block chooser_attributes %}data-chooser-url="{% url "wagtailimages:chooser" %}"{% endblock %}
 
 {% block chosen_state_view %}

wagtail/images/widgets.py

@@ -60,6 +60,8 @@ class AdminImageChooser(AdminChooser):
                 "title": value_data.get("title", ""),
                 "preview": value_data.get("preview", {}),
                 "edit_url": value_data.get("edit_url", ""),
+                "icon": "image",
+                "classname": "image-chooser",
             },
         )
 

wagtail/snippets/templates/wagtailsnippets/widgets/snippet_chooser.html

@@ -1,7 +1,3 @@
 {% extends "wagtailadmin/widgets/chooser.html" %}
-{% load wagtailadmin_tags %}
 
-{% block unchosen_icon %}{% icon name="snippet" %}{% endblock unchosen_icon %}
-{% block chosen_icon %}{% icon name="snippet" %}{% endblock chosen_icon %}
-{% block chooser_class %}snippet-chooser{% endblock %}
 {% block chooser_attributes %}data-chooser-url="{{ chooser_url }}"{% endblock %}

wagtail/snippets/widgets.py

@@ -69,6 +69,8 @@ class AdminSnippetChooser(AdminChooser):
                 "display_title": value_data.get("string", ""),
                 "edit_url": value_data.get("edit_url", ""),
                 "chooser_url": chooser_url,
+                "icon": "snippet",
+                "classname": "snippet-chooser",
             },
         )