From 305143d1d6fd2b72a2cdab4b81f241c5a80016ee Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 17 Dec 2024 12:06:26 -0500
Subject: [PATCH 01/13] Prefactor: remove dispatch method and super args

---
 corehq/apps/domain/views/__init__.py |  2 +-
 corehq/apps/domain/views/internal.py | 22 ++++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/corehq/apps/domain/views/__init__.py b/corehq/apps/domain/views/__init__.py
index da5874f6cc71..ec384b486d9a 100644
--- a/corehq/apps/domain/views/__init__.py
+++ b/corehq/apps/domain/views/__init__.py
@@ -1,3 +1,4 @@
+# flake8: noqa: F401
 from corehq.apps.domain.views.accounting import (
     BaseCardView,
     BaseStripePaymentView,
@@ -33,7 +34,6 @@
 from corehq.apps.domain.views.fixtures import LocationFixtureConfigView
 from corehq.apps.domain.views.internal import (
     ActivateTransferDomainView,
-    BaseInternalDomainSettingsView,
     DeactivateTransferDomainView,
     EditInternalCalculationsView,
     EditInternalDomainInfoView,
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index a1c6675a1ba6..d9bc638d2c45 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -53,15 +53,9 @@
 class BaseInternalDomainSettingsView(BaseProjectSettingsView):
     strict_domain_fetching = True
 
-    @method_decorator(always_allow_project_access)
-    @method_decorator(login_and_domain_required)
-    @method_decorator(require_superuser)
-    def dispatch(self, request, *args, **kwargs):
-        return super(BaseInternalDomainSettingsView, self).dispatch(request, *args, **kwargs)
-
     @property
     def main_context(self):
-        context = super(BaseInternalDomainSettingsView, self).main_context
+        context = super().main_context
         context.update({
             'project': self.domain_object,
         })
@@ -85,7 +79,7 @@ class EditInternalDomainInfoView(BaseInternalDomainSettingsView):
     @use_jquery_ui  # datepicker
     @use_multiselect
     def dispatch(self, request, *args, **kwargs):
-        return super(BaseInternalDomainSettingsView, self).dispatch(request, *args, **kwargs)
+        return super().dispatch(request, *args, **kwargs)
 
     @property
     @memoized
@@ -229,7 +223,7 @@ class EditInternalCalculationsView(BaseInternalDomainSettingsView):
     @method_decorator(login_and_domain_required)
     @method_decorator(require_superuser)
     def dispatch(self, request, *args, **kwargs):
-        return super(BaseInternalDomainSettingsView, self).dispatch(request, *args, **kwargs)
+        return super().dispatch(request, *args, **kwargs)
 
     @property
     def page_context(self):
@@ -349,7 +343,7 @@ def get(self, request, *args, **kwargs):
                 messages.info(request,
                               _("Resent transfer request for project '{domain}'").format(domain=self.domain))
 
-        return super(TransferDomainView, self).get(request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)
 
     def post(self, request, *args, **kwargs):
         form = self.transfer_domain_form
@@ -373,7 +367,7 @@ def page_context(self):
     def dispatch(self, request, *args, **kwargs):
         if not toggles.TRANSFER_DOMAIN.enabled(request.domain):
             raise Http404()
-        return super(TransferDomainView, self).dispatch(request, *args, **kwargs)
+        return super().dispatch(request, *args, **kwargs)
 
 
 class ActivateTransferDomainView(BasePageView):
@@ -405,7 +399,7 @@ def get(self, request, guid, *args, **kwargs):
                 and not request.user.is_superuser):
             return HttpResponseRedirect(reverse("no_permissions"))
 
-        return super(ActivateTransferDomainView, self).get(request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)
 
     def post(self, request, guid, *args, **kwargs):
         self.guid = guid
@@ -425,7 +419,7 @@ def post(self, request, guid, *args, **kwargs):
 
     @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):
-        return super(ActivateTransferDomainView, self).dispatch(*args, **kwargs)
+        return super().dispatch(*args, **kwargs)
 
 
 class DeactivateTransferDomainView(View):
@@ -457,7 +451,7 @@ def post(self, request, guid, *args, **kwargs):
 
     @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):
-        return super(DeactivateTransferDomainView, self).dispatch(*args, **kwargs)
+        return super().dispatch(*args, **kwargs)
 
 
 @login_and_domain_required

From 88c7c24b6f72aeb297d224ae1f66139026532cba Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Mon, 16 Dec 2024 15:56:46 -0500
Subject: [PATCH 02/13] B5 internal calculated properties

---
 .../apps/domain/static/domain/js/internal_calculations.js  | 2 +-
 .../templates/domain/bootstrap5/internal_calculations.html | 7 +++----
 corehq/apps/domain/views/internal.py                       | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/corehq/apps/domain/static/domain/js/internal_calculations.js b/corehq/apps/domain/static/domain/js/internal_calculations.js
index b6ff42689301..7ff1642366cc 100644
--- a/corehq/apps/domain/static/domain/js/internal_calculations.js
+++ b/corehq/apps/domain/static/domain/js/internal_calculations.js
@@ -21,7 +21,7 @@ hqDefine("domain/js/internal_calculations", [
                 $btn.addClass('btn-danger');
                 $error.html(data.error);
             }
-            $btn.html('Reload Data').removeClass('btn-primary');
+            $btn.html('Reload Data').removeClass('btn-primary').addClass('btn-outline-primary');
         });
     }
 
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html b/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html
index 126ddefbaef1..9796b5fe79d6 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html
@@ -10,11 +10,10 @@
     <p><button type="button" id="load-all-btn" class="btn btn-primary">{% trans 'Load EVERYTHING' %}</button></p>
     <hr />
     {% for calc_tag in order %}
-      <div class="form-group calc-group">  {# todo B5: css-form-group #}
+      <div class="row calc-group mb-3">
         <label class="form-label col-md-2">{{ calcs|dict_lookup:calc_tag }}</label>
-        <div class="col-md-8">
-          <div id="calc-{{ calc_tag }}"
-               class="card well-small calc-display"></div>  {# todo B5: css-well #}
+        <div class="card text-bg-light col-md-8">
+          <div id="calc-{{ calc_tag }}" class="card-body"></div>
         </div>
         <div class="col-md-2">
           <button class="btn btn-primary load-calc-btn" data-calc-tag="{{ calc_tag }}">
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index d9bc638d2c45..ad49e5c88e2c 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -217,8 +217,9 @@ def post(self, request, *args, **kwargs):
 class EditInternalCalculationsView(BaseInternalDomainSettingsView):
     urlname = 'domain_internal_calculations'
     page_title = gettext_lazy("Calculated Properties")
-    template_name = 'domain/bootstrap3/internal_calculations.html'
+    template_name = 'domain/bootstrap5/internal_calculations.html'
 
+    @use_bootstrap5
     @method_decorator(always_allow_project_access)
     @method_decorator(login_and_domain_required)
     @method_decorator(require_superuser)

From 871d3937ed3088f49cb29f474c932b5e133eca34 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Mon, 16 Dec 2024 20:57:57 +0000
Subject: [PATCH 03/13] "Bootstrap 5 Migration - Marked template
 'domain/internal_calculations.html' as complete and un-split files."

---
 .../bootstrap3/internal_calculations.html     | 28 -------------------
 .../internal_calculations.html                |  0
 corehq/apps/domain/views/internal.py          |  2 +-
 .../bootstrap/status/bootstrap3_to_5.json     |  1 +
 4 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 corehq/apps/domain/templates/domain/bootstrap3/internal_calculations.html
 rename corehq/apps/domain/templates/domain/{bootstrap5 => }/internal_calculations.html (100%)

diff --git a/corehq/apps/domain/templates/domain/bootstrap3/internal_calculations.html b/corehq/apps/domain/templates/domain/bootstrap3/internal_calculations.html
deleted file mode 100644
index 4aaeb32000d6..000000000000
--- a/corehq/apps/domain/templates/domain/bootstrap3/internal_calculations.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
-{% load hq_shared_tags %}
-{% load i18n %}
-
-{% js_entry_b3 "domain/js/internal_calculations" %}
-
-{% block page_content %}
-  {% registerurl 'calculated_properties' domain %}
-  <div class="form form-horizontal">
-    <p><button type="button" id="load-all-btn" class="btn btn-primary">{% trans 'Load EVERYTHING' %}</button></p>
-    <hr />
-    {% for calc_tag in order %}
-      <div class="form-group calc-group">
-        <label class="control-label col-sm-2">{{ calcs|dict_lookup:calc_tag }}</label>
-        <div class="col-sm-8">
-          <div id="calc-{{ calc_tag }}"
-               class="well well-small calc-display"></div>
-        </div>
-        <div class="col-sm-2">
-          <button class="btn btn-primary load-calc-btn" data-calc-tag="{{ calc_tag }}">
-            {% trans "Load Property" %}
-          </button>
-          <div class="calc-error"></div>
-        </div>
-      </div>
-    {% endfor %}
-  </div>
-{% endblock %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html b/corehq/apps/domain/templates/domain/internal_calculations.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html
rename to corehq/apps/domain/templates/domain/internal_calculations.html
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index ad49e5c88e2c..6be35833d03b 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -217,7 +217,7 @@ def post(self, request, *args, **kwargs):
 class EditInternalCalculationsView(BaseInternalDomainSettingsView):
     urlname = 'domain_internal_calculations'
     page_title = gettext_lazy("Calculated Properties")
-    template_name = 'domain/bootstrap5/internal_calculations.html'
+    template_name = 'domain/internal_calculations.html'
 
     @use_bootstrap5
     @method_decorator(always_allow_project_access)
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
index 7bea34b9214f..add98b24bcf8 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
+++ b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
@@ -60,6 +60,7 @@
       "admin/partials/commtrack_action_table.html",
       "admin/project_limits.html",
       "admin/sms_settings.html",
+      "internal_calculations.html",
       "internal_settings.html"
     ]
   },

From 3d739d9568435d1cf9242c7efd2bf4b93e5c1daa Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Mon, 16 Dec 2024 20:58:24 +0000
Subject: [PATCH 04/13] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../internal_calculations.html.diff.txt       | 32 -------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt
deleted file mode 100644
index 9f83abbf4e0f..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt
+++ /dev/null
@@ -1,32 +0,0 @@
---- 
-+++ 
-@@ -1,8 +1,8 @@
--{% extends "hqwebapp/bootstrap3/base_section.html" %}
-+{% extends "hqwebapp/bootstrap5/base_section.html" %}
- {% load hq_shared_tags %}
- {% load i18n %}
- 
--{% js_entry_b3 "domain/js/internal_calculations" %}
-+{% js_entry "domain/js/internal_calculations" %}
- 
- {% block page_content %}
-   {% registerurl 'calculated_properties' domain %}
-@@ -10,13 +10,13 @@
-     <p><button type="button" id="load-all-btn" class="btn btn-primary">{% trans 'Load EVERYTHING' %}</button></p>
-     <hr />
-     {% for calc_tag in order %}
--      <div class="form-group calc-group">
--        <label class="control-label col-sm-2">{{ calcs|dict_lookup:calc_tag }}</label>
--        <div class="col-sm-8">
-+      <div class="form-group calc-group">  {# todo B5: css-form-group #}
-+        <label class="form-label col-md-2">{{ calcs|dict_lookup:calc_tag }}</label>
-+        <div class="col-md-8">
-           <div id="calc-{{ calc_tag }}"
--               class="well well-small calc-display"></div>
-+               class="card well-small calc-display"></div>  {# todo B5: css-well #}
-         </div>
--        <div class="col-sm-2">
-+        <div class="col-md-2">
-           <button class="btn btn-primary load-calc-btn" data-calc-tag="{{ calc_tag }}">
-             {% trans "Load Property" %}
-           </button>

From f1dee62ff2d8fe16093e8b3fd82d45576aa3ab39 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 17 Dec 2024 11:09:17 -0500
Subject: [PATCH 05/13] B5 project flags

---
 .../bootstrap5/flags_and_privileges.html      | 24 +++++++++++++++----
 corehq/apps/domain/views/internal.py          |  3 ++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html
index d0380f56bf2f..7b6c0ccd1d58 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html
@@ -4,6 +4,20 @@
 
 {% js_entry 'domain/js/bootstrap5/toggles' %}
 
+{% block stylesheets %}
+  <style>
+    .success > td {
+      background-color: var(--bssuccess-bg-subtle);
+    }
+    .warning > td {
+      background-color: var(--bswarning-bg-subtle);
+    }
+    .bg-default, .bg-release {
+      background-color: rgba(var(--bssecondary-rgb), 1);
+    }
+  </style>
+{% endblock %}
+
 {% block page_content %}
 
   {% initial_page_data 'domain' domain %}
@@ -80,7 +94,7 @@ <h1>Feature Flags</h1>
         <tbody data-bind="foreach: toggles">
         <tr>
           <td>
-                            <span data-bind="css: ('label-' + tagCssClass),
+                            <span data-bind="css: ('bg-' + tagCssClass),
                                              text: tag"
                                   class="badge"></span>
           </td>
@@ -90,13 +104,13 @@ <h1>Feature Flags</h1>
           </td>
 
           <td data-bind="css: {'text-body-secondary': !isEnabled()}" >
-            <div class="row clickable" data-bind="click: showHideDescription">
-              <!--ko text: badge --><!--/ko-->
+            <div class="clickable" data-bind="click: showHideDescription">
+              <!--ko text: label --><!--/ko-->
 
               <span data-bind="visible: description || helpLink">&hellip;</span>
             </div>
 
-            <div class="row" data-bind="slideVisible: expanded()">
+            <div data-bind="slideVisible: expanded()">
               <br />
               <p data-bind="visible: description, html: description"></p>
               <span data-bind="visible: helpLink">
@@ -105,7 +119,7 @@ <h1>Feature Flags</h1>
 
               <hr data-bind="visible: description || helpLink" />
 
-              <span data-bind="css: ('label-' + tagCssClass),
+              <span data-bind="css: ('bg-' + tagCssClass),
                                                     text: tag"
                     class="badge"></span>
               <span data-bind="html: tagDescription"></span>
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index 6be35833d03b..fb87bea69951 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -234,12 +234,13 @@ def page_context(self):
         }
 
 
+@method_decorator(use_bootstrap5, name='dispatch')
 @method_decorator(always_allow_project_access, name='dispatch')
 @method_decorator(require_superuser, name='dispatch')
 class FlagsAndPrivilegesView(BaseAdminProjectSettingsView):
     urlname = 'feature_flags_and_privileges'
     page_title = gettext_lazy("Feature Flags and Privileges")
-    template_name = 'domain/admin/bootstrap3/flags_and_privileges.html'
+    template_name = 'domain/admin/bootstrap5/flags_and_privileges.html'
 
     def _get_toggles(self):
 

From 9fa459e7a13f638a5a394e541b85234ee7921f05 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 17 Dec 2024 16:10:13 +0000
Subject: [PATCH 06/13] "Bootstrap 5 Migration - Marked template
 'domain/admin/flags_and_privileges.html' as complete and un-split files."

---
 .../bootstrap3/flags_and_privileges.html      | 145 ------------------
 .../flags_and_privileges.html                 |   0
 corehq/apps/domain/views/internal.py          |   2 +-
 .../bootstrap/status/bootstrap3_to_5.json     |   1 +
 4 files changed, 2 insertions(+), 146 deletions(-)
 delete mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap3/flags_and_privileges.html
 rename corehq/apps/domain/templates/domain/admin/{bootstrap5 => }/flags_and_privileges.html (100%)

diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/flags_and_privileges.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/flags_and_privileges.html
deleted file mode 100644
index f34c193e157c..000000000000
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/flags_and_privileges.html
+++ /dev/null
@@ -1,145 +0,0 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
-{% load hq_shared_tags %}
-{% load i18n %}
-
-{% js_entry_b3 'domain/js/bootstrap3/toggles' %}
-
-{% block page_content %}
-
-  {% initial_page_data 'domain' domain %}
-  {% initial_page_data 'toggles' toggles %}
-  {% registerurl 'set_toggle' '---' %}
-  {% registerurl 'edit_toggle' '---' %}
-
-  <div class="row">
-    <div class="col-sm-10">
-      <p>
-        Features can be enabled or disabled based on feature flags or privileges. This page
-        is intended to provide a list of what features a domain has access to.
-      </p>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="col-sm-10">
-      <h1>Privileges</h1>
-      <p>
-        {% url "domain_subscription_view" domain as software_plan_url %}
-        Access to some features is dependent on a the software plan to which the domain
-        is subscribed.
-        <a href="{{ software_plan_url }}">Current Subscription</a>
-      </p>
-    </div>
-    <div class="col-sm-10">
-      <table class="table table-striped">
-        <thead>
-        <th>Privilege</th>
-        <th class="text-center text-nowrap">Enabled for domain?</th>
-        </thead>
-        <tbody>
-        {% for privilege_name, enabled_for_domain in privileges %}
-          <tr class="{% if enabled_for_domain %}success{% else %}warning{% endif %}">
-            <td>{{ privilege_name }}</td>
-            <td class="text-center">
-              {% if enabled_for_domain %}
-                <i class="fa fa-check"></i>
-              {% else %}
-                <i class="fa fa-ban"></i>
-              {% endif %}
-            </td>
-          </tr>
-        {% endfor %}
-        </tbody>
-      </table>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="col-sm-10">
-      <h1>Feature Flags</h1>
-      <p>
-        {% url 'toggle_list' as toggle_url %}
-        Feature Flags turn on features for individual users or projects. They are editable only by
-        super users, in the <a href="{{ toggle_url }}">Feature Flag edit UI</a>.
-        In addition, some feature flags are randomly enabled by domain.
-      </p>
-      <p>
-        Following are all flags enabled for this domain and/or for you.
-        This does not include any flags set for other users in this domain.
-      </p>
-    </div>
-    <div class="col-sm-10">
-      <table class="table table-striped ko-template" id="toggles-table">
-        <thead>
-        <th>Tag</th>
-        <th class="text-center text-nowrap"><!-- placeholder for flag icon --></th>
-        <th>Feature</th>
-        <th class="text-center text-nowrap">Enabled for me?</th>
-        <th class="text-center text-nowrap">Enabled for domain?</th>
-        </thead>
-        <tbody data-bind="foreach: toggles">
-        <tr>
-          <td>
-                            <span data-bind="css: ('label-' + tagCssClass),
-                                             text: tag"
-                                  class="label"></span>
-          </td>
-
-          <td>
-            <i class="fa fa-flag" data-bind="visible: isEnabled"></i>
-          </td>
-
-          <td data-bind="css: {'text-muted': !isEnabled()}" >
-            <div class="row clickable" data-bind="click: showHideDescription">
-              <!--ko text: label --><!--/ko-->
-
-              <span data-bind="visible: description || helpLink">&hellip;</span>
-            </div>
-
-            <div class="row" data-bind="slideVisible: expanded()">
-              <br />
-              <p data-bind="visible: description, html: description"></p>
-              <span data-bind="visible: helpLink">
-                                    <a data-bind="attr: {href: helpLink}">Documentation</a>
-                                </span>
-
-              <hr data-bind="visible: description || helpLink" />
-
-              <span data-bind="css: ('label-' + tagCssClass),
-                                                    text: tag"
-                    class="label"></span>
-              <span data-bind="html: tagDescription"></span>
-
-              <div class="text-right">
-                <small><a class="text-uppercase" data-bind="attr: {href: editLink}, text: slug"></a></small>
-              </div>
-            </div>
-          </td>
-
-          <td class="text-center">
-            <i class="fa fa-user" data-bind="visible: userEnabled"></i>
-          </td>
-
-          <td class="text-center">
-            <div data-bind="visible: hasDomainNamespace">
-              <button type="button"
-                      class="btn btn-default"
-                      data-bind="click: toggleEnabledState,
-                                 disable: setTogglePending,
-                                 css: {
-                                    'active': domainEnabled(),
-                                 }">
-                <i class="fa" data-bind="css: domainEnabled() ? 'fa-rocket' : 'fa-ban', hidden: setTogglePending"></i>
-                <i class="fa fa-spin fa-refresh" data-bind="visible: setTogglePending"></i>
-                <!--ko text: domainEnabled() ? 'Enabled' : 'Not Enabled' --><!--/ko-->
-              </button>
-            </div>
-            <div data-bind="visible: !hasDomainNamespace">---</div>
-          </td>
-
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  </div>
-{% endblock %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html b/corehq/apps/domain/templates/domain/admin/flags_and_privileges.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html
rename to corehq/apps/domain/templates/domain/admin/flags_and_privileges.html
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index fb87bea69951..55d960d8da84 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -240,7 +240,7 @@ def page_context(self):
 class FlagsAndPrivilegesView(BaseAdminProjectSettingsView):
     urlname = 'feature_flags_and_privileges'
     page_title = gettext_lazy("Feature Flags and Privileges")
-    template_name = 'domain/admin/bootstrap5/flags_and_privileges.html'
+    template_name = 'domain/admin/flags_and_privileges.html'
 
     def _get_toggles(self):
 
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
index add98b24bcf8..c1690a704c2c 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
+++ b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
@@ -56,6 +56,7 @@
     "templates": [
       "admin/case_search.html",
       "admin/commtrack_settings.html",
+      "admin/flags_and_privileges.html",
       "admin/partials/case_search_templates.html",
       "admin/partials/commtrack_action_table.html",
       "admin/project_limits.html",

From acac9a5bf02357080b1ced28e3f8db4911a63808 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Wed, 18 Dec 2024 13:14:44 +0000
Subject: [PATCH 07/13] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../admin/flags_and_privileges.html.diff.txt  | 100 ------------------
 1 file changed, 100 deletions(-)
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/flags_and_privileges.html.diff.txt

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/flags_and_privileges.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/flags_and_privileges.html.diff.txt
deleted file mode 100644
index 8a75105d62c7..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/flags_and_privileges.html.diff.txt
+++ /dev/null
@@ -1,100 +0,0 @@
---- 
-+++ 
-@@ -1,8 +1,8 @@
--{% extends "hqwebapp/bootstrap3/base_section.html" %}
-+{% extends "hqwebapp/bootstrap5/base_section.html" %}
- {% load hq_shared_tags %}
- {% load i18n %}
- 
--{% js_entry_b3 'domain/js/bootstrap3/toggles' %}
-+{% js_entry 'domain/js/bootstrap5/toggles' %}
- 
- {% block page_content %}
- 
-@@ -12,7 +12,7 @@
-   {% registerurl 'edit_toggle' '---' %}
- 
-   <div class="row">
--    <div class="col-sm-10">
-+    <div class="col-md-10">
-       <p>
-         Features can be enabled or disabled based on feature flags or privileges. This page
-         is intended to provide a list of what features a domain has access to.
-@@ -21,7 +21,7 @@
-   </div>
- 
-   <div class="row">
--    <div class="col-sm-10">
-+    <div class="col-md-10">
-       <h1>Privileges</h1>
-       <p>
-         {% url "domain_subscription_view" domain as software_plan_url %}
-@@ -30,7 +30,7 @@
-         <a href="{{ software_plan_url }}">Current Subscription</a>
-       </p>
-     </div>
--    <div class="col-sm-10">
-+    <div class="col-md-10">
-       <table class="table table-striped">
-         <thead>
-         <th>Privilege</th>
-@@ -55,7 +55,7 @@
-   </div>
- 
-   <div class="row">
--    <div class="col-sm-10">
-+    <div class="col-md-10">
-       <h1>Feature Flags</h1>
-       <p>
-         {% url 'toggle_list' as toggle_url %}
-@@ -68,7 +68,7 @@
-         This does not include any flags set for other users in this domain.
-       </p>
-     </div>
--    <div class="col-sm-10">
-+    <div class="col-md-10">
-       <table class="table table-striped ko-template" id="toggles-table">
-         <thead>
-         <th>Tag</th>
-@@ -82,16 +82,16 @@
-           <td>
-                             <span data-bind="css: ('label-' + tagCssClass),
-                                              text: tag"
--                                  class="label"></span>
-+                                  class="badge"></span>
-           </td>
- 
-           <td>
-             <i class="fa fa-flag" data-bind="visible: isEnabled"></i>
-           </td>
- 
--          <td data-bind="css: {'text-muted': !isEnabled()}" >
-+          <td data-bind="css: {'text-body-secondary': !isEnabled()}" >
-             <div class="row clickable" data-bind="click: showHideDescription">
--              <!--ko text: label --><!--/ko-->
-+              <!--ko text: badge --><!--/ko-->
- 
-               <span data-bind="visible: description || helpLink">&hellip;</span>
-             </div>
-@@ -107,10 +107,10 @@
- 
-               <span data-bind="css: ('label-' + tagCssClass),
-                                                     text: tag"
--                    class="label"></span>
-+                    class="badge"></span>
-               <span data-bind="html: tagDescription"></span>
- 
--              <div class="text-right">
-+              <div class="text-end">
-                 <small><a class="text-uppercase" data-bind="attr: {href: editLink}, text: slug"></a></small>
-               </div>
-             </div>
-@@ -123,7 +123,7 @@
-           <td class="text-center">
-             <div data-bind="visible: hasDomainNamespace">
-               <button type="button"
--                      class="btn btn-default"
-+                      class="btn btn-outline-primary"
-                       data-bind="click: toggleEnabledState,
-                                  disable: setTogglePending,
-                                  css: {

From 7fcb2b3f95c65b26bd1d9b68b4173571b99f2cc6 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 17 Dec 2024 11:55:12 -0500
Subject: [PATCH 08/13] B5 transfer domain forms

---
 .../domain/admin/bootstrap5/transfer_domain.html   | 14 ++++++--------
 corehq/apps/domain/views/internal.py               |  5 +++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain.html
index fc81be4601dc..e2803923fac1 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain.html
@@ -5,13 +5,11 @@
 
 
 {% block page_content %}
-  <div class="page-header">  {# todo B5: css-page-header #}
-    <h3>
-      {% blocktrans %}
-        Use this to transfer your project to another user.
-      {% endblocktrans %}
-    </h3>
-  </div>
-  {% crispy form %}  {# todo B5: crispy #}
+  <h3>
+    {% blocktrans %}
+      Use this to transfer your project to another user.
+    {% endblocktrans %}
+  </h3>
+  {% crispy form %}
 {% endblock %}
 
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index 55d960d8da84..fd5539b89f17 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -320,7 +320,7 @@ def _get_rate_limits(scope, rate_limiter):
 class TransferDomainView(BaseAdminProjectSettingsView):
     urlname = 'transfer_domain_view'
     page_title = gettext_lazy("Transfer Project")
-    template_name = 'domain/admin/bootstrap3/transfer_domain.html'
+    template_name = 'domain/admin/bootstrap5/transfer_domain.html'
 
     @property
     @memoized
@@ -338,7 +338,7 @@ def transfer_domain_form(self):
     def get(self, request, *args, **kwargs):
 
         if self.active_transfer:
-            self.template_name = 'domain/admin/bootstrap3/transfer_domain_pending.html'
+            self.template_name = 'domain/admin/bootstrap5/transfer_domain_pending.html'
 
             if request.GET.get('resend', None):
                 self.active_transfer.send_transfer_request()
@@ -365,6 +365,7 @@ def page_context(self):
         else:
             return {'form': self.transfer_domain_form}
 
+    @use_bootstrap5
     @method_decorator(domain_admin_required)
     def dispatch(self, request, *args, **kwargs):
         if not toggles.TRANSFER_DOMAIN.enabled(request.domain):

From f9e3cde29806ac937e4f0aedc4de6badadd51c98 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 17 Dec 2024 11:58:58 -0500
Subject: [PATCH 09/13] "Bootstrap 5 Migration - Marked template
 'domain/admin/transfer_domain*.html' as complete and un-split files."

---
 .../admin/bootstrap3/transfer_domain.html     | 17 ----------
 .../bootstrap3/transfer_domain_pending.html   | 34 -------------------
 .../{bootstrap5 => }/transfer_domain.html     |  0
 .../transfer_domain_pending.html              |  0
 corehq/apps/domain/views/internal.py          |  4 +--
 .../bootstrap/status/bootstrap3_to_5.json     |  2 ++
 6 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain.html
 delete mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain_pending.html
 rename corehq/apps/domain/templates/domain/admin/{bootstrap5 => }/transfer_domain.html (100%)
 rename corehq/apps/domain/templates/domain/admin/{bootstrap5 => }/transfer_domain_pending.html (100%)

diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain.html
deleted file mode 100644
index d2dd5b187834..000000000000
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
-{% load hq_shared_tags %}
-{% load crispy_forms_tags %}
-{% load i18n %}
-
-
-{% block page_content %}
-  <div class="page-header">
-    <h3>
-      {% blocktrans %}
-        Use this to transfer your project to another user.
-      {% endblocktrans %}
-    </h3>
-  </div>
-  {% crispy form %}
-{% endblock %}
-
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain_pending.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain_pending.html
deleted file mode 100644
index 42830bc3b05e..000000000000
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain_pending.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
-{% load hq_shared_tags %}
-{% load crispy_forms_tags %}
-{% load i18n %}
-
-
-{% block page_content %}
-  <div class="row">
-    <div class="col-sm-12">
-      <h4>
-        {% blocktrans with username=transfer.to_username %}
-          You have a pending transfer with {{ username }}
-        {% endblocktrans %}
-      </h4>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-sm-2">
-      <a href="{% url 'transfer_domain_view' domain %}?resend=true" class="btn btn-primary">
-        {% blocktrans %}
-          Resend Transfer Request
-        {% endblocktrans %}
-      </a>
-    </div>
-    <div class="col-sm-2">
-      <form action="{{ transfer.deactivate_url }}" method="POST">
-        {% csrf_token %}
-        <input class="btn btn-danger" type="submit" value="{% trans "Cancel Transfer" %}" />
-      </form>
-    </div>
-  </div>
-{% endblock %}
-
-
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain.html b/corehq/apps/domain/templates/domain/admin/transfer_domain.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain.html
rename to corehq/apps/domain/templates/domain/admin/transfer_domain.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain_pending.html b/corehq/apps/domain/templates/domain/admin/transfer_domain_pending.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain_pending.html
rename to corehq/apps/domain/templates/domain/admin/transfer_domain_pending.html
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index fd5539b89f17..d48506a2ce0c 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -320,7 +320,7 @@ def _get_rate_limits(scope, rate_limiter):
 class TransferDomainView(BaseAdminProjectSettingsView):
     urlname = 'transfer_domain_view'
     page_title = gettext_lazy("Transfer Project")
-    template_name = 'domain/admin/bootstrap5/transfer_domain.html'
+    template_name = 'domain/admin/transfer_domain.html'
 
     @property
     @memoized
@@ -338,7 +338,7 @@ def transfer_domain_form(self):
     def get(self, request, *args, **kwargs):
 
         if self.active_transfer:
-            self.template_name = 'domain/admin/bootstrap5/transfer_domain_pending.html'
+            self.template_name = 'domain/admin/transfer_domain_pending.html'
 
             if request.GET.get('resend', None):
                 self.active_transfer.send_transfer_request()
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
index c1690a704c2c..11dd5d1d2932 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
+++ b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
@@ -61,6 +61,8 @@
       "admin/partials/commtrack_action_table.html",
       "admin/project_limits.html",
       "admin/sms_settings.html",
+      "admin/transfer_domain.html",
+      "admin/transfer_domain_pending.html",
       "internal_calculations.html",
       "internal_settings.html"
     ]

From 7ecd13cf8a55957fb4d6cc4853425fdcecce4108 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 17 Dec 2024 16:59:51 +0000
Subject: [PATCH 10/13] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../admin/transfer_domain.html.diff.txt       | 23 -----------
 .../transfer_domain_pending.html.diff.txt     | 38 -------------------
 2 files changed, 61 deletions(-)
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain_pending.html.diff.txt

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain.html.diff.txt
deleted file mode 100644
index fa3eb59d0714..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain.html.diff.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---- 
-+++ 
-@@ -1,17 +1,17 @@
--{% extends "hqwebapp/bootstrap3/base_section.html" %}
-+{% extends "hqwebapp/bootstrap5/base_section.html" %}
- {% load hq_shared_tags %}
- {% load crispy_forms_tags %}
- {% load i18n %}
- 
- 
- {% block page_content %}
--  <div class="page-header">
-+  <div class="page-header">  {# todo B5: css-page-header #}
-     <h3>
-       {% blocktrans %}
-         Use this to transfer your project to another user.
-       {% endblocktrans %}
-     </h3>
-   </div>
--  {% crispy form %}
-+  {% crispy form %}  {# todo B5: crispy #}
- {% endblock %}
- 
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain_pending.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain_pending.html.diff.txt
deleted file mode 100644
index 7f757e419f0e..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain_pending.html.diff.txt
+++ /dev/null
@@ -1,38 +0,0 @@
---- 
-+++ 
-@@ -1,4 +1,4 @@
--{% extends "hqwebapp/bootstrap3/base_section.html" %}
-+{% extends "hqwebapp/bootstrap5/base_section.html" %}
- {% load hq_shared_tags %}
- {% load crispy_forms_tags %}
- {% load i18n %}
-@@ -6,7 +6,7 @@
- 
- {% block page_content %}
-   <div class="row">
--    <div class="col-sm-12">
-+    <div class="col-md-12">
-       <h4>
-         {% blocktrans with username=transfer.to_username %}
-           You have a pending transfer with {{ username }}
-@@ -15,17 +15,17 @@
-     </div>
-   </div>
-   <div class="row">
--    <div class="col-sm-2">
-+    <div class="col-md-2">
-       <a href="{% url 'transfer_domain_view' domain %}?resend=true" class="btn btn-primary">
-         {% blocktrans %}
-           Resend Transfer Request
-         {% endblocktrans %}
-       </a>
-     </div>
--    <div class="col-sm-2">
-+    <div class="col-md-2">
-       <form action="{{ transfer.deactivate_url }}" method="POST">
-         {% csrf_token %}
--        <input class="btn btn-danger" type="submit" value="{% trans "Cancel Transfer" %}" />
-+        <input class="btn btn-outline-danger" type="submit" value="{% trans "Cancel Transfer" %}" />
-       </form>
-     </div>
-   </div>

From 1f8cf002d3207f0ef8c6edaa722c7963825f75f4 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 17 Dec 2024 12:20:32 -0500
Subject: [PATCH 11/13] B5 activate domain transfer form

---
 .../templates/domain/bootstrap5/activate_transfer_domain.html  | 2 +-
 corehq/apps/domain/views/internal.py                           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/domain/templates/domain/bootstrap5/activate_transfer_domain.html b/corehq/apps/domain/templates/domain/bootstrap5/activate_transfer_domain.html
index 08eddbc4bc5d..40315fe61405 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/activate_transfer_domain.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/activate_transfer_domain.html
@@ -5,7 +5,7 @@
 {% block content %}
   <div class="container" id="hq-content">
     <div class="row">
-      <div class="page-header">  {# todo B5: css-page-header #}
+      <div class="mt-5">
         <h1>{% trans "Transfer project ownership" %}</h1>
       </div>
       <div class="col-lg-8 col-sm-12">
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index d48506a2ce0c..0038a3bd7301 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -376,7 +376,7 @@ def dispatch(self, request, *args, **kwargs):
 class ActivateTransferDomainView(BasePageView):
     urlname = 'activate_transfer_domain'
     page_title = 'Activate Domain Transfer'
-    template_name = 'domain/bootstrap3/activate_transfer_domain.html'
+    template_name = 'domain/bootstrap5/activate_transfer_domain.html'
 
     @property
     @memoized
@@ -420,6 +420,7 @@ def post(self, request, guid, *args, **kwargs):
 
         return HttpResponseRedirect(reverse('dashboard_default', args=[self.active_transfer.domain]))
 
+    @use_bootstrap5
     @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):
         return super().dispatch(*args, **kwargs)

From fcb351b445b1e2e2814bae21f72192667c58fdeb Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 17 Dec 2024 17:21:46 +0000
Subject: [PATCH 12/13] "Bootstrap 5 Migration - Marked template
 'domain/activate_transfer_domain.html' as complete and un-split files."

---
 .../activate_transfer_domain.html             |  0
 .../bootstrap3/activate_transfer_domain.html  | 42 -------------------
 corehq/apps/domain/views/internal.py          |  2 +-
 .../bootstrap/status/bootstrap3_to_5.json     |  1 +
 4 files changed, 2 insertions(+), 43 deletions(-)
 rename corehq/apps/domain/templates/domain/{bootstrap5 => }/activate_transfer_domain.html (100%)
 delete mode 100644 corehq/apps/domain/templates/domain/bootstrap3/activate_transfer_domain.html

diff --git a/corehq/apps/domain/templates/domain/bootstrap5/activate_transfer_domain.html b/corehq/apps/domain/templates/domain/activate_transfer_domain.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/bootstrap5/activate_transfer_domain.html
rename to corehq/apps/domain/templates/domain/activate_transfer_domain.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/activate_transfer_domain.html b/corehq/apps/domain/templates/domain/bootstrap3/activate_transfer_domain.html
deleted file mode 100644
index 45c1740d1d1c..000000000000
--- a/corehq/apps/domain/templates/domain/bootstrap3/activate_transfer_domain.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% extends 'hqwebapp/bootstrap3/base_navigation.html' %}
-{% load hq_shared_tags %}
-{% load i18n %}
-
-{% block content %}
-  <div class="container" id="hq-content">
-    <div class="row">
-      <div class="page-header">
-        <h1>{% trans "Transfer project ownership" %}</h1>
-      </div>
-      <div class="col-md-8 col-xs-12">
-        {% if transfer %}
-          <p class="lead">
-            {% blocktrans with domain=transfer.domain%}
-              By clicking "accept" below you acknowledge that you accept full ownership of this project space ("{{ domain }}").
-              You agree to be bound by the terms of Dimagi's <a href="https://www.dimagi.com/terms/latest/privacy/">Terms of Service and Business Agreement</a>.
-              By accepting this agreement, your are acknowledging you have permission and authority to accept these terms. A Dimagi representative will notify you when the transfer is complete.
-            {% endblocktrans %}
-          </p>
-          <div class="row">
-            <div class="col-md-2">
-              <form action="{{ transfer.activate_url }}" method="POST">{% csrf_token %}
-                <input type="submit" value="{% trans "Accept" %}" class="btn btn-primary"/>
-              </form>
-            </div>
-            <div class="col-md-2">
-              <form action="{{ transfer.deactivate_url }}" method="POST">{% csrf_token %}
-                <input type="submit" value="{% trans "Decline" %}" class="btn btn-danger"/>
-              </form>
-            </div>
-          </div>
-        {% else %}
-          <p class="lead">
-            {% blocktrans %}
-              Sorry this transfer request has expired.
-            {% endblocktrans %}
-          </p>
-        {% endif %}
-      </div>
-    </div>
-  </div>
-{% endblock content %}
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index 0038a3bd7301..b24efffd1eb5 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -376,7 +376,7 @@ def dispatch(self, request, *args, **kwargs):
 class ActivateTransferDomainView(BasePageView):
     urlname = 'activate_transfer_domain'
     page_title = 'Activate Domain Transfer'
-    template_name = 'domain/bootstrap5/activate_transfer_domain.html'
+    template_name = 'domain/activate_transfer_domain.html'
 
     @property
     @memoized
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
index 11dd5d1d2932..48334e10497b 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
+++ b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
@@ -54,6 +54,7 @@
   "domain": {
     "in_progress": true,
     "templates": [
+      "activate_transfer_domain.html",
       "admin/case_search.html",
       "admin/commtrack_settings.html",
       "admin/flags_and_privileges.html",

From ea22440afb40c68257774123f920fb55bb80965b Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 17 Dec 2024 17:22:09 +0000
Subject: [PATCH 13/13] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../activate_transfer_domain.html.diff.txt    | 38 -------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/activate_transfer_domain.html.diff.txt

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/activate_transfer_domain.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/activate_transfer_domain.html.diff.txt
deleted file mode 100644
index 6de4bc6a522b..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/activate_transfer_domain.html.diff.txt
+++ /dev/null
@@ -1,38 +0,0 @@
---- 
-+++ 
-@@ -1,14 +1,14 @@
--{% extends 'hqwebapp/bootstrap3/base_navigation.html' %}
-+{% extends 'hqwebapp/bootstrap5/base_navigation.html' %}
- {% load hq_shared_tags %}
- {% load i18n %}
- 
- {% block content %}
-   <div class="container" id="hq-content">
-     <div class="row">
--      <div class="page-header">
-+      <div class="page-header">  {# todo B5: css-page-header #}
-         <h1>{% trans "Transfer project ownership" %}</h1>
-       </div>
--      <div class="col-md-8 col-xs-12">
-+      <div class="col-lg-8 col-sm-12">
-         {% if transfer %}
-           <p class="lead">
-             {% blocktrans with domain=transfer.domain%}
-@@ -18,14 +18,14 @@
-             {% endblocktrans %}
-           </p>
-           <div class="row">
--            <div class="col-md-2">
-+            <div class="col-lg-2">
-               <form action="{{ transfer.activate_url }}" method="POST">{% csrf_token %}
-                 <input type="submit" value="{% trans "Accept" %}" class="btn btn-primary"/>
-               </form>
-             </div>
--            <div class="col-md-2">
-+            <div class="col-lg-2">
-               <form action="{{ transfer.deactivate_url }}" method="POST">{% csrf_token %}
--                <input type="submit" value="{% trans "Decline" %}" class="btn btn-danger"/>
-+                <input type="submit" value="{% trans "Decline" %}" class="btn btn-outline-danger"/>
-               </form>
-             </div>
-           </div>