Add chevron to dropdowns that are missing them, and make "Site" label translateable (#6242)

Co-authored-by: Thibaud Colas <thibaudcolas@gmail.com>

CHANGELOG.txt

@@ -71,6 +71,8 @@ Changelog
  * Fix: `wagtail.contrib.sitemaps` no longer depends on SiteMiddleware (Matt Westcott)
  * Fix: Purge image renditions cache when renditions are deleted (Pascal Widdershoven, Matt Westcott)
  * Fix: Image / document forms now display non-field errors such as `unique_together` constraints (Matt Westcott)
+ * Fix: Make "Site" chooser in site settings translateable (Andreas Bernacca)
+ * Fix: Add missing dropdown icons to image upload, document upload, and site settings screens (Andreas Bernacca)
 
 
 2.9.3 (20.07.2020)

client/scss/components/_forms.scss

@@ -108,6 +108,10 @@ select::-ms-expand {
     }
 }
 
+// the site setting dropdown is auto width, so the chevron will overlap with text if not padded
+.choice_field .setting-site-switch-form .input select {
+    padding-right: 5em;
+}
 
 // Other text
 .help,

docs/releases/2.10.rst

@@ -94,6 +94,8 @@ Bug fixes
  * ``wagtail.contrib.sitemaps`` no longer depends on SiteMiddleware (Matt Westcott)
  * Purge image renditions cache when renditions are deleted (Pascal Widdershoven, Matt Westcott)
  * Image / document forms now display non-field errors such as ``unique_together`` constraints (Matt Westcott)
+ * Make "Site" chooser in site settings translateable (Andreas Bernacca)
+ * Add missing dropdown icons to image upload, document upload, and site settings screens (Andreas Bernacca)
 
 
 Upgrade considerations

wagtail/contrib/settings/templates/wagtailsettings/edit.html

@@ -16,12 +16,17 @@
             </div>
             <div class="right">
                 {% if site_switcher %}
-                <form method="get" id="settings-site-switch" novalidate>
-                    <label for="{{ site_switcher.site.id_for_label }}">
-                        Site:
-                    </label>
-                    {{ site_switcher.site }}
-                </form>
+                <div class="field choice_field">
+                    <form method="get" class="setting-site-switch-form" id="settings-site-switch" novalidate>
+                        <label for="{{ site_switcher.site.id_for_label }}">
+                            {% trans "Site" %}:
+                        </label>
+                        <div class="input">
+                            {{ site_switcher.site }}
+                            <span></span>
+                        </div>
+                    </form>
+                </div>
                 {% endif %}
             </div>
         </div>

wagtail/documents/templates/wagtaildocs/multiple/add.html

@@ -27,14 +27,17 @@
                 </div>
                 {% csrf_token %}
                 {% if collections %}
-                    <div class="field">
+                    <div class="field choice_field select">
                         <label for="id_adddocument_collection">{% trans "Add to collection:" %}</label>
                         <div class="field-content">
-                            <select id="id_adddocument_collection" name="collection">
-                                {% for collection in collections %}
-                                    <option value="{{ collection.id|unlocalize }}">{{ collection.name }}</option>
-                                {% endfor %}
-                            </select>
+                            <div class="input">
+                                <select id="id_adddocument_collection" name="collection">
+                                    {% for collection in collections %}
+                                        <option value="{{ collection.id|unlocalize }}">{{ collection.name }}</option>
+                                    {% endfor %}
+                                </select>
+                                <span></span>
+                            </div>
                         </div>
                     </div>
                 {% endif %}

wagtail/images/templates/wagtailimages/multiple/add.html

@@ -27,14 +27,17 @@
                 </div>
                 {% csrf_token %}
                 {% if collections %}
-                    <div class="field">
+                    <div class="field choice_field select">
                         <label for="id_addimage_collection">{% trans "Add to collection:" %}</label>
                         <div class="field-content">
-                            <select id="id_addimage_collection" name="collection">
-                                {% for collection in collections %}
-                                    <option value="{{ collection.id|unlocalize }}">{{ collection.name }}</option>
-                                {% endfor %}
-                            </select>
+                            <div class="input">
+                                <select id="id_addimage_collection" name="collection">
+                                    {% for collection in collections %}
+                                        <option value="{{ collection.id|unlocalize }}">{{ collection.name }}</option>
+                                    {% endfor %}
+                                </select>
+                                <span></span>
+                            </div>
                         </div>
                     </div>
                 {% endif %}