From fe7a0cf3c567ad29ae5ae5fe7ddcbde8674b09f8 Mon Sep 17 00:00:00 2001
From: David Smith <smithdc@gmail.com>
Date: Mon, 13 Jul 2020 15:26:06 +0100
Subject: [PATCH] Filters

* Used bootstrap v5 icon pack
---
 .../templates/rest_framework/base.html          |  6 ++++--
 .../templates/rest_framework/filters/base.html  |  4 ++--
 .../rest_framework/filters/ordering.html        |  5 ++++-
 .../rest_framework/filters/search.html          | 17 +++++++++--------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index 2a36d90fe..99863f8a2 100644
--- a/rest_framework/templates/rest_framework/base.html
+++ b/rest_framework/templates/rest_framework/base.html
@@ -141,8 +141,10 @@
           {% endif %}
 
           {% if filter_form %}
-            <button style="float: right; margin-right: 10px" data-toggle="modal" data-target="#filtersModal" class="btn btn-default">
-              <span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>
+            <button data-toggle="modal" data-target="#filtersModal" class="btn btn-outline-secondary button-form">
+              <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-wrench" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" d="M.102 2.223A3.004 3.004 0 0 0 3.78 5.897l6.341 6.252A3.003 3.003 0 0 0 13 16a3 3 0 1 0-.851-5.878L5.897 3.781A3.004 3.004 0 0 0 2.223.1l2.141 2.142L4 4l-1.757.364L.102 2.223zm13.37 9.019L13 11l-.471.242-.529.026-.287.445-.445.287-.026.529L11 13l.242.471.026.529.445.287.287.445.529.026L13 15l.471-.242.529-.026.287-.445.445-.287.026-.529L15 13l-.242-.471-.026-.529-.445-.287-.287-.445-.529-.026z"/>
+              </svg>
               {% trans "Filters" %}
             </button>
           {% endif %}
diff --git a/rest_framework/templates/rest_framework/filters/base.html b/rest_framework/templates/rest_framework/filters/base.html
index f830e16ba..149d628ff 100644
--- a/rest_framework/templates/rest_framework/filters/base.html
+++ b/rest_framework/templates/rest_framework/filters/base.html
@@ -2,9 +2,9 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title">Filters</h4>
-    </div>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+      </div>
       <div class="modal-body">
           {% for element in elements %}
           {% if not forloop.first %}<hr/>{% endif %}
diff --git a/rest_framework/templates/rest_framework/filters/ordering.html b/rest_framework/templates/rest_framework/filters/ordering.html
index b71b2a5bf..25d0c198b 100644
--- a/rest_framework/templates/rest_framework/filters/ordering.html
+++ b/rest_framework/templates/rest_framework/filters/ordering.html
@@ -5,7 +5,10 @@
     {% for key, label in options %}
         {% if key == current %}
             <a href="{% add_query_param request param key %}" class="list-group-item active">
-                <span class="glyphicon glyphicon-ok" style="float: right" aria-hidden="true"></span> {{ label }}
+            <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check2" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
+            </svg>
+              {{ label }}
             </a>
         {% else %}
             <a href="{% add_query_param request param key %}" class="list-group-item">{{ label }}</a>
diff --git a/rest_framework/templates/rest_framework/filters/search.html b/rest_framework/templates/rest_framework/filters/search.html
index 323f2e749..8232589f4 100644
--- a/rest_framework/templates/rest_framework/filters/search.html
+++ b/rest_framework/templates/rest_framework/filters/search.html
@@ -1,12 +1,13 @@
 {% load i18n %}
 <h2>{% trans "Search" %}</h2>
-<form class="form-inline">
-  <div class="mb-3">
-    <div class="input-group">
+<form>
+    <div class="input-group mb-3">
       <input type="text" class="form-control" style="width: 350px" name="{{ param }}" value="{{ term }}">
-      <span class="input-group-btn">
-        <button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> {% trans "Search" %}</button>
-      </span>
-    </div>
-  </div>
+        <button class="btn btn-primary" type="submit">
+          <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-search" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path fill-rule="evenodd" d="M10.442 10.442a1 1 0 0 1 1.415 0l3.85 3.85a1 1 0 0 1-1.414 1.415l-3.85-3.85a1 1 0 0 1 0-1.415z"/>
+            <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
+          </svg>
+          {% trans "Search" %}</button>
+      </div>
 </form>