Unify pending status badges to single yellow 'Pending Approval'

- Replace dual green+yellow 'Approved/Pending Completion' pill with
  single yellow 'Pending Approval' badge in DataTables, submission
  detail, and completed approvals filter button.
- Also rename 'Awaiting Co-Approver' to 'Pending Approval' in my
  submissions view.
- Bump version to 0.24.1

Author: matteius

django_forms_workflows/templates/django_forms_workflows/completed_approvals.html

@@ -206,8 +206,8 @@ <h1 class="mb-0"><i class="bi bi-inbox"></i> Approvals</h1>
           <i class="bi bi-hourglass-split me-1"></i>Pending Approval
         </a>
         <a href="?{% if category_slug %}category={{ category_slug }}&{% endif %}{% if form_slug %}form={{ form_slug }}&{% endif %}status=approved_pending"
-           class="btn btn-sm {% if status_filter == 'approved_pending' %}btn-success{% else %}btn-outline-success{% endif %}">
-          <i class="bi bi-check-circle me-1"></i><i class="bi bi-hourglass-split me-1"></i>Pending Completion
+           class="btn btn-sm {% if status_filter == 'approved_pending' %}btn-warning text-dark{% else %}btn-outline-warning{% endif %}">
+          <i class="bi bi-hourglass-split me-1"></i>Pending Approval
         </a>
       </div>
       <div id="searchContainer"></div>

django_forms_workflows/templates/django_forms_workflows/submission_detail.html

@@ -17,9 +17,7 @@ <h1>Submission #{{ submission.id }}</h1>
                 {% elif submission.status == 'approved' %}
                     <span class="badge bg-success"><i class="bi bi-check-circle me-1"></i>Approved</span>
                 {% elif submission.status == 'approved_pending' %}
-                    <span class="d-inline-flex align-items-center">
-                        <span class="badge bg-success rounded-end-0 border-end border-white"><i class="bi bi-check-circle me-1"></i>Approved</span><span class="badge bg-warning text-dark rounded-start-0"><i class="bi bi-hourglass-split me-1"></i>Pending Completion</span>
-                    </span>
+                    <span class="badge bg-warning text-dark"><i class="bi bi-hourglass-split me-1"></i>Pending Approval</span>
                 {% elif submission.status == 'rejected' %}
                     <span class="badge bg-danger">Rejected</span>
                 {% elif submission.status == 'withdrawn' %}

django_forms_workflows/views.py

@@ -2316,17 +2316,10 @@ def bulk_export_submissions_pdf(request):
 
 _STATUS_BADGE = {
     "approved": '<span class="badge bg-success"><i class="bi bi-check-circle me-1"></i>Approved</span>',
-    "approved_pending": (
-        '<span class="d-inline-flex align-items-center">'
-        '<span class="badge bg-success rounded-end-0 border-end border-white">'
-        '<i class="bi bi-check-circle me-1"></i>Approved</span>'
-        '<span class="badge bg-warning text-dark rounded-start-0">'
-        '<i class="bi bi-hourglass-split me-1"></i>Pending Completion</span>'
-        "</span>"
-    ),
+    "approved_pending": '<span class="badge bg-warning text-dark"><i class="bi bi-hourglass-split me-1"></i>Pending Approval</span>',
     "rejected": '<span class="badge bg-danger"><i class="bi bi-x-circle me-1"></i>Rejected</span>',
     "withdrawn": '<span class="badge bg-secondary"><i class="bi bi-dash-circle me-1"></i>Withdrawn</span>',
-    "pending_approval": '<span class="badge bg-warning text-dark"><i class="bi bi-hourglass-split me-1"></i>Awaiting Co-Approver</span>',
+    "pending_approval": '<span class="badge bg-warning text-dark"><i class="bi bi-hourglass-split me-1"></i>Pending Approval</span>',
     "submitted": '<span class="badge bg-info">Submitted</span>',
     "draft": '<span class="badge bg-secondary">Draft</span>',
 }

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-forms-workflows"
-version = "0.24.0"
+version = "0.24.1"
 description = "Enterprise-grade, database-driven form builder with approval workflows and external data integration"
 license = "LGPL-3.0-only"
 readme = "README.md"