From 6091b9833a2575882ce2e39d9b262bfbe7d1d70e Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 30 Apr 2024 17:59:39 -0400
Subject: [PATCH 01/91] Switched views to B5

---
 corehq/apps/cloudcare/views.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/corehq/apps/cloudcare/views.py b/corehq/apps/cloudcare/views.py
index d60ec2051ac7..6a9f139804c7 100644
--- a/corehq/apps/cloudcare/views.py
+++ b/corehq/apps/cloudcare/views.py
@@ -74,7 +74,7 @@
 from corehq.apps.groups.models import Group
 from corehq.apps.hqwebapp.decorators import (
     use_bootstrap5,
-    use_daterangepicker,
+    use_tempusdominus,
     waf_allow,
 )
 from corehq.apps.hqwebapp.templatetags.hq_shared_tags import can_use_restore_as
@@ -100,7 +100,8 @@ class FormplayerMain(View):
     urlname = 'formplayer_main'
 
     @xframe_options_sameorigin
-    @use_daterangepicker
+    @use_bootstrap5
+    @use_tempusdominus
     @method_decorator(require_cloudcare_access)
     @method_decorator(requires_privilege_for_commcare_user(privileges.CLOUDCARE))
     def dispatch(self, request, *args, **kwargs):
@@ -214,7 +215,7 @@ def _default_lang():
         }
 
         return set_cookie(
-            render(request, "cloudcare/bootstrap3/formplayer_home.html", context)
+            render(request, "cloudcare/bootstrap5/formplayer_home.html", context)
         )
 
 
@@ -231,17 +232,18 @@ def wrap_get_current_app_doc(self, domain, username, app_id):
         return get_current_app_doc(domain, app_id)
 
 
+@method_decorator(use_bootstrap5, name='dispatch')
+@method_decorator(use_tempusdominus, name='dispatch')
 class PreviewAppView(TemplateView):
-    template_name = 'cloudcare/bootstrap3/preview_app.html'
+    template_name = 'cloudcare/bootstrap5/preview_app.html'
     urlname = 'preview_app'
 
-    @use_daterangepicker
     @xframe_options_sameorigin
     def get(self, request, *args, **kwargs):
         mobile_ucr_count = get_mobile_ucr_count(request.domain)
         if should_restrict_web_apps_usage(request.domain, mobile_ucr_count):
             context = BlockWebAppsView.get_context_for_ucr_limit_error(request.domain, mobile_ucr_count)
-            return render(request, 'cloudcare/bootstrap3/block_preview_app.html', context)
+            return render(request, 'cloudcare/bootstrap5/block_preview_app.html', context)
         app = get_app(request.domain, kwargs.pop('app_id'))
         return self.render_to_response({
             'app': _format_app_doc(app.to_json()),
@@ -357,7 +359,7 @@ def post(self, request, domain):
         readable_form = readable.get_readable_form_data(form_data_json, pretty_questions)
 
         rendered_readable_form = render_to_string(
-            'reports/form/partials/bootstrap3/readable_form.html',
+            'reports/form/partials/bootstrap5/readable_form.html',
             {'questions': readable_form}
         )
 
@@ -562,6 +564,7 @@ def _fail(error):
     return HttpResponseRedirect(reverse(FormplayerMain.urlname, args=[domain]) + "#" + cloudcare_state)
 
 
+@method_decorator(use_bootstrap5, name='dispatch')
 class BlockWebAppsView(BaseDomainView):
 
     urlname = 'block_web_apps'

From a35f80428f4efc40c74516f1185aebdfa9ddca45 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 3 Apr 2024 12:40:41 -0400
Subject: [PATCH 02/91] Updated javascript dependencies and added TODOs

This is basically the result of running the bootstrap migration tool.
---
 .../static/cloudcare/js/debugger/debugger.js      |  2 +-
 .../static/cloudcare/js/form_entry/entries.js     |  2 +-
 .../static/cloudcare/js/form_entry/form_ui.js     |  2 ++
 .../static/cloudcare/js/formplayer/app.js         |  1 +
 .../cloudcare/js/formplayer/menus/controller.js   |  1 +
 .../static/cloudcare/js/formplayer/menus/views.js |  2 +-
 .../cloudcare/js/formplayer/menus/views/query.js  | 15 ++++++++++-----
 .../static/cloudcare/js/formplayer/utils/utils.js |  3 ++-
 .../apps/cloudcare/static/cloudcare/js/utils.js   | 14 ++++++++++----
 9 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js b/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js
index 4a86a56fc38a..d70377527f14 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js
@@ -6,7 +6,7 @@ hqDefine('cloudcare/js/debugger/debugger', [
     'clipboard/dist/clipboard',
     'ace-builds/src-min-noconflict/ace',
     'analytix/js/kissmetrix',
-    'reports/js/bootstrap3/readable_form',
+    'reports/js/bootstrap5/readable_form',
     'hqwebapp/js/atwho',    // $.atwho
     'ace-builds/src-min-noconflict/mode-json',
     'ace-builds/src-min-noconflict/mode-xml',
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
index f3e704619f37..b8891f35e039 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
@@ -14,7 +14,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
     'cloudcare/js/form_entry/utils',
     'signature_pad/dist/signature_pad.umd.min',
     'mapbox.js/dist/mapbox.uncompressed',
-    'hqwebapp/js/bootstrap3/knockout_bindings.ko',  // fadeVisible
+    'hqwebapp/js/bootstrap5/knockout_bindings.ko',  // fadeVisible
     'cloudcare/js/formplayer/utils/calendar-picker-translations',   // EthiopianDateEntry
     'select2/dist/js/select2.full.min',
 ], function (
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index 1f214574dc1c..e04e41782b1d 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -623,11 +623,13 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
             $(document).on("click", ".help-text-trigger", function (event) {
                 event.preventDefault();
                 var container = $(event.currentTarget).closest(".caption");
+                // todo B5: update to use B5 modal
                 container.find(".modal").modal('show');
             });
 
             $(document).on("click", ".unsupported-question-type-trigger", function (event) {
                 var container = $(event.currentTarget).closest(".widget");
+                // todo B5: update to use B5 modal
                 container.find(".modal").modal('show');
             });
         };
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
index b63d64165d53..b725d857019a 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
@@ -130,6 +130,7 @@ hqDefine("cloudcare/js/formplayer/app", [
         $('#webforms-nav').html("");
         $('#cloudcare-debugger').html("");
         $('.atwho-container').remove();
+        // todo B5: update to use B5 modal
         $('#case-detail-modal').modal('hide');
     });
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
index b502e4ea982b..24551f71ef3b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
@@ -255,6 +255,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", [
         $('#case-detail-modal').find('.js-detail-tabs').html(tabListView.render().el);
         $('#case-detail-modal').find('.js-detail-content').html(contentView.render().el);
         $('#case-detail-modal').find('.js-detail-footer-content').html(detailFooterView.render().el);
+        // todo B5: update to use B5 modal
         $('#case-detail-modal').modal('show');
 
     };
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index 1e342ec36f7d..3560b0bc396b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -854,7 +854,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
             if (this.selectedCaseIds.length > this.maxSelectValue) {
                 let errorMessage = _.template(gettext("You have selected more than the maximum selection limit " +
                     "of <%- value %> . Please uncheck some values to continue."))({ value: this.maxSelectValue });
-                hqRequire(["hqwebapp/js/bootstrap3/alert_user"], function (alertUser) {
+                hqRequire(["hqwebapp/js/bootstrap5/alert_user"], function (alertUser) {
                     alertUser.alert_user(errorMessage, 'danger');
                 });
             }
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
index bb9af94a8795..8b28de918abf 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
@@ -7,6 +7,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
     'backbone.marionette',
     'moment',
     'hqwebapp/js/initial_page_data',
+    'hqwebapp/js/tempus_dominus',
     'hqwebapp/js/toggles',
     'analytix/js/kissmetrix',
     'cloudcare/js/markdown',
@@ -17,8 +18,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
     'cloudcare/js/formplayer/constants',
     'cloudcare/js/formplayer/menus/collections',
     'cloudcare/js/formplayer/utils/utils',
-    'hqwebapp/js/bootstrap3/hq.helpers',   // needed for hqHelp
-    'bootstrap-daterangepicker/daterangepicker',  // needed for $.daterangepicker
+    'hqwebapp/js/bootstrap5/hq.helpers',   // needed for hqHelp
     'cloudcare/js/formplayer/menus/api',    // needed for app:select:menus
     'select2/dist/js/select2.full.min',
 ], function (
@@ -29,6 +29,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
     Marionette,
     moment,
     initialPageData,
+    hqTempusDominus,
     toggles,
     kissmetrics,
     markdown,
@@ -379,7 +380,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
             self.model.set('searchForBlank', false);
             sessionStorage.removeItem('geocoderValues');
             if (self.ui.date.length) {
-                self.ui.date.data("DateTimePicker").clear();
+                self.ui.date.data("DateTimePicker").clear();    // todo B5
             }
             self._render();
             FormplayerFrontend.trigger('clearNotifications');
@@ -476,20 +477,24 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
                 this.ui.hqHelp.hqHelp({placement: 'auto ' + fallback});
             }
             cloudcareUtils.initDatePicker(this.ui.date, this.model.get('value'));
-            this.ui.dateRange.daterangepicker({
+            // todo B5: move to tempus dominus
+            //hqTempusDominus.createDateRangePicker(this.ui.dateRange);
+            /*this.ui.dateRange.daterangepicker({
                 locale: {
                     format: dateFormat,
                     separator: separator,
                 },
                 autoUpdateInput: false,
                 "autoApply": true,
-            });
+            });*/
             this.ui.dateRange.attr("placeholder", dateFormat + separator + dateFormat);
             let separatorChars = _.unique(separator).join("");
             this.ui.dateRange.attr("pattern", "^[\\d\\/\\-" + separatorChars + "]*$");
+            // todo B5: replace/remove
             this.ui.dateRange.on('cancel.daterangepicker', function () {
                 $(this).val('').trigger('change');
             });
+            // todo B5: replace/remove
             this.ui.dateRange.on('apply.daterangepicker', function (ev, picker) {
                 $(this).val(picker.startDate.format(dateFormat) + separator + picker.endDate.format(dateFormat)).trigger('change');
             });
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
index 387d5a764e98..6b95feb829bc 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
@@ -6,7 +6,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
     'DOMPurify/dist/purify.min',
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/toggles',
-    "cloudcare/js/formplayer/constants"
+    "cloudcare/js/formplayer/constants",
 ], function (
     $,
     _,
@@ -51,6 +51,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
         $confirmationButton.on('click.confirmationModal', function (e) {
             options.onConfirm(e);
         });
+        // todo B5: update to use B5 modal
         $modal.modal('show');
     };
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index e064655f7d46..77442f482dd3 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -5,19 +5,20 @@ hqDefine('cloudcare/js/utils', [
     'backbone.marionette',
     'moment',
     'hqwebapp/js/initial_page_data',
+    'hqwebapp/js/tempus_dominus',
     "hqwebapp/js/toggles",
     "cloudcare/js/formplayer/constants",
     "cloudcare/js/formplayer/layout/views/progress_bar",
     'nprogress/nprogress',
     'sentry_browser',
     "cloudcare/js/formplayer/users/models",
-    'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min',  // for $.datetimepicker
 ], function (
     $,
     _,
     Marionette,
     moment,
     initialPageData,
+    hqTempusDominus,
     toggles,
     constants,
     ProgressBar,
@@ -389,7 +390,9 @@ hqDefine('cloudcare/js/utils', [
             return;
         }
 
-        $el.datetimepicker({
+        // todo B5: move to tempus dominus
+        //hqTempusDominus.createDatePicker($el);
+        /*$el.datetimepicker({
             date: selectedDate,
             useCurrent: false,
             showClear: true,
@@ -409,6 +412,7 @@ hqDefine('cloudcare/js/utils', [
         $el.on("focusout", $el.data("DateTimePicker").hide);
         $el.attr("placeholder", dateFormat);
         $el.attr("pattern", "[0-9\-/]+");   // eslint-disable-line no-useless-escape
+        */
     };
 
     var initTimePicker = function ($el, selectedTime, timeFormat) {
@@ -417,7 +421,9 @@ hqDefine('cloudcare/js/utils', [
         }
 
         let date = moment(selectedTime, timeFormat);
-        $el.datetimepicker({
+        // todo B5: move to tempus dominus
+        //hqTempusDominus.createTimePicker($el);
+        /*$el.datetimepicker({
             date: date.isValid() ? date : null,
             format: timeFormat,
             useStrict: true,
@@ -428,7 +434,7 @@ hqDefine('cloudcare/js/utils', [
             tooltips: dateTimePickerTooltips,
         });
 
-        $el.on("focusout", $el.data("DateTimePicker").hide);
+        $el.on("focusout", $el.data("DateTimePicker").hide);*/
     };
 
     var smallScreenIsEnabled = function () {

From 2ae03a9774b612eecde8441ad51b2cfc051c8413 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 14 May 2024 14:27:26 -0400
Subject: [PATCH 03/91] Updated modals

---
 .../cloudcare/static/cloudcare/js/form_entry/form_ui.js   | 8 ++++----
 .../apps/cloudcare/static/cloudcare/js/formplayer/app.js  | 5 +++--
 .../static/cloudcare/js/formplayer/menus/controller.js    | 6 +++---
 .../static/cloudcare/js/formplayer/utils/utils.js         | 5 +++--
 .../partials/form_entry/bootstrap5/entry_unsupported.html | 5 ++---
 .../partials/form_entry/bootstrap5/question.html          | 8 ++++----
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index e04e41782b1d..1d7117ddfd53 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -5,6 +5,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
     'underscore',
     'DOMPurify/dist/purify.min',
     'hqwebapp/js/toggles',
+    'es6!hqwebapp/js/bootstrap5_loader',
     'cloudcare/js/markdown',
     'cloudcare/js/utils',
     'cloudcare/js/form_entry/const',
@@ -17,6 +18,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
     _,
     DOMPurify,
     toggles,
+    bootstrap,
     markdown,
     cloudcareUtils,
     constants,
@@ -623,14 +625,12 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
             $(document).on("click", ".help-text-trigger", function (event) {
                 event.preventDefault();
                 var container = $(event.currentTarget).closest(".caption");
-                // todo B5: update to use B5 modal
-                container.find(".modal").modal('show');
+                bootstrap.Modal.getOrCreateInstance(container.find(".modal")).show();
             });
 
             $(document).on("click", ".unsupported-question-type-trigger", function (event) {
                 var container = $(event.currentTarget).closest(".widget");
-                // todo B5: update to use B5 modal
-                container.find(".modal").modal('show');
+                bootstrap.Modal.getOrCreateInstance(container.find(".modal")).show();
             });
         };
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
index b725d857019a..b00be20f89a1 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
@@ -9,6 +9,7 @@ hqDefine("cloudcare/js/formplayer/app", [
     'backbone',
     'backbone.marionette',
     'markdown-it/dist/markdown-it',
+    'es6!hqwebapp/js/bootstrap5_loader',
     'hqwebapp/js/initial_page_data',
     'analytix/js/appcues',
     'analytix/js/google',
@@ -30,6 +31,7 @@ hqDefine("cloudcare/js/formplayer/app", [
     Backbone,
     Marionette,
     markdowner,
+    bootstrap,
     initialPageData,
     appcues,
     GGAnalytics,
@@ -130,8 +132,7 @@ hqDefine("cloudcare/js/formplayer/app", [
         $('#webforms-nav').html("");
         $('#cloudcare-debugger').html("");
         $('.atwho-container').remove();
-        // todo B5: update to use B5 modal
-        $('#case-detail-modal').modal('hide');
+        bootstrap.Modal.getOrCreateInstance($('#case-detail-modal')).hide();
     });
 
     FormplayerFrontend.getChannel().reply('clearMenu', function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
index 24551f71ef3b..f58904708bcc 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
@@ -4,6 +4,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", [
     'underscore',
     'backbone',
     'DOMPurify/dist/purify.min',
+    'es6!hqwebapp/js/bootstrap5_loader',
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/toggles',
     'cloudcare/js/markdown',
@@ -21,6 +22,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", [
     _,
     Backbone,
     DOMPurify,
+    bootstrap,
     initialPageData,
     toggles,
     markdown,
@@ -255,9 +257,7 @@ hqDefine("cloudcare/js/formplayer/menus/controller", [
         $('#case-detail-modal').find('.js-detail-tabs').html(tabListView.render().el);
         $('#case-detail-modal').find('.js-detail-content').html(contentView.render().el);
         $('#case-detail-modal').find('.js-detail-footer-content').html(detailFooterView.render().el);
-        // todo B5: update to use B5 modal
-        $('#case-detail-modal').modal('show');
-
+        bootstrap.Modal.getOrCreateInstance($('#case-detail-modal')).show();
     };
 
     var getDetailList = function (detailObject) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
index 6b95feb829bc..5a5d413cccf9 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
@@ -4,6 +4,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
     'underscore',
     'backbone',
     'DOMPurify/dist/purify.min',
+    'es6!hqwebapp/js/bootstrap5_loader',
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/toggles',
     "cloudcare/js/formplayer/constants",
@@ -12,6 +13,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
     _,
     Backbone,
     DOMPurify,
+    bootstrap,
     initialPageData,
     toggles,
     constants
@@ -51,8 +53,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
         $confirmationButton.on('click.confirmationModal', function (e) {
             options.onConfirm(e);
         });
-        // todo B5: update to use B5 modal
-        $modal.modal('show');
+        bootstrap.Modal.getOrCreateInstance($modal).show();
     };
 
     Utils.encodedUrlToObject = function (encodedUrl) {
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_unsupported.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_unsupported.html
index 8f56dc4f4a55..b5cd5caded9d 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_unsupported.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_unsupported.html
@@ -1,3 +1,4 @@
+{% load hq_shared_tags %}
 {% load i18n %}
 
 <script type="text/html" id="unsupported-entry-ko-template">
@@ -12,15 +13,13 @@
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-body">
+          <button type="button" class="btn-close float-end" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
           {% blocktrans %}
             This question will appear as follows in data exports.
           {% endblocktrans %}
           <br><br>
           <input type="text" class="form-control" data-bind="value: $data.answer" />
         </div>
-        <div class="modal-footer">
-          <button class="btn btn-outline-primary" data-bs-dismiss="modal">{% trans "OK" %}</button>
-        </div>
       </div>
     </div>
   </div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/question.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/question.html
index 414736e4354f..9dbd051bc138 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/question.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/question.html
@@ -1,3 +1,4 @@
+{% load hq_shared_tags %}
 {% load i18n %}
 
 <script type="text/html" id="question-fullform-ko-template">
@@ -33,15 +34,14 @@
           <div class="modal-dialog">
             <div class="modal-content">
               <div class="modal-body">
+                <button type="button" class="btn-close float-end" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
                 <p class="webapp-markdown-output" align="left" data-bind="html: help"></p>
                 <div class="widget-multimedia" data-bind="
                     template: {
                       name: 'widget-help-multimedia-ko-template',
                       data: $data
-                    } "></div>
-              </div>
-              <div class="modal-footer">
-                <button class="btn btn-outline-primary help-modal-close" data-bs-dismiss="modal">{% trans "Close" %}</button>
+                    } ">
+                </div>
               </div>
             </div>
           </div>

From 76263c6691863d34deefa612f1bd15bc90174d45 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 27 May 2024 11:58:17 -0400
Subject: [PATCH 04/91] Updated settings OQPS event

Followup for https://github.com/dimagi/commcare-hq/commit/ee098afdbee6a00a05b0ca42e6b58686a80081c2
---
 .../static/cloudcare/js/formplayer/layout/views/settings.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
index c9285dec04e9..8825c5bc71a7 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
@@ -67,7 +67,7 @@ hqDefine("cloudcare/js/formplayer/layout/views/settings", [
             oneQuestionPerScreen: '.js-one-question-per-screen',
         },
         events: {
-            'switchChange.bootstrapSwitch @ui.oneQuestionPerScreen': 'onChangeOneQuestionPerScreen',
+            'change @ui.oneQuestionPerScreen': 'onChangeOneQuestionPerScreen',
         },
         onRender: function () {
             if (!window.USE_BOOTSTRAP5) {

From eaa55885a5808f8b11b1d1639a0da34eeccc8713 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 15 May 2024 12:36:45 -0400
Subject: [PATCH 05/91] Updated spinners for clickable icons

---
 .../cloudcare/static/cloudcare/js/formplayer/menus/views.js | 4 ++--
 .../cloudcare/partials/case_list/bootstrap5/item.html       | 2 +-
 .../partials/case_list/bootstrap5/tile_grouped_item.html    | 6 +++---
 .../cloudcare/partials/case_list/bootstrap5/tile_item.html  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index 3560b0bc396b..df4af4420385 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -341,7 +341,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
             const $spinnerElement = $iconButton.find('i');
             $moduleIcon.css('display', 'none');
             $iconButton.addClass('disabled');
-            $spinnerElement.css('display', '');
+            $spinnerElement.removeClass("d-none");
 
             const currentUrlToObject = formplayerUtils.currentUrlToObject();
             currentUrlToObject.endpointArgs = {[endpointArg]: caseId};
@@ -351,7 +351,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
             function resetIcon() {
                 $moduleIcon.css('display', '');
                 $iconButton.removeClass('disabled');
-                $spinnerElement.css('display', 'none');
+                $spinnerElement.addClass("d-none");
             }
 
             $.when(FormplayerFrontend.getChannel().request("icon:click", currentUrlToObject)).done(function () {
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/item.html
index e750f577668e..0bba7f9d8e9b 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/item.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/item.html
@@ -10,7 +10,7 @@
         <td class="module-case-list-column">
           <button class="clickable-icon">
             <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
-            <i class="fa fa-spin fa-spinner" style="display:none"></i>  {# todo B5: inline style #}
+            <i class="fa fa-spin fa-spinner d-none"></i>
           </button>
         </td>
       <% } else if (styles[index].displayFormat === 'Markdown') { %>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_grouped_item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_grouped_item.html
index fa14541cc608..4bd71ae3ea68 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_grouped_item.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_grouped_item.html
@@ -13,7 +13,7 @@
           if(resolveUri(datum)) { %>
             <button class="clickable-icon">
               <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>" />
-              <i class="fa fa-spin fa-spinner" style="display:none"></i>  {# todo B5: inline style #}
+              <i class="fa fa-spin fa-spinner d-none"></i>
             </button>
           <% } %>
           <% } else if (styles[index].displayFormat === 'Image') {
@@ -21,7 +21,7 @@
             <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
           <% } %>
           <% } else if(styles[index].widthHint === 0) { %>
-            <div style="display:none;"><%- datum %></div>  {# todo B5: inline style #}
+            <div class="d-none"><%- datum %></div>
           <% } else { %>
             <div class="webapp-markdown-output"><%= renderMarkdown(datum) %></div>
           <% } %>
@@ -43,7 +43,7 @@
                 if(resolveUri(datum)) { %>
                   <button class="clickable-icon">
                     <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>" />
-                    <i class="fa fa-spin fa-spinner" style="display:none"></i>  {# todo B5: inline style #}
+                    <i class="fa fa-spin fa-spinner d-none"></i>
                   </button>
                 <% } %>
               <% } else { %>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_item.html
index 29540f5e79f7..69358433b390 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_item.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_item.html
@@ -16,11 +16,11 @@
       if(resolveUri(datum)) { %>
         <button class="clickable-icon">
           <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
-          <i class="fa fa-spin fa-spinner" style="display:none"></i>  {# todo B5: inline style #}
+          <i class="fa fa-spin fa-spinner d-none"></i>
         </button>
       <% } %>
       <% } else if(styles[index].widthHint === 0) { %>
-        <div style="display:none;"><%- datum %></div>  {# todo B5: inline style #}
+        <div class="d-none"><%- datum %></div>
       <% } else { %>
         <div class="webapp-markdown-output"><%= renderMarkdown(datum) %></div>
       <% } %>

From 86b2d2a0801880e91d640cfe517cf03c4cc2a6e9 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 20 May 2024 15:44:10 -0400
Subject: [PATCH 06/91] Migrated to tempus dominus

- dateTimePickerTooltips are already handled by by defaultTranslations in the HQ tempus dominus module
- Several callbacks/handlers were no longer needed
- It's annoying that showing the clear button is handled through initial page data, but updating that is out of scope
---
 .../js/formplayer/menus/views/query.js        |  30 ++---
 .../cloudcare/static/cloudcare/js/utils.js    | 105 ++++++++----------
 .../cloudcare/bootstrap5/formplayer_home.html |   1 +
 .../cloudcare/bootstrap5/preview_app.html     |   1 +
 .../static/hqwebapp/js/tempus_dominus.js      |   1 +
 5 files changed, 57 insertions(+), 81 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
index 8b28de918abf..d44687a7239a 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
@@ -41,7 +41,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
     Collection,
     formplayerUtils
 ) {
-    var separator = " to ",
+    var separator = hqTempusDominus.getDateRangeSeparator(),
         serverSeparator = "__",
         serverPrefix = "__range__",
         dateFormat = cloudcareUtils.dateFormat,
@@ -379,9 +379,6 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
             self.errorMessage = null;
             self.model.set('searchForBlank', false);
             sessionStorage.removeItem('geocoderValues');
-            if (self.ui.date.length) {
-                self.ui.date.data("DateTimePicker").clear();    // todo B5
-            }
             self._render();
             FormplayerFrontend.trigger('clearNotifications');
         },
@@ -477,27 +474,16 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
                 this.ui.hqHelp.hqHelp({placement: 'auto ' + fallback});
             }
             cloudcareUtils.initDatePicker(this.ui.date, this.model.get('value'));
-            // todo B5: move to tempus dominus
-            //hqTempusDominus.createDateRangePicker(this.ui.dateRange);
-            /*this.ui.dateRange.daterangepicker({
-                locale: {
-                    format: dateFormat,
-                    separator: separator,
-                },
-                autoUpdateInput: false,
-                "autoApply": true,
-            });*/
+            this.ui.dateRange.each(function (index, el) {
+                hqTempusDominus.createDefaultDateRangePicker(el, {
+                    localization: {
+                        format: dateFormat,
+                    },
+                });
+            });
             this.ui.dateRange.attr("placeholder", dateFormat + separator + dateFormat);
             let separatorChars = _.unique(separator).join("");
             this.ui.dateRange.attr("pattern", "^[\\d\\/\\-" + separatorChars + "]*$");
-            // todo B5: replace/remove
-            this.ui.dateRange.on('cancel.daterangepicker', function () {
-                $(this).val('').trigger('change');
-            });
-            // todo B5: replace/remove
-            this.ui.dateRange.on('apply.daterangepicker', function (ev, picker) {
-                $(this).val(picker.startDate.format(dateFormat) + separator + picker.endDate.format(dateFormat)).trigger('change');
-            });
             this.ui.dateRange.on('change', function () {
                 // Validate free-text input
                 var start, end,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index 77442f482dd3..3926599f75e8 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -320,34 +320,6 @@ hqDefine('cloudcare/js/utils', [
         }
     };
 
-    var dateTimePickerTooltips = {     // use default text, but enable translations
-        today: gettext('Go to today'),
-        clear: gettext('Clear selection'),
-        close: gettext('Close the picker'),
-        selectMonth: gettext('Select Month'),
-        prevMonth: gettext('Previous Month'),
-        nextMonth: gettext('Next Month'),
-        selectYear: gettext('Select Year'),
-        prevYear: gettext('Previous Year'),
-        nextYear: gettext('Next Year'),
-        selectDecade: gettext('Select Decade'),
-        prevDecade: gettext('Previous Decade'),
-        nextDecade: gettext('Next Decade'),
-        prevCentury: gettext('Previous Century'),
-        nextCentury: gettext('Next Century'),
-        pickHour: gettext('Pick Hour'),
-        incrementHour: gettext('Increment Hour'),
-        decrementHour: gettext('Decrement Hour'),
-        pickMinute: gettext('Pick Minute'),
-        incrementMinute: gettext('Increment Minute'),
-        decrementMinute: gettext('Decrement Minute'),
-        pickSecond: gettext('Pick Second'),
-        incrementSecond: gettext('Increment Second'),
-        decrementSecond: gettext('Decrement Second'),
-        togglePeriod: gettext('Toggle Period'),
-        selectTime: gettext('Select Time'),
-    };
-
     /**
      *  Convert two-digit year to four-digit year.
      *  Differs from JavaScript's two-year parsing to better match CommCare,
@@ -376,6 +348,15 @@ hqDefine('cloudcare/js/utils', [
     var dateFormat = 'MM/DD/YYYY';
     var dateFormats = ['MM/DD/YYYY', 'YYYY-MM-DD', 'M/D/YYYY', 'M/D/YY', 'M-D-YYYY', 'M-D-YY', moment.defaultFormat];
 
+    // Annoyingly, moment and tempus dominus use different formats.
+    // Moment: https://momentjs.com/docs/#/parsing/string-format/
+    // TD: https://getdatepicker.com/6/plugins/customDateFormat.html
+    // TD does have a plugin to integrate with moment, but since other usages of TD in HQ
+    // don't need it, instead of enabling that, hack around this.
+    const _momentFormatToTempusFormat = function (momentFormat) {
+        return momentFormat.replaceAll("D", "d").replaceAll("Y", "y");
+    };
+
     /** Coerce an input date string to a moment object */
     var parseInputDate = function (dateString) {
         if (!moment.isMoment(dateString)) {
@@ -390,29 +371,29 @@ hqDefine('cloudcare/js/utils', [
             return;
         }
 
-        // todo B5: move to tempus dominus
-        //hqTempusDominus.createDatePicker($el);
-        /*$el.datetimepicker({
-            date: selectedDate,
-            useCurrent: false,
-            showClear: true,
-            showClose: true,
-            showTodayButton: true,
-            debug: true,
-            format: dateFormat,
-            extraFormats: dateFormats,
-            useStrict: true,
-            icons: {
-                today: 'glyphicon glyphicon-calendar',
+        let options = {
+            display: {
+                buttons: {
+                    clear: true,
+                    close: true,
+                    today: true,
+                },
             },
-            tooltips: dateTimePickerTooltips,
-            parseInputDate: parseInputDate,
-        });
+            localization: {
+                format: _momentFormatToTempusFormat(dateFormat),
+            },
+            useCurrent: false,
+        };
+        if (selectedDate) {
+            options.viewDate = new hqTempusDominus.tempusDominus.DateTime(selectedDate);
+        }
+        let tempus = hqTempusDominus.createDatePicker($el.get(0), options);
 
-        $el.on("focusout", $el.data("DateTimePicker").hide);
+        $el.on("focusout", function () {
+            tempus.hide();
+        });
         $el.attr("placeholder", dateFormat);
         $el.attr("pattern", "[0-9\-/]+");   // eslint-disable-line no-useless-escape
-        */
     };
 
     var initTimePicker = function ($el, selectedTime, timeFormat) {
@@ -421,20 +402,26 @@ hqDefine('cloudcare/js/utils', [
         }
 
         let date = moment(selectedTime, timeFormat);
-        // todo B5: move to tempus dominus
-        //hqTempusDominus.createTimePicker($el);
-        /*$el.datetimepicker({
-            date: date.isValid() ? date : null,
-            format: timeFormat,
-            useStrict: true,
+        let options = {
+            display: {
+                buttons: {
+                    clear: true,
+                    close: true,
+                },
+            },
+            localization: {
+                format: timeFormat,
+            },
             useCurrent: false,
-            showClear: true,
-            showClose: true,
-            debug: true,
-            tooltips: dateTimePickerTooltips,
-        });
+        };
+        if (date.isValid()) {
+            options.viewDate = new hqTempusDominus.tempusDominus.DateTime(date.format(timeFormat));
+        }
+        let tempus = hqTempusDominus.createTimePicker($el.get(0), options);
 
-        $el.on("focusout", $el.data("DateTimePicker").hide);*/
+        $el.on("focusout", function () {
+            tempus.hide();
+        });
     };
 
     var smallScreenIsEnabled = function () {
diff --git a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/formplayer_home.html b/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/formplayer_home.html
index d989be84abbf..b88c5fa89c66 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/formplayer_home.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/formplayer_home.html
@@ -60,6 +60,7 @@
 {% block content %}
 
   {% initial_page_data 'apps' apps %}
+  {% initial_page_data 'daterangepicker-show-clear' 'true' %}
   {% initial_page_data 'domain_is_on_trial' domain_is_on_trial %}
   {% initial_page_data 'debugger_enabled' request.couch_user.can_edit_data %}
   {% initial_page_data 'domain' domain %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app.html b/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app.html
index 0870d0a1e5cd..f5730db55c8c 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app.html
@@ -22,6 +22,7 @@
 
   {% initial_page_data 'allowed_host' request.get_host %}
   {% initial_page_data 'app' app %}
+  {% initial_page_data 'daterangepicker-show-clear' 'true' %}
   {% initial_page_data 'debugger_enabled' request.couch_user.can_edit_data %}
   {% initial_page_data 'domain' request.domain %}
   {% initial_page_data 'environment' environment %}
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js b/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
index 91e500b05118..99feb451ca41 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
@@ -148,5 +148,6 @@ hqDefine("hqwebapp/js/tempus_dominus", [
         createDefaultDateRangePicker: createDefaultDateRangePicker,
         createTimePicker: createTimePicker,
         getDateRangeSeparator: getDateRangeSeparator,
+        tempusDominus: tempusDominus,
     };
 });

From 49739b7ff6616cbf33e067d2267b681e4a50d631 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Thu, 16 May 2024 15:53:01 -0400
Subject: [PATCH 07/91] Fixed grid layouts not displaying icons inline

This finishes up https://github.com/dimagi/commcare-hq/pull/34647/commits/a43a5276b2b6f36d21694a7d9e2628165f221946
---
 .../static/cloudcare/js/formplayer/menus/views.js         | 8 +++++++-
 .../cloudcare/partials/menu/bootstrap5/grid_item.html     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index df4af4420385..4ebb8045fb24 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -41,7 +41,13 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
                 return 'tr';
             }
         },
-        className: "formplayer-request",
+        className: function () {
+            let classNames = "formplayer-request";
+            if (this.isGrid()) {
+                classNames += " col-sm-6 col-md-4 col-lg-3";
+            }
+            return classNames;
+        },
         attributes: function () {
             const displayText = this.options.model.attributes.displayText;
             return {
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/grid_item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/grid_item.html
index bdfde964e06d..36088398444b 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/grid_item.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/grid_item.html
@@ -1,5 +1,5 @@
 <script type="text/template" id="menu-view-grid-item-template">
-  <div class="col-sm-6 col-md-4 col-lg-3">
+  <div>
     <% if (imageUrl) { %>
     <div class="gridicon badge-container" style="background-image: url('<%- imageUrl %>');">
       <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}

From 9ef185aec964e56530d675c6ca33dee3d1de4c9f Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Thu, 23 May 2024 21:29:55 -0400
Subject: [PATCH 08/91] Updated CSS classes in javascript

The migration tool doesn't check js files for CSS class names,
and some of these aren't greppable anyway.
---
 .../static/cloudcare/js/form_entry/const.js          | 12 ++++++------
 .../static/cloudcare/js/form_entry/entries.js        |  2 +-
 .../static/cloudcare/js/form_entry/form_ui.js        |  6 +++---
 .../static/cloudcare/js/formplayer/apps/views.js     |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
index 30d614caa073..5fc42f34c2dc 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
@@ -55,15 +55,15 @@ hqDefine("cloudcare/js/form_entry/const", [], function () {
         NO_ANSWER: null,
 
         // UI
-        LABEL_WIDTH: 'col-sm-4',
-        LABEL_OFFSET: 'col-sm-offset-4',
-        CONTROL_WIDTH: 'col-sm-8',
+        LABEL_WIDTH: 'col-md-4',
+        LABEL_OFFSET: 'col-md-offset-4',
+        CONTROL_WIDTH: 'col-md-8',
         BLOCK_NONE: 'block-none',
         BLOCK_SUBMIT: 'block-submit',
         BLOCK_ALL: 'block-all',
-        FULL_WIDTH: 'col-sm-12',
-        SHORT_WIDTH: 'col-sm-2',
-        MEDIUM_WIDTH: 'col-sm-4',
+        FULL_WIDTH: 'col-md-12',
+        SHORT_WIDTH: 'col-md-2',
+        MEDIUM_WIDTH: 'col-md-4',
 
         // XForm Navigation
         QUESTIONS_FOR_INDEX: 'questions_for_index',
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
index b8891f35e039..5f6b3a3e1921 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
@@ -78,7 +78,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
     Entry.prototype.getColStyle = function (numChoices) {
         // Account for number of choices plus column for clear button
         var colWidth = parseInt(12 / (numChoices + 1)) || 1;
-        return 'col-xs-' + colWidth;
+        return 'col-sm-' + colWidth;
     };
 
     // This should set the answer value if the answer is valid. If the raw answer is valid, this
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index 1d7117ddfd53..caa911752f81 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -794,7 +794,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
         };
 
         let columnWidth = GroupedElementTileRow.calculateElementWidth(this.style);
-        this.elementTile = `col-sm-${columnWidth}`;
+        this.elementTile = `col-md-${columnWidth}`;
     }
 
     Group.prototype = Object.create(Container.prototype);
@@ -830,7 +830,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
         };
 
         const columnWidth = GroupedElementTileRow.calculateElementWidth(this.style);
-        this.elementTile = `col-sm-${columnWidth}`;
+        this.elementTile = `col-md-${columnWidth}`;
     }
     Repeat.prototype = Object.create(Container.prototype);
     Repeat.prototype.constructor = Container;
@@ -1078,7 +1078,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
         if (self.stylesContains(constants.PER_ROW_PATTERN)) {
             self.controlWidth = constants.FULL_WIDTH;
             self.labelWidth = constants.FULL_WIDTH;
-            self.questionTileWidth = `col-sm-${columnWidth}`;
+            self.questionTileWidth = `col-md-${columnWidth}`;
         } else {
             self.controlWidth = constants.CONTROL_WIDTH;
             self.labelWidth = constants.LABEL_WIDTH;
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
index b4e4fdb9df86..b94a80650c2f 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
@@ -21,7 +21,7 @@ hqDefine("cloudcare/js/formplayer/apps/views", [
     var GridItem = Marionette.View.extend({
         template: _.template($("#row-template").html() || ""),
         tagName: "div",
-        className: "grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request",
+        className: "grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request",
         events: {
             "click": "rowClick",
             "keydown": "rowKeyAction",

From 556e7e1ab72e4ed4485630ba144692a169f3452d Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Thu, 23 May 2024 21:31:35 -0400
Subject: [PATCH 09/91] Finished updating map in case list logic

This completes changes that were started in 845d9ffc8b3fda932c7057b0bf11a87ce3361eaf
---
 .../cloudcare/static/cloudcare/js/formplayer/menus/views.js   | 4 ++--
 .../cloudcare/partials/case_list/bootstrap5/list.html         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index 4ebb8045fb24..42a721e478ce 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -804,12 +804,12 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
             const displayClass = window.USE_BOOTSTRAP5 ? "d-none" : "hide";
             if (!mapDiv.hasClass(displayClass)) {
                 mapDiv.addClass(displayClass);
-                moduleCaseList.removeClass('col-md-7 col-md-pull-5').addClass('col-md');
+                moduleCaseList.removeClass('col-lg-7').addClass('col-lg');
                 hideButton.text(gettext('Show Map'));
                 $(e.target).attr('aria-expanded', 'false');
             } else {
                 mapDiv.removeClass(displayClass);
-                moduleCaseList.addClass('col-md-7 col-md-pull-5').removeClass('col-md');
+                moduleCaseList.addClass('col-lg-7').removeClass('col-lg');
                 hideButton.text(gettext('Hide Map'));
                 $(e.target).attr('aria-expanded', 'true');
             }
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/list.html
index fb8797b71081..215ce50df5fe 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/list.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/list.html
@@ -39,9 +39,9 @@
          class="row g-0">
       <% if (showMap) { %>
         <div id="module-case-list-map"
-             class="sticky sticky-map col-lg-5 order-md-1<% if (useTiles) { %> white-border<% } %> noprint-sub-container"></div>
+             class="sticky sticky-map col-lg-5 order-lg-1<% if (useTiles) { %> white-border<% } %> noprint-sub-container"></div>
       <% } %>
-      <div id="module-case-list" class="col-md<% if (showMap) { %>-7 col-md-pull-5<% } %>">
+      <div id="module-case-list" class="col-lg<% if (showMap) { %>-7<% } %>">
         <% if (useTiles) { %>
           <% if (hasNoItems) { %>
             {% include 'cloudcare/partials/case_list/no_items_text.html' %}

From 73f3347f344d5d276ff0cf958d6d58d9ab525b0a Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 27 May 2024 11:44:05 -0400
Subject: [PATCH 10/91] Removed USE_BOOSTRAP5 in js

---
 .../static/cloudcare/js/formplayer/app.js     |  4 +-
 .../cloudcare/js/formplayer/apps/views.js     |  9 +---
 .../formplayer/layout/views/progress_bar.js   |  9 ++--
 .../js/formplayer/layout/views/settings.js    |  9 ----
 .../static/cloudcare/js/formplayer/main.js    |  8 ++--
 .../cloudcare/js/formplayer/menus/views.js    | 47 +++++--------------
 .../js/formplayer/menus/views/query.js        | 11 ++---
 .../cloudcare/static/cloudcare/js/utils.js    | 12 +----
 .../bootstrap5/preview_app_base.html          |  1 -
 9 files changed, 30 insertions(+), 80 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
index b00be20f89a1..d446e687a2eb 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
@@ -128,7 +128,7 @@ hqDefine("cloudcare/js/formplayer/app", [
 
     FormplayerFrontend.on('clearForm', function () {
         $('#webforms').html("");
-        $('.menu-scrollable-container').removeClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
+        $('.menu-scrollable-container').removeClass("d-none");
         $('#webforms-nav').html("");
         $('#cloudcare-debugger').html("");
         $('.atwho-container').remove();
@@ -293,7 +293,7 @@ hqDefine("cloudcare/js/formplayer/app", [
         };
         var sess = WebFormSession.WebFormSession(data);
         sess.renderFormXml(data, $('#webforms'));
-        $('.menu-scrollable-container').addClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
+        $('.menu-scrollable-container').addClass("d-none");
     });
 
     FormplayerFrontend.on("start", function (model, options) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
index b94a80650c2f..10ab24d7ec0d 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
@@ -101,14 +101,7 @@ hqDefine("cloudcare/js/formplayer/apps/views", [
     var GridView = Marionette.CollectionView.extend({
         template: _.template($("#grid-template").html() || ""),
         childView: GridItem,
-        childViewContainer: function () {
-            if (window.USE_BOOTSTRAP5) {
-                return ".row";
-            } else {
-                return ".js-application-container";
-            }
-        },
-
+        childViewContainer: ".row",
         events: _.extend(BaseAppView.events),
         incompleteSessionsClick: _.extend(BaseAppView.incompleteSessionsClick),
         syncClick: _.extend(BaseAppView.syncClick),
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/progress_bar.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/progress_bar.js
index 8111f4318b09..b1436f9ff437 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/progress_bar.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/progress_bar.js
@@ -29,13 +29,12 @@ hqDefine("cloudcare/js/formplayer/layout/views/progress_bar", [
         },
 
         setProgress: function (done, total, duration) {
-            const invisibilityClass = window.USE_BOOTSTRAP5 ? "d-none" : "hide";
             if (done === 0) {
-                this.progressEl.find('.progress').addClass(invisibilityClass);
-                this.progressEl.find('.js-loading').removeClass(invisibilityClass);
+                this.progressEl.find('.progress').addClass("d-none");
+                this.progressEl.find('.js-loading').removeClass("d-none");
             } else {
-                this.progressEl.find('.progress').removeClass(invisibilityClass);
-                this.progressEl.find('.js-loading').addClass(invisibilityClass);
+                this.progressEl.find('.progress').removeClass("d-none");
+                this.progressEl.find('.js-loading').addClass("d-none");
             }
 
             var progress = total === 0 ? 0 : done / total;
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
index 8825c5bc71a7..dd783bb59819 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
@@ -7,7 +7,6 @@ hqDefine("cloudcare/js/formplayer/layout/views/settings", [
     'cloudcare/js/formplayer/apps/api',
     'cloudcare/js/formplayer/users/models',
     'cloudcare/js/formplayer/utils/utils',
-    'bootstrap-switch/dist/js/bootstrap-switch', // bootstrapSwitch: only when window.USE_BOOTSTRAP5 is false
 ], function (
     $,
     _,
@@ -69,14 +68,6 @@ hqDefine("cloudcare/js/formplayer/layout/views/settings", [
         events: {
             'change @ui.oneQuestionPerScreen': 'onChangeOneQuestionPerScreen',
         },
-        onRender: function () {
-            if (!window.USE_BOOTSTRAP5) {
-                this.ui.oneQuestionPerScreen.bootstrapSwitch(
-                    'state',
-                    this.currentUser.displayOptions.oneQuestionPerScreen
-                );
-            }
-        },
         onChangeOneQuestionPerScreen: function (e, switchValue) {
             this.currentUser.displayOptions.oneQuestionPerScreen = switchValue;
             UsersModels.saveDisplayOptions(this.currentUser.displayOptions);
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js
index fc8a83a82bfb..4a7b547f69aa 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js
@@ -31,14 +31,14 @@ hqDefine("cloudcare/js/formplayer/main", [
             $trialBanner = $('#cta-trial-banner');
         var hideMenu = function () {
             $menuToggle.data('minimized', 'yes');
-            $navbar.addClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
-            $trialBanner.addClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
+            $navbar.addClass("d-none");
+            $trialBanner.addClass("d-none");
             $menuToggle.text(gettext('Show Full Menu'));
         };
         var showMenu = function () {
             $menuToggle.data('minimized', 'no');
-            $navbar.removeClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
-            $trialBanner.removeClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
+            $navbar.removeClass("d-none");
+            $trialBanner.removeClass("d-none");
             $navbar.css('margin-top', '');
             $menuToggle.text(gettext('Hide Full Menu'));
         };
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index 42a721e478ce..e91c620131c2 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -91,15 +91,14 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
             e.preventDefault();
             const $playBtn = $(e.originalEvent.srcElement).closest('.js-module-audio-play');
             const $pauseBtn = $playBtn.parent().find('.js-module-audio-pause');
-            const displayClass = window.USE_BOOTSTRAP5 ? "d-none" : "hide";
-            $pauseBtn.removeClass(displayClass);
-            $playBtn.addClass(displayClass);
+            $pauseBtn.removeClass("d-none");
+            $playBtn.addClass("d-none");
             const $audioElem = $playBtn.parent().find('.js-module-audio');
             if ($audioElem.data('isFirstPlay') !== 'yes') {
                 $audioElem.data('isFirstPlay', 'yes');
                 $audioElem.one('ended', function () {
-                    $playBtn.removeClass(displayClass);
-                    $pauseBtn.addClass(displayClass);
+                    $playBtn.removeClass("d-none");
+                    $pauseBtn.addClass("d-none");
                     $audioElem.data('isFirstPlay', 'no');
                 });
             }
@@ -108,9 +107,8 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
         audioPause: function (e) {
             e.preventDefault();
             const $pauseBtn = $(e.originalEvent.srcElement).closest('.js-module-audio-pause');
-            const displayClass = window.USE_BOOTSTRAP5 ? "d-none" : "hide";
-            $pauseBtn.parent().find('.js-module-audio-play').removeClass(displayClass);
-            $pauseBtn.addClass(displayClass);
+            $pauseBtn.parent().find('.js-module-audio-play').removeClass("d-none");
+            $pauseBtn.addClass("d-none");
             $pauseBtn.parent().find('.js-module-audio').get(0).pause();
         },
         rowKeyAction: function (e) {
@@ -801,14 +799,13 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
             const mapDiv = $('#module-case-list-map');
             const moduleCaseList = $('#module-case-list');
             const hideButton = $('#hide-map-button');
-            const displayClass = window.USE_BOOTSTRAP5 ? "d-none" : "hide";
-            if (!mapDiv.hasClass(displayClass)) {
-                mapDiv.addClass(displayClass);
+            if (!mapDiv.hasClass("d-none")) {
+                mapDiv.addClass("d-none");
                 moduleCaseList.removeClass('col-lg-7').addClass('col-lg');
                 hideButton.text(gettext('Show Map'));
                 $(e.target).attr('aria-expanded', 'false');
             } else {
-                mapDiv.removeClass(displayClass);
+                mapDiv.removeClass("d-none");
                 moduleCaseList.addClass('col-lg-7').removeClass('col-lg');
                 hideButton.text(gettext('Hide Map'));
                 $(e.target).attr('aria-expanded', 'true');
@@ -1020,7 +1017,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
             self.boundHandleScroll = self.handleScroll.bind(self);
             $(window).on('scroll', self.boundHandleScroll);
             if (self.shouldShowScrollButton()) {
-                $('#scroll-to-bottom').removeClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
+                $('#scroll-to-bottom').removeClass("d-none");
             }
         },
 
@@ -1276,13 +1273,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
     const BreadcrumbView = Marionette.View.extend({
         tagName: "li",
         template: _.template($("#breadcrumb-item-template").html() || ""),
-        className: function () {
-            if (window.USE_BOOTSTRAP5) {
-                return "breadcrumb-item";
-            } else {
-                return "breadcrumb-text";
-            }
-        },
+        className: "breadcrumb-item",
         attributes: function () {
             let attributes = {
                 "role": "link",
@@ -1433,13 +1424,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
 
     const DetailTabView = Marionette.View.extend({
         tagName: "li",
-        className: function () {
-            if (window.USE_BOOTSTRAP5) {
-                return "nav-item";
-            } else {
-                return this.options.model.get('active') ? 'active' : '';
-            }
-        },
+        className: "nav-item",
         attributes: {
             role: "presentation",
         },
@@ -1472,13 +1457,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
 
     const CaseDetailFooterView = Marionette.View.extend({
         tagName: "div",
-        className: function () {
-            if (window.USE_BOOTSTRAP5) {
-                return "d-flex gap-2 justify-content-center";
-            } else {
-                return "";
-            }
-        },
+        className: "d-flex gap-2 justify-content-center",
         events: {
             "click #select-case": "selectCase",
         },
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
index d44687a7239a..ec64c6f0f7c3 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
@@ -468,11 +468,10 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
         onRender: function () {
             this._initializeSelect2Dropdown();
             const fallback = this.parentView.options.sidebarEnabled && this.parentView.smallScreenEnabled ?  'bottom' : 'right';
-            if (window.USE_BOOTSTRAP5) {
-                this.ui.hqHelp.hqHelp({placement: 'auto', fallbackPlacements: [fallback]});
-            } else {
-                this.ui.hqHelp.hqHelp({placement: 'auto ' + fallback});
-            }
+            this.ui.hqHelp.hqHelp({
+                placement: 'auto',
+                fallbackPlacements: [fallback],
+            });
             cloudcareUtils.initDatePicker(this.ui.date, this.model.get('value'));
             this.ui.dateRange.each(function (index, el) {
                 hqTempusDominus.createDefaultDateRangePicker(el, {
@@ -505,7 +504,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
                 }
             });
             if (this.model.get('hidden') === 'true') {
-                this.$el.addClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
+                this.$el.addClass("d-none");
             }
         },
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index 3926599f75e8..fbbfc59c86cb 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -109,17 +109,7 @@ hqDefine('cloudcare/js/utils', [
         // HTML errors may already have an alert dialog
         $alertDialog = $container.hasClass("alert") ? $container : $container.find('.alert');
         try {
-            if (window.USE_BOOTSTRAP5) {
-                $alertDialog.append($("<button />").addClass("btn-close").attr("data-bs-dismiss", "alert").attr("aria-label", gettext("Close")));
-            } else {
-                $alertDialog
-                    .prepend(
-                        $("<a />")
-                            .addClass("close")
-                            .attr("data-dismiss", "alert")
-                            .html("&times;")
-                    );
-            }
+            $alertDialog.append($("<button />").addClass("btn-close").attr("data-bs-dismiss", "alert").attr("aria-label", gettext("Close")));
         } catch (e) {
             // escaping a DOM-related error from running mocha tests using grunt
             // in the command line. This passes just fine in the browser but
diff --git a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app_base.html b/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app_base.html
index fc63a599dfdd..703fef9a181c 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app_base.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app_base.html
@@ -57,7 +57,6 @@
 
   {# This is fine as an inline script; it'll be removed once form designer is migrated to RequireJS #}
   <script>
-    window.USE_BOOTSTRAP5 = true;
     window.USE_REQUIREJS = true;
   </script>
 </head>

From 7921e409431e0856154c31285c62de34dec839e4 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 27 May 2024 11:20:21 -0400
Subject: [PATCH 11/91] Removed B3 files

---
 Gruntfile.js                                  |   2 -
 .../bootstrap3/block_preview_app.html         |  10 -
 .../cloudcare/bootstrap3/formplayer_home.html | 135 ------------
 .../cloudcare/bootstrap3/preview_app.html     |  82 -------
 .../bootstrap3/preview_app_base.html          |  95 --------
 .../partials/bootstrap3/all_templates.html    |  70 ------
 .../partials/bootstrap3/case_detail.html      |  66 ------
 .../bootstrap3/confirmation_modal.html        |  22 --
 .../partials/bootstrap3/debugger.html         | 204 ------------------
 .../bootstrap3/new_app_version_modal.html     |  36 ----
 .../partials/bootstrap3/pagination.html       | 108 ----------
 .../partials/bootstrap3/progress.html         |  20 --
 .../partials/bootstrap3/settings_view.html    |  47 ----
 .../partials/case_list/bootstrap3/item.html   |  25 ---
 .../partials/case_list/bootstrap3/list.html   |  79 -------
 .../case_list/bootstrap3/menu_header.html     |  25 ---
 .../multi_select_continue_button.html         |  11 -
 .../case_list/bootstrap3/search_controls.html |  28 ---
 .../case_list/bootstrap3/table_container.html |  31 ---
 .../bootstrap3/tile_grouped_item.html         |  58 -----
 .../case_list/bootstrap3/tile_item.html       |  30 ---
 .../form_entry/bootstrap3/entry_button.html   |   5 -
 .../bootstrap3/entry_choice_label.html        |  30 ---
 .../form_entry/bootstrap3/entry_date.html     |   7 -
 .../form_entry/bootstrap3/entry_datetime.html |   6 -
 .../form_entry/bootstrap3/entry_dropdown.html |  13 --
 .../bootstrap3/entry_ethiopian_date.html      |   6 -
 .../form_entry/bootstrap3/entry_file.html     |  23 --
 .../form_entry/bootstrap3/entry_geo.html      |  36 ----
 .../bootstrap3/entry_multidropdown.html       |  12 --
 .../form_entry/bootstrap3/entry_password.html |  10 -
 .../form_entry/bootstrap3/entry_select.html   |  30 ---
 .../bootstrap3/entry_signature.html           |  24 ---
 .../form_entry/bootstrap3/entry_str.html      |  12 --
 .../form_entry/bootstrap3/entry_text.html     |  12 --
 .../form_entry/bootstrap3/entry_time.html     |   6 -
 .../bootstrap3/entry_unsupported.html         |  27 ---
 .../partials/form_entry/bootstrap3/form.html  |  72 -------
 .../bootstrap3/grouped_element_tile_row.html  |   5 -
 .../bootstrap3/help_multimedia.html           |  23 --
 .../form_entry/bootstrap3/multimedia.html     |  24 ---
 .../form_entry/bootstrap3/question.html       | 138 ------------
 .../bootstrap3/repeat_juncture.html           |  30 ---
 .../form_entry/bootstrap3/sub_group.html      |  87 --------
 .../partials/grid_view/bootstrap3/grid.html   |  55 -----
 .../bootstrap3/landing_page_app.html          |  17 --
 .../partials/grid_view/bootstrap3/row.html    |  12 --
 .../grid_view/bootstrap3/single_app.html      |  58 -----
 .../partials/menu/bootstrap3/audio.html       |  24 ---
 .../partials/menu/bootstrap3/badge.html       |  11 -
 .../partials/menu/bootstrap3/breadcrumbs.html |  15 --
 .../partials/menu/bootstrap3/dropdown.html    |  24 ---
 .../partials/menu/bootstrap3/grid.html        |  10 -
 .../partials/menu/bootstrap3/grid_item.html   |  30 ---
 .../partials/menu/bootstrap3/list.html        |  11 -
 .../partials/query/bootstrap3/group.html      |  16 --
 .../partials/query/bootstrap3/item.html       |  97 ---------
 .../partials/query/bootstrap3/list.html       |  40 ----
 .../partials/sessions/bootstrap3/list.html    |  36 ----
 .../partials/users/bootstrap3/restore_as.html |  33 ---
 .../cloudcare/spec/bootstrap3/mocha.html      |  21 --
 .../spec/form_entry/bootstrap3/mocha.html     |  19 --
 .../tests/utils/test_bootstrap_changes.py     |   2 -
 63 files changed, 2353 deletions(-)
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/bootstrap3/block_preview_app.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/bootstrap3/formplayer_home.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/bootstrap3/preview_app.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/bootstrap3/preview_app_base.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/all_templates.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/case_detail.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/confirmation_modal.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/debugger.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/new_app_version_modal.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/pagination.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/progress.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/settings_view.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/item.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/list.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/menu_header.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/multi_select_continue_button.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/search_controls.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/table_container.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/tile_grouped_item.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/tile_item.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_button.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_choice_label.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_date.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_datetime.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_dropdown.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_ethiopian_date.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_file.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_geo.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_multidropdown.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_password.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_select.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_signature.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_str.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_text.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_time.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_unsupported.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/form.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/grouped_element_tile_row.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/help_multimedia.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/multimedia.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/question.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/repeat_juncture.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/sub_group.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/grid.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/landing_page_app.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/row.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/single_app.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/audio.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/badge.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/breadcrumbs.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/dropdown.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/grid.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/grid_item.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/list.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/group.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/item.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/list.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/sessions/bootstrap3/list.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/users/bootstrap3/restore_as.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/spec/bootstrap3/mocha.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/bootstrap3/mocha.html

diff --git a/Gruntfile.js b/Gruntfile.js
index 6f526ce96a47..dde6ef09b484 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -34,9 +34,7 @@ module.exports = function (grunt) {
         'reports_core/choiceListUtils',
         'locations',
         'userreports',
-        'cloudcare/bootstrap3',
         'cloudcare/bootstrap5',
-        'cloudcare/form_entry/bootstrap3',
         'cloudcare/form_entry/bootstrap5',
         'hqwebapp/bootstrap3',
         'hqwebapp/bootstrap5',
diff --git a/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/block_preview_app.html b/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/block_preview_app.html
deleted file mode 100644
index 16b55ca8707a..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/block_preview_app.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "cloudcare/bootstrap3/preview_app_base.html" %}
-{% load hq_shared_tags %}
-{% load compress %}
-{% load i18n %}
-
-{% block body %}
-<div class="alert alert-warning">
-    <p>{{ error_message }}</p>
-</div>
-{% endblock %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/formplayer_home.html b/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/formplayer_home.html
deleted file mode 100644
index 688aff40eb09..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/formplayer_home.html
+++ /dev/null
@@ -1,135 +0,0 @@
-{% extends 'hqwebapp/bootstrap3/base_navigation.html' %}
-{% load i18n %}
-{% load hq_shared_tags %}
-{% load compress %}
-
-{% block title %}
-  {% trans "Web Apps" %}
-{% endblock %}
-
-{% block page_title %}{% endblock %}
-
-{% block head %}
-  {{ block.super }}
-  <style id="persistent-cell-layout-style"></style>
-  <style id="persistent-cell-grid-style"></style>
-  <style id="list-cell-layout-style"></style>
-  <style id="list-cell-grid-style"></style>
-  <style id="list-cell-wrapper-style"></style>
-  <style id="list-cell-container-style"></style>
-{% endblock %}
-
-{% block navigation %}{{ block.super }}
-  <div class="navbar navbar-inverse navbar-cloudcare navbar-static-top">
-    <div class="container-fluid">
-      <a class="navbar-brand" href="{{ home_url }}"><i class="fcc fcc-flower"></i> Web Apps</a>
-      <ul class="nav navbar-nav navbar-right" >
-        <li><a href="#" id="commcare-menu-toggle">{% trans 'Show Full Menu' %}</a></li>
-      </ul>
-    </div>
-  </div>
-{% endblock navigation %}
-
-{% block stylesheets %}
-  {% compress css %}
-    <link rel="stylesheet" href="{% static 'nprogress/nprogress.css' %}">
-    <link rel="stylesheet" href="{% static 'At.js/dist/css/jquery.atwho.min.css' %}">
-    <link rel="stylesheet" href="{% static 'bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css' %}"/>
-  {% endcompress %}
-  {% compress css %}
-    <link type="text/less"
-          rel="stylesheet"
-          media="all"
-          href="{% static 'cloudcare/less/font-formplayer.less' %}" />
-    <link type="text/less"
-          rel="stylesheet"
-          media="all"
-          href="{% static 'cloudcare/less/formplayer-common.less' %}"/>
-    <link type="text/less"
-          rel="stylesheet"
-          media="all"
-          href="{% static 'cloudcare/less/formplayer-webapp.less' %}"/>
-  {% endcompress %}
-{% endblock %}
-
-{% requirejs_main "cloudcare/js/formplayer/main" %}
-
-{% block js %} {{ block.super }}
-  {% include "cloudcare/partials/dependencies.html" %}
-{% endblock %}
-
-{% block content %}
-
-  {% initial_page_data 'apps' apps %}
-  {% initial_page_data 'domain_is_on_trial' domain_is_on_trial %}
-  {% initial_page_data 'debugger_enabled' request.couch_user.can_edit_data %}
-  {% initial_page_data 'domain' domain %}
-  {% initial_page_data 'environment' environment %}
-  {% initial_page_data 'formplayer_url' formplayer_url %}
-  {% initial_page_data 'language' language %}
-  {% initial_page_data 'mapbox_access_token' mapbox_access_token %}
-  {% initial_page_data 'default_geocoder_location' default_geocoder_location %}
-  {% initial_page_data 'username' username %}
-  {% initial_page_data 'has_geocoder_privs' has_geocoder_privs %}
-  {% initial_page_data 'dialer_enabled' integrations.dialer_enabled %}
-  {% initial_page_data 'gaen_otp_enabled' integrations.gaen_otp_enabled %}
-  {% initial_page_data 'hmac_root_url' integrations.hmac_root_url %}
-  {% initial_page_data 'hmac_api_key' integrations.hmac_api_key %}
-  {% initial_page_data 'hmac_hashed_secret' integrations.hmac_hashed_secret %}
-  {% initial_page_data 'sentry' sentry %}
-  {% initial_page_data 'valid_multimedia_extensions_map' valid_multimedia_extensions_map %}
-  {% initial_page_data 'lang_code_name_mapping' lang_code_name_mapping %}
-  {% registerurl 'list_case_exports' request.domain %}
-  {% registerurl 'list_form_exports' request.domain %}
-  {% registerurl 'case_data' request.domain '---' %}
-  {% registerurl 'render_form_data' request.domain '---' %}
-  {% registerurl 'report_formplayer_error' request.domain %}
-  {% registerurl 'report_sentry_error' request.domain %}
-  {% registerurl 'dialer_view' request.domain %}
-  {% registerurl 'api_histogram_metrics' request.domain %}
-  {% if integrations.gaen_otp_enabled %}
-    {% registerurl 'gaen_otp_view' request.domain %}
-  {% endif %}
-
-  <!-- For now we won't touch this since the form entry code is coupled with it  -->
-
-  <div id="cloudcare-main" class="cloudcare-home-content">
-    <section id="cases"></section>
-    <div id="menu-container">
-      <section id="formplayer-progress-container"></section>
-      <div id="restore-as-region"></div>
-      <div id="breadcrumb-region" class="print-container"></div>
-      <section id="cloudcare-notifications" class="container notifications-container"></section>
-      <div class="container case-tile-container">
-        <div id="persistent-case-tile" class="print-container"></div>
-      </div>
-      <div id="content-container" class="container">
-        <div id="sidebar-region" class="noprint-sub-container"></div>
-        <div id="menu-region" class="print-container"></div>
-        <section id="webforms" data-bind="
-                  template: {
-                      name: 'form-fullform-ko-template',
-                      afterRender: afterRender
-                  }">
-        </section>
-      </div>
-    </div>
-    <div role="region" id="sr-notification-region" class="sr-only" aria-live="assertive" aria-relevant="all"></div>
-    <small id="version-info"></small>
-    {% if request.couch_user.can_edit_data %}
-      <section id="cloudcare-debugger" data-bind="
-          template: {
-              name: 'instance-viewer-ko-template',
-              afterRender: adjustWidth
-          }
-        "></section>
-    {% endif %}
-  </div>
-  {% if not request.session.secure_session %}
-    {% include 'hqwebapp/includes/inactivity_modal_data.html' %}
-  {% endif %}
-  {% include 'cloudcare/partials/bootstrap3/confirmation_modal.html' %}
-  {% include 'cloudcare/partials/bootstrap3/new_app_version_modal.html' %}
-  {% include 'cloudcare/partials/bootstrap3/all_templates.html' %}
-
-{% endblock %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/preview_app.html b/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/preview_app.html
deleted file mode 100644
index ae0e8bfb2056..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/preview_app.html
+++ /dev/null
@@ -1,82 +0,0 @@
-{% extends "cloudcare/bootstrap3/preview_app_base.html" %}
-{% load hq_shared_tags %}
-{% load compress %}
-
-{% block css %}
-  {% compress css %}
-    <link type="text/less"
-          rel="stylesheet"
-          media="all"
-          href="{% static 'preview_app/less/preview_app.less' %}"/>
-      <link type="text/css"
-            rel="stylesheet"
-            media="all"
-            href="{% static 'select2/dist/css/select2.min.css' %}" />
-  {% endcompress %}
-{% endblock %}
-
-{% block body %}
-  {% block csrf_token_block %}
-    <input id="csrfTokenContainer" type="hidden" value="{{ csrf_token }}">
-  {% endblock %}
-
-  {% initial_page_data 'allowed_host' request.get_host %}
-  {% initial_page_data 'app' app %}
-  {% initial_page_data 'debugger_enabled' request.couch_user.can_edit_data %}
-  {% initial_page_data 'domain' request.domain %}
-  {% initial_page_data 'environment' environment %}
-  {% initial_page_data 'formplayer_url' formplayer_url %}
-  {% initial_page_data 'is_dimagi' request.couch_user.is_dimagi %}
-  {% initial_page_data 'language' request.user.language|default:'en' %}
-  {% initial_page_data 'mapbox_access_token' mapbox_access_token %}
-  {% initial_page_data 'default_geocoder_location' default_geocoder_location %}
-  {% initial_page_data 'has_geocoder_privs' has_geocoder_privs %}
-  {% initial_page_data 'username' request.user.username %}
-  {% initial_page_data 'dialer_enabled' integrations.dialer_enabled %}
-  {% initial_page_data 'gaen_otp_enabled' integrations.gaen_otp_enabled %}
-  {% initial_page_data 'hmac_root_url' integrations.hmac_root_url %}
-  {% initial_page_data 'hmac_api_key' integrations.hmac_api_key %}
-  {% initial_page_data 'hmac_hashed_secret' integrations.hmac_hashed_secret %}
-  {% initial_page_data 'secure_cookies' secure_cookies %}
-  {% initial_page_data 'sentry' sentry %}
-  {% initial_page_data 'valid_multimedia_extensions_map' valid_multimedia_extensions_map %}
-  {% registerurl 'list_case_exports' request.domain %}
-  {% registerurl 'list_form_exports' request.domain %}
-  {% registerurl 'login_new_window' %}
-  {% registerurl 'case_data' request.domain '---' %}
-  {% registerurl 'render_form_data' request.domain '---' %}
-  {% registerurl 'report_formplayer_error' request.domain %}
-  {% registerurl 'report_sentry_error' request.domain %}
-  {% registerurl 'dialer_view' request.domain %}
-  {% if integrations.gaen_otp_enabled %}
-    {% registerurl 'gaen_otp_view' request.domain %}
-  {% endif %}
-
-  <section id="cases"></section>
-  <div id="menu-container">
-    <div id="formplayer-progress-container"></div>
-    <section id="cloudcare-notifications" class="notifications-container"></section>
-    <div id="restore-as-region"></div>
-    <div id="breadcrumb-region"></div>
-    <div class="scrollable-container dragscroll menu-scrollable-container">
-      <div id="menu-region" class="content menu-content"></div>
-      <small id="version-info"></small>
-    </div>
-    <div class="scrollable-container dragscroll form-scrollable-container">
-      <section id="webforms" data-bind="
-          template: {
-              name: 'form-fullform-ko-template',
-              afterRender: afterRender
-          }">
-      </section>
-    </div>
-    {% if request.couch_user.can_edit_data %}
-      <section id="cloudcare-debugger" data-bind="
-        template: {
-            name: 'instance-viewer-ko-template',
-            afterRender: adjustWidth
-        }
-    "></section>
-    {% endif %}
-  </div>
-{% endblock %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/preview_app_base.html b/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/preview_app_base.html
deleted file mode 100644
index d39db32d4175..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/bootstrap3/preview_app_base.html
+++ /dev/null
@@ -1,95 +0,0 @@
-{% load hq_shared_tags %}
-{% load compress %}
-{% load statici18n %}
-
-{% requirejs_main "cloudcare/js/preview_app/main" %}
-
-<!DOCTYPE html>
-<html lang="{{ LANGUAGE_CODE }}">
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="HandheldFriendly" content="True">
-
-  {% include 'hqwebapp/includes/bootstrap3/core_stylesheets.html' %}
-  {% compress css %}
-    <link type="text/less"
-          rel="stylesheet"
-          media="all"
-          href="{% static 'cloudcare/less/font-formplayer.less' %}" />
-    <link type="text/less"
-          rel="stylesheet"
-          media="all"
-          href="{% static 'cloudcare/less/formplayer-common.less' %}"/>
-  {% endcompress %}
-
-  {% if request.use_daterangepicker %}
-    {% compress css %}
-      <link type="text/css"
-            rel="stylesheet"
-            media="screen"
-            href="{% static "bootstrap-daterangepicker/daterangepicker.css" %}" />
-    {% endcompress %}
-  {% endif %}
-
-  {% block css %}{% endblock %}
-
-  <link rel="stylesheet"
-        href="{% static 'bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css' %}"/>
-  <link type="text/css"
-        rel="stylesheet"
-        media="screen"
-        href="{% static "jquery-ui-built-themes/redmond/jquery-ui.min.css" %}" />
-
-  <link rel="stylesheet" href="{% static 'nprogress/nprogress.css' %}">
-  <link rel="stylesheet" href="{% static 'jquery-ui-built-themes/base/jquery-ui.min.css' %}">
-  <link rel="stylesheet" href="{% static 'At.js/dist/css/jquery.atwho.min.css' %}">
-
-  <script src="{% statici18n LANGUAGE_CODE %}"></script> {# DO NOT COMPRESS #}
-
-  {% include "hqwebapp/partials/requirejs.html" %}
-
-  <style id="list-cell-layout-style"></style>
-  <!-- For Formplayer's app preview -->
-
-  {# This is fine as an inline script; it'll be removed once form designer is migrated to RequireJS #}
-  <script>
-    window.USE_REQUIREJS = true;
-  </script>
-</head>
-<body>
-{% block body %}{% endblock %}
-
-{% include 'cloudcare/partials/bootstrap3/confirmation_modal.html' %}
-{% include 'cloudcare/partials/bootstrap3/all_templates.html' %}
-
-{% block js %}{{ block.super }}
-  {% include 'cloudcare/partials/dependencies.html' %}
-{% endblock %}
-
-{% initial_page_data 'toggles_dict' toggles_dict %}
-{% initial_page_data 'previews_dict' previews_dict %}
-<div class="initial-page-data" class="hide">
-  {% block initial_page_data %}
-    {# do not override this block, use initial_page_data template tag to populate #}
-  {% endblock %}
-</div>
-<div class="commcarehq-urls" class="hide">
-  {% block registered_urls %}
-    {# do not override this block, use registerurl template tag to populate #}
-  {% endblock %}
-</div>
-{% include 'analytics/initial/all.html' %}
-<div class="initial-analytics-data hide">
-  {% block initial_analytics_data %}
-    {# do not override this block, use initial_analytics_data template tag to populate #}
-  {% endblock %}
-</div>
-<div class="analytics-ab-tests hide">
-  {% block analytics_ab_test %}
-    {# do not override this block, use analytics_ab_test template tag to populate #}
-  {% endblock %}
-</div>
-</body>
-</html>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/all_templates.html b/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/all_templates.html
deleted file mode 100644
index 6da8b8b468d1..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/all_templates.html
+++ /dev/null
@@ -1,70 +0,0 @@
-{% include 'cloudcare/partials/bootstrap3/case_detail.html' %}
-
-{% include 'cloudcare/partials/case_list/cell_container_style.html' %}
-{% include 'cloudcare/partials/case_list/cell_grid_style.html' %}
-{% include 'cloudcare/partials/case_list/cell_layout_style.html' %}
-{% include 'cloudcare/partials/case_list/detail.html' %}
-{% include 'cloudcare/partials/case_list/bootstrap3/item.html' %}
-{% include 'cloudcare/partials/case_list/bootstrap3/list.html' %}
-{% include 'cloudcare/partials/case_list/bootstrap3/tile_grouped_item.html' %}
-{% include 'cloudcare/partials/case_list/bootstrap3/tile_item.html' %}
-
-{% include 'cloudcare/partials/bootstrap3/debugger.html' %}
-
-{% include 'cloudcare/partials/form_entry/bootstrap3/add_group.html' %}
-{% include 'cloudcare/partials/form_entry/entry_address.html' %}
-{% include 'cloudcare/partials/form_entry/entry_blank.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_button.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_choice_label.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_date.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_datetime.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_dropdown.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_ethiopian_date.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_file.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_geo.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_multidropdown.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_password.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_select.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_signature.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_str.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_text.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_time.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/entry_unsupported.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/form.html' %}
-{% include 'cloudcare/partials/form_entry/form_navigation.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/grouped_element_tile_row.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/help_multimedia.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/multimedia.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/question.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/repeat_juncture.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap3/sub_group.html' %}
-
-{% include 'cloudcare/partials/grid_view/bootstrap3/grid.html' %}
-{% include 'cloudcare/partials/grid_view/bootstrap3/landing_page_app.html' %}
-{% include 'cloudcare/partials/grid_view/bootstrap3/row.html' %}
-{% include 'cloudcare/partials/grid_view/bootstrap3/single_app.html' %}
-
-{% include 'cloudcare/partials/menu/bootstrap3/audio.html' %}
-{% include 'cloudcare/partials/menu/bootstrap3/badge.html' %}
-{% include 'cloudcare/partials/menu/bootstrap3/breadcrumbs.html' %}
-{% include 'cloudcare/partials/menu/bootstrap3/dropdown.html' %}
-{% include 'cloudcare/partials/menu/bootstrap3/grid.html' %}
-{% include 'cloudcare/partials/menu/bootstrap3/grid_item.html' %}
-{% include 'cloudcare/partials/menu/bootstrap3/list.html' %}
-{% include 'cloudcare/partials/menu/row.html' %}
-
-{% include 'cloudcare/partials/bootstrap3/progress.html' %}
-
-{% include 'cloudcare/partials/query/bootstrap3/group.html' %}
-{% include 'cloudcare/partials/query/bootstrap3/item.html' %}
-{% include 'cloudcare/partials/query/bootstrap3/list.html' %}
-
-{% include 'cloudcare/partials/sessions/item.html' %}
-{% include 'cloudcare/partials/sessions/bootstrap3/list.html' %}
-
-{% include 'cloudcare/partials/bootstrap3/settings_view.html' %}
-
-{% include 'cloudcare/partials/users/bootstrap3/restore_as.html' %}
-{% include 'cloudcare/partials/users/restore_as_banner.html' %}
-{% include 'cloudcare/partials/users/user_data.html' %}
-{% include 'cloudcare/partials/users/user_row.html' %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/case_detail.html b/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/case_detail.html
deleted file mode 100644
index b3866998ce85..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/case_detail.html
+++ /dev/null
@@ -1,66 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-
-<script type="text/template" id="detail-view-list-template">
-  <tbody>
-  </tbody>
-</script>
-
-<script type="text/template" id="detail-view-item-template">
-  <th><%- header %></th>
-  <% if (style.displayFormat === 'Graph') { %>
-  <td><iframe srcdoc="<%- data %>" height="300" width="300"></iframe></td>
-  <% } else if (style.displayFormat === 'Image') { %>
-  <td class="module-case-list-column"><img alt="<%- altText %>" class="module-icon" src="<%- resolveUri(data) %>"/></td>
-  <% } else if (style.displayFormat === 'Phone') { %>
-  <td><a href="tel:<%- data %>"><%- data %></a></td>
-  <% } else if (style.displayFormat === 'Markdown' && html) { %>
-  <td class="webapp-markdown-output"><%= html %></td>
-  <% } else { %>
-  <td><%- data %></td>
-  <% } %>
-</script>
-
-<script type="text/template" id="detail-view-tab-list-template">
-  <ul class="nav nav-tabs" role="tablist">
-  </ul>
-</script>
-
-<script type="text/template" id="detail-view-tab-item-template">
-  <a href="" role="tab" data-keyboard="true" data-toggle="tab"><%- title %></a>
-</script>
-
-<script type="text/template" id="module-case-detail-multi-select">
-  <button type="button"
-      class="btn btn-success btn-lg module-case-detail-btn"
-      id="select-case"
-      data-dismiss="modal">{% trans "Select" %}</button>
-  <button type="button"
-      class="btn btn-default btn-lg module-case-detail-btn"
-      data-dismiss="modal">{% trans "Cancel" %}</button>
-</script>
-
-<script type="text/template" id="module-case-detail">
-  <button type="button"
-          class="btn btn-success btn-lg module-case-detail-continue"
-          id="select-case"
-          data-dismiss="modal">{% trans "Continue" %}</button>
-</script>
-
-<div id="case-detail-modal" class="modal fade module-case-detail-modal" role="dialog" tabindex='-1'>
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" aria-label='{% trans_html_attr "Close" %}' class="close" data-dismiss="modal">&times;</button>
-        <h4 class="modal-title">{% trans "Case Detail" %}</h4>
-      </div>
-      <div class="modal-body">
-        <div class="js-detail-tabs module-case-detail-tabs"></div>
-        <div class="js-detail-content"></div>
-      </div>
-      <div class="modal-footer">
-        <div class="js-detail-footer-content text-center"></div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/confirmation_modal.html b/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/confirmation_modal.html
deleted file mode 100644
index 93ebe8b37ef1..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/confirmation_modal.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div id="js-confirmation-modal" class="modal fade module-modal" role="dialog" tabindex='-1'>
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal">&times;</button>
-        <h3 class="js-modal-title modal-title"></h3>
-      </div>
-      <div class="js-modal-body modal-body">
-      </div>
-      <div class="modal-footer">
-        <button type="button"
-                class="btn btn-primary btn-lg"
-                id="js-confirmation-confirm"
-                data-dismiss="modal"></button>
-        <button type="button"
-                class="btn btn-default btn-lg"
-                id="js-confirmation-cancel"
-                data-dismiss="modal"></button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/debugger.html b/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/debugger.html
deleted file mode 100644
index bad3785dfe1c..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/debugger.html
+++ /dev/null
@@ -1,204 +0,0 @@
-{% load i18n %}
-{% load hq_shared_tags %}
-
-<script type="text/html" id="instance-viewer-ko-template">
-  <div id="instance-xml-home" class="debugger" data-bind="
-        css: {
-            'debugger-minimized': isMinimized,
-            'debugger-maximized': !isMinimized(),
-            'debugger-updating': updating
-        }
-        ">
-    <!-- Tab title -->
-    <button class="btn-block debugger-tab-title" tabindex="0"
-      data-bind="click: toggleState,
-        attr: {'aria-label': isMinimized() ? expandAriaLabel : collapseAriaLabel}">
-      <span class="sr-only">{% trans "Expand Data Preview Section." %}</span>
-      <i class="fa-solid fa-xmark pull-right"></i>
-      <div class="pull-left">
-        <i class="fa fa-table"></i>
-        <span class="debugger-title">{% trans "Data Preview" %}</span>
-      </div>
-    </button>
-
-    <!-- Debugger content -->
-    <div data-bind="visible: !isMinimized()" class="debugger-container">
-      <!-- navigation tabs -->
-
-      <nav class="navbar navbar-default debugger-navbar">
-        <div class="container-fluid">
-
-          <div class="navbar-header">
-            <button
-              type="button"
-              class="navbar-toggle collapsed"
-              data-toggle="collapse"
-              data-target="#debugger-navbar-collapse" aria-expanded="false">
-              <span class="sr-only">Toggle navigation</span>
-              <i class="fa fa-bars"></i> Menu
-            </button>
-          </div>
-
-          <!-- Tab links -->
-          <div class="collapse navbar-collapse" id="debugger-navbar-collapse">
-            <ul class="nav navbar-nav" data-bind="foreach: registeredTabIds">
-              <li role="presentation" data-bind="css: { active: $index() === 0 }">
-                <a
-                  role="tab"
-                  data-toggle="tab"
-                  data-bind="
-                                attr: {
-                                    id: $parent.tabs[$data].id,
-                                    href: '#' + $parent.tabs[$data].tab,
-                                },
-                                text: $parent.tabs[$data].label,
-                                click: $parent.collapseNavbar,
-                            ">
-                </a>
-              </li>
-            </ul>
-          </div><!-- /.navbar-collapse -->
-        </div><!-- /.container-fluid -->
-      </nav>
-
-      <!-- tab content -->
-      <div class="tab-content debugger-content" data-bind="foreach: registeredTabIds">
-        <div role="tabpanel" class="tab-pane" id="debugger-form-data"
-             data-bind="
-                        attr: {
-                            id: $parent.tabs[$data].tab
-                        },
-                        css: { active: $index() === 0 }
-                    ">
-          <div data-bind="template: {
-                        name: $parent.tabs[$data].tabTemplate,
-                        data: $parent
-                    }"></div>
-        </div>
-      </div>
-    </div>
-  </div>
-</script>
-
-<script type="text/html" id="debugger-form-data-template">
-  <div data-bind="html: formattedQuestionsHtml" id="question-viewer-pretty"></div>
-</script>
-
-<script type="text/html" id="debugger-xml-instance-template">
-  <div id="xml-viewer-pretty"></div>
-</script>
-
-<script type="text/html" id="debugger-evaluate-result-template">
-  <!--ko if: xPathQuery.successResult() === ''-->
-  <div><em>{% trans "Empty String" %}</em></div>
-  <!--/ko-->
-  <!--ko if: xPathQuery.errorResult()-->
-  <div data-bind="text: xPathQuery.errorResult(), css: 'text-danger'"></div>
-  <!--/ko-->
-  <!--ko if: xPathQuery.isSuccessTruncated() && options.showInFull-->
-  <div>
-    <em>{% trans "Showing the first" %} <span data-bind="text: xPathQuery.getMaxLines()"/> {% trans "lines..." %}</em>
-    <a class="clickable pull-right" data-clipboard-action="copy" data-bind="clipboardButton: xPathQuery.getFullSuccessResult()">
-      {% trans "Copy Full Evaluation to Clipboard" %}
-    </a>
-  </div>
-  <!--/ko-->
-  <!--ko if: options.showInFull && xPathQuery.successResult()-->
-  <textarea type="text" data-bind="
-        aceEditor: xPathQuery.successResult()
-    "></textarea>
-  <!--/ko-->
-  <!--ko if: xPathQuery.isTraceTruncated() && options.showInFull-->
-  <div>
-    <em>{% trans "Showing the first" %} <span data-bind="text: xPathQuery.getMaxLines()"/> {% trans "lines..." %}</em>
-    <a class="clickable pull-right" data-clipboard-action="copy" data-bind="clipboardButton: xPathQuery.getFullTraceResult()">
-      {% trans "Copy Full Trace to Clipboard" %}
-    </a>
-  </div>
-  <!--/ko-->
-  <!--ko if: options.showInFull && xPathQuery.hasTrace()-->
-  <textarea type="text" data-bind="
-        aceEditor: xPathQuery.traceResult()
-    "></textarea>
-  <!--/ko-->
-  <!--ko if: !options.showInFull && xPathQuery.successResult()-->
-  <pre data-bind="text: xPathQuery.getTruncatedSuccess()"></pre>
-  <!--/ko-->
-</script>
-
-<script type="text/html" id="debugger-evaluate-template">
-  <!--ko with: evalXPath-->
-  <form class="form-horizontal" data-bind="submit: onSubmitXPath">
-    <div class="col-sm-12">
-      <div class="form-group">
-                <textarea
-                  id="xpath"
-                  class="form-control vertical-resize debugger-code at-who-input"
-                  name="xpath"
-                  placeholder="XPath Expression"
-                  autocomplete="off"
-                  spellcheck=false
-                  data-bind="value: xpath, event: { mouseup: onMouseUp }" ></textarea>
-      </div>
-    </div>
-    <div class="col-sm-12">
-      <div class="form-group">
-        <input class="btn btn-primary" id="evaluate-button" value="Evaluate" type="submit"/>
-        <input
-          class="btn btn-default"
-          value="Evaluate Selection"
-          type="button"
-          data-bind="css: { disabled: !selectedXPath() }, click: onClickSelectedXPath"/>
-        <div class="col-sm-3 pull-right">
-          <select class="form-control" data-bind="value: selectedDebugOption, options: debugTraceOptions, optionsText: 'label'"></select>
-        </div>
-      </div>
-    </div>
-    <div class="col-sm-12" data-bind="template: {
-            name: 'debugger-evaluate-result-template',
-            data: {xPathQuery: xPathQuery(), options: {showInFull: true}},
-            if: xPathQuery()
-        }">
-    </div>
-  </form>
-  <div class="row">
-    <div class="col-sm-12">
-      <h4>{% trans "Recent Queries" %}</h4>
-    </div>
-  </div>
-  <!-- ko if: recentXPathQueries().length -->
-  <div class="table-responsive">
-    <table class="table table-striped table-hover">
-      <tbody data-bind="foreach: recentXPathQueries">
-      <tr class="query-container" data-bind="click: $parent.onClickSavedQuery">
-        <td class="col-sm-1 query-status">
-                        <span><i class="fa" data-bind="
-                            css: {
-                                'fa-check': success(),
-                                'fa-times': !success(),
-                                'text-success': success(),
-                                'text-danger': !success()
-                            }
-                        "></i></span>
-        </td>
-        <td class="col-sm-8 debugger-code">
-          <span data-bind="text: xpath"></span>
-        </td>
-        <td class="col-sm-3" data-bind="template: {
-                        name: 'debugger-evaluate-result-template',
-                        data: {xPathQuery: $data, options: {showInFull: false}}
-                    }"></td>
-      </tr>
-      </tbody>
-    </table>
-  </div>
-  <!-- /ko -->
-  <!-- ko ifnot: recentXPathQueries().length -->
-  <div class="row">
-    <div class="col-sm-12">
-      <i>{% trans "No recent queries" %}</i>
-    </div>
-  </div>
-  <!-- /ko -->
-  <!--/ko-->
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/new_app_version_modal.html b/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/new_app_version_modal.html
deleted file mode 100644
index fda4ed1cc884..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/new_app_version_modal.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load i18n %}
-
-<div class="modal fade" id ="newAppVersionModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
-      <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">{% trans "A new version of this app is available" %}</h4>
-        </div>
-        <div class="modal-body">
-          <p>
-            {% blocktrans %}
-              CommCare recommends that you get the latest version of this app.
-            {% endblocktrans %}
-          <p>
-          <div id="incompleteFormWarning" style="display: none;">
-              <p> {% trans "To keep any unsaved changes -" %} </p>
-              <ol>
-                <li>{% trans 'Click on “Update Later”.' %}</li>
-                <li>{% trans 'Submit your changes.' %}</li>
-                <li>{% trans 'Update by clicking on “Web Apps” at the top left of the browser page.' %}</li>
-              </ol>
-              <p>
-                {% blocktrans %}
-                  If you don’t have any unsaved changes and would like to update, click on “Get Latest App”.
-                {% endblocktrans %}
-              </p>
-          </div>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Update Later" %}</button>
-          <button id="refreshApp" type="button" class="btn btn-primary">{% trans "Get Latest App" %}</button>
-        </div>
-      </div>
-    </div>
-  </div>
\ No newline at end of file
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/pagination.html b/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/pagination.html
deleted file mode 100644
index 9f76ed84b650..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/pagination.html
+++ /dev/null
@@ -1,108 +0,0 @@
-{% load i18n %}
-{% load hq_shared_tags %}
-
-
-
-{% block pagination_templates %}
-  <% if (showPagination) { %>
-    <div class="container pagination-container">
-      <div class="row">
-        <div class="col-xs-6 col-sm-3 module-per-page-container">
-          <div class="form-inline input-group-lg">
-            <select class="form-control per-page-limit">
-              <% for(var i = 0; i < rowRange.length; i++) { %>
-                <% if (rowRange[i] === limit) { %>
-                  <option value="<%- rowRange[i] %>" selected>{% trans "<%- rowRange[i] %> per page" %}</option>
-                <% } else { %>
-                  <option value="<%- rowRange[i] %>">{% trans "<%- rowRange[i] %> per page" %}</option>
-                <% } %>
-              <% } %>
-            </select>
-          </div>
-        </div>
-        <% if (pageCount > 1) { %>
-          <div class="col-xs-6 col-sm-3 col-sm-push-6 module-go-container">
-            <div class="input-group input-group-lg">
-              <input type="text" class="form-control" placeholder='{% trans_html_attr "Go to page" %}' id="goText">
-              <div class="input-group-btn">
-                <button class="btn btn-default" type="button" id="pagination-go-button">{% trans "Go" %}</button>
-              </div>
-            </div>
-          </div>
-          <div class="col-xs-12 col-sm-6 col-sm-pull-3 text-center">
-            <nav class="module-pagination-container">
-              <ul class="pagination">
-                <!-- Render Previous button -->
-                <% if (currentPage > 0) { %>
-                  <li>
-                    <a class="js-page" aria-label='{% trans_html_attr "First Page" %}' tabindex="0" data-id="0">
-                    <span><i class="fa fa-fast-backward"></i></span>
-                  </a>
-                  <a class="js-page" aria-label='{% trans_html_attr "Previous" %}' tabindex="0" data-id="<%- currentPage - 1 %>">
-                    <span><i class="fa fa-caret-left"></i></span>
-                  </a>
-                  </li>
-                <% } else { %>
-                  <li class="paginate-disabled">
-                  <a class="js-page" data-id="0">
-                    <span><i class="fa fa-fast-backward"></i></span>
-                  </a>
-                  <a class="js-page" data-id="<%- currentPage - 1 %>">
-                    <span><i class="fa fa-caret-left"></i></span>
-                  </a>
-                  </li>
-                <% } %>
-                <!-- Render page buttons -->
-                <% if (pageCount <= 5) { %>
-                    <% for (i = startPage-1; i < endPage; i++) { %>
-                      <li class="js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i %>"><a aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current ='page'<% } %> tabindex="0"><%- i + 1 %></a></li>
-                    <% } %>
-                <% } else { %>
-                  <% if (startPage <= 3) { %>
-                    <% for (i = 0; i < startPage; i++) { %>
-                      <li class="js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i %>"><a aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current='page'<% } %> tabindex="0"><%- i + 1 %></a></li>
-                    <% } %>
-                  <% } else { %>
-                      <li class="js-page" data-id="0"><a aria-label="<%- pageNumLabel({num: 1}) %>" tabindex="0">{% trans "1" %}</a></li>
-                      <li class="js-page"><a class="paginate-disabled">{% trans "..." %}</a></li>
-                  <% } %>
-                  <% for (i = startPage; i < endPage; i++) { %>
-                    <li class="js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i %>"><a aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current='page'<% } %> tabindex="0"><%- i + 1 %></a></li>
-                  <% } %>
-                  <% if (endPage >= pageCount - 2) { %>
-                    <% for (i = endPage+1; i <= pageCount; i++) { %>
-                      <li class="js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i - 1 %>"><a aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current='page'<% } %> tabindex="0"><%- i %></a></li>
-                    <% } %>
-                  <% } else { %>
-                    <li class="js-page"><a class="paginate-disabled">{% trans "..." %}</a></li>
-                    <li class="js-page" data-id="<%- pageCount - 1 %>"><a aria-label="<%- pageNumLabel({num: pageCount}) %>" tabindex="0"><%- pageCount %></a></li>
-                  <% } %>
-                <% } %>
-                <!-- Render Next buttons -->
-                <% if (currentPage >= pageCount - 1) { %>
-                  <li class="paginate-disabled">
-                    <a class="js-page" data-id="<%- currentPage + 1 %>">
-                    <span><i class="fa fa-caret-right"></i></span>
-                  </a>
-                  <a class="js-page" data-id="<%- pageCount - 1 %>">
-                    <span><i class="fa fa-fast-forward"></i></span>
-                  </a>
-                  </li>
-                <% } else { %>
-                  <li>
-                  <a class="js-page" aria-label='{% trans_html_attr "Next" %}' tabindex="0" data-id="<%- currentPage + 1 %>">
-                    <span><i class="fa fa-caret-right"></i></span>
-                  </a>
-                  <a class="js-page" aria-label='{% trans_html_attr "Last Page" %}' tabindex="0" data-id="<%- pageCount - 1 %>">
-                    <span><i class="fa fa-fast-forward"></i></span>
-                  </a>
-                  </li>
-                <% } %>
-              </ul>
-            </nav>
-          </div>
-        <% } %>
-      </div>
-    </div>
-  <% } %>
-{% endblock %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/progress.html b/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/progress.html
deleted file mode 100644
index 217a9de99c50..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/progress.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<script type="text/template" id="progress-view-template">
-  <div id="formplayer-progress">
-    <div class="progress-container">
-      <div class="progress-title">
-        <h1>
-          <i class="fa fa-spinner fa-spin js-loading"></i>
-          <%- progressMessage %>
-        </h1>
-        <h2 class="subtext text-left js-subtext"><small></small></h2>
-      </div>
-      <div class="progress hide">
-        <div
-          style="width: 0%"
-          class="js-progress-bar progress-bar progress-bar-striped active"
-          role="progressbar">
-        </div>
-      </div>
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/settings_view.html b/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/settings_view.html
deleted file mode 100644
index 82100f963f38..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap3/settings_view.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-
-<script type="text/template" id="settings-template">
-  <div class="module-menu-container module-menu-bar-offset">
-    <div class="page-header menu-header">
-      <h1 class="page-title">Settings</h1>
-    </div>
-    <table class="table module-table">
-      <tbody>
-      </tbody>
-    </table>
-    <div class="page-footer">
-      <button class="btn btn-primary js-done">
-        {% trans "Done" %}
-      </button>
-    </div>
-  </div>
-</script>
-<script type="text/template" id="display-setting-template">
-  <th>{% trans "Use one question per screen" %}</th>
-  <td><input class="js-one-question-per-screen" type="checkbox" data-size="mini" /></td>
-</script>
-<script type="text/template" id="lang-setting-template">
-  <th>{% trans "Set the application language" %}</th>
-  <td>
-    <select class="form-control js-lang">
-      <% _.each(langs, function(lang) { %>
-      <option <% if (lang === currentLang) { %>selected<% } %>>
-      <%- lang %>
-      </option>
-      <% }) %>
-    </select>
-  </td>
-</script>
-<script type="text/template" id="clear-user-data-setting-template">
-  <th>{% trans "Clear user data" %}</th>
-  <td><button class="js-clear-user-data btn btn-sm btn-danger">{% trans "Clear" %}</button></td>
-</script>
-<script type="text/template" id="break-locks-setting-template">
-  <th>{% trans "Break Pending Request Locks" %}</th>
-  <td><button class="js-break-locks btn btn-sm btn-danger">{% trans "Break" %}</button></td>
-</script>
-<script type="text/template" id="sync-setting-template">
-  <th>{% trans "Sync User Data" %}</th>
-  <td><button class="js-sync btn btn-sm btn-danger">{% trans "Sync" %}</button></td>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/item.html
deleted file mode 100644
index 5d2e3ccdf449..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/item.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<script type="text/template" id="case-view-item-template">
-  <% if (isMultiSelect) { %>
-    <td class="module-case-list-column-checkbox"><input type="checkbox" class="select-row-checkbox"/></td>
-  <% } %>
-  <% _.each(data, function(datum, index) { %>
-    <% if (!(styles[index].widthHint === 0)) { %>
-      <% if (styles[index].displayFormat === 'Image') { %>
-        <td class="module-case-list-column"><img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/></td>
-      <% } else if (styles[index].displayFormat === 'ClickableIcon') { %>
-        <td class="module-case-list-column">
-          <button class="clickable-icon">
-            <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
-            <i class="fa fa-spin fa-spinner" style="display:none"></i>
-          </button>
-        </td>
-      <% } else if (styles[index].displayFormat === 'Markdown') { %>
-        <td class="module-case-list-column webapp-markdown-output"><%= renderMarkdown(datum) %></td>
-      <% } else if (styles[index].displayFormat === 'Graph') { %>
-        <td class="module-case-list-column"><iframe srcdoc="<%- datum %>" height="300" width="300"></iframe></td>
-      <% } else { %>
-        <td class="module-case-list-column"><%- datum %></td>
-      <% } %>
-    <% } %>
-  <% }); %>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/list.html
deleted file mode 100644
index 8900ae7bfed2..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/list.html
+++ /dev/null
@@ -1,79 +0,0 @@
-{% load i18n %}
-
-<script type="text/template" id="case-view-list-template">
-  <div class="module-case-list-container">
-
-    <button id="scroll-to-bottom"
-            class="btn btn-lg btn-circle btn-primary hidden-md hidden-lg hide"
-            type="button"
-            aria-label="{% trans 'Scroll to bottom' %}">
-      <i class="fa fa-lg fa-arrow-down" aria-hidden="true"></i>
-    </button>
-
-    {% include "cloudcare/partials/case_list/bootstrap3/menu_header.html" %}
-
-    <% if (isMultiSelect) { %>
-    <div class="case-list-actions">
-      {% include 'cloudcare/partials/case_list/bootstrap3/multi_select_continue_button.html' %}
-    </div>
-    <% } %>
-
-    <% if (!splitScreenToggleEnabled) { %>
-    <div class="module-search-container">
-      <div class="input-group input-group-lg">
-        <input type="text"
-               class="form-control"
-               placeholder="Search"
-               id="searchText">
-        <div class="input-group-btn">
-          <button class="btn btn-default"
-                  type="button"
-                  id="case-list-search-button">
-            <i class="fa fa-search" aria-hidden="true"></i>
-          </button>
-        </div>
-      </div>
-    </div>
-    <% } %>
-
-    <div id="module-case-list-container__results-container"
-         class="row row-no-gutters">
-      <% if (showMap) { %>
-        <div id="module-case-list-map"
-             class="sticky sticky-map col-md-5 col-md-push-9<% if (useTiles) { %> white-border<% } %> noprint-sub-container"></div>
-      <% } %>
-      <div id="module-case-list" class="col-md<% if (showMap) { %>-7 col-md-pull-5<% } %>">
-        <% if (useTiles) { %>
-          <% if (hasNoItems) { %>
-            {% include 'cloudcare/partials/case_list/no_items_text.html' %}
-          <% } else { %>
-            {% include 'cloudcare/partials/case_list/bootstrap3/search_controls.html' %}
-          <% } %>
-          <section class="js-case-container clearfix list-cell-container-style"></section>
-        <% } else { %>
-          {% include 'cloudcare/partials/case_list/bootstrap3/table_container.html' %}
-        <% } %>
-      </div>
-    </div>
-    <% if (actions || isMultiSelect) { %>
-      <div class="case-list-actions">
-        <% if (isMultiSelect) { %>
-          {% include 'cloudcare/partials/case_list/bootstrap3/multi_select_continue_button.html' %}
-        <% } %>
-        <% if (actions) { %>
-          <% _.each(actions, function(action, index) { %>
-            <div class="case-list-action-button btn-group formplayer-request">
-              <button type="button" class="btn btn-default btn-lg " data-index="<%- index %>"><%- action.text %></button>
-            </div>
-          <% }) %>
-        <% } %>
-      </div>
-    <% } %>
-
-    <% if (!hasNoItems) { %>
-      {% block pagination_templates %}
-        {% include 'cloudcare/partials/bootstrap3/pagination.html' %}
-      {% endblock %}
-    <% } %>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/menu_header.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/menu_header.html
deleted file mode 100644
index 6567a87bb1be..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/menu_header.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-
-<div class="page-header menu-header clearfix" id="case-list-menu-header">
-  <div class="pull-right">
-    <% if (showMap) { %>
-      <button id="hide-map-button" class="btn btn-primary pull-right" type="button"
-         aria-expanded="true" aria-controls="module-case-list-map">
-        {% trans "Hide Map" %}
-      </button>
-    <% } %>
-    <% if (sidebarEnabled) { %>
-      <button id="search-more" class="btn btn-primary visible-xs visible-sm pull-right" type="button"
-        data-toggle="collapse" data-target="#sidebar-region" aria-expanded="false" aria-controls="sidebar-region">
-        {% trans "Refine search" %}
-      </button>
-    <% } %>
-  </div>
-  <% if (title.length > 0) { %>
-    <h1  aria-label="<%- title %>" tabindex="0" class="page-title"><%- title %></h1>
-  <% } %>
-  <% if (sidebarEnabled && description.length > 0) { %>
-    <div aria-label="<%- description %>" tabindex="0" class="query-description"><%= description %></div>
-  <% } %>
-</div>
\ No newline at end of file
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/multi_select_continue_button.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/multi_select_continue_button.html
deleted file mode 100644
index aac79cdaf029..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/multi_select_continue_button.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% load i18n %}
-<button type="button" class="btn btn-success btn-lg formplayer-request multi-select-continue-btn" disabled="true">
-  <% if (selectText && selectText.length > 0) { %>
-    <%- selectText %>
-    <% } else { %>
-      {% trans "Continue" %}
-    <% } %>
-  <span id="multi-select-btn-text" class="badge">
-    <%- selectedCaseIds.length %>
-  </span>
-</button>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/search_controls.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/search_controls.html
deleted file mode 100644
index 3a82e9185697..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/search_controls.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-
-<div id="case-list-search-controls">
-  <div>
-    <% if (isMultiSelect) { %>
-      <input type="checkbox" id="select-all-tile-checkbox"/>
-      <label id="select-all-tile-checkbox-label" for="select-all-tile-checkbox">{% trans "Select All" %}</label>
-    <% } %>
-  </div>
-  <div class="dropdown">
-    <button class="btn" id="case-list-sort-by-btn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-      <span> {% trans "Sort By" %} </span><i class="fa fa-sort" aria-hidden="true"></i>
-    </button>
-    <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="case-list-sort-by">
-      <%  _.each(sortOptions, function(sortOption) { %>
-        <li tabindex="0" class="header-clickable formplayer-request" data-id="<%- sortOption.index %>" role="menuitem">
-          <a>
-            <%= sortOption.header %>
-            <% if (sortOption.sortOrder) { %>
-              <i class="fa fa-arrow-<%= sortOption.sortOrder === 'V' ? 'down' : 'up' %> pull-right"></i>
-            <% } %>
-          </a>
-        </li>
-      <% }); %>
-    </ul>
-  </div>
-</div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/table_container.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/table_container.html
deleted file mode 100644
index 3c0a0c08caa3..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/table_container.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-
-<div class="module-case-list-table-container">
-  <table class="table module-table module-table-case-list">
-
-    <thead>
-      <tr>
-        <% if (isMultiSelect && !hasNoItems) { %>
-          <th class="module-case-list-header"><input type="checkbox" id="select-all-checkbox"/></th>
-        <% } %>
-        <%  _.each(headers, function(header, index) { %>
-          <% if (columnVisible(index)) { %>
-            <% if (columnSortable(index)) { %>
-              <th class="module-case-list-header header-clickable formplayer-request" data-id="<%- index %>"> <%= header %></th>
-            <% } else { %>
-              <th class="module-case-list-header" data-id="<%- index %>"> <%= header %></th>
-            <% } %>
-          <% } %>
-        <% }); %>
-      </tr>
-    </thead>
-
-    <% if (hasNoItems) { %>
-      {% include 'cloudcare/partials/case_list/no_items_text.html' %}
-    <% } %>
-
-    <tbody class="wrapper js-case-container"></tbody>
-
-  </table>
-</div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/tile_grouped_item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/tile_grouped_item.html
deleted file mode 100644
index 4bbbb5b8d797..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/tile_grouped_item.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<script type="text/template" id="case-tile-grouped-view-item-template">
-  <% if (isMultiSelect) { %>
-    <div class="select-row-checkbox-div">
-      <input type="checkbox" class="select-row-checkbox"/>
-    </div>
-  <% } %>
-
-  <div class="group-data collapsible-tile-content">
-    <div class="<%- prefix %>-cell-grid-style">
-      <% for (let [index, datum] of Object.entries(indexedHeaderData)) { %>
-        <div class="<%- prefix %>-grid-style-<%- index %> box" >
-          <% if (styles[index].displayFormat === 'ClickableIcon') {
-          if(resolveUri(datum)) { %>
-            <button class="clickable-icon">
-              <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>" style="max-width:100%; max-height:100%;"/>
-              <i class="fa fa-spin fa-spinner" style="display:none"></i>
-            </button>
-          <% } %>
-          <% } else if (styles[index].displayFormat === 'Image') {
-          if(resolveUri(datum)) { %>
-            <img alt="<%- altText[index] %>" class="module-icon" style="max-width:100%; max-height:100%;" src="<%- resolveUri(datum) %>"/>
-          <% } %>
-          <% } else if(styles[index].widthHint === 0) { %>
-            <div style="display:none;"><%- datum %></div>
-          <% } else { %>
-            <div class="webapp-markdown-output"><%= renderMarkdown(datum) %></div>
-          <% } %>
-        </div>
-      <% }; %>
-    </div>
-
-    <div class="group-rows">
-      <% _.each(indexedRowDataList, function(indexedRowData) { %>
-        <div class="<%- prefix %>-cell-grid-style group-row">
-          <% for (let index in indexedRowData) { %>
-            <% let datum = indexedRowData[index]; %>
-            <div class="<%- prefix %>-grid-style-<%- index %> box">
-              <% if (styles[index].displayFormat === 'Image') {
-                if(resolveUri(datum)) { %>
-                  <img alt="<%- altText[index] %>" class="module-icon" style="max-width:100%; max-height:100%;" src="<%- resolveUri(datum) %>"/>
-                <% } %>
-              <% } else if (styles[index].displayFormat === 'ClickableIcon') {
-                if(resolveUri(datum)) { %>
-                  <button class="clickable-icon">
-                    <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>" style="max-width:100%; max-height:100%;"/>
-                    <i class="fa fa-spin fa-spinner" style="display:none"></i>
-                  </button>
-                <% } %>
-              <% } else { %>
-                  <div class="webapp-markdown-output"><%= renderMarkdown(datum) %></div>
-              <% } %>
-            </div>
-          <% } %>
-        </div>
-      <% }); %>
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/tile_item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/tile_item.html
deleted file mode 100644
index ee7a88b5e5e8..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap3/tile_item.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<script type="text/template" id="case-tile-view-item-template">
-    <% if (isMultiSelect) { %>
-      <div class="select-row-checkbox-div">
-        <input type="checkbox" class="select-row-checkbox"/>
-      </div>
-    <% } %>
-
-  <div class="<%- prefix %>-cell-grid-style collapsible-tile-content">
-    <% _.each(data, function(datum, index) { %>
-    <div class="<%- prefix %>-grid-style-<%- index %> box">
-      <% if (styles[index].displayFormat === 'Image') {
-      if(resolveUri(datum)) { %>
-        <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
-      <% } %>
-      <% } else if (styles[index].displayFormat === 'ClickableIcon') {
-      if(resolveUri(datum)) { %>
-        <button class="clickable-icon">
-          <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
-          <i class="fa fa-spin fa-spinner" style="display:none"></i>
-        </button>
-      <% } %>
-      <% } else if(styles[index].widthHint === 0) { %>
-        <div style="display:none;"><%- datum %></div>
-      <% } else { %>
-        <div class="webapp-markdown-output"><%= renderMarkdown(datum) %></div>
-      <% } %>
-    </div>
-    <% }); %>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_button.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_button.html
deleted file mode 100644
index 7cd1c232c186..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_button.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script type="text/html" id="button-entry-ko-template">
-  <button class="btn btn-default" data-bind="click: onClick, attr: {id: entryId}">
-    <span data-bind="renderMarkdown: buttonLabel()"></span>
-  </button>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_choice_label.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_choice_label.html
deleted file mode 100644
index 4239ea40a2ef..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_choice_label.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load i18n %}
-
-<script type="text/html" id="choice-label-entry-ko-template">
-  <div class="row">
-    <!-- ko foreach: choices -->
-      <div data-bind="attr: { 'class': $parent.colStyle }, style: { 'word-wrap': 'break-word' }">
-        <!-- ko if: $parent.hideLabel -->
-          <input type="radio" data-bind="
-                checked: $parent.rawAnswer,
-                checkedValue: $index() + 1,
-                attr: {
-                    id: 'group-' + $parent.entryId + '-choice-' + $index(),
-                    'aria-labelledby': $parent.entryId + '-choice-' + $index() + '-sr',
-                    name: $parent.entryId,
-                    class: 'group-' + $parent.entryId,
-                }
-            "/>
-        <!-- /ko -->
-        <span data-bind="renderMarkdown: $data, class: $parent.hideLabel ? 'sr-only' : '', attr: { id: $parent.entryId + '-choice-' + $index() + '-sr' }"></span>
-      </div>
-    <!-- /ko -->
-    <!-- ko if: hideLabel -->
-      <div data-bind="attr: { 'class': colStyle }">
-        <button class="btn btn-default btn-xs" data-bind="click: onClear, fadeVisible: rawAnswer()">
-          {% trans "Clear" %}
-        </button>
-      </div>
-    <!-- /ko -->
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_date.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_date.html
deleted file mode 100644
index 3c3dbc2ff82e..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_date.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<script type="text/html" id="date-entry-ko-template">
-  <div class="input-group">
-    <input type="text" class="form-control"
-      data-bind="attr: {id: entryId, 'aria-required': $parent.required() ? 'true' : 'false'}"/>
-    <span class="input-group-addon"><i class="fa-solid fa-calendar-days"></i></span>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_datetime.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_datetime.html
deleted file mode 100644
index 16106b11550b..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_datetime.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<script type="text/html" id="datetime-entry-ko-template">
-  <div class="input-group">
-    <input type="text" class="form-control" data-bind="attr: { id: entryId, 'aria-required': $parent.required() ? 'true' : 'false' }"/>
-    <span class="input-group-addon"><i class="fcc fcc-fd-datetime"></i></span>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_dropdown.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_dropdown.html
deleted file mode 100644
index c13a03e542ce..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_dropdown.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<script type="text/html" id="dropdown-entry-ko-template">
-  <select class="form-control" data-bind="
-        foreach: options,
-        value: rawAnswer,
-        attr: {
-            id: entryId,
-            'aria-required': $parent.required() ? 'true' : 'false',
-        },
-        valueAllowUnset: true,
-        ">
-    <option data-bind="value: id, text: text"></option>
-  </select>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_ethiopian_date.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_ethiopian_date.html
deleted file mode 100644
index ec803057a374..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_ethiopian_date.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<script type="text/html" id="ethiopian-date-entry-ko-template">
-  <div class="input-group">
-    <input type="text" class="form-control" autocomplete="off" data-bind="attr: { id: entryId, 'aria-required': $parent.required() ? 'true' : 'false' }"/>
-    <span class="input-group-addon"><i class="fa-solid fa-calendar-days"></i></span>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_file.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_file.html
deleted file mode 100644
index 443a711bb6c8..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_file.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% load hq_shared_tags %}
-
-<script type="text/html" id="file-entry-ko-template">
-  <div class="row">
-    <div class="col-xs-8">
-      <input type="file" data-bind="
-            value: $data.rawAnswer,
-            attr: {
-                id: entryId,
-                'aria-required': $parent.required() ? 'true' : 'false',
-                accept: accept,
-            },
-        "/>
-    </div>
-    <div class="col-xs-4">
-      <button class="btn btn-default btn-xs pull-right" data-bind="
-        click: onClear,
-        text: $root.getTranslation('upload.clear.title', '{% trans_html_attr 'Clear' %}'),
-      ">
-      </button>
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_geo.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_geo.html
deleted file mode 100644
index 5e04196a05ee..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_geo.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load i18n %}
-
-<script type="text/html" id="geo-entry-ko-template">
-  <table width="100%" cellpadding="0" cellspacing="0" border="0">
-    <tbody>
-    <tr>
-      <td class="lat coordinate" data-bind="text: formatLat()"></td>
-      <td class="lon coordinate" data-bind="text: formatLon()"></td>
-      <td align="right" valign="bottom">
-        <button class="btn btn-default btn-xs clear" data-bind="click: onClear">{% trans "Clear map" %}</button>
-      </td>
-    </tr>
-    </tbody>
-  </table>
-  <div class="map" data-bind="
-    attr: {
-      'id': entryId,
-      'aria-labelledby': entryId + '-label',
-    }">
-    <div class="wait" data-bind="visible: !hasMap" >{% trans "Please wait while the map loads" %}</div>
-  </div>
-  <div>
-    <form data-bind="submit: search">
-      <div class="form-group">
-        <div class="controls" data-bind="css: control_width">
-          <div class="input-group">
-            <input class="query form-control" type="text" />
-            <span class="input-group-btn">
-              <button class="btn btn-default search">{% trans "Search" %}</button>
-            </span>
-          </div>
-        </div>
-      </div>
-    </form>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_multidropdown.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_multidropdown.html
deleted file mode 100644
index 6f1a5f714789..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_multidropdown.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<script type="text/html" id="multidropdown-entry-ko-template">
-  <select multiple class="form-control" data-bind="
-        options: choices,
-        selectedOptions: rawAnswer,
-        attr: {
-            id: entryId,
-            'aria-required': $parent.required() ? 'true' : 'false',
-        },
-        valueAllowUnset: true,
-        ">
-  </select>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_password.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_password.html
deleted file mode 100644
index 974ed1618f44..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_password.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<script type="text/html" id="password-entry-ko-template">
-  <input type="password" class="form-control" data-bind="
-        value: $data.rawAnswer,
-        valueUpdate: valueUpdate,
-        attr: {
-          id: entryId,
-          'aria-required': $parent.required() ? 'true' : 'false',
-        },
-    "/>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_select.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_select.html
deleted file mode 100644
index 55a4e3cde6dc..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_select.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load i18n %}
-
-<script type="text/html" id="select-entry-ko-template">
-  <fieldset>
-  <legend class="sr-only" data-bind="text: question.caption()"></legend>
-    <div class="sel clear">
-      <div data-bind="foreach: choices, as: 'choice'">
-        <div data-bind="css: { checkbox: $parent.isMulti, radio: !$parent.isMulti }, class: $parent.colStyleIfHideLabel">
-          <label>
-              <input data-bind="
-                          checked: $parent.rawAnswer,
-                          checkedValue: $data,
-                          attr: {
-                              id: 'group-' + $parent.entryId + '-choice-' + $index(),
-                              type: $parent.isMulti ? 'checkbox' : 'radio',
-                              name: $parent.entryId,
-                              class: 'group-' + $parent.entryId,
-                          },
-                      "/>
-              <span data-bind="renderMarkdown: $data, class: $parent.hideLabel ? 'sr-only' : ''"></span>
-          </label>
-          </div>
-        </div>
-      </div>
-      <button class="btn btn-default btn-xs pull-right" data-bind="click: onClear, fadeVisible: !isMulti && rawAnswer()">
-        {% trans "Clear" %}
-      </button>
-    </div>
-  </fieldset>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_signature.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_signature.html
deleted file mode 100644
index 0525e8ff265f..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_signature.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% load i18n %}
-
-<script type="text/html" id="signature-entry-ko-template">
-  <div data-bind="attr: { id: entryId + '-wrapper' }">
-    <canvas data-bind="
-        attr: {
-            id: entryId + '-canvas',
-            'aria-required': $parent.required() ? 'true' : 'false',
-        },
-      "
-      style="border: 1px solid #ccc; border-radius: 4px;"/>
-    </canvas>
-  </div>
-  <button class="btn btn-default btn-xs pull-right" data-bind="click: onClear">
-    {% trans "Clear" %}
-  </button>
-  <input type="file" class="hidden" data-bind="
-      value: $data.rawAnswer,
-      attr: {
-          id: entryId,
-          accept: accept,
-      },
-    "/>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_str.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_str.html
deleted file mode 100644
index 72d1bebf13dd..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_str.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<script type="text/html" id="str-entry-ko-template">
-  <input autocomplete="off" type="text" class="form-control" data-bind="
-        value: $data.rawAnswer,
-        valueUpdate: valueUpdate,
-        attr: {
-            maxlength: lengthLimit,
-            id: entryId,
-            placeholder: placeholderText,
-            'aria-required': $parent.required() ? 'true' : 'false',
-        }
-    "/>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_text.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_text.html
deleted file mode 100644
index d4d52676564e..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_text.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<script type="text/html" id="text-entry-ko-template">
-  <textarea class="textfield form-control vertical-resize" data-bind="
-        value: $data.rawAnswer,
-        valueUpdate: valueUpdate,
-        attr: {
-            placeholder: placeholderText,
-            maxlength: lengthLimit,
-            id: entryId,
-            'aria-required': $parent.required() ? 'true' : 'false',
-        },
-    "></textarea>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_time.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_time.html
deleted file mode 100644
index 1ed97412d140..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_time.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<script type="text/html" id="time-entry-ko-template">
-  <div class="input-group">
-    <input type="text" class="form-control" data-bind="attr: { id: entryId, 'aria-required': $parent.required() ? 'true' : 'false' }"/>
-    <span class="input-group-addon"><i class="fa-regular fa-clock"></i></span>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_unsupported.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_unsupported.html
deleted file mode 100644
index 64df6d48ffa7..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/entry_unsupported.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% load i18n %}
-
-<script type="text/html" id="unsupported-entry-ko-template">
-  <div class="unsupported alert alert-warning">
-    <a class="unsupported-question-type-trigger" role="button"
-    ><i class="fa fa-question-circle"></i></a>
-    {% blocktrans %}
-      Sorry, web entry cannot support this type of question.
-    {% endblocktrans %}
-  </div>
-  <div class="modal fade" role="dialog" id="unsupported-question-type-modal">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-body">
-          {% blocktrans %}
-            This question will appear as follows in data exports.
-          {% endblocktrans %}
-          <br><br>
-          <input type="text" class="form-control" data-bind="value: $data.answer" />
-        </div>
-        <div class="modal-footer">
-          <button class="btn btn-default" data-dismiss="modal">{% trans "OK" %}</button>
-        </div>
-      </div>
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/form.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/form.html
deleted file mode 100644
index 83a5b5179c9b..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/form.html
+++ /dev/null
@@ -1,72 +0,0 @@
-{% load i18n %}
-{% load hq_shared_tags %}
-
-<script type="text/html" id="form-fullform-ko-template">
-  <div class="webforms-nav-container"
-       data-bind="css: { 'webforms-nav-single-question': showInFormNavigation }">
-    <div class="webforms-nav"
-         data-bind="template: { name: 'form-navigation-ko-template' }"></div>
-  </div>
-  <div class="form-container js-form-container print-container" data-bind="
-          css: { 'form-single-question': showInFormNavigation },
-      ">
-
-    <div class="page-header">
-      <h1 class="title" data-bind="text: title, visible: !showInFormNavigation()"></h1>
-    </div>
-
-    <form class="form form-horizontal" data-bind="submit: submitForm">
-      <div class="question-container">
-        <div data-bind="template: { name: childTemplate, foreach: $data.children }"/>
-      </div>
-      {% if environment == "web-apps" %}
-        <div class="row" data-bind="visible: erroredQuestions().length > 0">
-          <div class="col-sm-12 alert alert-danger">
-            {% blocktrans %}
-              Please correct the answers below before submitting.
-              <br>
-              You can use the <strong><i class='fa fa-fast-forward'></i> Next Error</strong> button on the left-hand side of the screen to navigate between required fields.
-            {% endblocktrans %}
-            <ul data-bind="foreach: erroredQuestions">
-                <li>
-                    <a href="#" data-bind="click: navigateTo, html: caption_markdown() || caption() || question_id() || gettext('Unknown Question')"></a>
-                    <span data-bind="visible: serverError, text: serverError"></span>
-                    <span data-bind="if: error">
-                      <!-- ko text: error --><!-- /ko -->
-                    </span>
-                    <span data-bind="visible: !serverError() && !error()">
-                      {% trans "An answer is required." %}
-                    </span>
-                </li>
-            </ul>
-          </div>
-        </div>
-      {% endif %}
-      <div id="submit-button" class="form-actions form-group noprint-sub-container"
-           data-bind="
-              visible: showSubmitButton,
-              css: { 'sticky-submit': isAnchoredSubmitStyle },
-              style: {
-                'bottom':isAnchoredSubmitStyle && {{ request.couch_user.can_edit_data|yesno:'true,false' }} {% if environment != "web-apps" %} && false {% endif %} ? '30px' : '0' {# data preview bar #}
-              }"
-      >
-        <div class="col-12 text-center submit">
-          <button class="submit btn btn-primary"
-                  type="submit"
-                  data-bind="enable: enableSubmitButton">
-            <i class="fa fa-spin fa-refresh"
-               data-bind="visible: !enableSubmitButton(){% if environment == "web-apps" %} && erroredQuestions.length != 0{% endif %}"
-            ></i>
-            <!-- ko text: submitText --><!-- /ko -->
-          </button>
-        </div>
-      </div>
-    </form>
-  </div>
-  <div data-bind="visible: erroredQuestions().length > 0">
-    <div id="scroll-bottom" class="btn btn-danger" style="position: fixed; bottom: 35px" title="{% trans_html_attr "Jump between required/errored questions" %}" data-bind="click: jumpToErrors">
-      <i class='fa fa-fast-forward'> </i>
-          {% trans "Next Error" %}
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/grouped_element_tile_row.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/grouped_element_tile_row.html
deleted file mode 100644
index eee27db7a158..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/grouped_element_tile_row.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script type="text/html" id="grouped-element-tile-row-fullform-ko-template">
-  <div class="row">
-    <div data-bind="template: { name: childTemplate, foreach: $data.children }" class="question-tile-row"/>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/help_multimedia.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/help_multimedia.html
deleted file mode 100644
index 873b450e90e4..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/help_multimedia.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% load i18n %}
-
-<script type="text/html" id="widget-help-multimedia-ko-template">
-  <img class="img-responsive" data-bind="
-      attr: { src: mediaSrc($data.help_image()) },
-      visible: mediaSrc($data.help_image())" />
-  <audio controls="controls" data-bind="
-      visible: help_audio,
-      attr: {
-          src: mediaSrc($data.help_audio()),
-          tabindex: help_audio() ? '0' : '-1',
-      }">
-    {% trans "Your browser does not support audio" %}
-  </audio>
-  <video controls="controls" data-bind="
-      visible: help_video,
-      attr: {
-          src: mediaSrc($data.help_video()),
-          tabindex: help_video() ? '0' : '-1',
-      }">
-    {% trans "Your browser does not support video" %}
-  </video>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/multimedia.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/multimedia.html
deleted file mode 100644
index b16443943cbe..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/multimedia.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% load i18n %}
-
-<script type="text/html" id="widget-multimedia-ko-template">
-  <img class="img-responsive" data-bind="
-         attr: { src: mediaSrc($data.caption_image()) },
-         visible: mediaSrc($data.caption_image())
-         " />
-  <audio controls="controls" data-bind="
-      visible: caption_audio,
-      attr: {
-          src: mediaSrc($data.caption_audio()),
-          tabindex: caption_audio() ? '0' : '-1',
-      }">
-    {% trans "Your browser does not support audio" %}
-  </audio>
-  <video controls="controls" data-bind="
-      visible: caption_video,
-      attr: {
-          src: mediaSrc($data.caption_video()),
-          tabindex: caption_video() ? '0' : '-1',
-      }">
-    {% trans "Your browser does not support video" %}
-  </video>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/question.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/question.html
deleted file mode 100644
index 2a06fee977c6..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/question.html
+++ /dev/null
@@ -1,138 +0,0 @@
-{% load i18n %}
-
-<script type="text/html" id="question-fullform-ko-template">
-  <div data-bind="class:questionTileWidth">
-  <!-- ko if: !isLabel && !isButton -->
-  <div class="q form-group" data-bind="
-            css: {
-                error: error,
-                required: $data.required,
-                on: $root.forceRequiredVisible,
-            }
-        ">
-    <label class="caption control-label" data-bind="
-      css: labelWidth,
-      attr: {
-        id: entry.entryId + '-label',
-        'for': entry.entryId,
-      },
-      visible: hasLabelContent">
-      {# appearance attributes TEXT_ALIGN_CENTER TEXT_ALIGN_RIGHT #}
-      <div data-bind="css: {
-          'row': help(),
-          'text-center': stylesContains('text-align-center'),
-          'text-right': stylesContains('text-align-right'),
-        }">
-        <span class="webapp-markdown-output" data-bind="
-            html: ko.utils.unwrapObservable($data.caption_markdown) || caption(),
-            css: {'col-md-11' : help()}"></span>
-        <!-- ko if: help() -->
-        <a
-          class="help-text-trigger col-md-1"
-          role="button"
-          href="javascript:void(0)"
-          title="{% trans 'Show help dialog' %}"
-        ><i class="fa fa-question-circle"></i></a>
-        <div class="modal fade" role="dialog">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-body">
-                <p class="webapp-markdown-output" align="left" data-bind="html: help"></p>
-                <div class="widget-multimedia" data-bind="
-                    template: {
-                      name: 'widget-help-multimedia-ko-template',
-                      data: $data
-                    } "></div>
-              </div>
-              <div class="modal-footer">
-                <button class="btn btn-default help-modal-close" data-dismiss="modal">{% trans "Close" %}</button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <!-- /ko -->
-      </div>
-      <span class="hint-text" data-bind="
-              text: ko.utils.unwrapObservable($data.hint),
-              visible: !entry.useHintAsPlaceHolder()
-          "></span>
-      <!-- ko if: required() -->
-      <span class="sr-only">{% trans "A response is required for this question." %}</span>
-      <!-- /ko -->
-    </label>
-    <div class="widget-container controls" data-bind="css: controlWidth">
-      <div class="widget" data-bind="
-                template: { name: entryTemplate, data: entry, afterRender: afterRender },
-                css: { 'has-error': hasError }
-            ">
-      </div>
-      <div class="widget-multimedia" data-bind="
-                template: { name: 'widget-multimedia-ko-template', data: $data }"
-      >
-      </div>
-      <div class="text-danger error-message" data-bind="
-                visible: error,
-                text: error
-            "></div>
-      <div class="text-danger error-message" data-bind="
-                visible: serverError,
-                text: serverError
-            "></div>
-    </div>
-    <span class="ix" data-bind="text: ixInfo($data)"></span>
-    <div class="eoq"></div>
-  </div>
-  <div class="form-group-required-label"
-       aria-hidden="true"
-       data-bind="visible: $data.required, css: {
-                      on: $root.forceRequiredVisible,
-                    }">{% trans 'Sorry, this response is required!' %}</div>
-  <!-- /ko -->
-  <!-- ko if: isLabel -->
-  <div class="form-group">
-    {# appearance attributes TEXT_ALIGN_CENTER TEXT_ALIGN_RIGHT #}
-    <div class="info col-sm-12" data-bind="
-        css: {
-            'text-center': stylesContains('text-align-center'),
-            'text-right': stylesContains('text-align-right'),
-        },
-        attr: {
-            id: entry.entryId + '-label',
-        },
-    ">
-      <span class="ix" data-bind="text: ixInfo($data)">></span>
-      <span class="caption webapp-markdown-output" data-bind="
-          html: ko.utils.unwrapObservable($data.caption_markdown) || caption()
-          "></span>
-      <div class="widget-multimedia" data-bind="
-                template: { name: 'widget-multimedia-ko-template', data: $data }"
-      >
-      </div>
-      <div class="widget-container controls" data-bind="css: controlWidth">
-        <!-- labels only deal with server errors, since there's no data type validation for the browser to do-->
-        <div class="text-danger error-message" data-bind="
-          visible: serverError,
-          text: serverError
-          "></div>
-      </div>
-    </div>
-  </div>
-  <!-- /ko -->
-  <!-- ko if: isButton -->
-  {# appearance attributes TEXT_ALIGN_CENTER TEXT_ALIGN_RIGHT #}
-  <div class="q form-group" data-bind="
-    css: {
-      error: error,
-      'text-center': stylesContains('text-align-center'),
-      'text-right': stylesContains('text-align-right')
-    }">
-    <div class="widget-container controls col-sm-12">
-      <div class="widget" data-bind="
-        template: { name: entryTemplate, data: entry, afterRender: afterRender },
-        css: { 'has-error': hasError }
-        "></div>
-      </div>
-    </div>
-  <!-- /ko -->
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/repeat_juncture.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/repeat_juncture.html
deleted file mode 100644
index d93c5f82f94d..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/repeat_juncture.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load i18n %}
-{% load hq_shared_tags %}
-
-<script type="text/html" id="repeat-juncture-fullform-ko-template">
-  <div data-bind="class: elementTile">
-    <div class="panel panel-default rep">
-      <div class="panel-heading" data-bind="style: {
-          'background-color': headerBackgroundColor(),
-          'color': headerBackgroundColor() ? 'white' : '',
-        }">
-        <h3 class="caption" data-bind="html: header"></h3>
-        <span class="ix" data-bind="text: ixInfo($data)"></span>
-      </div>
-      <div class="panel-body">
-        <div class="children" data-bind="template: { name: childTemplate, foreach: $data.children }"></div>
-        <div class="alert alert-info empty" data-bind="visible: !children().length">
-          {% trans "This repeatable group is empty" %}
-        </div>
-      </div>
-      <div class="panel-footer">
-        <button class="btn btn-default add" href="#"
-                data-bind="click: newRepeat"
-                id="repeat-add-new">
-                <i class="fa fa-plus"></i>
-                <!-- ko text: $root.getTranslation('repeat.dialog.add.new', '{% trans_html_attr 'Add new repeat' %}') --><!-- /ko -->
-        </button>
-      </div>
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/sub_group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/sub_group.html
deleted file mode 100644
index 1921862a72cb..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/sub_group.html
+++ /dev/null
@@ -1,87 +0,0 @@
-{% load i18n %}
-{% load hq_shared_tags %}
-
-<script type="text/html" id="sub-group-fullform-ko-template">
-  <div tabindex="-1" class ="gr" data-bind="
-        class: elementTile,
-        css: {
-          'gr-no-children': $data.children().length === 0,
-          'gr-has-no-nested-questions': !$data.hasAnyNestedQuestions(),
-          'panel panel-default': collapsible,
-          'repetition': isRepetition,
-          'required-group': !showChildren() && childrenRequired(),
-          'stripe-repeats': stripeRepeats,
-          'group-border': groupBorder,
-        }">
-    <fieldset class="gr-header" data-bind="
-        css: {
-          'panel-heading': collapsible,
-           clickable: collapsible
-        },
-        attr: collapsible ? {
-                'role': 'button',
-                'aria-expanded': showChildren() ? 'true' : 'false',
-                'aria-labelledby': captionId(),
-                // tab focus only if group is visible
-                'tabindex': isVisibleGroup() ? '0' : '-1'
-              } : {
-                'aria-labelledby': captionId(),
-              },
-        click: toggleChildren,
-        event: collapsible ? { keypress: keyPressAction } : {},
-        style: {'display': showHeader ? 'block': 'none',
-                'background-color': headerBackgroundColor(),
-                'color': headerBackgroundColor() ? 'white' : ''
-        }">
-      <div data-bind="ifnot: collapsible">
-        <legend>
-          <span class="caption webapp-markdown-output"
-                data-bind="
-                  html: ko.utils.unwrapObservable($data.caption_markdown) || caption(),
-                "></span>
-          <button class="btn btn-danger del pull-right" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
-                  data-bind="
-                      visible: showDelete,
-                      enabled: hasNoPendingAnswer(),
-                      click: deleteRepeat
-                  "><i class="fa fa-remove"></i></button>
-        </legend>
-      </div>
-      <div data-bind="if: collapsible">
-        <div class="d-flex align-items-center">
-          <div class="collapsible-icon-container">
-            <i class="fa" data-bind="
-                css: {'fa-angle-double-right': !showChildren(), 'fa-angle-double-down': showChildren()},
-            "></i>
-          </div>
-          <span class="webapp-markdown-output caption" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
-          <i class="fa fa-warning text-danger pull-right" data-bind="visible: hasError() && !showChildren()"></i>
-           <button class="btn btn-danger del pull-right" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
-                  data-bind="
-                      visible: showDelete,
-                      enabled: hasNoPendingAnswer(),
-                      click: deleteRepeat
-                  "><i class="fa fa-remove"></i></button>
-        </div>
-      </div>
-      <span class="ix"></span>
-    </fieldset>
-      <div data-bind="visible: showChildren">
-        <fieldset>
-        <legend aria-hidden="true" class="sr-only">{% trans "Question Group" %}</legend>
-          <div class="children" data-bind="
-              slideVisible: showChildren(),
-              template: {
-                name: childTemplate,
-                foreach: $data.children,
-                afterRender: focusNewRepeat,
-              },
-              css: {
-                'panel-body': collapsible,
-                'group-body': !collapsible,
-                'stripe-repeats': stripeRepeats,
-              }"></div>
-        </fieldset>
-      </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/grid.html b/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/grid.html
deleted file mode 100644
index 357330830112..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/grid.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-
-<script id="grid-template" type="text/template">
-  <div class="page-header page-header-apps">
-    <h1 class="page-title">{% trans "Applications" %}</h1>
-  </div>
-
-  <div class="row">
-    <div class="js-application-container">
-
-    </div>
-    <% if (shouldShowIncompleteForms) { %>
-    <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-      <div class="js-incomplete-sessions-item appicon appicon-incomplete" role="link" tabindex="0" aria-labelledby="grid-template-incomplete-forms-heading">
-        <i class="ff ff-incomplete-bg appicon-icon appicon-icon-bg" aria-hidden="true"></i>
-        <i class="ff ff-incomplete-fg appicon-icon appicon-icon-fg" aria-hidden="true"></i>
-        <div class="appicon-title">
-          <h3 id="grid-template-incomplete-forms-heading">{% trans "Incomplete Forms" %}</h3>
-        </div>
-      </div>
-    </div>
-    <% } %>
-
-    {% if not request|toggle_enabled:"HIDE_SYNC_BUTTON" %}
-    <div class=" grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-      <div class="js-sync-item appicon appicon-sync" role="link" tabindex="0" aria-labelledby="grid-template-sync-heading">
-        <i class="ff ff-sync appicon-icon" aria-hidden="true"></i>
-        <div class="appicon-title">
-          <h3 id="grid-template-sync-heading">{% trans "Sync" %}</h3>
-        </div>
-      </div>
-    </div>
-    {% endif %}
-
-    {% if request|can_use_restore_as %}
-      <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-        <div class="js-restore-as-item appicon appicon-restore-as" role="link" tabindex="0" aria-labelledby="grid-template-login-as-heading">
-          <i class="fa fa-user appicon-icon" aria-hidden="true"></i>
-          <div class="appicon-title">
-            <h3 id="grid-template-login-as-heading">{% trans "Log in as" %}</h3>
-          </div>
-        </div>
-      </div>
-    {% endif %}
-    <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-      <div class="js-settings appicon appicon-settings" role="link" tabindex="0" aria-labelledby="grid-template-settings-heading">
-        <i class="fa-solid fa-gear appicon-icon" aria-hidden="true"></i>
-        <div class="appicon-title">
-          <h3 id="grid-template-settings-heading">{% trans "Settings" %}</h3>
-        </div>
-      </div>
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/landing_page_app.html b/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/landing_page_app.html
deleted file mode 100644
index 9df4533c619d..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/landing_page_app.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<script id="landing-page-app-template" type="text/template">
-  <div class="container">
-    <div class="spacer"></div>
-    <div class="col-xs-6 col-sm-4 col-xs-offset-3 col-sm-offset-4">
-      <div class="appicon appicon-default js-start-app" role="link" tabindex="0" aria-label="<%- appName %>">
-        <% if (!imageUrl) { %>
-          <i class="fcc fcc-flower appicon-icon" aria-hidden="true"></i>
-        <% } else { %>
-          <i class="fcc appicon-custom appicon-icon" style="background-image: url('<%- imageUrl %>');" aria-hidden="true"></i>
-        <% } %>
-        <div class="appicon-title">
-          <h3><%- appName %></h3>
-        </div>
-      </div>
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/row.html b/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/row.html
deleted file mode 100644
index bbb6d86c0e7b..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/row.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<script id="row-template" type="text/template">
-  <div class="appicon appicon-default" role="link" tabindex="0" aria-label="<%- name %>">
-    <% if (!imageUrl) { %>
-      <i class="fcc fcc-flower appicon-icon" aria-hidden="true"></i>
-    <% } else { %>
-      <i class="fcc appicon-custom appicon-icon" style="background-image: url('<%- imageUrl %>');" aria-hidden="true"></i>
-    <% } %>
-    <div class="appicon-title">
-      <h3><%- name %></h3>
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/single_app.html b/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/single_app.html
deleted file mode 100644
index 768adc91005b..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap3/single_app.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-
-<script id="single-app-template" type="text/template">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-text"><%- appName %></li>
-  </ol>
-  <div class="container container-appicons">
-    <div class="row">
-      <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-        <div class="js-start-app appicon appicon-start" role="link" tabindex="0" aria-labelledby="single-app-start-heading">
-          <i class="ff ff-start-bg appicon-icon appicon-icon-bg" aria-hidden="true"></i>
-          <i class="ff ff-start-fg appicon-icon appicon-icon-fg" aria-hidden="true"></i>
-          <div class="appicon-title">
-            <h3 id="single-app-start-heading">{% trans "Start" %}</h3>
-          </div>
-        </div>
-      </div>
-      <% if (shouldShowIncompleteForms()) { %>
-      <div class=" grid-item col-xs-6 col-sm-4 formplayer-request">
-        <div class="js-incomplete-sessions-item appicon appicon-incomplete" role="link" tabindex="0" aria-labelledby="single-app-incomplete-forms-heading">
-          <i class="ff ff-incomplete-bg appicon-icon appicon-icon-bg" aria-hidden="true"></i>
-          <i class="ff ff-incomplete-fg appicon-icon appicon-icon-fg" aria-hidden="true"></i>
-          <div class="appicon-title">
-            <h3 id="single-app-incomplete-forms-heading">{% trans "Incomplete Forms" %}</h3>
-          </div>
-        </div>
-      </div>
-      <% } %>
-      <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-        <div class="js-sync-item appicon appicon-sync" role="link" tabindex="0" aria-labelledby="single-app-sync-heading">
-          <i class="ff ff-sync appicon-icon" aria-hidden="true"></i>
-          <div class="appicon-title">
-            <h3 id="single-app-sync-heading">{% trans "Sync" %}</h3>
-          </div>
-        </div>
-      </div>
-      {% if request|can_use_restore_as %}
-        <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-          <div class="js-restore-as-item appicon appicon-restore-as" role="link" tabindex="0" aria-labelledby="single-app-login-as-heading">
-            <i class="fa fa-user appicon-icon" aria-hidden="true"></i>
-            <div class="appicon-title">
-              <h3 id="single-app-login-as-heading">{% trans "Log in as" %}</h3>
-            </div>
-          </div>
-        </div>
-      {% endif %}
-      <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-        <div class="js-settings appicon appicon-settings" role="link" tabindex="0" aria-labelledby="single-app-settings-heading">
-          <i class="fa-solid fa-gear appicon-icon" aria-hidden="true"></i>
-          <div class="appicon-title">
-            <h3 id="single-app-settings-heading">{% trans "Settings" %}</h3>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/audio.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/audio.html
deleted file mode 100644
index e7aaf9feda42..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/audio.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<script type="text/template" id="menu-view-row-audio-template">
-  <td class="module-column module-column-icon">
-    <% if (imageUrl) { %>
-    <div class="module-icon-image badge-container" style="background-image: url('<%- imageUrl %>');">
-      <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}
-    </div>
-    <% } else { %>
-    <div class="module-icon-container badge-container">
-      <i class="fa fa-pencil module-icon" aria-hidden="true"></i>
-      <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}
-    </div>
-    <% } %>
-  </td>
-  <td class="module-column module-column-name module-column-name-audio">
-    <h3><%- displayText ? displayText : "" %></h3>
-    <div class="module-audio-controls-container">
-      <audio class="js-module-audio">
-        <source src="<%- audioUrl %>" type="audio/mpeg">
-      </audio>
-      <div class="module-audio-control module-audio-play js-module-audio-play"><i class="fa fa-volume-up module-audio-icon js-module-audio-icon"></i></div>
-      <div class="module-audio-control module-audio-pause js-module-audio-pause hide"><i class="fa fa-pause module-audio-icon js-module-audio-icon"></i></div>
-    </div>
-  </td>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/badge.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/badge.html
deleted file mode 100644
index 5c9ed4b230c6..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/badge.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<script type="text/template" id="maybe-custom-badge-template">
-  <% /*
-  Ensure backwards compatibility with formplayer backend
-  before it added the badgeText field.
-  typeof x !== 'undefined' means "the variable hasn't been defined",
-  and is different from x === undefined.
-  */ %>
-  <% if (typeof badgeText !== 'undefined' && badgeText) { %>
-  <span class="badge"><%- badgeText %></span>
-  <% } %>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/breadcrumbs.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/breadcrumbs.html
deleted file mode 100644
index 4447ab2116cf..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/breadcrumbs.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% load i18n %}
-
-<script type="text/template" id="breadcrumb-item-template">
-  <%- data %>
-</script>
-
-<script type="text/template" id="breadcrumb-list-template">
-  <nav class="breadcrumb-nav" aria-label="Breadcrumb">
-    <ol class="breadcrumb">
-      <li class="js-home breadcrumb-text" role="link" tabindex="0">{% trans 'Home' %}</li>
-    </ol>
-    <div class="pull-right dropdown dropdown-menu-right" id="breadcrumb__menu-dropdown">
-    </div>
-  </nav>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/dropdown.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/dropdown.html
deleted file mode 100644
index 28be407acf86..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/dropdown.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% load i18n %}
-
-<script type="text/template" id="menu-dropdown-template">
-  <div class="btn-group" id="menu-dropdown">
-    <button class="btn btn-primary-dark dropdown-toggle" role="button"
-            data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-      <i class="fa fa-bars"></i>
-      <span class="sr-only">{% trans 'Dropdown toggle' %}</span>
-    </button>
-    <ul class="dropdown-menu dropdown-menu-right noprint-sub-container" aria-label="Dropdown">
-      <li tabindex="0" class="dropdown-header print-button">{% trans "Print" %}</li>
-      <% if (languageOptionsEnabled) { %>
-      <li><hr class="dropdown-divider"></li>
-      <li class="dropdown-header">{% trans "Languages" %}</li>
-      <% } %>
-    </ul>
-  </div>
-</script>
-
-<script type="text/template" id="language-option-template">
-  <% if (languageOptionsEnabled) { %>
-  <a tabindex="0" class="lang" id="<%- lang_code %>"><%- lang_label %></a>
-  <% } %>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/grid.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/grid.html
deleted file mode 100644
index 333474021597..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/grid.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<script type="text/template" id="menu-view-grid-template">
-  <div class="module-menu-container">
-    <div class="page-header menu-header">
-      <h1 class="page-title"><%- title %></h1>
-    </div>
-    <div class="<% if (isAppPreview) { %>container<% } %>">
-      <div class="row menus-container"></div>
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/grid_item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/grid_item.html
deleted file mode 100644
index ed02feb25de9..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/grid_item.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<script type="text/template" id="menu-view-grid-item-template">
-  <div class="col-xs-6 col-sm-4 col-md-3">
-    <% if (imageUrl) { %>
-    <div class="gridicon badge-container" style="background-image: url('<%- imageUrl %>');">
-      <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}
-    </div>
-    <% } else { %>
-    <div class="gridicon gridicon-circle badge-container">
-      <% if (navState === "JUMP") { %>
-      <i class="fa fa-pencil gridicon-icon" aria-hidden="true"></i>
-      <% } else { %>
-      <i class="fa fa-folder gridicon-icon" aria-hidden="true"></i>
-      <% } %>
-      <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}
-    </div>
-    <% } %>
-    <div class="module-column-name text-center">
-      <h3><%- displayText ? displayText : "" %></h3>
-    </div>
-  </div>
-  <% if (menuIndex % 2 === 1) { %>
-  <div class="clearfix visible-xs"></div>
-  <% } %>
-  <% if (menuIndex % 3 === 2) { %>
-  <div class="clearfix visible-sm"></div>
-  <% } %>
-  <% if (menuIndex % 4 === 3) { %>
-  <div class="clearfix visible-md visible-lg"></div>
-  <% } %>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/list.html
deleted file mode 100644
index 9a18181ff0b3..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap3/list.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<script type="text/template" id="menu-view-list-template">
-  <div class="module-menu-container">
-    <div class="page-header menu-header">
-      <h1 class="page-title"><%- title %></h1>
-    </div>
-    <table class="table module-table">
-      <tbody class="menus-container">
-      </tbody>
-    </table>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/group.html
deleted file mode 100644
index bfa9fad7b455..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/group.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<script type="text/template" id="query-view-group-template">
-  <td class="search-query-group">
-    <% if (named) { %>
-    <div class="search-query-group-header <% if (required) { %> required<% } %>" data-toggle="collapse" data-target="#group-<%- groupKey %>" aria-expanded="true" aria-controls="group-<%- groupKey %>">
-      <label class="search-query-group-header-label"><%= groupName %></label>
-      <i class="fa fa-angle-double-down pull-right" style="font-size: larger"></i>
-    </div>
-    <% } %>
-    <div id="group-<%- groupKey %>" class="in">
-      <table class="table table-hover" role="presentation">
-        <tbody id="query-group-content">
-        </tbody>
-      </table>
-    </div>
-  </td>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/item.html
deleted file mode 100644
index 3615d5eb7839..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/item.html
+++ /dev/null
@@ -1,97 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-
-<script type="text/template" id="query-view-item-template">
-  <<%- contentTag %>
-    class="<% if (contentTag === 'td') { %>col-sm-6 <% } %>query-caption
-           <% if (required) { %> required<% } %>
-           <% if (errorMessage) { %> has-error<% } %>">
-    <div class="d-flex justify-content-between">
-      <label class="control-label" for="<%- text ? text : "" %>">
-        <%- text ? text : "" %>
-      </label>
-      <% if (typeof hint !== "undefined" && hint !== null) { %>
-      <div class="hq-help">
-        <a href="#" tabindex="-1"  data-title="<%- text ? text : "" %>" data-content="<%- hint ? hint : "" %>">
-          <i class="fa fa-question-circle icon-question-sign"></i>
-        </a>
-      </div>
-      <% } %>
-    </div>
-  </<%- contentTag %>>
-  <<%- contentTag %>
-    class="<% if (contentTag === 'td') { %>col-sm-6 <% } else { %>input-group-sm <% } %>query-input-group
-           <% if (errorMessage) { %> has-error<% } %>">
-
-    <% if (input == "select1") { %>
-    <select class="query-field form-control hqwebapp-select2" data-receive="<%- receive %>"<% if (required) { %> aria-required="true"<% } %>>
-        <option value=""></option>
-        <% for (let key in itemsetChoicesDict) { %>
-        <option value="<%- key %>" <% if (value === String(key)) { %>selected<% } %>>
-            <%- itemsetChoicesDict[key] %>
-        </option>
-        <% } %>
-    </select>
-
-    <% } else if (input == "select") { %>
-    <select multiple class="query-field form-control hqwebapp-select2" data-receive="<%- receive %>"<% if (required) { %> aria-required="true"<% } %>>
-        <% for (let key in itemsetChoicesDict) { %>
-        <option value="<%- key %>" <% if (value && value.indexOf(String(key)) > -1) { %>selected<% } %>>
-            <%- itemsetChoicesDict[key] %>
-        </option>
-        <% } %>
-    </select>
-
-    <% } else if (input === "date") { %>
-    <div class="input-group">
-      <input id="<%- text ? text : "" %>"
-             type="text"
-             class="date query-field form-control"
-             value="<%- value %>"
-             <% if (required) { %> aria-required="true"<% } %>>
-      <span class="input-group-addon"><i class="fa-solid fa-calendar-days"></i></span>
-    </div>
-
-    <% } else if (input === "daterange") { %>
-    <input id="<%- text ? text : "" %>"
-           type="text"
-           class="daterange query-field form-control"
-           value="<%- value %>"
-           <% if (required) { %> aria-required="true"<% } %>>
-
-    <% } else if (input === "checkbox") { %>
-    <fieldset multiple class="query-field" id="<%- text ? text : "" %>" <% if (required) { %> aria-required="true"<% } %>>
-      <legend class="sr-only"><%- text ? text : "" %></legend>
-      <% for (let key in itemsetChoicesDict) { %>
-      <div id="<%- text ? text : "checkbox" %>-<%- key %>" class="checkbox">
-        <label>
-          <input type="checkbox" value="<%- key %>" <% if (value && value.indexOf(String(key)) !== -1) { %>checked<% } %>>
-          <%- itemsetChoicesDict[key] %>
-        </label>
-      </div>
-      <% } %>
-    </fieldset>
-
-    <% } else if (input == "address") { %>
-    <!-- ARIA live region for highlighted geocoder values, populated via javascript -->
-    <div role="region" aria-live="polite" class="sr-only" id="<%- id %>_mapbox-sr"></div>
-    <div class="query-field" value="<%- value %>" id="<%- id %>_mapbox" data-address="<%- id %>">
-    </div>
-
-    <% } else { %>
-    <input id="<%- text ? text : "" %>"
-           type="text"
-           class="query-field form-control"
-           value="<%- value %>"
-           data-receive="<%- receive %>"
-           <% if (required) { %> aria-required="true"<% } %>>
-           <% } %>
-           <% if (errorMessage) { %> <div class="help-block has-error"> <%- errorMessage || "" %> </div> <% } %>
-           <% if (allow_blank_value) { %>
-            <label class="control-label">
-              <input type="checkbox" class="search-for-blank" <% if (searchForBlank) { %>checked<% } %>>
-              {% trans "Include results where '<%- text %>' is blank" %}
-            </label>
-            <% } %>
-  </<%- contentTag %>>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/list.html
deleted file mode 100644
index 00173bfb2e62..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap3/list.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% load i18n %}
-
-<script type="text/template" id="query-view-list-template">
-  <form>
-    <% if (sidebarEnabled) { %>
-      <button type="button" class="close visible-xs visible-sm" aria-label="{% trans "Close" %}"
-        data-toggle="collapse" data-target="#sidebar-region" aria-expanded="false" aria-controls="sidebar-region">
-        <span aria-hidden="true">&times;</span>
-      </button>
-      <div class="query-button-container">
-        <button class="btn btn-default" type="button" id="query-clear-button">
-          <div>{% trans "Clear" %}</div>
-        </button>
-        <button class="btn btn-primary" type="submit" id="query-submit-button">
-          <div>{% trans "Search" %}</div>
-        </button>
-      </div>
-    <% } %>
-    <% if (title.length > 0 && !sidebarEnabled) { %>
-      <h2 tabindex="0"><%- title %></h2>
-    <% } %>
-    <% if (description.length > 0 && !sidebarEnabled) { %>
-      <div class="query-description" tabindex="0">
-        <%= description %>
-      </div>
-    <% } %>
-    <table class="table table-hover <%= grouped ? '' : 'table-striped table-bordered' %>" role="presentation">
-      <tbody id="query-properties">
-      </tbody>
-    </table>
-    <% if (!sidebarEnabled) {%>
-      <button class="btn btn-default" type="button" id="query-clear-button">
-        <div>{% trans "Clear" %}</div>
-      </button>
-      <button class="btn btn-primary" type="submit" id="query-submit-button">
-        <div>{% trans "Search" %}</div>
-      </button>
-    <% } %>
-  </form>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/bootstrap3/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/bootstrap3/list.html
deleted file mode 100644
index 184140079780..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/bootstrap3/list.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load i18n %}
-
-<script type="text/template" id="session-view-list-template">
-  <% if(isPreviewEnv) { %>
-  <div class="breadcrumb-form-container">
-    <ol class="breadcrumb breadcrumb-form">
-      <li class="breadcrumb-text">{% trans "Incomplete Forms" %}</li>
-    </ol>
-  </div>
-  <% } else { %>
-  <div class="module-banner alert alert-info">
-    <span>
-        {% blocktrans %}
-          Web Apps deletes any Incomplete Forms that are more than 7 days old.
-          Please submit any forms with important data before then to avoid data loss.
-        {% endblocktrans %}
-    </span>
-  </div>
-  <% } %>
-  <div class="module-menu-container module-menu-bar-offset">
-    <% if (!isPreviewEnv) { %>
-    <div class="page-header menu-header">
-      <h1 class="page-title">{% trans "Incomplete Forms" %}</h1>
-    </div>
-    <% } %>
-    <table class="table module-table">
-      <tbody>
-      </tbody>
-    </table>
-    <% if (endPage) { %>
-      {% block pagination_templates %}
-        {% include 'cloudcare/partials/bootstrap3/pagination.html' %}
-      {% endblock %}
-    <% } %>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/users/bootstrap3/restore_as.html b/corehq/apps/cloudcare/templates/cloudcare/partials/users/bootstrap3/restore_as.html
deleted file mode 100644
index dc9362778928..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/users/bootstrap3/restore_as.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-
-<script type="text/template" id="restore-as-view-template">
-  <div class="module-menu-container">
-    <div class="page-header menu-header">
-      <h1 class="page-title">{% trans "Log in as user" %}</h1>
-    </div>
-    <form class="module-search-container js-user-search">
-      <div class="input-group input-group-lg">
-        <input
-          type="text"
-          class="js-user-query form-control"
-          value="<%- query %>"
-          placeholder="{% trans_html_attr "Filter workers" %}" />
-        <div class="input-group-btn">
-          <button class="btn btn-default" type="submit">
-            <i class="fa fa-search" aria-hidden="true"></i>
-          </button>
-        </div>
-      </div>
-    </form>
-    <table class="table module-table">
-      <tbody>
-      </tbody>
-    </table>
-    <% if (endPage) { %>
-      {% block pagination_templates %}
-        {% include 'cloudcare/partials/bootstrap3/pagination.html' %}
-      {% endblock %}
-    <% } %>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/spec/bootstrap3/mocha.html b/corehq/apps/cloudcare/templates/cloudcare/spec/bootstrap3/mocha.html
deleted file mode 100644
index ac4e91b326a3..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/spec/bootstrap3/mocha.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "mocha/base.html" %}
-{% load hq_shared_tags %}
-
-{% requirejs_main "cloudcare/js/formplayer/spec/main" %}
-
-{% block dependencies %}
-  {% include "cloudcare/partials/dependencies.html" %}
-{% endblock %}
-
-{% block fixtures %}
-  <div id="restore-as-region"></div>
-  <div id="phone-mode-navigation"></div>
-  <div id="breadcrumb-region"></div>
-  <div id="persistent-case-tile" class="container"></div>
-  <div id="menu-region" class="container"></div>
-  <div id="sidebar-region" class="container"></div>
-
-  {% include 'cloudcare/partials/bootstrap3/confirmation_modal.html' %}
-  {% include 'cloudcare/partials/bootstrap3/all_templates.html' %}
-
-{% endblock %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/bootstrap3/mocha.html b/corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/bootstrap3/mocha.html
deleted file mode 100644
index c99aa28c8c24..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/bootstrap3/mocha.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "mocha/base.html" %}
-{% load hq_shared_tags %}
-
-{% requirejs_main "cloudcare/js/form_entry/spec/main" %}
-
-{% block stylesheets %}{{ block.super }}
-  <link type="text/css"
-        rel="stylesheet"
-        media="all"
-        href="{% static 'select2/dist/css/select2.min.css' %}" />
-{% endblock %}
-
-{% block dependencies %}
-  {% include "cloudcare/partials/dependencies.html" %}
-{% endblock %}
-
-{% block fixtures %}
-  <div id="date-entry-ethiopian" />
-{% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py b/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
index e8ac7acff41f..e79c107cd7fa 100644
--- a/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
+++ b/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
@@ -429,9 +429,7 @@ def test_update_gruntfile():
         'reports_core/choiceListUtils',
         'locations',
         'userreports',
-        'cloudcare/bootstrap3',
         'cloudcare/bootstrap5',
-        'cloudcare/form_entry/bootstrap3',
         'cloudcare/form_entry/bootstrap5',
         'hqwebapp',
         'case_importer',

From 9f88ca50c87dbf87f176890c2d11446d2dcc39cc Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 27 May 2024 11:20:29 -0400
Subject: [PATCH 12/91] Updated diff config

The LESS stays in here because it's still used by integration/base_cloudcare_template.html
---
 .../tests/data/bootstrap5_diff_config.json    | 101 ------------------
 1 file changed, 101 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json b/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
index a14e9b16b866..75a5f82ef875 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
@@ -415,107 +415,6 @@
       "compare_all_files": true
     }
   ],
-  "apps/cloudcare/templates/cloudcare": [
-    {
-      "directories": [
-        "bootstrap3",
-        "bootstrap5"
-      ],
-      "file_type": "template",
-      "label": "cloudcare",
-      "compare_all_files": true
-    },
-    {
-      "directories": [
-        "partials/bootstrap3",
-        "partials/bootstrap5"
-      ],
-      "file_type": "template",
-      "label": "cloudcare/partials",
-      "compare_all_files": true
-    },
-    {
-      "directories": [
-        "partials/case_list/bootstrap3",
-        "partials/case_list/bootstrap5"
-      ],
-      "file_type": "template",
-      "label": "cloudcare/partials/case_list",
-      "compare_all_files": true
-    },
-    {
-      "directories": [
-        "partials/form_entry/bootstrap3",
-        "partials/form_entry/bootstrap5"
-      ],
-      "file_type": "template",
-      "label": "cloudcare/partials/form_entry",
-      "compare_all_files": true
-    },
-    {
-      "directories": [
-        "partials/grid_view/bootstrap3",
-        "partials/grid_view/bootstrap5"
-      ],
-      "file_type": "template",
-      "label": "cloudcare/partials/grid_view",
-      "compare_all_files": true
-    },
-    {
-      "directories": [
-        "partials/menu/bootstrap3",
-        "partials/menu/bootstrap5"
-      ],
-      "file_type": "template",
-      "label": "cloudcare/partials/menu",
-      "compare_all_files": true
-    },
-    {
-      "directories": [
-        "partials/query/bootstrap3",
-        "partials/query/bootstrap5"
-      ],
-      "file_type": "template",
-      "label": "cloudcare/partials/query",
-      "compare_all_files": true
-    },
-    {
-      "directories": [
-        "partials/sessions/bootstrap3",
-        "partials/sessions/bootstrap5"
-      ],
-      "file_type": "template",
-      "label": "cloudcare/partials/sessions",
-      "compare_all_files": true
-    },
-    {
-      "directories": [
-        "partials/users/bootstrap3",
-        "partials/users/bootstrap5"
-      ],
-      "file_type": "template",
-      "label": "cloudcare/partials/users",
-      "compare_all_files": true
-    },
-    {
-      "directories": [
-        "spec/bootstrap3",
-        "spec/bootstrap5"
-      ],
-      "file_type": "template",
-      "label": "cloudcare/spec",
-      "compare_all_files": true
-    },
-    {
-      "directories": [
-        "spec/form_entry/bootstrap3",
-        "spec/form_entry/bootstrap5"
-      ],
-      "file_type": "template",
-      "label": "cloudcare/spec/form_entry",
-      "compare_all_files": true
-    }
-  ],
   "apps/notifications/static/notifications/spec": [
     {
       "directories": [

From fa786f47de2f251455e1a72c32012c2a34cbf39a Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 27 May 2024 11:32:35 -0400
Subject: [PATCH 13/91] Moved B5 files back into default positions

---
 Gruntfile.js                                  |  4 +-
 .../{bootstrap5 => }/block_preview_app.html   |  2 +-
 .../{bootstrap5 => }/formplayer_home.html     |  6 +-
 .../cloudcare/partials/all_templates.html     | 70 +++++++++++++++++++
 .../partials/bootstrap5/all_templates.html    | 70 -------------------
 .../{bootstrap5 => }/case_detail.html         |  0
 .../case_list/{bootstrap5 => }/item.html      |  0
 .../case_list/{bootstrap5 => }/list.html      | 12 ++--
 .../{bootstrap5 => }/menu_header.html         |  0
 .../multi_select_continue_button.html         |  0
 .../{bootstrap5 => }/search_controls.html     |  0
 .../{bootstrap5 => }/table_container.html     |  0
 .../{bootstrap5 => }/tile_grouped_item.html   |  0
 .../case_list/{bootstrap5 => }/tile_item.html |  0
 .../{bootstrap5 => }/confirmation_modal.html  |  0
 .../partials/{bootstrap5 => }/debugger.html   |  0
 .../{bootstrap5 => }/add_group.html           |  0
 .../{bootstrap5 => }/entry_button.html        |  0
 .../{bootstrap5 => }/entry_choice_label.html  |  0
 .../{bootstrap5 => }/entry_date.html          |  0
 .../{bootstrap5 => }/entry_datetime.html      |  0
 .../{bootstrap5 => }/entry_dropdown.html      |  0
 .../entry_ethiopian_date.html                 |  0
 .../{bootstrap5 => }/entry_file.html          |  0
 .../{bootstrap5 => }/entry_geo.html           |  0
 .../{bootstrap5 => }/entry_multidropdown.html |  0
 .../{bootstrap5 => }/entry_password.html      |  0
 .../{bootstrap5 => }/entry_select.html        |  0
 .../{bootstrap5 => }/entry_signature.html     |  0
 .../{bootstrap5 => }/entry_str.html           |  0
 .../{bootstrap5 => }/entry_text.html          |  0
 .../{bootstrap5 => }/entry_time.html          |  0
 .../{bootstrap5 => }/entry_unsupported.html   |  0
 .../form_entry/{bootstrap5 => }/form.html     |  0
 .../grouped_element_tile_row.html             |  0
 .../{bootstrap5 => }/help_multimedia.html     |  0
 .../{bootstrap5 => }/multimedia.html          |  0
 .../form_entry/{bootstrap5 => }/question.html |  0
 .../{bootstrap5 => }/repeat_juncture.html     |  0
 .../{bootstrap5 => }/sub_group.html           |  0
 .../grid_view/{bootstrap5 => }/grid.html      |  0
 .../{bootstrap5 => }/landing_page_app.html    |  0
 .../grid_view/{bootstrap5 => }/row.html       |  0
 .../{bootstrap5 => }/single_app.html          |  0
 .../partials/menu/{bootstrap5 => }/audio.html |  0
 .../partials/menu/{bootstrap5 => }/badge.html |  0
 .../menu/{bootstrap5 => }/breadcrumbs.html    |  0
 .../menu/{bootstrap5 => }/dropdown.html       |  0
 .../partials/menu/{bootstrap5 => }/grid.html  |  0
 .../menu/{bootstrap5 => }/grid_item.html      |  0
 .../partials/menu/{bootstrap5 => }/list.html  |  0
 .../new_app_version_modal.html                |  0
 .../partials/{bootstrap5 => }/pagination.html |  0
 .../partials/{bootstrap5 => }/progress.html   |  0
 .../query/{bootstrap5 => }/group.html         |  0
 .../partials/query/{bootstrap5 => }/item.html |  0
 .../partials/query/{bootstrap5 => }/list.html |  0
 .../sessions/{bootstrap5 => }/list.html       |  2 +-
 .../{bootstrap5 => }/settings_view.html       |  0
 .../users/{bootstrap5 => }/restore_as.html    |  2 +-
 .../{bootstrap5 => }/preview_app.html         |  2 +-
 .../{bootstrap5 => }/preview_app_base.html    |  4 +-
 .../form_entry/{bootstrap5 => }/mocha.html    |  0
 .../spec/{bootstrap5 => }/mocha.html          |  4 +-
 corehq/apps/cloudcare/views.py                |  6 +-
 .../tests/utils/test_bootstrap_changes.py     |  4 +-
 66 files changed, 94 insertions(+), 94 deletions(-)
 rename corehq/apps/cloudcare/templates/cloudcare/{bootstrap5 => }/block_preview_app.html (73%)
 rename corehq/apps/cloudcare/templates/cloudcare/{bootstrap5 => }/formplayer_home.html (96%)
 create mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/all_templates.html
 rename corehq/apps/cloudcare/templates/cloudcare/partials/{bootstrap5 => }/case_detail.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/case_list/{bootstrap5 => }/item.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/case_list/{bootstrap5 => }/list.html (82%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/case_list/{bootstrap5 => }/menu_header.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/case_list/{bootstrap5 => }/multi_select_continue_button.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/case_list/{bootstrap5 => }/search_controls.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/case_list/{bootstrap5 => }/table_container.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/case_list/{bootstrap5 => }/tile_grouped_item.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/case_list/{bootstrap5 => }/tile_item.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/{bootstrap5 => }/confirmation_modal.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/{bootstrap5 => }/debugger.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/add_group.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_button.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_choice_label.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_date.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_datetime.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_dropdown.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_ethiopian_date.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_file.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_geo.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_multidropdown.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_password.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_select.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_signature.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_str.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_text.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_time.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/entry_unsupported.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/form.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/grouped_element_tile_row.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/help_multimedia.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/multimedia.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/question.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/repeat_juncture.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/{bootstrap5 => }/sub_group.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/{bootstrap5 => }/grid.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/{bootstrap5 => }/landing_page_app.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/{bootstrap5 => }/row.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/{bootstrap5 => }/single_app.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/menu/{bootstrap5 => }/audio.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/menu/{bootstrap5 => }/badge.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/menu/{bootstrap5 => }/breadcrumbs.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/menu/{bootstrap5 => }/dropdown.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/menu/{bootstrap5 => }/grid.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/menu/{bootstrap5 => }/grid_item.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/menu/{bootstrap5 => }/list.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/{bootstrap5 => }/new_app_version_modal.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/{bootstrap5 => }/pagination.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/{bootstrap5 => }/progress.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/query/{bootstrap5 => }/group.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/query/{bootstrap5 => }/item.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/query/{bootstrap5 => }/list.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/sessions/{bootstrap5 => }/list.html (93%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/{bootstrap5 => }/settings_view.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/partials/users/{bootstrap5 => }/restore_as.html (92%)
 rename corehq/apps/cloudcare/templates/cloudcare/{bootstrap5 => }/preview_app.html (98%)
 rename corehq/apps/cloudcare/templates/cloudcare/{bootstrap5 => }/preview_app_base.html (95%)
 rename corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/{bootstrap5 => }/mocha.html (100%)
 rename corehq/apps/cloudcare/templates/cloudcare/spec/{bootstrap5 => }/mocha.html (79%)

diff --git a/Gruntfile.js b/Gruntfile.js
index dde6ef09b484..12503d1f7365 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -34,8 +34,8 @@ module.exports = function (grunt) {
         'reports_core/choiceListUtils',
         'locations',
         'userreports',
-        'cloudcare/bootstrap5',
-        'cloudcare/form_entry/bootstrap5',
+        'cloudcare',
+        'cloudcare/form_entry',
         'hqwebapp/bootstrap3',
         'hqwebapp/bootstrap5',
         'case_importer',
diff --git a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/block_preview_app.html b/corehq/apps/cloudcare/templates/cloudcare/block_preview_app.html
similarity index 73%
rename from corehq/apps/cloudcare/templates/cloudcare/bootstrap5/block_preview_app.html
rename to corehq/apps/cloudcare/templates/cloudcare/block_preview_app.html
index 7b7bb59437de..6f534fe39f64 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/block_preview_app.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/block_preview_app.html
@@ -1,4 +1,4 @@
-{% extends "cloudcare/bootstrap5/preview_app_base.html" %}
+{% extends "cloudcare/preview_app_base.html" %}
 {% load hq_shared_tags %}
 {% load compress %}
 {% load i18n %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/formplayer_home.html b/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
similarity index 96%
rename from corehq/apps/cloudcare/templates/cloudcare/bootstrap5/formplayer_home.html
rename to corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
index b88c5fa89c66..5044f4b284cc 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/formplayer_home.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
@@ -128,8 +128,8 @@
   {% if not request.session.secure_session %}
     {% include 'hqwebapp/includes/inactivity_modal_data.html' %}
   {% endif %}
-  {% include 'cloudcare/partials/bootstrap5/confirmation_modal.html' %}
-  {% include 'cloudcare/partials/bootstrap5/new_app_version_modal.html' %}
-  {% include 'cloudcare/partials/bootstrap5/all_templates.html' %}
+  {% include 'cloudcare/partials/confirmation_modal.html' %}
+  {% include 'cloudcare/partials/new_app_version_modal.html' %}
+  {% include 'cloudcare/partials/all_templates.html' %}
 
 {% endblock %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html b/corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html
new file mode 100644
index 000000000000..4f57ee8c4b4f
--- /dev/null
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html
@@ -0,0 +1,70 @@
+{% include 'cloudcare/partials/case_detail.html' %}
+
+{% include 'cloudcare/partials/case_list/cell_container_style.html' %}
+{% include 'cloudcare/partials/case_list/cell_grid_style.html' %}
+{% include 'cloudcare/partials/case_list/cell_layout_style.html' %}
+{% include 'cloudcare/partials/case_list/detail.html' %}
+{% include 'cloudcare/partials/case_list/item.html' %}
+{% include 'cloudcare/partials/case_list/list.html' %}
+{% include 'cloudcare/partials/case_list/tile_grouped_item.html' %}
+{% include 'cloudcare/partials/case_list/tile_item.html' %}
+
+{% include 'cloudcare/partials/debugger.html' %}
+
+{% include 'cloudcare/partials/form_entry/add_group.html' %}
+{% include 'cloudcare/partials/form_entry/entry_address.html' %}
+{% include 'cloudcare/partials/form_entry/entry_blank.html' %}
+{% include 'cloudcare/partials/form_entry/entry_button.html' %}
+{% include 'cloudcare/partials/form_entry/entry_choice_label.html' %}
+{% include 'cloudcare/partials/form_entry/entry_date.html' %}
+{% include 'cloudcare/partials/form_entry/entry_datetime.html' %}
+{% include 'cloudcare/partials/form_entry/entry_dropdown.html' %}
+{% include 'cloudcare/partials/form_entry/entry_ethiopian_date.html' %}
+{% include 'cloudcare/partials/form_entry/entry_file.html' %}
+{% include 'cloudcare/partials/form_entry/entry_geo.html' %}
+{% include 'cloudcare/partials/form_entry/entry_multidropdown.html' %}
+{% include 'cloudcare/partials/form_entry/entry_password.html' %}
+{% include 'cloudcare/partials/form_entry/entry_select.html' %}
+{% include 'cloudcare/partials/form_entry/entry_signature.html' %}
+{% include 'cloudcare/partials/form_entry/entry_str.html' %}
+{% include 'cloudcare/partials/form_entry/entry_text.html' %}
+{% include 'cloudcare/partials/form_entry/entry_time.html' %}
+{% include 'cloudcare/partials/form_entry/entry_unsupported.html' %}
+{% include 'cloudcare/partials/form_entry/form.html' %}
+{% include 'cloudcare/partials/form_entry/form_navigation.html' %}
+{% include 'cloudcare/partials/form_entry/grouped_element_tile_row.html' %}
+{% include 'cloudcare/partials/form_entry/help_multimedia.html' %}
+{% include 'cloudcare/partials/form_entry/multimedia.html' %}
+{% include 'cloudcare/partials/form_entry/question.html' %}
+{% include 'cloudcare/partials/form_entry/repeat_juncture.html' %}
+{% include 'cloudcare/partials/form_entry/sub_group.html' %}
+
+{% include 'cloudcare/partials/grid_view/grid.html' %}
+{% include 'cloudcare/partials/grid_view/landing_page_app.html' %}
+{% include 'cloudcare/partials/grid_view/row.html' %}
+{% include 'cloudcare/partials/grid_view/single_app.html' %}
+
+{% include 'cloudcare/partials/menu/audio.html' %}
+{% include 'cloudcare/partials/menu/badge.html' %}
+{% include 'cloudcare/partials/menu/breadcrumbs.html' %}
+{% include 'cloudcare/partials/menu/dropdown.html' %}
+{% include 'cloudcare/partials/menu/grid.html' %}
+{% include 'cloudcare/partials/menu/grid_item.html' %}
+{% include 'cloudcare/partials/menu/list.html' %}
+{% include 'cloudcare/partials/menu/row.html' %}
+
+{% include 'cloudcare/partials/progress.html' %}
+
+{% include 'cloudcare/partials/query/group.html' %}
+{% include 'cloudcare/partials/query/item.html' %}
+{% include 'cloudcare/partials/query/list.html' %}
+
+{% include 'cloudcare/partials/sessions/item.html' %}
+{% include 'cloudcare/partials/sessions/list.html' %}
+
+{% include 'cloudcare/partials/settings_view.html' %}
+
+{% include 'cloudcare/partials/users/restore_as.html' %}
+{% include 'cloudcare/partials/users/restore_as_banner.html' %}
+{% include 'cloudcare/partials/users/user_data.html' %}
+{% include 'cloudcare/partials/users/user_row.html' %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/all_templates.html b/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/all_templates.html
deleted file mode 100644
index 5c7867a6329a..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/all_templates.html
+++ /dev/null
@@ -1,70 +0,0 @@
-{% include 'cloudcare/partials/bootstrap5/case_detail.html' %}
-
-{% include 'cloudcare/partials/case_list/cell_container_style.html' %}
-{% include 'cloudcare/partials/case_list/cell_grid_style.html' %}
-{% include 'cloudcare/partials/case_list/cell_layout_style.html' %}
-{% include 'cloudcare/partials/case_list/detail.html' %}
-{% include 'cloudcare/partials/case_list/bootstrap5/item.html' %}
-{% include 'cloudcare/partials/case_list/bootstrap5/list.html' %}
-{% include 'cloudcare/partials/case_list/bootstrap5/tile_grouped_item.html' %}
-{% include 'cloudcare/partials/case_list/bootstrap5/tile_item.html' %}
-
-{% include 'cloudcare/partials/bootstrap5/debugger.html' %}
-
-{% include 'cloudcare/partials/form_entry/bootstrap5/add_group.html' %}
-{% include 'cloudcare/partials/form_entry/entry_address.html' %}
-{% include 'cloudcare/partials/form_entry/entry_blank.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_button.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_choice_label.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_date.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_datetime.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_dropdown.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_ethiopian_date.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_file.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_geo.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_multidropdown.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_password.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_select.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_signature.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_str.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_text.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_time.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/entry_unsupported.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/form.html' %}
-{% include 'cloudcare/partials/form_entry/form_navigation.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/grouped_element_tile_row.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/help_multimedia.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/multimedia.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/question.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/repeat_juncture.html' %}
-{% include 'cloudcare/partials/form_entry/bootstrap5/sub_group.html' %}
-
-{% include 'cloudcare/partials/grid_view/bootstrap5/grid.html' %}
-{% include 'cloudcare/partials/grid_view/bootstrap5/landing_page_app.html' %}
-{% include 'cloudcare/partials/grid_view/bootstrap5/row.html' %}
-{% include 'cloudcare/partials/grid_view/bootstrap5/single_app.html' %}
-
-{% include 'cloudcare/partials/menu/bootstrap5/audio.html' %}
-{% include 'cloudcare/partials/menu/bootstrap5/badge.html' %}
-{% include 'cloudcare/partials/menu/bootstrap5/breadcrumbs.html' %}
-{% include 'cloudcare/partials/menu/bootstrap5/dropdown.html' %}
-{% include 'cloudcare/partials/menu/bootstrap5/grid.html' %}
-{% include 'cloudcare/partials/menu/bootstrap5/grid_item.html' %}
-{% include 'cloudcare/partials/menu/bootstrap5/list.html' %}
-{% include 'cloudcare/partials/menu/row.html' %}
-
-{% include 'cloudcare/partials/bootstrap5/progress.html' %}
-
-{% include 'cloudcare/partials/query/bootstrap5/group.html' %}
-{% include 'cloudcare/partials/query/bootstrap5/item.html' %}
-{% include 'cloudcare/partials/query/bootstrap5/list.html' %}
-
-{% include 'cloudcare/partials/sessions/item.html' %}
-{% include 'cloudcare/partials/sessions/bootstrap5/list.html' %}
-
-{% include 'cloudcare/partials/bootstrap5/settings_view.html' %}
-
-{% include 'cloudcare/partials/users/bootstrap5/restore_as.html' %}
-{% include 'cloudcare/partials/users/restore_as_banner.html' %}
-{% include 'cloudcare/partials/users/user_data.html' %}
-{% include 'cloudcare/partials/users/user_row.html' %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/case_detail.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/case_detail.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/item.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/item.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/case_list/item.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/list.html
similarity index 82%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/list.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/case_list/list.html
index 215ce50df5fe..c0d1429818af 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/list.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/list.html
@@ -11,11 +11,11 @@
       <i class="fa fa-lg fa-arrow-down" aria-hidden="true"></i>
     </button>
 
-    {% include "cloudcare/partials/case_list/bootstrap5/menu_header.html" %}
+    {% include "cloudcare/partials/case_list/menu_header.html" %}
 
     <% if (isMultiSelect) { %>
     <div class="case-list-actions d-grid gap-2 d-md-block">
-      {% include 'cloudcare/partials/case_list/bootstrap5/multi_select_continue_button.html' %}
+      {% include 'cloudcare/partials/case_list/multi_select_continue_button.html' %}
     </div>
     <% } %>
 
@@ -46,18 +46,18 @@
           <% if (hasNoItems) { %>
             {% include 'cloudcare/partials/case_list/no_items_text.html' %}
           <% } else { %>
-            {% include 'cloudcare/partials/case_list/bootstrap5/search_controls.html' %}
+            {% include 'cloudcare/partials/case_list/search_controls.html' %}
           <% } %>
           <section class="js-case-container clearfix list-cell-container-style"></section>
         <% } else { %>
-          {% include 'cloudcare/partials/case_list/bootstrap5/table_container.html' %}
+          {% include 'cloudcare/partials/case_list/table_container.html' %}
         <% } %>
       </div>
     </div>
     <% if (actions || isMultiSelect) { %>
       <div class="case-list-actions d-grid gap-2 d-md-block">
         <% if (isMultiSelect) { %>
-          {% include 'cloudcare/partials/case_list/bootstrap5/multi_select_continue_button.html' %}
+          {% include 'cloudcare/partials/case_list/multi_select_continue_button.html' %}
         <% } %>
         <% if (actions) { %>
           <% _.each(actions, function(action, index) { %>
@@ -71,7 +71,7 @@
 
     <% if (!hasNoItems) { %>
       {% block pagination_templates %}
-        {% include 'cloudcare/partials/bootstrap5/pagination.html' %}
+        {% include 'cloudcare/partials/pagination.html' %}
       {% endblock %}
     <% } %>
   </div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/menu_header.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/menu_header.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/multi_select_continue_button.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/multi_select_continue_button.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/multi_select_continue_button.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/case_list/multi_select_continue_button.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/search_controls.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/search_controls.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/search_controls.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/case_list/search_controls.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/table_container.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/table_container.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/table_container.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/case_list/table_container.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_grouped_item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/tile_grouped_item.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_grouped_item.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/case_list/tile_grouped_item.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/tile_item.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/case_list/bootstrap5/tile_item.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/case_list/tile_item.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/confirmation_modal.html b/corehq/apps/cloudcare/templates/cloudcare/partials/confirmation_modal.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/confirmation_modal.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/confirmation_modal.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/debugger.html b/corehq/apps/cloudcare/templates/cloudcare/partials/debugger.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/debugger.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/debugger.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/add_group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/add_group.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/add_group.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/add_group.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_button.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_button.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_button.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_button.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_choice_label.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_choice_label.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_choice_label.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_choice_label.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_date.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_date.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_date.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_date.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_datetime.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_datetime.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_datetime.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_datetime.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_dropdown.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_dropdown.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_dropdown.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_dropdown.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_ethiopian_date.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_ethiopian_date.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_ethiopian_date.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_ethiopian_date.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_file.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_file.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_file.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_file.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_geo.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_geo.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_geo.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_geo.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_multidropdown.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_multidropdown.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_multidropdown.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_multidropdown.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_password.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_password.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_password.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_password.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_select.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_select.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_signature.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_signature.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_signature.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_signature.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_str.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_str.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_str.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_str.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_text.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_text.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_text.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_text.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_time.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_time.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_time.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_time.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_unsupported.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/entry_unsupported.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/form.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/form.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/grouped_element_tile_row.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/grouped_element_tile_row.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/grouped_element_tile_row.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/grouped_element_tile_row.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/help_multimedia.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/help_multimedia.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/help_multimedia.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/help_multimedia.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/multimedia.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/multimedia.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/multimedia.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/multimedia.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/question.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/question.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/question.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/question.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/repeat_juncture.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/repeat_juncture.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/repeat_juncture.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/repeat_juncture.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/sub_group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap5/sub_group.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap5/grid.html b/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/grid.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap5/grid.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/grid.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap5/landing_page_app.html b/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/landing_page_app.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap5/landing_page_app.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/landing_page_app.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap5/row.html b/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/row.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap5/row.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/row.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap5/single_app.html b/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/single_app.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/bootstrap5/single_app.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/single_app.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/audio.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/audio.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/audio.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/menu/audio.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/badge.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/badge.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/badge.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/menu/badge.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/breadcrumbs.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/breadcrumbs.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/breadcrumbs.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/menu/breadcrumbs.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/dropdown.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/dropdown.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/dropdown.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/menu/dropdown.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/grid.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/grid.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/grid.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/menu/grid.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/grid_item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/grid_item.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/grid_item.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/menu/grid_item.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/list.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/menu/bootstrap5/list.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/menu/list.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/new_app_version_modal.html b/corehq/apps/cloudcare/templates/cloudcare/partials/new_app_version_modal.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/new_app_version_modal.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/new_app_version_modal.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/pagination.html b/corehq/apps/cloudcare/templates/cloudcare/partials/pagination.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/pagination.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/pagination.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/progress.html b/corehq/apps/cloudcare/templates/cloudcare/partials/progress.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/progress.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/progress.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/group.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/group.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/query/group.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/item.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/item.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/query/item.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/query/bootstrap5/list.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/bootstrap5/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/list.html
similarity index 93%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/sessions/bootstrap5/list.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/sessions/list.html
index 3ad70e62c190..259ff5f35e9b 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/bootstrap5/list.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/list.html
@@ -31,7 +31,7 @@ <h1 class="page-title">{% trans "Incomplete Forms" %}</h1>
     </table>
     <% if (endPage) { %>
       {% block pagination_templates %}
-        {% include 'cloudcare/partials/bootstrap5/pagination.html' %}
+        {% include 'cloudcare/partials/pagination.html' %}
       {% endblock %}
     <% } %>
   </div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/settings_view.html b/corehq/apps/cloudcare/templates/cloudcare/partials/settings_view.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/bootstrap5/settings_view.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/settings_view.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/users/bootstrap5/restore_as.html b/corehq/apps/cloudcare/templates/cloudcare/partials/users/restore_as.html
similarity index 92%
rename from corehq/apps/cloudcare/templates/cloudcare/partials/users/bootstrap5/restore_as.html
rename to corehq/apps/cloudcare/templates/cloudcare/partials/users/restore_as.html
index 7ad4bccc54b2..23678716039f 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/users/bootstrap5/restore_as.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/users/restore_as.html
@@ -24,7 +24,7 @@ <h1 class="page-title">{% trans "Log in as user" %}</h1>
     </table>
     <% if (endPage) { %>
       {% block pagination_templates %}
-        {% include 'cloudcare/partials/bootstrap5/pagination.html' %}
+        {% include 'cloudcare/partials/pagination.html' %}
       {% endblock %}
     <% } %>
   </div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app.html b/corehq/apps/cloudcare/templates/cloudcare/preview_app.html
similarity index 98%
rename from corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app.html
rename to corehq/apps/cloudcare/templates/cloudcare/preview_app.html
index f5730db55c8c..1de3beb6e50d 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/preview_app.html
@@ -1,4 +1,4 @@
-{% extends "cloudcare/bootstrap5/preview_app_base.html" %}
+{% extends "cloudcare/preview_app_base.html" %}
 {% load hq_shared_tags %}
 {% load compress %}
 
diff --git a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app_base.html b/corehq/apps/cloudcare/templates/cloudcare/preview_app_base.html
similarity index 95%
rename from corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app_base.html
rename to corehq/apps/cloudcare/templates/cloudcare/preview_app_base.html
index 703fef9a181c..62b81b425b60 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/bootstrap5/preview_app_base.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/preview_app_base.html
@@ -63,8 +63,8 @@
 <body>
 {% block body %}{% endblock %}
 
-{% include 'cloudcare/partials/bootstrap5/confirmation_modal.html' %}
-{% include 'cloudcare/partials/bootstrap5/all_templates.html' %}
+{% include 'cloudcare/partials/confirmation_modal.html' %}
+{% include 'cloudcare/partials/all_templates.html' %}
 
 {% block js %}{{ block.super }}
   {% include 'cloudcare/partials/dependencies.html' %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/bootstrap5/mocha.html b/corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/mocha.html
similarity index 100%
rename from corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/bootstrap5/mocha.html
rename to corehq/apps/cloudcare/templates/cloudcare/spec/form_entry/mocha.html
diff --git a/corehq/apps/cloudcare/templates/cloudcare/spec/bootstrap5/mocha.html b/corehq/apps/cloudcare/templates/cloudcare/spec/mocha.html
similarity index 79%
rename from corehq/apps/cloudcare/templates/cloudcare/spec/bootstrap5/mocha.html
rename to corehq/apps/cloudcare/templates/cloudcare/spec/mocha.html
index 485a46e300a9..3cedc4fe1f95 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/spec/bootstrap5/mocha.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/spec/mocha.html
@@ -15,7 +15,7 @@
   <div id="menu-region" class="container"></div>
   <div id="sidebar-region" class="container"></div>
 
-  {% include 'cloudcare/partials/bootstrap5/confirmation_modal.html' %}
-  {% include 'cloudcare/partials/bootstrap5/all_templates.html' %}
+  {% include 'cloudcare/partials/confirmation_modal.html' %}
+  {% include 'cloudcare/partials/all_templates.html' %}
 
 {% endblock %}
diff --git a/corehq/apps/cloudcare/views.py b/corehq/apps/cloudcare/views.py
index 6a9f139804c7..0e44fd6792dc 100644
--- a/corehq/apps/cloudcare/views.py
+++ b/corehq/apps/cloudcare/views.py
@@ -215,7 +215,7 @@ def _default_lang():
         }
 
         return set_cookie(
-            render(request, "cloudcare/bootstrap5/formplayer_home.html", context)
+            render(request, "cloudcare/formplayer_home.html", context)
         )
 
 
@@ -235,7 +235,7 @@ def wrap_get_current_app_doc(self, domain, username, app_id):
 @method_decorator(use_bootstrap5, name='dispatch')
 @method_decorator(use_tempusdominus, name='dispatch')
 class PreviewAppView(TemplateView):
-    template_name = 'cloudcare/bootstrap5/preview_app.html'
+    template_name = 'cloudcare/preview_app.html'
     urlname = 'preview_app'
 
     @xframe_options_sameorigin
@@ -243,7 +243,7 @@ def get(self, request, *args, **kwargs):
         mobile_ucr_count = get_mobile_ucr_count(request.domain)
         if should_restrict_web_apps_usage(request.domain, mobile_ucr_count):
             context = BlockWebAppsView.get_context_for_ucr_limit_error(request.domain, mobile_ucr_count)
-            return render(request, 'cloudcare/bootstrap5/block_preview_app.html', context)
+            return render(request, 'cloudcare/block_preview_app.html', context)
         app = get_app(request.domain, kwargs.pop('app_id'))
         return self.render_to_response({
             'app': _format_app_doc(app.to_json()),
diff --git a/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py b/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
index e79c107cd7fa..1fb0c44d108d 100644
--- a/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
+++ b/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
@@ -429,8 +429,8 @@ def test_update_gruntfile():
         'reports_core/choiceListUtils',
         'locations',
         'userreports',
-        'cloudcare/bootstrap5',
-        'cloudcare/form_entry/bootstrap5',
+        'cloudcare',
+        'cloudcare/form_entry',
         'hqwebapp',
         'case_importer',
     ];

From a8d5b1f844f77c2059af26ecd2846ac4adf62af0 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 27 May 2024 11:33:39 -0400
Subject: [PATCH 14/91] Bootstrap 5 Migration - Rebuilt diffs

---
 .../cloudcare/block_preview_app.html.diff.txt |   8 -
 .../cloudcare/formplayer_home.html.diff.txt   |  69 -----
 .../partials/all_templates.html.diff.txt      | 121 ---------
 .../partials/case_detail.html.diff.txt        |  51 ----
 .../partials/case_list/item.html.diff.txt     |  11 -
 .../partials/case_list/list.html.diff.txt     |  96 -------
 .../case_list/menu_header.html.diff.txt       |  32 ---
 ...multi_select_continue_button.html.diff.txt |  19 --
 .../case_list/search_controls.html.diff.txt   |  29 --
 .../case_list/table_container.html.diff.txt   |  11 -
 .../case_list/tile_grouped_item.html.diff.txt |  49 ----
 .../case_list/tile_item.html.diff.txt         |  25 --
 .../partials/confirmation_modal.html.diff.txt |  31 ---
 .../cloudcare/partials/debugger.html.diff.txt | 249 ------------------
 .../form_entry/entry_button.html.diff.txt     |   9 -
 .../entry_choice_label.html.diff.txt          |  19 --
 .../form_entry/entry_date.html.diff.txt       |  15 --
 .../form_entry/entry_datetime.html.diff.txt   |  14 -
 .../form_entry/entry_dropdown.html.diff.txt   |  10 -
 .../entry_ethiopian_date.html.diff.txt        |  14 -
 .../form_entry/entry_file.html.diff.txt       |  25 --
 .../form_entry/entry_geo.html.diff.txt        |  33 ---
 .../entry_multidropdown.html.diff.txt         |  10 -
 .../form_entry/entry_password.html.diff.txt   |  10 -
 .../form_entry/entry_select.html.diff.txt     |  43 ---
 .../form_entry/entry_signature.html.diff.txt  |  25 --
 .../form_entry/entry_str.html.diff.txt        |  10 -
 .../form_entry/entry_text.html.diff.txt       |  10 -
 .../form_entry/entry_time.html.diff.txt       |  14 -
 .../entry_unsupported.html.diff.txt           |  11 -
 .../partials/form_entry/form.html.diff.txt    |  38 ---
 .../grouped_element_tile_row.html.diff.txt    |   9 -
 .../form_entry/help_multimedia.html.diff.txt  |  11 -
 .../form_entry/multimedia.html.diff.txt       |  11 -
 .../form_entry/question.html.diff.txt         | 110 --------
 .../form_entry/repeat_juncture.html.diff.txt  |  31 ---
 .../form_entry/sub_group.html.diff.txt        |  49 ----
 .../partials/grid_view/grid.html.diff.txt     |  42 ---
 .../grid_view/landing_page_app.html.diff.txt  |  11 -
 .../partials/grid_view/row.html.diff.txt      |   0
 .../grid_view/single_app.html.diff.txt        |  53 ----
 .../partials/menu/audio.html.diff.txt         |  11 -
 .../partials/menu/badge.html.diff.txt         |  10 -
 .../partials/menu/breadcrumbs.html.diff.txt   |  16 --
 .../partials/menu/dropdown.html.diff.txt      |  31 ---
 .../partials/menu/grid.html.diff.txt          |  15 --
 .../partials/menu/grid_item.html.diff.txt     |  25 --
 .../partials/menu/list.html.diff.txt          |  10 -
 .../new_app_version_modal.html.diff.txt       |  38 ---
 .../partials/pagination.html.diff.txt         | 212 ---------------
 .../cloudcare/partials/progress.html.diff.txt |  19 --
 .../partials/query/group.html.diff.txt        |  19 --
 .../partials/query/item.html.diff.txt         |  88 -------
 .../partials/query/list.html.diff.txt         |  33 ---
 .../partials/sessions/list.html.diff.txt      |  31 ---
 .../partials/settings_view.html.diff.txt      |  47 ----
 .../partials/users/restore_as.html.diff.txt   |  33 ---
 .../cloudcare/preview_app.html.diff.txt       |  28 --
 .../cloudcare/preview_app_base.html.diff.txt  |  99 -------
 .../spec/form_entry/mocha.html.diff.txt       |  11 -
 .../cloudcare/spec/mocha.html.diff.txt        |  21 --
 ...grid.formplayer-common_grid.style.diff.txt |   7 +
 ...n.formplayer-common_version.style.diff.txt |   8 +
 63 files changed, 15 insertions(+), 2235 deletions(-)
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/block_preview_app.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/formplayer_home.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/all_templates.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_detail.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/item.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/list.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/menu_header.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/multi_select_continue_button.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/search_controls.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/table_container.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/tile_grouped_item.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/tile_item.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/confirmation_modal.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/debugger.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_button.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_choice_label.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_date.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_datetime.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_dropdown.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_ethiopian_date.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_file.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_geo.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_multidropdown.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_password.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_select.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_signature.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_str.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_text.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_time.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_unsupported.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/form.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/grouped_element_tile_row.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/help_multimedia.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/multimedia.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/question.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/repeat_juncture.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/sub_group.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/grid.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/landing_page_app.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/row.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/single_app.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/audio.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/badge.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/breadcrumbs.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/dropdown.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/grid.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/grid_item.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/list.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/new_app_version_modal.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/pagination.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/progress.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/group.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/item.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/list.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/sessions/list.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/settings_view.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/users/restore_as.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/preview_app.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/preview_app_base.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/spec/form_entry/mocha.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/spec/mocha.html.diff.txt

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/block_preview_app.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/block_preview_app.html.diff.txt
deleted file mode 100644
index 4939714ee4a8..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/block_preview_app.html.diff.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- 
-+++ 
-@@ -1,4 +1,4 @@
--{% extends "cloudcare/bootstrap3/preview_app_base.html" %}
-+{% extends "cloudcare/bootstrap5/preview_app_base.html" %}
- {% load hq_shared_tags %}
- {% load compress %}
- {% load i18n %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/formplayer_home.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/formplayer_home.html.diff.txt
deleted file mode 100644
index d5ce15c90452..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/formplayer_home.html.diff.txt
+++ /dev/null
@@ -1,69 +0,0 @@
---- 
-+++ 
-@@ -1,4 +1,4 @@
--{% extends 'hqwebapp/bootstrap3/base_navigation.html' %}
-+{% extends 'hqwebapp/bootstrap5/base_navigation.html' %}
- {% load i18n %}
- {% load hq_shared_tags %}
- {% load compress %}
-@@ -20,11 +20,11 @@
- {% endblock %}
- 
- {% block navigation %}{{ block.super }}
--  <div class="navbar navbar-inverse navbar-cloudcare navbar-static-top">
-+  <div class="navbar navbar-cloudcare">
-     <div class="container-fluid">
--      <a class="navbar-brand" href="{{ home_url }}"><i class="fcc fcc-flower"></i> Web Apps</a>
--      <ul class="nav navbar-nav navbar-right" >
--        <li><a href="#" id="commcare-menu-toggle">{% trans 'Show Full Menu' %}</a></li>
-+      <a class="navbar-brand" href="{{ home_url }}"><i class="fcc fcc-flower"></i> {% trans "Web Apps" %}</a>
-+      <ul class="nav navbar-nav navbar-right">
-+        <li class="nav-item"><a href="#" class="nav-link" id="commcare-menu-toggle">{% trans 'Show Full Menu' %}</a></li>
-       </ul>
-     </div>
-   </div>
-@@ -34,25 +34,24 @@
-   {% compress css %}
-     <link rel="stylesheet" href="{% static 'nprogress/nprogress.css' %}">
-     <link rel="stylesheet" href="{% static 'At.js/dist/css/jquery.atwho.min.css' %}">
--    <link rel="stylesheet" href="{% static 'bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css' %}"/>
-   {% endcompress %}
-   {% compress css %}
--    <link type="text/less"
-+    <link type="text/scss"
-           rel="stylesheet"
-           media="all"
--          href="{% static 'cloudcare/less/font-formplayer.less' %}" />
--    <link type="text/less"
-+          href="{% static 'cloudcare/scss/font-formplayer.scss' %}" />
-+    <link type="text/scss"
-           rel="stylesheet"
-           media="all"
--          href="{% static 'cloudcare/less/formplayer-common.less' %}"/>
--    <link type="text/less"
-+          href="{% static 'cloudcare/scss/formplayer-common.scss' %}"/>
-+    <link type="text/scss"
-           rel="stylesheet"
-           media="all"
--          href="{% static 'cloudcare/less/formplayer-webapp.less' %}"/>
-+          href="{% static 'cloudcare/scss/formplayer-webapp.scss' %}"/>
-   {% endcompress %}
- {% endblock %}
- 
--{% requirejs_main "cloudcare/js/formplayer/main" %}
-+{% requirejs_main_b5 "cloudcare/js/formplayer/main" %}
- 
- {% block js %} {{ block.super }}
-   {% include "cloudcare/partials/dependencies.html" %}
-@@ -128,8 +127,8 @@
-   {% if not request.session.secure_session %}
-     {% include 'hqwebapp/includes/inactivity_modal_data.html' %}
-   {% endif %}
--  {% include 'cloudcare/partials/bootstrap3/confirmation_modal.html' %}
--  {% include 'cloudcare/partials/bootstrap3/new_app_version_modal.html' %}
--  {% include 'cloudcare/partials/bootstrap3/all_templates.html' %}
-+  {% include 'cloudcare/partials/bootstrap5/confirmation_modal.html' %}
-+  {% include 'cloudcare/partials/bootstrap5/new_app_version_modal.html' %}
-+  {% include 'cloudcare/partials/bootstrap5/all_templates.html' %}
- 
- {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/all_templates.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/all_templates.html.diff.txt
deleted file mode 100644
index b2147549caa3..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/all_templates.html.diff.txt
+++ /dev/null
@@ -1,121 +0,0 @@
---- 
-+++ 
-@@ -1,70 +1,70 @@
--{% include 'cloudcare/partials/bootstrap3/case_detail.html' %}
-+{% include 'cloudcare/partials/bootstrap5/case_detail.html' %}
- 
- {% include 'cloudcare/partials/case_list/cell_container_style.html' %}
- {% include 'cloudcare/partials/case_list/cell_grid_style.html' %}
- {% include 'cloudcare/partials/case_list/cell_layout_style.html' %}
- {% include 'cloudcare/partials/case_list/detail.html' %}
--{% include 'cloudcare/partials/case_list/bootstrap3/item.html' %}
--{% include 'cloudcare/partials/case_list/bootstrap3/list.html' %}
--{% include 'cloudcare/partials/case_list/bootstrap3/tile_grouped_item.html' %}
--{% include 'cloudcare/partials/case_list/bootstrap3/tile_item.html' %}
-+{% include 'cloudcare/partials/case_list/bootstrap5/item.html' %}
-+{% include 'cloudcare/partials/case_list/bootstrap5/list.html' %}
-+{% include 'cloudcare/partials/case_list/bootstrap5/tile_grouped_item.html' %}
-+{% include 'cloudcare/partials/case_list/bootstrap5/tile_item.html' %}
- 
--{% include 'cloudcare/partials/bootstrap3/debugger.html' %}
-+{% include 'cloudcare/partials/bootstrap5/debugger.html' %}
- 
--{% include 'cloudcare/partials/form_entry/bootstrap3/add_group.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/add_group.html' %}
- {% include 'cloudcare/partials/form_entry/entry_address.html' %}
- {% include 'cloudcare/partials/form_entry/entry_blank.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_button.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_choice_label.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_date.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_datetime.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_dropdown.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_ethiopian_date.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_file.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_geo.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_multidropdown.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_password.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_select.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_signature.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_str.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_text.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_time.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/entry_unsupported.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/form.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_button.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_choice_label.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_date.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_datetime.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_dropdown.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_ethiopian_date.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_file.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_geo.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_multidropdown.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_password.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_select.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_signature.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_str.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_text.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_time.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/entry_unsupported.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/form.html' %}
- {% include 'cloudcare/partials/form_entry/form_navigation.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/grouped_element_tile_row.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/help_multimedia.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/multimedia.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/question.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/repeat_juncture.html' %}
--{% include 'cloudcare/partials/form_entry/bootstrap3/sub_group.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/grouped_element_tile_row.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/help_multimedia.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/multimedia.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/question.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/repeat_juncture.html' %}
-+{% include 'cloudcare/partials/form_entry/bootstrap5/sub_group.html' %}
- 
--{% include 'cloudcare/partials/grid_view/bootstrap3/grid.html' %}
--{% include 'cloudcare/partials/grid_view/bootstrap3/landing_page_app.html' %}
--{% include 'cloudcare/partials/grid_view/bootstrap3/row.html' %}
--{% include 'cloudcare/partials/grid_view/bootstrap3/single_app.html' %}
-+{% include 'cloudcare/partials/grid_view/bootstrap5/grid.html' %}
-+{% include 'cloudcare/partials/grid_view/bootstrap5/landing_page_app.html' %}
-+{% include 'cloudcare/partials/grid_view/bootstrap5/row.html' %}
-+{% include 'cloudcare/partials/grid_view/bootstrap5/single_app.html' %}
- 
--{% include 'cloudcare/partials/menu/bootstrap3/audio.html' %}
--{% include 'cloudcare/partials/menu/bootstrap3/badge.html' %}
--{% include 'cloudcare/partials/menu/bootstrap3/breadcrumbs.html' %}
--{% include 'cloudcare/partials/menu/bootstrap3/dropdown.html' %}
--{% include 'cloudcare/partials/menu/bootstrap3/grid.html' %}
--{% include 'cloudcare/partials/menu/bootstrap3/grid_item.html' %}
--{% include 'cloudcare/partials/menu/bootstrap3/list.html' %}
-+{% include 'cloudcare/partials/menu/bootstrap5/audio.html' %}
-+{% include 'cloudcare/partials/menu/bootstrap5/badge.html' %}
-+{% include 'cloudcare/partials/menu/bootstrap5/breadcrumbs.html' %}
-+{% include 'cloudcare/partials/menu/bootstrap5/dropdown.html' %}
-+{% include 'cloudcare/partials/menu/bootstrap5/grid.html' %}
-+{% include 'cloudcare/partials/menu/bootstrap5/grid_item.html' %}
-+{% include 'cloudcare/partials/menu/bootstrap5/list.html' %}
- {% include 'cloudcare/partials/menu/row.html' %}
- 
--{% include 'cloudcare/partials/bootstrap3/progress.html' %}
-+{% include 'cloudcare/partials/bootstrap5/progress.html' %}
- 
--{% include 'cloudcare/partials/query/bootstrap3/group.html' %}
--{% include 'cloudcare/partials/query/bootstrap3/item.html' %}
--{% include 'cloudcare/partials/query/bootstrap3/list.html' %}
-+{% include 'cloudcare/partials/query/bootstrap5/group.html' %}
-+{% include 'cloudcare/partials/query/bootstrap5/item.html' %}
-+{% include 'cloudcare/partials/query/bootstrap5/list.html' %}
- 
- {% include 'cloudcare/partials/sessions/item.html' %}
--{% include 'cloudcare/partials/sessions/bootstrap3/list.html' %}
-+{% include 'cloudcare/partials/sessions/bootstrap5/list.html' %}
- 
--{% include 'cloudcare/partials/bootstrap3/settings_view.html' %}
-+{% include 'cloudcare/partials/bootstrap5/settings_view.html' %}
- 
--{% include 'cloudcare/partials/users/bootstrap3/restore_as.html' %}
-+{% include 'cloudcare/partials/users/bootstrap5/restore_as.html' %}
- {% include 'cloudcare/partials/users/restore_as_banner.html' %}
- {% include 'cloudcare/partials/users/user_data.html' %}
- {% include 'cloudcare/partials/users/user_row.html' %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_detail.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_detail.html.diff.txt
deleted file mode 100644
index 48a54a48f3bb..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_detail.html.diff.txt
+++ /dev/null
@@ -1,51 +0,0 @@
---- 
-+++ 
-@@ -27,39 +27,39 @@
- </script>
- 
- <script type="text/template" id="detail-view-tab-item-template">
--  <a href="" role="tab" data-keyboard="true" data-toggle="tab"><%- title %></a>
-+  <a class="nav-link<% if (active) { %> active<% } %>" href="" role="tab" data-keyboard="true" data-bs-toggle="tab"><%- title %></a>
- </script>
- 
- <script type="text/template" id="module-case-detail-multi-select">
-   <button type="button"
-       class="btn btn-success btn-lg module-case-detail-btn"
-       id="select-case"
--      data-dismiss="modal">{% trans "Select" %}</button>
-+      data-bs-dismiss="modal">{% trans "Select" %}</button>
-   <button type="button"
--      class="btn btn-default btn-lg module-case-detail-btn"
--      data-dismiss="modal">{% trans "Cancel" %}</button>
-+      class="btn btn-outline-primary btn-lg module-case-detail-btn"
-+      data-bs-dismiss="modal">{% trans "Cancel" %}</button>
- </script>
- 
- <script type="text/template" id="module-case-detail">
-   <button type="button"
-           class="btn btn-success btn-lg module-case-detail-continue"
-           id="select-case"
--          data-dismiss="modal">{% trans "Continue" %}</button>
-+          data-bs-dismiss="modal">{% trans "Continue" %}</button>
- </script>
- 
--<div id="case-detail-modal" class="modal fade module-case-detail-modal" role="dialog" tabindex='-1'>
-+<div id="case-detail-modal" class="modal fade module-case-detail-modal" aria-labelledby="case-detail-modal-title" role="dialog" tabindex='-1'>
-   <div class="modal-dialog">
-     <div class="modal-content">
-       <div class="modal-header">
--        <button type="button" aria-label='{% trans_html_attr "Close" %}' class="close" data-dismiss="modal">&times;</button>
--        <h4 class="modal-title">{% trans "Case Detail" %}</h4>
-+        <h4 class="modal-title" id="case-detail-modal-title">{% trans "Case Detail" %}</h4>
-+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
-       </div>
-       <div class="modal-body">
-         <div class="js-detail-tabs module-case-detail-tabs"></div>
-         <div class="js-detail-content"></div>
-       </div>
-       <div class="modal-footer">
--        <div class="js-detail-footer-content text-center"></div>
-+        <div class="js-detail-footer-content full-width"></div>
-       </div>
-     </div>
-   </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/item.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/item.html.diff.txt
deleted file mode 100644
index 402e576b876a..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/item.html.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -10,7 +10,7 @@
-         <td class="module-case-list-column">
-           <button class="clickable-icon">
-             <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
--            <i class="fa fa-spin fa-spinner" style="display:none"></i>
-+            <i class="fa fa-spin fa-spinner" style="display:none"></i>  {# todo B5: inline style #}
-           </button>
-         </td>
-       <% } else if (styles[index].displayFormat === 'Markdown') { %>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/list.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/list.html.diff.txt
deleted file mode 100644
index 966c9ce069b5..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/list.html.diff.txt
+++ /dev/null
@@ -1,96 +0,0 @@
---- 
-+++ 
-@@ -1,20 +1,21 @@
-+{% load hq_shared_tags %}
- {% load i18n %}
- 
- <script type="text/template" id="case-view-list-template">
-   <div class="module-case-list-container">
- 
-     <button id="scroll-to-bottom"
--            class="btn btn-lg btn-circle btn-primary hidden-md hidden-lg hide"
-+            class="btn btn-lg btn-circle btn-primary d-md-none d-lg-none d-none"
-             type="button"
--            aria-label="{% trans 'Scroll to bottom' %}">
-+            aria-label="{% trans_html_attr 'Scroll to bottom' %}">
-       <i class="fa fa-lg fa-arrow-down" aria-hidden="true"></i>
-     </button>
- 
--    {% include "cloudcare/partials/case_list/bootstrap3/menu_header.html" %}
-+    {% include "cloudcare/partials/case_list/bootstrap5/menu_header.html" %}
- 
-     <% if (isMultiSelect) { %>
--    <div class="case-list-actions">
--      {% include 'cloudcare/partials/case_list/bootstrap3/multi_select_continue_button.html' %}
-+    <div class="case-list-actions d-grid gap-2 d-md-block">
-+      {% include 'cloudcare/partials/case_list/bootstrap5/multi_select_continue_button.html' %}
-     </div>
-     <% } %>
- 
-@@ -25,45 +26,43 @@
-                class="form-control"
-                placeholder="Search"
-                id="searchText">
--        <div class="input-group-btn">
--          <button class="btn btn-default"
--                  type="button"
--                  id="case-list-search-button">
--            <i class="fa fa-search" aria-hidden="true"></i>
--          </button>
--        </div>
-+        <button class="btn btn-outline-primary"
-+                type="button"
-+                id="case-list-search-button">
-+          <i class="fa fa-search" aria-hidden="true"></i>
-+        </button>
-       </div>
-     </div>
-     <% } %>
- 
-     <div id="module-case-list-container__results-container"
--         class="row row-no-gutters">
-+         class="row g-0">
-       <% if (showMap) { %>
-         <div id="module-case-list-map"
--             class="sticky sticky-map col-md-5 col-md-push-9<% if (useTiles) { %> white-border<% } %> noprint-sub-container"></div>
-+             class="sticky sticky-map col-lg-5 order-md-1<% if (useTiles) { %> white-border<% } %> noprint-sub-container"></div>
-       <% } %>
-       <div id="module-case-list" class="col-md<% if (showMap) { %>-7 col-md-pull-5<% } %>">
-         <% if (useTiles) { %>
-           <% if (hasNoItems) { %>
-             {% include 'cloudcare/partials/case_list/no_items_text.html' %}
-           <% } else { %>
--            {% include 'cloudcare/partials/case_list/bootstrap3/search_controls.html' %}
-+            {% include 'cloudcare/partials/case_list/bootstrap5/search_controls.html' %}
-           <% } %>
-           <section class="js-case-container clearfix list-cell-container-style"></section>
-         <% } else { %>
--          {% include 'cloudcare/partials/case_list/bootstrap3/table_container.html' %}
-+          {% include 'cloudcare/partials/case_list/bootstrap5/table_container.html' %}
-         <% } %>
-       </div>
-     </div>
-     <% if (actions || isMultiSelect) { %>
--      <div class="case-list-actions">
-+      <div class="case-list-actions d-grid gap-2 d-md-block">
-         <% if (isMultiSelect) { %>
--          {% include 'cloudcare/partials/case_list/bootstrap3/multi_select_continue_button.html' %}
-+          {% include 'cloudcare/partials/case_list/bootstrap5/multi_select_continue_button.html' %}
-         <% } %>
-         <% if (actions) { %>
-           <% _.each(actions, function(action, index) { %>
-             <div class="case-list-action-button btn-group formplayer-request">
--              <button type="button" class="btn btn-default btn-lg " data-index="<%- index %>"><%- action.text %></button>
-+              <button type="button" class="btn btn-outline-primary btn-lg " data-index="<%- index %>"><%- action.text %></button>
-             </div>
-           <% }) %>
-         <% } %>
-@@ -72,7 +71,7 @@
- 
-     <% if (!hasNoItems) { %>
-       {% block pagination_templates %}
--        {% include 'cloudcare/partials/bootstrap3/pagination.html' %}
-+        {% include 'cloudcare/partials/bootstrap5/pagination.html' %}
-       {% endblock %}
-     <% } %>
-   </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/menu_header.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/menu_header.html.diff.txt
deleted file mode 100644
index bb98bd9c5d59..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/menu_header.html.diff.txt
+++ /dev/null
@@ -1,32 +0,0 @@
---- 
-+++ 
-@@ -2,24 +2,24 @@
- {% load i18n %}
- 
- <div class="page-header menu-header clearfix" id="case-list-menu-header">
--  <div class="pull-right">
-+  <div class="float-end">
-     <% if (showMap) { %>
--      <button id="hide-map-button" class="btn btn-primary pull-right" type="button"
-+      <button id="hide-map-button" class="btn btn-primary float-end" type="button"
-          aria-expanded="true" aria-controls="module-case-list-map">
-         {% trans "Hide Map" %}
-       </button>
-     <% } %>
-     <% if (sidebarEnabled) { %>
--      <button id="search-more" class="btn btn-primary visible-xs visible-sm pull-right" type="button"
--        data-toggle="collapse" data-target="#sidebar-region" aria-expanded="false" aria-controls="sidebar-region">
-+      <button id="search-more" class="btn btn-primary d-xs-block d-sm-block d-md-none float-end" type="button"
-+        data-bs-toggle="collapse" data-bs-target="#sidebar-region" aria-expanded="false" aria-controls="sidebar-region">
-         {% trans "Refine search" %}
-       </button>
-     <% } %>
-   </div>
-   <% if (title.length > 0) { %>
--    <h1  aria-label="<%- title %>" tabindex="0" class="page-title"><%- title %></h1>
-+    <h1 aria-label="<%- title %>" tabindex="0" class="page-title d-none d-md-block"><%- title %></h1>
-   <% } %>
-   <% if (sidebarEnabled && description.length > 0) { %>
-     <div aria-label="<%- description %>" tabindex="0" class="query-description"><%= description %></div>
-   <% } %>
--</div>+</div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/multi_select_continue_button.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/multi_select_continue_button.html.diff.txt
deleted file mode 100644
index e52559c84e5c..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/multi_select_continue_button.html.diff.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- 
-+++ 
-@@ -1,11 +1,13 @@
- {% load i18n %}
- <button type="button" class="btn btn-success btn-lg formplayer-request multi-select-continue-btn" disabled="true">
--  <% if (selectText && selectText.length > 0) { %>
--    <%- selectText %>
-+  <span class="align-middle">
-+    <% if (selectText && selectText.length > 0) { %>
-+      <%- selectText %>
-     <% } else { %>
-       {% trans "Continue" %}
-     <% } %>
--  <span id="multi-select-btn-text" class="badge">
-+  </span>
-+  <span id="multi-select-btn-text" class="badge rounded-pill bg-light text-dark">
-     <%- selectedCaseIds.length %>
-   </span>
- </button>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/search_controls.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/search_controls.html.diff.txt
deleted file mode 100644
index ec44e9bbc185..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/search_controls.html.diff.txt
+++ /dev/null
@@ -1,29 +0,0 @@
---- 
-+++ 
-@@ -4,21 +4,21 @@
- <div id="case-list-search-controls">
-   <div>
-     <% if (isMultiSelect) { %>
--      <input type="checkbox" id="select-all-tile-checkbox"/>
--      <label id="select-all-tile-checkbox-label" for="select-all-tile-checkbox">{% trans "Select All" %}</label>
-+      <input type="checkbox" id="select-all-tile-checkbox" class="form-check-input" />
-+      <label id="select-all-tile-checkbox-label" for="select-all-tile-checkbox" class="mt-2 clickable">{% trans "Select All" %}</label>
-     <% } %>
-   </div>
-   <div class="dropdown">
--    <button class="btn" id="case-list-sort-by-btn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-+    <button class="btn" id="case-list-sort-by-btn" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-       <span> {% trans "Sort By" %} </span><i class="fa fa-sort" aria-hidden="true"></i>
-     </button>
-     <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="case-list-sort-by">
-       <%  _.each(sortOptions, function(sortOption) { %>
--        <li tabindex="0" class="header-clickable formplayer-request" data-id="<%- sortOption.index %>" role="menuitem">
-+        <li tabindex="0" class="header-clickable formplayer-request dropdown-item" data-id="<%- sortOption.index %>" role="menuitem">
-           <a>
-             <%= sortOption.header %>
-             <% if (sortOption.sortOrder) { %>
--              <i class="fa fa-arrow-<%= sortOption.sortOrder === 'V' ? 'down' : 'up' %> pull-right"></i>
-+              <i class="fa fa-arrow-<%= sortOption.sortOrder === 'V' ? 'down' : 'up' %> float-end"></i>
-             <% } %>
-           </a>
-         </li>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/table_container.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/table_container.html.diff.txt
deleted file mode 100644
index faba9cb2437c..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/table_container.html.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -7,7 +7,7 @@
-     <thead>
-       <tr>
-         <% if (isMultiSelect && !hasNoItems) { %>
--          <th class="module-case-list-header"><input type="checkbox" id="select-all-checkbox"/></th>
-+          <th class="module-case-list-header"><input type="checkbox" id="select-all-checkbox" class="form-check-input" /></th>
-         <% } %>
-         <%  _.each(headers, function(header, index) { %>
-           <% if (columnVisible(index)) { %>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/tile_grouped_item.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/tile_grouped_item.html.diff.txt
deleted file mode 100644
index febc8a2f5220..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/tile_grouped_item.html.diff.txt
+++ /dev/null
@@ -1,49 +0,0 @@
---- 
-+++ 
-@@ -1,7 +1,7 @@
- <script type="text/template" id="case-tile-grouped-view-item-template">
-   <% if (isMultiSelect) { %>
-     <div class="select-row-checkbox-div">
--      <input type="checkbox" class="select-row-checkbox"/>
-+      <input type="checkbox" class="select-row-checkbox form-check-input" />
-     </div>
-   <% } %>
- 
-@@ -12,16 +12,16 @@
-           <% if (styles[index].displayFormat === 'ClickableIcon') {
-           if(resolveUri(datum)) { %>
-             <button class="clickable-icon">
--              <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>" style="max-width:100%; max-height:100%;"/>
--              <i class="fa fa-spin fa-spinner" style="display:none"></i>
-+              <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>" />
-+              <i class="fa fa-spin fa-spinner" style="display:none"></i>  {# todo B5: inline style #}
-             </button>
-           <% } %>
-           <% } else if (styles[index].displayFormat === 'Image') {
-           if(resolveUri(datum)) { %>
--            <img alt="<%- altText[index] %>" class="module-icon" style="max-width:100%; max-height:100%;" src="<%- resolveUri(datum) %>"/>
-+            <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
-           <% } %>
-           <% } else if(styles[index].widthHint === 0) { %>
--            <div style="display:none;"><%- datum %></div>
-+            <div style="display:none;"><%- datum %></div>  {# todo B5: inline style #}
-           <% } else { %>
-             <div class="webapp-markdown-output"><%= renderMarkdown(datum) %></div>
-           <% } %>
-@@ -37,13 +37,13 @@
-             <div class="<%- prefix %>-grid-style-<%- index %> box">
-               <% if (styles[index].displayFormat === 'Image') {
-                 if(resolveUri(datum)) { %>
--                  <img alt="<%- altText[index] %>" class="module-icon" style="max-width:100%; max-height:100%;" src="<%- resolveUri(datum) %>"/>
-+                  <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
-                 <% } %>
-               <% } else if (styles[index].displayFormat === 'ClickableIcon') {
-                 if(resolveUri(datum)) { %>
-                   <button class="clickable-icon">
--                    <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>" style="max-width:100%; max-height:100%;"/>
--                    <i class="fa fa-spin fa-spinner" style="display:none"></i>
-+                    <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>" />
-+                    <i class="fa fa-spin fa-spinner" style="display:none"></i>  {# todo B5: inline style #}
-                   </button>
-                 <% } %>
-               <% } else { %>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/tile_item.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/tile_item.html.diff.txt
deleted file mode 100644
index 3fcb4ff09257..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/case_list/tile_item.html.diff.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- 
-+++ 
-@@ -1,7 +1,7 @@
- <script type="text/template" id="case-tile-view-item-template">
-     <% if (isMultiSelect) { %>
-       <div class="select-row-checkbox-div">
--        <input type="checkbox" class="select-row-checkbox"/>
-+        <input type="checkbox" class="select-row-checkbox form-check-input" />
-       </div>
-     <% } %>
- 
-@@ -16,11 +16,11 @@
-       if(resolveUri(datum)) { %>
-         <button class="clickable-icon">
-           <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
--          <i class="fa fa-spin fa-spinner" style="display:none"></i>
-+          <i class="fa fa-spin fa-spinner" style="display:none"></i>  {# todo B5: inline style #}
-         </button>
-       <% } %>
-       <% } else if(styles[index].widthHint === 0) { %>
--        <div style="display:none;"><%- datum %></div>
-+        <div style="display:none;"><%- datum %></div>  {# todo B5: inline style #}
-       <% } else { %>
-         <div class="webapp-markdown-output"><%= renderMarkdown(datum) %></div>
-       <% } %>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/confirmation_modal.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/confirmation_modal.html.diff.txt
deleted file mode 100644
index 15c2a22f2419..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/confirmation_modal.html.diff.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---- 
-+++ 
-@@ -1,9 +1,11 @@
-+{% load hq_shared_tags %}
-+
- <div id="js-confirmation-modal" class="modal fade module-modal" role="dialog" tabindex='-1'>
-   <div class="modal-dialog">
-     <div class="modal-content">
-       <div class="modal-header">
--        <button type="button" class="close" data-dismiss="modal">&times;</button>
--        <h3 class="js-modal-title modal-title"></h3>
-+        <h4 class="js-modal-title modal-title"></h4>
-+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
-       </div>
-       <div class="js-modal-body modal-body">
-       </div>
-@@ -11,11 +13,11 @@
-         <button type="button"
-                 class="btn btn-primary btn-lg"
-                 id="js-confirmation-confirm"
--                data-dismiss="modal"></button>
-+                data-bs-dismiss="modal"></button>
-         <button type="button"
--                class="btn btn-default btn-lg"
-+                class="btn btn-outline-primary btn-lg"
-                 id="js-confirmation-cancel"
--                data-dismiss="modal"></button>
-+                data-bs-dismiss="modal"></button>
-       </div>
-     </div>
-   </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/debugger.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/debugger.html.diff.txt
deleted file mode 100644
index 24f992e9fa26..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/debugger.html.diff.txt
+++ /dev/null
@@ -1,249 +0,0 @@
---- 
-+++ 
-@@ -10,70 +10,72 @@
-         }
-         ">
-     <!-- Tab title -->
--    <button class="btn-block debugger-tab-title" tabindex="0"
-+    <div class="debugger-tab-title clickable" tabindex="0"
-       data-bind="click: toggleState,
-         attr: {'aria-label': isMinimized() ? expandAriaLabel : collapseAriaLabel}">
-       <span class="sr-only">{% trans "Expand Data Preview Section." %}</span>
--      <i class="fa-solid fa-xmark pull-right"></i>
--      <div class="pull-left">
--        <i class="fa fa-table"></i>
--        <span class="debugger-title">{% trans "Data Preview" %}</span>
--      </div>
--    </button>
-+      <i class="fa-solid fa-xmark float-end"></i>
-+      <i class="fa fa-table"></i>
-+      <span class="debugger-title">{% trans "Data Preview" %}</span>
-+    </div>
- 
-     <!-- Debugger content -->
-     <div data-bind="visible: !isMinimized()" class="debugger-container">
-       <!-- navigation tabs -->
- 
--      <nav class="navbar navbar-default debugger-navbar">
-+      <nav class="navbar navbar-expand-md debugger-navbar">
-         <div class="container-fluid">
- 
--          <div class="navbar-header">
--            <button
--              type="button"
--              class="navbar-toggle collapsed"
--              data-toggle="collapse"
--              data-target="#debugger-navbar-collapse" aria-expanded="false">
--              <span class="sr-only">Toggle navigation</span>
--              <i class="fa fa-bars"></i> Menu
--            </button>
--          </div>
-+          <!-- Toggler shown on small screens -->
-+          <button
-+            type="button"
-+            class="navbar-toggler"
-+            data-bs-toggle="collapse"
-+            data-bs-target="#debugger-navbar-collapse"
-+            aria-expanded="false"
-+            aria-label="{% trans_html_attr "Toggle navigation" %}"
-+            aria-controls="debugger-navbar-collapse">
-+              <i class="navbar-toggler-icon"></i>
-+          </button>
- 
-           <!-- Tab links -->
-           <div class="collapse navbar-collapse" id="debugger-navbar-collapse">
-             <ul class="nav navbar-nav" data-bind="foreach: registeredTabIds">
--              <li role="presentation" data-bind="css: { active: $index() === 0 }">
-+              <li class="nav-item" role="presentation">
-                 <a
-+                  class="nav-link"
-                   role="tab"
--                  data-toggle="tab"
-+                  data-bs-toggle="tab"
-                   data-bind="
--                                attr: {
--                                    id: $parent.tabs[$data].id,
--                                    href: '#' + $parent.tabs[$data].tab,
--                                },
--                                text: $parent.tabs[$data].label,
--                                click: $parent.collapseNavbar,
--                            ">
-+                    attr: {
-+                      id: $parent.tabs[$data].id,
-+                      href: '#' + $parent.tabs[$data].tab,
-+                    },
-+                    css: { active: $index() === 0 },
-+                    text: $parent.tabs[$data].label,
-+                    click: $parent.collapseNavbar,
-+                  ">
-                 </a>
-               </li>
-             </ul>
-           </div><!-- /.navbar-collapse -->
-+
-         </div><!-- /.container-fluid -->
-       </nav>
- 
-       <!-- tab content -->
-       <div class="tab-content debugger-content" data-bind="foreach: registeredTabIds">
-         <div role="tabpanel" class="tab-pane" id="debugger-form-data"
--             data-bind="
--                        attr: {
--                            id: $parent.tabs[$data].tab
--                        },
--                        css: { active: $index() === 0 }
--                    ">
-+          data-bind="
-+            attr: {
-+              id: $parent.tabs[$data].tab
-+            },
-+            css: { active: $index() === 0 }
-+        ">
-           <div data-bind="template: {
--                        name: $parent.tabs[$data].tabTemplate,
--                        data: $parent
--                    }"></div>
-+            name: $parent.tabs[$data].tabTemplate,
-+            data: $parent
-+          }"></div>
-         </div>
-       </div>
-     </div>
-@@ -98,7 +100,7 @@
-   <!--ko if: xPathQuery.isSuccessTruncated() && options.showInFull-->
-   <div>
-     <em>{% trans "Showing the first" %} <span data-bind="text: xPathQuery.getMaxLines()"/> {% trans "lines..." %}</em>
--    <a class="clickable pull-right" data-clipboard-action="copy" data-bind="clipboardButton: xPathQuery.getFullSuccessResult()">
-+    <a class="clickable float-end" data-clipboard-action="copy" data-bind="clipboardButton: xPathQuery.getFullSuccessResult()">
-       {% trans "Copy Full Evaluation to Clipboard" %}
-     </a>
-   </div>
-@@ -111,7 +113,7 @@
-   <!--ko if: xPathQuery.isTraceTruncated() && options.showInFull-->
-   <div>
-     <em>{% trans "Showing the first" %} <span data-bind="text: xPathQuery.getMaxLines()"/> {% trans "lines..." %}</em>
--    <a class="clickable pull-right" data-clipboard-action="copy" data-bind="clipboardButton: xPathQuery.getFullTraceResult()">
-+    <a class="clickable float-end" data-clipboard-action="copy" data-bind="clipboardButton: xPathQuery.getFullTraceResult()">
-       {% trans "Copy Full Trace to Clipboard" %}
-     </a>
-   </div>
-@@ -128,41 +130,37 @@
- 
- <script type="text/html" id="debugger-evaluate-template">
-   <!--ko with: evalXPath-->
--  <form class="form-horizontal" data-bind="submit: onSubmitXPath">
--    <div class="col-sm-12">
--      <div class="form-group">
--                <textarea
--                  id="xpath"
--                  class="form-control vertical-resize debugger-code at-who-input"
--                  name="xpath"
--                  placeholder="XPath Expression"
--                  autocomplete="off"
--                  spellcheck=false
--                  data-bind="value: xpath, event: { mouseup: onMouseUp }" ></textarea>
-+  <form data-bind="submit: onSubmitXPath">
-+    <div class="mb-3">
-+      <textarea
-+        id="xpath"
-+        class="form-control vertical-resize debugger-code at-who-input"
-+        name="xpath"
-+        placeholder="{% trans_html_attr "XPath Expression" %}"
-+        autocomplete="off"
-+        spellcheck=false
-+        data-bind="value: xpath, event: { mouseup: onMouseUp }" ></textarea>
-+    </div>
-+    <div class="mb-3">
-+      <input class="btn btn-primary" id="evaluate-button" value="Evaluate" type="submit"/>
-+      <input
-+        class="btn btn-outline-primary"
-+        value="Evaluate Selection"
-+        type="button"
-+        data-bind="css: { disabled: !selectedXPath() }, click: onClickSelectedXPath"/>
-+      <div class="col-md-3 float-end">
-+        <select class="form-control" data-bind="value: selectedDebugOption, options: debugTraceOptions, optionsText: 'label'"></select>
-       </div>
-     </div>
--    <div class="col-sm-12">
--      <div class="form-group">
--        <input class="btn btn-primary" id="evaluate-button" value="Evaluate" type="submit"/>
--        <input
--          class="btn btn-default"
--          value="Evaluate Selection"
--          type="button"
--          data-bind="css: { disabled: !selectedXPath() }, click: onClickSelectedXPath"/>
--        <div class="col-sm-3 pull-right">
--          <select class="form-control" data-bind="value: selectedDebugOption, options: debugTraceOptions, optionsText: 'label'"></select>
--        </div>
--      </div>
--    </div>
--    <div class="col-sm-12" data-bind="template: {
--            name: 'debugger-evaluate-result-template',
--            data: {xPathQuery: xPathQuery(), options: {showInFull: true}},
--            if: xPathQuery()
--        }">
-+    <div class="mb-3" data-bind="template: {
-+      name: 'debugger-evaluate-result-template',
-+      data: {xPathQuery: xPathQuery(), options: {showInFull: true}},
-+      if: xPathQuery()
-+    }">
-     </div>
-   </form>
-   <div class="row">
--    <div class="col-sm-12">
-+    <div class="col-md-12">
-       <h4>{% trans "Recent Queries" %}</h4>
-     </div>
-   </div>
-@@ -170,35 +168,31 @@
-   <div class="table-responsive">
-     <table class="table table-striped table-hover">
-       <tbody data-bind="foreach: recentXPathQueries">
--      <tr class="query-container" data-bind="click: $parent.onClickSavedQuery">
--        <td class="col-sm-1 query-status">
--                        <span><i class="fa" data-bind="
--                            css: {
--                                'fa-check': success(),
--                                'fa-times': !success(),
--                                'text-success': success(),
--                                'text-danger': !success()
--                            }
--                        "></i></span>
-+      <tr class="clickable" data-bind="click: $parent.onClickSavedQuery">
-+        <td class="col-md-1 query-status">
-+          <span><i class="fa" data-bind="
-+            css: {
-+              'fa-check': success(),
-+              'fa-times': !success(),
-+              'text-success': success(),
-+              'text-danger': !success(),
-+            }
-+          "></i></span>
-         </td>
--        <td class="col-sm-8 debugger-code">
-+        <td class="col-md-8 debugger-code">
-           <span data-bind="text: xpath"></span>
-         </td>
--        <td class="col-sm-3" data-bind="template: {
--                        name: 'debugger-evaluate-result-template',
--                        data: {xPathQuery: $data, options: {showInFull: false}}
--                    }"></td>
-+        <td class="col-md-3" data-bind="template: {
-+          name: 'debugger-evaluate-result-template',
-+          data: {xPathQuery: $data, options: {showInFull: false}}
-+        }"></td>
-       </tr>
-       </tbody>
-     </table>
-   </div>
-   <!-- /ko -->
-   <!-- ko ifnot: recentXPathQueries().length -->
--  <div class="row">
--    <div class="col-sm-12">
--      <i>{% trans "No recent queries" %}</i>
--    </div>
--  </div>
-+    <p>{% trans "No recent queries" %}</p>
-   <!-- /ko -->
-   <!--/ko-->
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_button.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_button.html.diff.txt
deleted file mode 100644
index 9b9feeb3d99f..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_button.html.diff.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- 
-+++ 
-@@ -1,5 +1,5 @@
- <script type="text/html" id="button-entry-ko-template">
--  <button class="btn btn-default" data-bind="click: onClick, attr: {id: entryId}">
-+  <button class="btn btn-outline-primary" data-bind="click: onClick, attr: {id: entryId}">
-     <span data-bind="renderMarkdown: buttonLabel()"></span>
-   </button>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_choice_label.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_choice_label.html.diff.txt
deleted file mode 100644
index 9404b4059138..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_choice_label.html.diff.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- 
-+++ 
-@@ -12,6 +12,7 @@
-                     id: 'group-' + $parent.entryId + '-choice-' + $index(),
-                     'aria-labelledby': $parent.entryId + '-choice-' + $index() + '-sr',
-                     name: $parent.entryId,
-+                    css: { 'is-invalid': $root.hasError() },
-                     class: 'group-' + $parent.entryId,
-                 }
-             "/>
-@@ -21,7 +22,7 @@
-     <!-- /ko -->
-     <!-- ko if: hideLabel -->
-       <div data-bind="attr: { 'class': colStyle }">
--        <button class="btn btn-default btn-xs" data-bind="click: onClear, fadeVisible: rawAnswer()">
-+        <button class="btn btn-outline-primary btn-sm" data-bind="click: onClear, fadeVisible: rawAnswer()">
-           {% trans "Clear" %}
-         </button>
-       </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_date.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_date.html.diff.txt
deleted file mode 100644
index 011455d640cb..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_date.html.diff.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- 
-+++ 
-@@ -1,7 +1,10 @@
- <script type="text/html" id="date-entry-ko-template">
-   <div class="input-group">
-     <input type="text" class="form-control"
--      data-bind="attr: {id: entryId, 'aria-required': $parent.required() ? 'true' : 'false'}"/>
--    <span class="input-group-addon"><i class="fa-solid fa-calendar-days"></i></span>
-+      data-bind="
-+        css: { 'is-invalid': $parent.hasError() },
-+        attr: {id: entryId, 'aria-required': $parent.required() ? 'true' : 'false'},
-+      "/>
-+    <span class="input-group-text"><i class="fa-solid fa-calendar-days"></i></span>
-   </div>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_datetime.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_datetime.html.diff.txt
deleted file mode 100644
index 4479dd32bbb6..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_datetime.html.diff.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- 
-+++ 
-@@ -1,6 +1,9 @@
- <script type="text/html" id="datetime-entry-ko-template">
-   <div class="input-group">
--    <input type="text" class="form-control" data-bind="attr: { id: entryId, 'aria-required': $parent.required() ? 'true' : 'false' }"/>
--    <span class="input-group-addon"><i class="fcc fcc-fd-datetime"></i></span>
-+    <input type="text" class="form-control" data-bind="
-+      css: { 'is-invalid': $parent.hasError() },
-+      attr: { id: entryId, 'aria-required': $parent.required() ? 'true' : 'false' },
-+    "/>
-+    <span class="input-group-text"><i class="fcc fcc-fd-datetime"></i></span>
-   </div>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_dropdown.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_dropdown.html.diff.txt
deleted file mode 100644
index 3198cd1668db..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_dropdown.html.diff.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- 
-+++ 
-@@ -2,6 +2,7 @@
-   <select class="form-control" data-bind="
-         foreach: options,
-         value: rawAnswer,
-+        css: { 'is-invalid': $parent.hasError() },
-         attr: {
-             id: entryId,
-             'aria-required': $parent.required() ? 'true' : 'false',
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_ethiopian_date.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_ethiopian_date.html.diff.txt
deleted file mode 100644
index 2e86da4bd28c..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_ethiopian_date.html.diff.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- 
-+++ 
-@@ -1,6 +1,9 @@
- <script type="text/html" id="ethiopian-date-entry-ko-template">
-   <div class="input-group">
--    <input type="text" class="form-control" autocomplete="off" data-bind="attr: { id: entryId, 'aria-required': $parent.required() ? 'true' : 'false' }"/>
--    <span class="input-group-addon"><i class="fa-solid fa-calendar-days"></i></span>
-+    <input type="text" class="form-control" autocomplete="off" data-bind="
-+      css: { 'is-invalid': $parent.hasError() },
-+      attr: { id: entryId, 'aria-required': $parent.required() ? 'true' : 'false' },
-+    "/>
-+    <span class="input-group-text"><i class="fa-solid fa-calendar-days"></i></span>
-   </div>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_file.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_file.html.diff.txt
deleted file mode 100644
index d2111190b14a..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_file.html.diff.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- 
-+++ 
-@@ -2,9 +2,10 @@
- 
- <script type="text/html" id="file-entry-ko-template">
-   <div class="row">
--    <div class="col-xs-8">
-+    <div class="col-sm-8">
-       <input type="file" data-bind="
-             value: $data.rawAnswer,
-+            css: { 'is-invalid': $parent.hasError() },
-             attr: {
-                 id: entryId,
-                 'aria-required': $parent.required() ? 'true' : 'false',
-@@ -12,8 +13,8 @@
-             },
-         "/>
-     </div>
--    <div class="col-xs-4">
--      <button class="btn btn-default btn-xs pull-right" data-bind="
-+    <div class="col-sm-4">
-+      <button class="btn btn-outline-primary btn-sm float-end" data-bind="
-         click: onClear,
-         text: $root.getTranslation('upload.clear.title', '{% trans_html_attr 'Clear' %}'),
-       ">
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_geo.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_geo.html.diff.txt
deleted file mode 100644
index 9384cf8f91f5..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_geo.html.diff.txt
+++ /dev/null
@@ -1,33 +0,0 @@
---- 
-+++ 
-@@ -7,7 +7,7 @@
-       <td class="lat coordinate" data-bind="text: formatLat()"></td>
-       <td class="lon coordinate" data-bind="text: formatLon()"></td>
-       <td align="right" valign="bottom">
--        <button class="btn btn-default btn-xs clear" data-bind="click: onClear">{% trans "Clear map" %}</button>
-+        <button class="btn btn-outline-primary btn-sm clear" data-bind="click: onClear">{% trans "Clear map" %}</button>
-       </td>
-     </tr>
-     </tbody>
-@@ -21,14 +21,13 @@
-   </div>
-   <div>
-     <form data-bind="submit: search">
--      <div class="form-group">
--        <div class="controls" data-bind="css: control_width">
--          <div class="input-group">
--            <input class="query form-control" type="text" />
--            <span class="input-group-btn">
--              <button class="btn btn-default search">{% trans "Search" %}</button>
--            </span>
--          </div>
-+      <div class="mt-1" data-bind="css: control_width">
-+        <div class="input-group">
-+          <input class="query form-control"
-+                 type="text"
-+                 data-bind="css: { 'is-invalid': $parent.hasError() }"
-+          />
-+          <button class="btn btn-outline-primary search">{% trans "Search" %}</button>
-         </div>
-       </div>
-     </form>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_multidropdown.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_multidropdown.html.diff.txt
deleted file mode 100644
index 7f00f9430d01..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_multidropdown.html.diff.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- 
-+++ 
-@@ -2,6 +2,7 @@
-   <select multiple class="form-control" data-bind="
-         options: choices,
-         selectedOptions: rawAnswer,
-+        css: { 'is-invalid': $parent.hasError() },
-         attr: {
-             id: entryId,
-             'aria-required': $parent.required() ? 'true' : 'false',
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_password.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_password.html.diff.txt
deleted file mode 100644
index 50ba667815b1..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_password.html.diff.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- 
-+++ 
-@@ -2,6 +2,7 @@
-   <input type="password" class="form-control" data-bind="
-         value: $data.rawAnswer,
-         valueUpdate: valueUpdate,
-+        css: { 'is-invalid': $parent.hasError() },
-         attr: {
-           id: entryId,
-           'aria-required': $parent.required() ? 'true' : 'false',
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_select.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_select.html.diff.txt
deleted file mode 100644
index 7a6ed62e4aa7..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_select.html.diff.txt
+++ /dev/null
@@ -1,43 +0,0 @@
---- 
-+++ 
-@@ -5,24 +5,24 @@
-   <legend class="sr-only" data-bind="text: question.caption()"></legend>
-     <div class="sel clear">
-       <div data-bind="foreach: choices, as: 'choice'">
--        <div data-bind="css: { checkbox: $parent.isMulti, radio: !$parent.isMulti }, class: $parent.colStyleIfHideLabel">
--          <label>
--              <input data-bind="
--                          checked: $parent.rawAnswer,
--                          checkedValue: $data,
--                          attr: {
--                              id: 'group-' + $parent.entryId + '-choice-' + $index(),
--                              type: $parent.isMulti ? 'checkbox' : 'radio',
--                              name: $parent.entryId,
--                              class: 'group-' + $parent.entryId,
--                          },
--                      "/>
--              <span data-bind="renderMarkdown: $data, class: $parent.hideLabel ? 'sr-only' : ''"></span>
--          </label>
--          </div>
-+        <div class="form-check" data-bind="css: { checkbox: $parent.isMulti, radio: !$parent.isMulti }, class: $parent.colStyleIfHideLabel">
-+          <input data-bind="
-+                      checked: $parent.rawAnswer,
-+                      checkedValue: $data,
-+                      css: { 'is-invalid': $root.hasError() },
-+                      attr: {
-+                          id: 'group-' + $parent.entryId + '-choice-' + $index(),
-+                          type: $parent.isMulti ? 'checkbox' : 'radio',
-+                          name: $parent.entryId,
-+                          class: 'group-' + $parent.entryId + ' form-check-input',
-+                      },
-+                  "/>
-+          <label class="form-check-label"
-+                 data-bind="renderMarkdown: $data, class: $parent.hideLabel ? 'sr-only' : '', attr: {'for': 'group-' + $parent.entryId + '-choice-' + $index(),}"
-+          ></label>
-         </div>
-       </div>
--      <button class="btn btn-default btn-xs pull-right" data-bind="click: onClear, fadeVisible: !isMulti && rawAnswer()">
-+      <button class="btn btn-outline-primary btn-sm float-end" data-bind="click: onClear, fadeVisible: !isMulti && rawAnswer()">
-         {% trans "Clear" %}
-       </button>
-     </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_signature.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_signature.html.diff.txt
deleted file mode 100644
index f620e401f34f..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_signature.html.diff.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- 
-+++ 
-@@ -3,18 +3,19 @@
- <script type="text/html" id="signature-entry-ko-template">
-   <div data-bind="attr: { id: entryId + '-wrapper' }">
-     <canvas data-bind="
-+        css: { 'is-invalid': $parent.hasError() },
-         attr: {
-             id: entryId + '-canvas',
-             'aria-required': $parent.required() ? 'true' : 'false',
-         },
-       "
--      style="border: 1px solid #ccc; border-radius: 4px;"/>
-+      class="border rounded" />
-     </canvas>
-   </div>
--  <button class="btn btn-default btn-xs pull-right" data-bind="click: onClear">
-+  <button class="btn btn-outline-primary btn-sm float-end" data-bind="click: onClear">
-     {% trans "Clear" %}
-   </button>
--  <input type="file" class="hidden" data-bind="
-+  <input type="file" class="d-none" data-bind="
-       value: $data.rawAnswer,
-       attr: {
-           id: entryId,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_str.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_str.html.diff.txt
deleted file mode 100644
index 09fc00b6b56d..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_str.html.diff.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- 
-+++ 
-@@ -2,6 +2,7 @@
-   <input autocomplete="off" type="text" class="form-control" data-bind="
-         value: $data.rawAnswer,
-         valueUpdate: valueUpdate,
-+        css: { 'is-invalid': $parent.hasError() },
-         attr: {
-             maxlength: lengthLimit,
-             id: entryId,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_text.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_text.html.diff.txt
deleted file mode 100644
index a0ee19da7863..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_text.html.diff.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- 
-+++ 
-@@ -2,6 +2,7 @@
-   <textarea class="textfield form-control vertical-resize" data-bind="
-         value: $data.rawAnswer,
-         valueUpdate: valueUpdate,
-+        css: { 'is-invalid': $parent.hasError() },
-         attr: {
-             placeholder: placeholderText,
-             maxlength: lengthLimit,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_time.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_time.html.diff.txt
deleted file mode 100644
index 5729b7f54c3b..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_time.html.diff.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- 
-+++ 
-@@ -1,6 +1,9 @@
- <script type="text/html" id="time-entry-ko-template">
-   <div class="input-group">
--    <input type="text" class="form-control" data-bind="attr: { id: entryId, 'aria-required': $parent.required() ? 'true' : 'false' }"/>
--    <span class="input-group-addon"><i class="fa-regular fa-clock"></i></span>
-+    <input type="text" class="form-control" data-bind="
-+      attr: { id: entryId, 'aria-required': $parent.required() ? 'true' : 'false' },
-+      css: { 'is-invalid': $parent.hasError() },
-+    "/>
-+    <span class="input-group-text"><i class="fa-regular fa-clock"></i></span>
-   </div>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_unsupported.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_unsupported.html.diff.txt
deleted file mode 100644
index 1f79467f14f8..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/entry_unsupported.html.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -19,7 +19,7 @@
-           <input type="text" class="form-control" data-bind="value: $data.answer" />
-         </div>
-         <div class="modal-footer">
--          <button class="btn btn-default" data-dismiss="modal">{% trans "OK" %}</button>
-+          <button class="btn btn-outline-primary" data-bs-dismiss="modal">{% trans "OK" %}</button>
-         </div>
-       </div>
-     </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/form.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/form.html.diff.txt
deleted file mode 100644
index 60b5cdeb18ed..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/form.html.diff.txt
+++ /dev/null
@@ -1,38 +0,0 @@
---- 
-+++ 
-@@ -17,11 +17,11 @@
- 
-     <form class="form form-horizontal" data-bind="submit: submitForm">
-       <div class="question-container">
--        <div data-bind="template: { name: childTemplate, foreach: $data.children }"/>
-+        <div class="mb-3" data-bind="template: { name: childTemplate, foreach: $data.children }"/>
-       </div>
-       {% if environment == "web-apps" %}
-         <div class="row" data-bind="visible: erroredQuestions().length > 0">
--          <div class="col-sm-12 alert alert-danger">
-+          <div class="col-md-12 alert alert-danger">
-             {% blocktrans %}
-               Please correct the answers below before submitting.
-               <br>
-@@ -42,7 +42,7 @@
-           </div>
-         </div>
-       {% endif %}
--      <div id="submit-button" class="form-actions form-group noprint-sub-container"
-+      <div id="submit-button" class="form-actions noprint-sub-container"
-            data-bind="
-               visible: showSubmitButton,
-               css: { 'sticky-submit': isAnchoredSubmitStyle },
-@@ -64,9 +64,9 @@
-     </form>
-   </div>
-   <div data-bind="visible: erroredQuestions().length > 0">
--    <div id="scroll-bottom" class="btn btn-danger" style="position: fixed; bottom: 35px" title="{% trans_html_attr "Jump between required/errored questions" %}" data-bind="click: jumpToErrors">
--      <i class='fa fa-fast-forward'> </i>
--          {% trans "Next Error" %}
-+    <div id="next-error" class="btn btn-outline-danger" title="{% trans_html_attr "Jump between required/errored questions" %}" data-bind="click: jumpToErrors">
-+      <i class='fa fa-fast-forward'></i>
-+      {% trans "Next Error" %}
-     </div>
-   </div>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/grouped_element_tile_row.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/grouped_element_tile_row.html.diff.txt
deleted file mode 100644
index b09821b06086..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/grouped_element_tile_row.html.diff.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- 
-+++ 
-@@ -1,5 +1,3 @@
- <script type="text/html" id="grouped-element-tile-row-fullform-ko-template">
--  <div class="row">
--    <div data-bind="template: { name: childTemplate, foreach: $data.children }" class="question-tile-row"/>
--  </div>
-+  <div data-bind="template: { name: childTemplate, foreach: $data.children }" class="question-tile-row"/>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/help_multimedia.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/help_multimedia.html.diff.txt
deleted file mode 100644
index c4fe692b291a..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/help_multimedia.html.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -1,7 +1,7 @@
- {% load i18n %}
- 
- <script type="text/html" id="widget-help-multimedia-ko-template">
--  <img class="img-responsive" data-bind="
-+  <img class="img-fluid" data-bind="
-       attr: { src: mediaSrc($data.help_image()) },
-       visible: mediaSrc($data.help_image())" />
-   <audio controls="controls" data-bind="
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/multimedia.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/multimedia.html.diff.txt
deleted file mode 100644
index 7d2d95657910..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/multimedia.html.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -1,7 +1,7 @@
- {% load i18n %}
- 
- <script type="text/html" id="widget-multimedia-ko-template">
--  <img class="img-responsive" data-bind="
-+  <img class="img-fluid" data-bind="
-          attr: { src: mediaSrc($data.caption_image()) },
-          visible: mediaSrc($data.caption_image())
-          " />
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/question.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/question.html.diff.txt
deleted file mode 100644
index 39d572098d43..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/question.html.diff.txt
+++ /dev/null
@@ -1,110 +0,0 @@
---- 
-+++ 
-@@ -3,14 +3,14 @@
- <script type="text/html" id="question-fullform-ko-template">
-   <div data-bind="class:questionTileWidth">
-   <!-- ko if: !isLabel && !isButton -->
--  <div class="q form-group" data-bind="
-+  <div class="q row" data-bind="
-             css: {
-                 error: error,
-                 required: $data.required,
-                 on: $root.forceRequiredVisible,
-             }
-         ">
--    <label class="caption control-label" data-bind="
-+    <label class="caption form-label" data-bind="
-       css: labelWidth,
-       attr: {
-         id: entry.entryId + '-label',
-@@ -19,16 +19,12 @@
-       visible: hasLabelContent">
-       {# appearance attributes TEXT_ALIGN_CENTER TEXT_ALIGN_RIGHT #}
-       <div data-bind="css: {
--          'row': help(),
-           'text-center': stylesContains('text-align-center'),
--          'text-right': stylesContains('text-align-right'),
-+          'text-end': stylesContains('text-align-right'),
-         }">
--        <span class="webapp-markdown-output" data-bind="
--            html: ko.utils.unwrapObservable($data.caption_markdown) || caption(),
--            css: {'col-md-11' : help()}"></span>
-         <!-- ko if: help() -->
-         <a
--          class="help-text-trigger col-md-1"
-+          class="help-text-trigger float-end ms-3 mb-1"
-           role="button"
-           href="javascript:void(0)"
-           title="{% trans 'Show help dialog' %}"
-@@ -45,12 +41,13 @@
-                     } "></div>
-               </div>
-               <div class="modal-footer">
--                <button class="btn btn-default help-modal-close" data-dismiss="modal">{% trans "Close" %}</button>
-+                <button class="btn btn-outline-primary help-modal-close" data-bs-dismiss="modal">{% trans "Close" %}</button>
-               </div>
-             </div>
-           </div>
-         </div>
-         <!-- /ko -->
-+        <span class="webapp-markdown-output" data-bind="html: ko.utils.unwrapObservable($data.caption_markdown) || caption()"></span>
-       </div>
-       <span class="hint-text" data-bind="
-               text: ko.utils.unwrapObservable($data.hint),
-@@ -62,9 +59,8 @@
-     </label>
-     <div class="widget-container controls" data-bind="css: controlWidth">
-       <div class="widget" data-bind="
--                template: { name: entryTemplate, data: entry, afterRender: afterRender },
--                css: { 'has-error': hasError }
--            ">
-+        template: { name: entryTemplate, data: entry, afterRender: afterRender },
-+      ">
-       </div>
-       <div class="widget-multimedia" data-bind="
-                 template: { name: 'widget-multimedia-ko-template', data: $data }"
-@@ -89,12 +85,11 @@
-                     }">{% trans 'Sorry, this response is required!' %}</div>
-   <!-- /ko -->
-   <!-- ko if: isLabel -->
--  <div class="form-group">
-     {# appearance attributes TEXT_ALIGN_CENTER TEXT_ALIGN_RIGHT #}
--    <div class="info col-sm-12" data-bind="
-+    <div class="info" data-bind="
-         css: {
-             'text-center': stylesContains('text-align-center'),
--            'text-right': stylesContains('text-align-right'),
-+            'text-end': stylesContains('text-align-right'),
-         },
-         attr: {
-             id: entry.entryId + '-label',
-@@ -116,20 +111,18 @@
-           "></div>
-       </div>
-     </div>
--  </div>
-   <!-- /ko -->
-   <!-- ko if: isButton -->
-   {# appearance attributes TEXT_ALIGN_CENTER TEXT_ALIGN_RIGHT #}
--  <div class="q form-group" data-bind="
--    css: {
--      error: error,
--      'text-center': stylesContains('text-align-center'),
--      'text-right': stylesContains('text-align-right')
--    }">
--    <div class="widget-container controls col-sm-12">
--      <div class="widget" data-bind="
--        template: { name: entryTemplate, data: entry, afterRender: afterRender },
--        css: { 'has-error': hasError }
-+    <div class="q row" data-bind="
-+      css: {
-+        error: error,
-+        'text-center': stylesContains('text-align-center'),
-+        'text-end': stylesContains('text-align-right')
-+      }">
-+      <div class="widget-container controls col-md-12">
-+        <div class="widget" data-bind="
-+          template: { name: entryTemplate, data: entry, afterRender: afterRender },
-         "></div>
-       </div>
-     </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/repeat_juncture.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/repeat_juncture.html.diff.txt
deleted file mode 100644
index 8a3ee4890e3f..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/repeat_juncture.html.diff.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---- 
-+++ 
-@@ -3,22 +3,22 @@
- 
- <script type="text/html" id="repeat-juncture-fullform-ko-template">
-   <div data-bind="class: elementTile">
--    <div class="panel panel-default rep">
--      <div class="panel-heading" data-bind="style: {
-+    <div class="card rep">
-+      <div class="card-header" data-bind="style: {
-           'background-color': headerBackgroundColor(),
-           'color': headerBackgroundColor() ? 'white' : '',
-         }">
--        <h3 class="caption" data-bind="html: header"></h3>
-+        <div class="caption fs-3" data-bind="html: header"></div>
-         <span class="ix" data-bind="text: ixInfo($data)"></span>
-       </div>
--      <div class="panel-body">
-+      <div class="card-body">
-         <div class="children" data-bind="template: { name: childTemplate, foreach: $data.children }"></div>
-         <div class="alert alert-info empty" data-bind="visible: !children().length">
-           {% trans "This repeatable group is empty" %}
-         </div>
-       </div>
--      <div class="panel-footer">
--        <button class="btn btn-default add" href="#"
-+      <div class="card-footer">
-+        <button class="btn btn-outline-primary add" href="#"
-                 data-bind="click: newRepeat"
-                 id="repeat-add-new">
-                 <i class="fa fa-plus"></i>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/sub_group.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/sub_group.html.diff.txt
deleted file mode 100644
index 71e3a8f2445b..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/sub_group.html.diff.txt
+++ /dev/null
@@ -1,49 +0,0 @@
---- 
-+++ 
-@@ -7,7 +7,7 @@
-         css: {
-           'gr-no-children': $data.children().length === 0,
-           'gr-has-no-nested-questions': !$data.hasAnyNestedQuestions(),
--          'panel panel-default': collapsible,
-+          'card': collapsible,
-           'repetition': isRepetition,
-           'required-group': !showChildren() && childrenRequired(),
-           'stripe-repeats': stripeRepeats,
-@@ -15,7 +15,7 @@
-         }">
-     <fieldset class="gr-header" data-bind="
-         css: {
--          'panel-heading': collapsible,
-+          'card-header': collapsible,
-            clickable: collapsible
-         },
-         attr: collapsible ? {
-@@ -39,7 +39,7 @@
-                 data-bind="
-                   html: ko.utils.unwrapObservable($data.caption_markdown) || caption(),
-                 "></span>
--          <button class="btn btn-danger del pull-right" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
-+          <button class="btn btn-outline-danger del float-end" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
-                   data-bind="
-                       visible: showDelete,
-                       enabled: hasNoPendingAnswer(),
-@@ -55,8 +55,8 @@
-             "></i>
-           </div>
-           <span class="webapp-markdown-output caption" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
--          <i class="fa fa-warning text-danger pull-right" data-bind="visible: hasError() && !showChildren()"></i>
--           <button class="btn btn-danger del pull-right" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
-+          <i class="fa fa-warning text-danger float-end" data-bind="visible: hasError() && !showChildren()"></i>
-+           <button class="btn btn-outline-danger del float-end" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
-                   data-bind="
-                       visible: showDelete,
-                       enabled: hasNoPendingAnswer(),
-@@ -77,7 +77,7 @@
-                 afterRender: focusNewRepeat,
-               },
-               css: {
--                'panel-body': collapsible,
-+                'card-body': collapsible,
-                 'group-body': !collapsible,
-                 'stripe-repeats': stripeRepeats,
-               }"></div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/grid.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/grid.html.diff.txt
deleted file mode 100644
index 708e630e7323..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/grid.html.diff.txt
+++ /dev/null
@@ -1,42 +0,0 @@
---- 
-+++ 
-@@ -7,11 +7,8 @@
-   </div>
- 
-   <div class="row">
--    <div class="js-application-container">
--
--    </div>
-     <% if (shouldShowIncompleteForms) { %>
--    <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-+    <div class="order-1 grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
-       <div class="js-incomplete-sessions-item appicon appicon-incomplete" role="link" tabindex="0" aria-labelledby="grid-template-incomplete-forms-heading">
-         <i class="ff ff-incomplete-bg appicon-icon appicon-icon-bg" aria-hidden="true"></i>
-         <i class="ff ff-incomplete-fg appicon-icon appicon-icon-fg" aria-hidden="true"></i>
-@@ -23,7 +20,7 @@
-     <% } %>
- 
-     {% if not request|toggle_enabled:"HIDE_SYNC_BUTTON" %}
--    <div class=" grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-+    <div class="order-2 grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
-       <div class="js-sync-item appicon appicon-sync" role="link" tabindex="0" aria-labelledby="grid-template-sync-heading">
-         <i class="ff ff-sync appicon-icon" aria-hidden="true"></i>
-         <div class="appicon-title">
-@@ -34,7 +31,7 @@
-     {% endif %}
- 
-     {% if request|can_use_restore_as %}
--      <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-+      <div class="order-3 grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
-         <div class="js-restore-as-item appicon appicon-restore-as" role="link" tabindex="0" aria-labelledby="grid-template-login-as-heading">
-           <i class="fa fa-user appicon-icon" aria-hidden="true"></i>
-           <div class="appicon-title">
-@@ -43,7 +40,7 @@
-         </div>
-       </div>
-     {% endif %}
--    <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-+    <div class="order-4 grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
-       <div class="js-settings appicon appicon-settings" role="link" tabindex="0" aria-labelledby="grid-template-settings-heading">
-         <i class="fa-solid fa-gear appicon-icon" aria-hidden="true"></i>
-         <div class="appicon-title">
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/landing_page_app.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/landing_page_app.html.diff.txt
deleted file mode 100644
index 3f95d5d6020f..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/landing_page_app.html.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -1,7 +1,7 @@
- <script id="landing-page-app-template" type="text/template">
-   <div class="container">
-     <div class="spacer"></div>
--    <div class="col-xs-6 col-sm-4 col-xs-offset-3 col-sm-offset-4">
-+    <div class="col-sm-6 col-md-4 offset-sm-3 offset-md-4">
-       <div class="appicon appicon-default js-start-app" role="link" tabindex="0" aria-label="<%- appName %>">
-         <% if (!imageUrl) { %>
-           <i class="fcc fcc-flower appicon-icon" aria-hidden="true"></i>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/row.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/row.html.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/single_app.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/single_app.html.diff.txt
deleted file mode 100644
index b5edd5f68edb..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/grid_view/single_app.html.diff.txt
+++ /dev/null
@@ -1,53 +0,0 @@
---- 
-+++ 
-@@ -3,11 +3,11 @@
- 
- <script id="single-app-template" type="text/template">
-   <ol class="breadcrumb">
--    <li class="breadcrumb-text"><%- appName %></li>
-+    <li class="breadcrumb-item"><%- appName %></li>
-   </ol>
-   <div class="container container-appicons">
--    <div class="row">
--      <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-+    <div class="row row-cols-2">
-+      <div class="grid-item col formplayer-request">
-         <div class="js-start-app appicon appicon-start" role="link" tabindex="0" aria-labelledby="single-app-start-heading">
-           <i class="ff ff-start-bg appicon-icon appicon-icon-bg" aria-hidden="true"></i>
-           <i class="ff ff-start-fg appicon-icon appicon-icon-fg" aria-hidden="true"></i>
-@@ -17,7 +17,7 @@
-         </div>
-       </div>
-       <% if (shouldShowIncompleteForms()) { %>
--      <div class=" grid-item col-xs-6 col-sm-4 formplayer-request">
-+      <div class="grid-item col formplayer-request">
-         <div class="js-incomplete-sessions-item appicon appicon-incomplete" role="link" tabindex="0" aria-labelledby="single-app-incomplete-forms-heading">
-           <i class="ff ff-incomplete-bg appicon-icon appicon-icon-bg" aria-hidden="true"></i>
-           <i class="ff ff-incomplete-fg appicon-icon appicon-icon-fg" aria-hidden="true"></i>
-@@ -27,7 +27,7 @@
-         </div>
-       </div>
-       <% } %>
--      <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-+      <div class="grid-item col formplayer-request">
-         <div class="js-sync-item appicon appicon-sync" role="link" tabindex="0" aria-labelledby="single-app-sync-heading">
-           <i class="ff ff-sync appicon-icon" aria-hidden="true"></i>
-           <div class="appicon-title">
-@@ -36,7 +36,7 @@
-         </div>
-       </div>
-       {% if request|can_use_restore_as %}
--        <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-+        <div class="grid-item col formplayer-request">
-           <div class="js-restore-as-item appicon appicon-restore-as" role="link" tabindex="0" aria-labelledby="single-app-login-as-heading">
-             <i class="fa fa-user appicon-icon" aria-hidden="true"></i>
-             <div class="appicon-title">
-@@ -45,7 +45,7 @@
-           </div>
-         </div>
-       {% endif %}
--      <div class="grid-item col-xs-6 col-sm-4 col-lg-3 formplayer-request">
-+      <div class="grid-item col formplayer-request">
-         <div class="js-settings appicon appicon-settings" role="link" tabindex="0" aria-labelledby="single-app-settings-heading">
-           <i class="fa-solid fa-gear appicon-icon" aria-hidden="true"></i>
-           <div class="appicon-title">
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/audio.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/audio.html.diff.txt
deleted file mode 100644
index 7b9fe1dc002f..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/audio.html.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -18,7 +18,7 @@
-         <source src="<%- audioUrl %>" type="audio/mpeg">
-       </audio>
-       <div class="module-audio-control module-audio-play js-module-audio-play"><i class="fa fa-volume-up module-audio-icon js-module-audio-icon"></i></div>
--      <div class="module-audio-control module-audio-pause js-module-audio-pause hide"><i class="fa fa-pause module-audio-icon js-module-audio-icon"></i></div>
-+      <div class="module-audio-control module-audio-pause js-module-audio-pause d-none"><i class="fa fa-pause module-audio-icon js-module-audio-icon"></i></div>
-     </div>
-   </td>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/badge.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/badge.html.diff.txt
deleted file mode 100644
index 373dede076d9..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/badge.html.diff.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- 
-+++ 
-@@ -6,6 +6,6 @@
-   and is different from x === undefined.
-   */ %>
-   <% if (typeof badgeText !== 'undefined' && badgeText) { %>
--  <span class="badge"><%- badgeText %></span>
-+  <span class="badge rounded-pill"><%- badgeText %></span>
-   <% } %>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/breadcrumbs.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/breadcrumbs.html.diff.txt
deleted file mode 100644
index d4e365cb0942..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/breadcrumbs.html.diff.txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- 
-+++ 
-@@ -7,9 +7,11 @@
- <script type="text/template" id="breadcrumb-list-template">
-   <nav class="breadcrumb-nav" aria-label="Breadcrumb">
-     <ol class="breadcrumb">
--      <li class="js-home breadcrumb-text" role="link" tabindex="0">{% trans 'Home' %}</li>
-+      <li class="js-home breadcrumb-item" role="link" tabindex="0">
-+        {% trans 'Home' %}
-+      </li>
-     </ol>
--    <div class="pull-right dropdown dropdown-menu-right" id="breadcrumb__menu-dropdown">
-+    <div class="float-end dropdown dropdown-menu-right" id="breadcrumb__menu-dropdown">
-     </div>
-   </nav>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/dropdown.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/dropdown.html.diff.txt
deleted file mode 100644
index 1d31efd3c826..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/dropdown.html.diff.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---- 
-+++ 
-@@ -2,13 +2,17 @@
- 
- <script type="text/template" id="menu-dropdown-template">
-   <div class="btn-group" id="menu-dropdown">
--    <button class="btn btn-primary-dark dropdown-toggle" role="button"
--            data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-+    <button class="btn btn-dark dropdown-toggle" role="button"
-+            data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-       <i class="fa fa-bars"></i>
-       <span class="sr-only">{% trans 'Dropdown toggle' %}</span>
-     </button>
-     <ul class="dropdown-menu dropdown-menu-right noprint-sub-container" aria-label="Dropdown">
--      <li tabindex="0" class="dropdown-header print-button">{% trans "Print" %}</li>
-+      <li tabindex="0" class="print-button">
-+        <a href="#" class="dropdown-item">
-+          {% trans "Print" %}
-+        </a>
-+      </li>
-       <% if (languageOptionsEnabled) { %>
-       <li><hr class="dropdown-divider"></li>
-       <li class="dropdown-header">{% trans "Languages" %}</li>
-@@ -19,6 +23,6 @@
- 
- <script type="text/template" id="language-option-template">
-   <% if (languageOptionsEnabled) { %>
--  <a tabindex="0" class="lang" id="<%- lang_code %>"><%- lang_label %></a>
-+  <a tabindex="0" class="lang dropdown-item" id="<%- lang_code %>"><%- lang_label %></a>
-   <% } %>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/grid.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/grid.html.diff.txt
deleted file mode 100644
index 9ce80751f9c6..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/grid.html.diff.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- 
-+++ 
-@@ -1,10 +1,10 @@
- <script type="text/template" id="menu-view-grid-template">
-   <div class="module-menu-container">
--    <div class="page-header menu-header">
-+    <div class="page-header menu-header d-none d-md-block">
-       <h1 class="page-title"><%- title %></h1>
-     </div>
-     <div class="<% if (isAppPreview) { %>container<% } %>">
--      <div class="row menus-container"></div>
-+      <div class="row menus-container<% if (isAppPreview) { %> row-cols-2<% } %>"></div>
-     </div>
-   </div>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/grid_item.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/grid_item.html.diff.txt
deleted file mode 100644
index 169d827a0fe2..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/grid_item.html.diff.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- 
-+++ 
-@@ -1,5 +1,5 @@
- <script type="text/template" id="menu-view-grid-item-template">
--  <div class="col-xs-6 col-sm-4 col-md-3">
-+  <div class="col-sm-6 col-md-4 col-lg-3">
-     <% if (imageUrl) { %>
-     <div class="gridicon badge-container" style="background-image: url('<%- imageUrl %>');">
-       <%= _.template($('#maybe-custom-badge-template').text())(arguments[0]) %>{# maybe-custom-badge-template output is already escaped #}
-@@ -19,12 +19,12 @@
-     </div>
-   </div>
-   <% if (menuIndex % 2 === 1) { %>
--  <div class="clearfix visible-xs"></div>
-+  <div class="clearfix d-xs-block"></div>
-   <% } %>
-   <% if (menuIndex % 3 === 2) { %>
--  <div class="clearfix visible-sm"></div>
-+  <div class="clearfix d-sm-block"></div>
-   <% } %>
-   <% if (menuIndex % 4 === 3) { %>
--  <div class="clearfix visible-md visible-lg"></div>
-+  <div class="clearfix d-md-block d-lg-block"></div>
-   <% } %>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/list.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/list.html.diff.txt
deleted file mode 100644
index 523790e99f86..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/menu/list.html.diff.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- 
-+++ 
-@@ -1,6 +1,6 @@
- <script type="text/template" id="menu-view-list-template">
-   <div class="module-menu-container">
--    <div class="page-header menu-header">
-+    <div class="page-header menu-header d-none d-md-block">
-       <h1 class="page-title"><%- title %></h1>
-     </div>
-     <table class="table module-table">
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/new_app_version_modal.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/new_app_version_modal.html.diff.txt
deleted file mode 100644
index 3bac171abc2d..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/new_app_version_modal.html.diff.txt
+++ /dev/null
@@ -1,38 +0,0 @@
---- 
-+++ 
-@@ -1,11 +1,12 @@
-+{% load hq_shared_tags %}
- {% load i18n %}
- 
--<div class="modal fade" id ="newAppVersionModal" tabindex="-1" role="dialog">
-+<div class="modal fade" id="newAppVersionModal" aria-labelledby=="newAppVersionModalTitle" tabindex="-1" role="dialog">
-     <div class="modal-dialog" role="document">
-       <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">{% trans "A new version of this app is available" %}</h4>
-+          <h4 class="modal-title" id="newAppVersionModalTitle">{% trans "A new version of this app is available" %}</h4>
-+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
-         </div>
-         <div class="modal-body">
-           <p>
-@@ -13,7 +14,7 @@
-               CommCare recommends that you get the latest version of this app.
-             {% endblocktrans %}
-           <p>
--          <div id="incompleteFormWarning" style="display: none;">
-+          <div id="incompleteFormWarning" class="d-none">
-               <p> {% trans "To keep any unsaved changes -" %} </p>
-               <ol>
-                 <li>{% trans 'Click on “Update Later”.' %}</li>
-@@ -28,9 +29,9 @@
-           </div>
-         </div>
-         <div class="modal-footer">
--          <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Update Later" %}</button>
-+          <button type="button" class="btn btn-outline-primary" data-bs-dismiss="modal">{% trans "Update Later" %}</button>
-           <button id="refreshApp" type="button" class="btn btn-primary">{% trans "Get Latest App" %}</button>
-         </div>
-       </div>
-     </div>
--  </div>+  </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/pagination.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/pagination.html.diff.txt
deleted file mode 100644
index 90a728ff1efa..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/pagination.html.diff.txt
+++ /dev/null
@@ -1,212 +0,0 @@
---- 
-+++ 
-@@ -1,105 +1,119 @@
- {% load i18n %}
- {% load hq_shared_tags %}
--
--
- 
- {% block pagination_templates %}
-   <% if (showPagination) { %>
-     <div class="container pagination-container">
--      <div class="row">
--        <div class="col-xs-6 col-sm-3 module-per-page-container">
--          <div class="form-inline input-group-lg">
--            <select class="form-control per-page-limit">
--              <% for(var i = 0; i < rowRange.length; i++) { %>
--                <% if (rowRange[i] === limit) { %>
--                  <option value="<%- rowRange[i] %>" selected>{% trans "<%- rowRange[i] %> per page" %}</option>
--                <% } else { %>
--                  <option value="<%- rowRange[i] %>">{% trans "<%- rowRange[i] %> per page" %}</option>
--                <% } %>
-+      <div class="d-flex justify-content-between flex-wrap">
-+        <div class="module-per-page-container mb-2">
-+          <select class="form-control form-control-lg per-page-limit">
-+            <% for(var i = 0; i < rowRange.length; i++) { %>
-+              <% if (rowRange[i] === limit) { %>
-+                <option value="<%- rowRange[i] %>" selected>{% trans "<%- rowRange[i] %> per page" %}</option>
-+              <% } else { %>
-+                <option value="<%- rowRange[i] %>">{% trans "<%- rowRange[i] %> per page" %}</option>
-               <% } %>
--            </select>
--          </div>
-+            <% } %>
-+          </select>
-         </div>
-         <% if (pageCount > 1) { %>
--          <div class="col-xs-6 col-sm-3 col-sm-push-6 module-go-container">
-+          <ul class="pagination pagination-lg mb-2">
-+            <!-- Render Previous button -->
-+            <% if (currentPage > 0) { %>
-+              <li class="page-item">
-+                <a class="page-link js-page" aria-label='{% trans_html_attr "First Page" %}' tabindex="0" data-id="0">
-+                  <span><i class="fa fa-fast-backward"></i></span>
-+                </a>
-+              </li>
-+              <li>
-+                <a class="page-link js-page" aria-label='{% trans_html_attr "Previous" %}' tabindex="0" data-id="<%- currentPage - 1 %>">
-+                  <span><i class="fa fa-caret-left"></i></span>
-+                </a>
-+              </li>
-+            <% } else { %>
-+              <li class="page-item paginate-disabled">
-+                <a class="page-link js-page" data-id="0">
-+                  <span><i class="fa fa-fast-backward"></i></span>
-+                </a>
-+              </li>
-+              <li>
-+                <a class="page-link js-page" data-id="<%- currentPage - 1 %>">
-+                  <span><i class="fa fa-caret-left"></i></span>
-+                </a>
-+              </li>
-+            <% } %>
-+            <!-- Render page buttons -->
-+            <% if (pageCount <= 5) { %>
-+                <% for (i = startPage-1; i < endPage; i++) { %>
-+                  <li class="page-item js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i %>">
-+                    <a class="page-link" aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current ='page'<% } %> tabindex="0"><%- i + 1 %></a>
-+                  </li>
-+                <% } %>
-+            <% } else { %>
-+              <% if (startPage <= 3) { %>
-+                <% for (i = 0; i < startPage; i++) { %>
-+                  <li class="page-item js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i %>">
-+                    <a class="page-link" aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current='page'<% } %> tabindex="0"><%- i + 1 %></a>
-+                  </li>
-+                <% } %>
-+              <% } else { %>
-+                  <li class="page-item js-page" data-id="0">
-+                    <a class="page-link" aria-label="<%- pageNumLabel({num: 1}) %>" tabindex="0">{% trans "1" %}</a>
-+                  </li>
-+                  <li class="page-item js-page">
-+                    <a class="page-link paginate-disabled">{% trans "..." %}</a>
-+                  </li>
-+              <% } %>
-+              <% for (i = startPage; i < endPage; i++) { %>
-+                <li class="page-item js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i %>">
-+                  <a class="page-link" aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current='page'<% } %> tabindex="0"><%- i + 1 %></a>
-+                </li>
-+              <% } %>
-+              <% if (endPage >= pageCount - 2) { %>
-+                <% for (i = endPage+1; i <= pageCount; i++) { %>
-+                  <li class="page-item js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i - 1 %>">
-+                    <a class="page-link" aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current='page'<% } %> tabindex="0"><%- i %></a>
-+                  </li>
-+                <% } %>
-+              <% } else { %>
-+                <li class="page-item js-page">
-+                  <a class="page-link paginate-disabled">{% trans "..." %}</a>
-+                </li>
-+                <li class="page-item js-page" data-id="<%- pageCount - 1 %>">
-+                  <a class="page-link" aria-label="<%- pageNumLabel({num: pageCount}) %>" tabindex="0"><%- pageCount %></a>
-+                </li>
-+              <% } %>
-+            <% } %>
-+            <!-- Render Next buttons -->
-+            <% if (currentPage >= pageCount - 1) { %>
-+              <li class="page-item paginate-disabled">
-+                <a class="page-link js-page" data-id="<%- currentPage + 1 %>">
-+                  <span><i class="fa fa-caret-right"></i></span>
-+                </a>
-+              </li>
-+              <li>
-+                <a class="page-link js-page" data-id="<%- pageCount - 1 %>">
-+                  <span><i class="fa fa-fast-forward"></i></span>
-+                </a>
-+              </li>
-+            <% } else { %>
-+              <li class="page-item">
-+                <a class="page-link js-page" aria-label='{% trans_html_attr "Next" %}' tabindex="0" data-id="<%- currentPage + 1 %>">
-+                  <span><i class="fa fa-caret-right"></i></span>
-+                </a>
-+              </li>
-+              <li class="page-item">
-+                <a class="page-link js-page" aria-label='{% trans_html_attr "Last Page" %}' tabindex="0" data-id="<%- pageCount - 1 %>">
-+                  <span><i class="fa fa-fast-forward"></i></span>
-+                </a>
-+              </li>
-+            <% } %>
-+          </ul>
-+          <div class="module-go-container mb-2">
-             <div class="input-group input-group-lg">
-               <input type="text" class="form-control" placeholder='{% trans_html_attr "Go to page" %}' id="goText">
--              <div class="input-group-btn">
--                <button class="btn btn-default" type="button" id="pagination-go-button">{% trans "Go" %}</button>
--              </div>
-+              <button class="btn btn-outline-primary" type="button" id="pagination-go-button">{% trans "Go" %}</button>
-             </div>
--          </div>
--          <div class="col-xs-12 col-sm-6 col-sm-pull-3 text-center">
--            <nav class="module-pagination-container">
--              <ul class="pagination">
--                <!-- Render Previous button -->
--                <% if (currentPage > 0) { %>
--                  <li>
--                    <a class="js-page" aria-label='{% trans_html_attr "First Page" %}' tabindex="0" data-id="0">
--                    <span><i class="fa fa-fast-backward"></i></span>
--                  </a>
--                  <a class="js-page" aria-label='{% trans_html_attr "Previous" %}' tabindex="0" data-id="<%- currentPage - 1 %>">
--                    <span><i class="fa fa-caret-left"></i></span>
--                  </a>
--                  </li>
--                <% } else { %>
--                  <li class="paginate-disabled">
--                  <a class="js-page" data-id="0">
--                    <span><i class="fa fa-fast-backward"></i></span>
--                  </a>
--                  <a class="js-page" data-id="<%- currentPage - 1 %>">
--                    <span><i class="fa fa-caret-left"></i></span>
--                  </a>
--                  </li>
--                <% } %>
--                <!-- Render page buttons -->
--                <% if (pageCount <= 5) { %>
--                    <% for (i = startPage-1; i < endPage; i++) { %>
--                      <li class="js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i %>"><a aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current ='page'<% } %> tabindex="0"><%- i + 1 %></a></li>
--                    <% } %>
--                <% } else { %>
--                  <% if (startPage <= 3) { %>
--                    <% for (i = 0; i < startPage; i++) { %>
--                      <li class="js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i %>"><a aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current='page'<% } %> tabindex="0"><%- i + 1 %></a></li>
--                    <% } %>
--                  <% } else { %>
--                      <li class="js-page" data-id="0"><a aria-label="<%- pageNumLabel({num: 1}) %>" tabindex="0">{% trans "1" %}</a></li>
--                      <li class="js-page"><a class="paginate-disabled">{% trans "..." %}</a></li>
--                  <% } %>
--                  <% for (i = startPage; i < endPage; i++) { %>
--                    <li class="js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i %>"><a aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current='page'<% } %> tabindex="0"><%- i + 1 %></a></li>
--                  <% } %>
--                  <% if (endPage >= pageCount - 2) { %>
--                    <% for (i = endPage+1; i <= pageCount; i++) { %>
--                      <li class="js-page<% if (i === currentPage) { %> active<% } %>" data-id="<%- i - 1 %>"><a aria-label="<%- pageNumLabel({num: i + 1}) %>" <% if (i === currentPage ) { %> aria-current='page'<% } %> tabindex="0"><%- i %></a></li>
--                    <% } %>
--                  <% } else { %>
--                    <li class="js-page"><a class="paginate-disabled">{% trans "..." %}</a></li>
--                    <li class="js-page" data-id="<%- pageCount - 1 %>"><a aria-label="<%- pageNumLabel({num: pageCount}) %>" tabindex="0"><%- pageCount %></a></li>
--                  <% } %>
--                <% } %>
--                <!-- Render Next buttons -->
--                <% if (currentPage >= pageCount - 1) { %>
--                  <li class="paginate-disabled">
--                    <a class="js-page" data-id="<%- currentPage + 1 %>">
--                    <span><i class="fa fa-caret-right"></i></span>
--                  </a>
--                  <a class="js-page" data-id="<%- pageCount - 1 %>">
--                    <span><i class="fa fa-fast-forward"></i></span>
--                  </a>
--                  </li>
--                <% } else { %>
--                  <li>
--                  <a class="js-page" aria-label='{% trans_html_attr "Next" %}' tabindex="0" data-id="<%- currentPage + 1 %>">
--                    <span><i class="fa fa-caret-right"></i></span>
--                  </a>
--                  <a class="js-page" aria-label='{% trans_html_attr "Last Page" %}' tabindex="0" data-id="<%- pageCount - 1 %>">
--                    <span><i class="fa fa-fast-forward"></i></span>
--                  </a>
--                  </li>
--                <% } %>
--              </ul>
--            </nav>
-           </div>
-         <% } %>
-       </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/progress.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/progress.html.diff.txt
deleted file mode 100644
index d9636544f4dd..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/progress.html.diff.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- 
-+++ 
-@@ -6,13 +6,12 @@
-           <i class="fa fa-spinner fa-spin js-loading"></i>
-           <%- progressMessage %>
-         </h1>
--        <h2 class="subtext text-left js-subtext"><small></small></h2>
-+        <h2 class="subtext text-start js-subtext"><small></small></h2>
-       </div>
--      <div class="progress hide">
-+      <div class="progress d-none" role="progressbar">
-         <div
-           style="width: 0%"
--          class="js-progress-bar progress-bar progress-bar-striped active"
--          role="progressbar">
-+          class="js-progress-bar progress-bar progress-bar-striped active">
-         </div>
-       </div>
-     </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/group.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/group.html.diff.txt
deleted file mode 100644
index 12ba0b676e90..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/group.html.diff.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- 
-+++ 
-@@ -1,12 +1,12 @@
- <script type="text/template" id="query-view-group-template">
-   <td class="search-query-group">
-     <% if (named) { %>
--    <div class="search-query-group-header <% if (required) { %> required<% } %>" data-toggle="collapse" data-target="#group-<%- groupKey %>" aria-expanded="true" aria-controls="group-<%- groupKey %>">
--      <label class="search-query-group-header-label"><%= groupName %></label>
--      <i class="fa fa-angle-double-down pull-right" style="font-size: larger"></i>
-+    <div class="search-query-group-header <% if (required) { %> required<% } %>" data-bs-toggle="collapse" data-bs-target="#group-<%- groupKey %>" aria-expanded="true" aria-controls="group-<%- groupKey %>">
-+      <label class="search-query-group-header-label fw-bold"><%= groupName %></label>
-+      <i class="fa fa-angle-double-down float-end fs-5"></i>
-     </div>
-     <% } %>
--    <div id="group-<%- groupKey %>" class="in">
-+    <div id="group-<%- groupKey %>" class="show">
-       <table class="table table-hover" role="presentation">
-         <tbody id="query-group-content">
-         </tbody>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/item.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/item.html.diff.txt
deleted file mode 100644
index a2454c44a6ec..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/item.html.diff.txt
+++ /dev/null
@@ -1,88 +0,0 @@
---- 
-+++ 
-@@ -2,17 +2,17 @@
- {% load i18n %}
- 
- <script type="text/template" id="query-view-item-template">
-+  <% if (contentTag !== 'td') { %><td><% } %>
-   <<%- contentTag %>
-     class="<% if (contentTag === 'td') { %>col-sm-6 <% } %>query-caption
--           <% if (required) { %> required<% } %>
--           <% if (errorMessage) { %> has-error<% } %>">
-+           <% if (required) { %> required<% } %>">
-     <div class="d-flex justify-content-between">
--      <label class="control-label" for="<%- text ? text : "" %>">
-+      <label class="form-label fw-bold" for="<%- text ? text : "" %>">
-         <%- text ? text : "" %>
-       </label>
-       <% if (typeof hint !== "undefined" && hint !== null) { %>
--      <div class="hq-help">
--        <a href="#" tabindex="-1"  data-title="<%- text ? text : "" %>" data-content="<%- hint ? hint : "" %>">
-+      <div class="hq-help" data-bs-toggle="popover">
-+        <a href="#" tabindex="-1" title="<%- text ? text : "" %>" data-bs-content="<%- hint ? hint : "" %>">
-           <i class="fa fa-question-circle icon-question-sign"></i>
-         </a>
-       </div>
-@@ -20,8 +20,7 @@
-     </div>
-   </<%- contentTag %>>
-   <<%- contentTag %>
--    class="<% if (contentTag === 'td') { %>col-sm-6 <% } else { %>input-group-sm <% } %>query-input-group
--           <% if (errorMessage) { %> has-error<% } %>">
-+    class="<% if (contentTag === 'td') { %>col-sm-6 <% } else { %>input-group-sm <% } %>query-input-group">
- 
-     <% if (input == "select1") { %>
-     <select class="query-field form-control hqwebapp-select2" data-receive="<%- receive %>"<% if (required) { %> aria-required="true"<% } %>>
-@@ -49,7 +48,7 @@
-              class="date query-field form-control"
-              value="<%- value %>"
-              <% if (required) { %> aria-required="true"<% } %>>
--      <span class="input-group-addon"><i class="fa-solid fa-calendar-days"></i></span>
-+      <span class="input-group-text"><i class="fa-solid fa-calendar-days"></i></span>
-     </div>
- 
-     <% } else if (input === "daterange") { %>
-@@ -63,9 +62,13 @@
-     <fieldset multiple class="query-field" id="<%- text ? text : "" %>" <% if (required) { %> aria-required="true"<% } %>>
-       <legend class="sr-only"><%- text ? text : "" %></legend>
-       <% for (let key in itemsetChoicesDict) { %>
--      <div id="<%- text ? text : "checkbox" %>-<%- key %>" class="checkbox">
--        <label>
--          <input type="checkbox" value="<%- key %>" <% if (value && value.indexOf(String(key)) !== -1) { %>checked<% } %>>
-+      <div class="form-check">
-+        <input type="checkbox"
-+               value="<%- key %>"
-+               <% if (value && value.indexOf(String(key)) !== -1) { %>checked<% } %>
-+               id="<%- text ? text : "checkbox" %>-<%- key %>"
-+               class="form-check-input">
-+        <label class="form-check-label" for="<%- text ? text : "checkbox" %>-<%- key %>">
-           <%- itemsetChoicesDict[key] %>
-         </label>
-       </div>
-@@ -81,17 +84,20 @@
-     <% } else { %>
-     <input id="<%- text ? text : "" %>"
-            type="text"
--           class="query-field form-control"
-+           class="query-field form-control<% if (errorMessage) { %> is-invalid<% } %>"
-            value="<%- value %>"
-            data-receive="<%- receive %>"
-            <% if (required) { %> aria-required="true"<% } %>>
-            <% } %>
--           <% if (errorMessage) { %> <div class="help-block has-error"> <%- errorMessage || "" %> </div> <% } %>
-+           <% if (errorMessage) { %> <div class="invalid-feedback"> <%- errorMessage || "" %> </div> <% } %>
-            <% if (allow_blank_value) { %>
--            <label class="control-label">
--              <input type="checkbox" class="search-for-blank" <% if (searchForBlank) { %>checked<% } %>>
--              {% trans "Include results where '<%- text %>' is blank" %}
--            </label>
-+            <div class="form-check">
-+              <input type="checkbox" class="form-check-input search-for-blank" <% if (searchForBlank) { %>checked<% } %> id="<%- id %>_allow_blank">
-+              <label class="form-check-label" for="<%- id %>_allow_blank">
-+                {% trans "Include results where '<%- text %>' is blank" %}
-+              </label>
-+            </div>
-             <% } %>
-   </<%- contentTag %>>
-+  <% if (contentTag !== 'td') { %></td><% } %>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/list.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/list.html.diff.txt
deleted file mode 100644
index bca4d69ead51..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/query/list.html.diff.txt
+++ /dev/null
@@ -1,33 +0,0 @@
---- 
-+++ 
-@@ -3,12 +3,11 @@
- <script type="text/template" id="query-view-list-template">
-   <form>
-     <% if (sidebarEnabled) { %>
--      <button type="button" class="close visible-xs visible-sm" aria-label="{% trans "Close" %}"
--        data-toggle="collapse" data-target="#sidebar-region" aria-expanded="false" aria-controls="sidebar-region">
--        <span aria-hidden="true">&times;</span>
-+      <button type="button" class="btn-close d-xs-block d-sm-block d-md-none float-end" aria-label="{% trans "Close" %}"
-+        data-bs-toggle="collapse" data-bs-target="#sidebar-region" aria-expanded="false" aria-controls="sidebar-region">
-       </button>
-       <div class="query-button-container">
--        <button class="btn btn-default" type="button" id="query-clear-button">
-+        <button class="btn btn-outline-primary" type="button" id="query-clear-button">
-           <div>{% trans "Clear" %}</div>
-         </button>
-         <button class="btn btn-primary" type="submit" id="query-submit-button">
-@@ -24,12 +23,12 @@
-         <%= description %>
-       </div>
-     <% } %>
--    <table class="table table-hover <%= grouped ? '' : 'table-striped table-bordered' %>" role="presentation">
-+    <table class="table <%= grouped ? '' : 'table-striped table-bordered' %>" role="presentation">
-       <tbody id="query-properties">
-       </tbody>
-     </table>
-     <% if (!sidebarEnabled) {%>
--      <button class="btn btn-default" type="button" id="query-clear-button">
-+      <button class="btn btn-outline-primary" type="button" id="query-clear-button">
-         <div>{% trans "Clear" %}</div>
-       </button>
-       <button class="btn btn-primary" type="submit" id="query-submit-button">
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/sessions/list.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/sessions/list.html.diff.txt
deleted file mode 100644
index cdd3c1490684..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/sessions/list.html.diff.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---- 
-+++ 
-@@ -4,7 +4,9 @@
-   <% if(isPreviewEnv) { %>
-   <div class="breadcrumb-form-container">
-     <ol class="breadcrumb breadcrumb-form">
--      <li class="breadcrumb-text">{% trans "Incomplete Forms" %}</li>
-+      <li class="breadcrumb-item">
-+        {% trans "Incomplete Forms" %}
-+      </li>
-     </ol>
-   </div>
-   <% } else { %>
-@@ -19,7 +21,7 @@
-   <% } %>
-   <div class="module-menu-container module-menu-bar-offset">
-     <% if (!isPreviewEnv) { %>
--    <div class="page-header menu-header">
-+    <div class="page-header menu-header d-none d-md-block">
-       <h1 class="page-title">{% trans "Incomplete Forms" %}</h1>
-     </div>
-     <% } %>
-@@ -29,7 +31,7 @@
-     </table>
-     <% if (endPage) { %>
-       {% block pagination_templates %}
--        {% include 'cloudcare/partials/bootstrap3/pagination.html' %}
-+        {% include 'cloudcare/partials/bootstrap5/pagination.html' %}
-       {% endblock %}
-     <% } %>
-   </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/settings_view.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/settings_view.html.diff.txt
deleted file mode 100644
index e51fca156f91..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/settings_view.html.diff.txt
+++ /dev/null
@@ -1,47 +0,0 @@
---- 
-+++ 
-@@ -3,8 +3,8 @@
- 
- <script type="text/template" id="settings-template">
-   <div class="module-menu-container module-menu-bar-offset">
--    <div class="page-header menu-header">
--      <h1 class="page-title">Settings</h1>
-+    <div class="page-header menu-header d-none d-md-block">
-+      <h1 class="page-title">{% trans "Settings" %}</h1>
-     </div>
-     <table class="table module-table">
-       <tbody>
-@@ -18,8 +18,14 @@
-   </div>
- </script>
- <script type="text/template" id="display-setting-template">
--  <th>{% trans "Use one question per screen" %}</th>
--  <td><input class="js-one-question-per-screen" type="checkbox" data-size="mini" /></td>
-+  <th>
-+    <label class="form-check-label" for="oqps-switch">{% trans "Use one question per screen" %}</label>
-+  </th>
-+  <td>
-+    <div class="form-check form-switch">
-+      <input class="js-one-question-per-screen form-check-input" type="checkbox" id="oqps-switch"/>
-+    </div>
-+  </td>
- </script>
- <script type="text/template" id="lang-setting-template">
-   <th>{% trans "Set the application language" %}</th>
-@@ -35,13 +41,13 @@
- </script>
- <script type="text/template" id="clear-user-data-setting-template">
-   <th>{% trans "Clear user data" %}</th>
--  <td><button class="js-clear-user-data btn btn-sm btn-danger">{% trans "Clear" %}</button></td>
-+  <td><button class="js-clear-user-data btn btn-sm btn-outline-danger">{% trans "Clear" %}</button></td>
- </script>
- <script type="text/template" id="break-locks-setting-template">
-   <th>{% trans "Break Pending Request Locks" %}</th>
--  <td><button class="js-break-locks btn btn-sm btn-danger">{% trans "Break" %}</button></td>
-+  <td><button class="js-break-locks btn btn-sm btn-outline-danger">{% trans "Break" %}</button></td>
- </script>
- <script type="text/template" id="sync-setting-template">
-   <th>{% trans "Sync User Data" %}</th>
--  <td><button class="js-sync btn btn-sm btn-danger">{% trans "Sync" %}</button></td>
-+  <td><button class="js-sync btn btn-sm btn-outline-danger">{% trans "Sync" %}</button></td>
- </script>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/users/restore_as.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/users/restore_as.html.diff.txt
deleted file mode 100644
index 1e3b565f2cb7..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/users/restore_as.html.diff.txt
+++ /dev/null
@@ -1,33 +0,0 @@
---- 
-+++ 
-@@ -3,7 +3,7 @@
- 
- <script type="text/template" id="restore-as-view-template">
-   <div class="module-menu-container">
--    <div class="page-header menu-header">
-+    <div class="page-header menu-header d-none d-md-block">
-       <h1 class="page-title">{% trans "Log in as user" %}</h1>
-     </div>
-     <form class="module-search-container js-user-search">
-@@ -13,11 +13,9 @@
-           class="js-user-query form-control"
-           value="<%- query %>"
-           placeholder="{% trans_html_attr "Filter workers" %}" />
--        <div class="input-group-btn">
--          <button class="btn btn-default" type="submit">
-+          <button class="btn btn-outline-primary" type="submit">
-             <i class="fa fa-search" aria-hidden="true"></i>
-           </button>
--        </div>
-       </div>
-     </form>
-     <table class="table module-table">
-@@ -26,7 +24,7 @@
-     </table>
-     <% if (endPage) { %>
-       {% block pagination_templates %}
--        {% include 'cloudcare/partials/bootstrap3/pagination.html' %}
-+        {% include 'cloudcare/partials/bootstrap5/pagination.html' %}
-       {% endblock %}
-     <% } %>
-   </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/preview_app.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/preview_app.html.diff.txt
deleted file mode 100644
index 74df0307bad0..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/preview_app.html.diff.txt
+++ /dev/null
@@ -1,28 +0,0 @@
---- 
-+++ 
-@@ -1,13 +1,13 @@
--{% extends "cloudcare/bootstrap3/preview_app_base.html" %}
-+{% extends "cloudcare/bootstrap5/preview_app_base.html" %}
- {% load hq_shared_tags %}
- {% load compress %}
- 
- {% block css %}
-   {% compress css %}
--    <link type="text/less"
-+    <link type="text/scss"
-           rel="stylesheet"
-           media="all"
--          href="{% static 'preview_app/less/preview_app.less' %}"/>
-+          href="{% static 'preview_app/scss/preview_app.scss' %}"/>
-       <link type="text/css"
-             rel="stylesheet"
-             media="all"
-@@ -60,7 +60,7 @@
-     <div id="breadcrumb-region"></div>
-     <div class="scrollable-container dragscroll menu-scrollable-container">
-       <div id="menu-region" class="content menu-content"></div>
--      <small id="version-info"></small>
-+      <small id="version-info" class="m-2"></small>
-     </div>
-     <div class="scrollable-container dragscroll form-scrollable-container">
-       <section id="webforms" data-bind="
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/preview_app_base.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/preview_app_base.html.diff.txt
deleted file mode 100644
index df7b8e745ad8..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/preview_app_base.html.diff.txt
+++ /dev/null
@@ -1,99 +0,0 @@
---- 
-+++ 
-@@ -2,7 +2,7 @@
- {% load compress %}
- {% load statici18n %}
- 
--{% requirejs_main "cloudcare/js/preview_app/main" %}
-+{% requirejs_main_b5 "cloudcare/js/preview_app/main" %}
- 
- <!DOCTYPE html>
- <html lang="{{ LANGUAGE_CODE }}">
-@@ -12,16 +12,16 @@
-   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-   <meta name="HandheldFriendly" content="True">
- 
--  {% include 'hqwebapp/includes/bootstrap3/core_stylesheets.html' %}
-+  {% include 'hqwebapp/includes/bootstrap5/core_stylesheets.html' %}
-   {% compress css %}
--    <link type="text/less"
-+    <link type="text/scss"
-           rel="stylesheet"
-           media="all"
--          href="{% static 'cloudcare/less/font-formplayer.less' %}" />
--    <link type="text/less"
-+          href="{% static 'cloudcare/scss/font-formplayer.scss' %}" />
-+    <link type="text/scss"
-           rel="stylesheet"
-           media="all"
--          href="{% static 'cloudcare/less/formplayer-common.less' %}"/>
-+          href="{% static 'cloudcare/scss/formplayer-common.scss' %}"/>
-   {% endcompress %}
- 
-   {% if request.use_daterangepicker %}
-@@ -35,8 +35,6 @@
- 
-   {% block css %}{% endblock %}
- 
--  <link rel="stylesheet"
--        href="{% static 'bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css' %}"/>
-   <link type="text/css"
-         rel="stylesheet"
-         media="screen"
-@@ -45,6 +43,10 @@
-   <link rel="stylesheet" href="{% static 'nprogress/nprogress.css' %}">
-   <link rel="stylesheet" href="{% static 'jquery-ui-built-themes/base/jquery-ui.min.css' %}">
-   <link rel="stylesheet" href="{% static 'At.js/dist/css/jquery.atwho.min.css' %}">
-+  <link type="text/css"
-+        rel="stylesheet"
-+        media="screen"
-+        href="{% static "@eonasdan/tempus-dominus/dist/css/tempus-dominus.min.css" %}" />
- 
-   <script src="{% statici18n LANGUAGE_CODE %}"></script> {# DO NOT COMPRESS #}
- 
-@@ -55,14 +57,15 @@
- 
-   {# This is fine as an inline script; it'll be removed once form designer is migrated to RequireJS #}
-   <script>
-+    window.USE_BOOTSTRAP5 = true;
-     window.USE_REQUIREJS = true;
-   </script>
- </head>
- <body>
- {% block body %}{% endblock %}
- 
--{% include 'cloudcare/partials/bootstrap3/confirmation_modal.html' %}
--{% include 'cloudcare/partials/bootstrap3/all_templates.html' %}
-+{% include 'cloudcare/partials/bootstrap5/confirmation_modal.html' %}
-+{% include 'cloudcare/partials/bootstrap5/all_templates.html' %}
- 
- {% block js %}{{ block.super }}
-   {% include 'cloudcare/partials/dependencies.html' %}
-@@ -70,23 +73,23 @@
- 
- {% initial_page_data 'toggles_dict' toggles_dict %}
- {% initial_page_data 'previews_dict' previews_dict %}
--<div class="initial-page-data" class="hide">
-+<div class="initial-page-data" class="d-none">
-   {% block initial_page_data %}
-     {# do not override this block, use initial_page_data template tag to populate #}
-   {% endblock %}
- </div>
--<div class="commcarehq-urls" class="hide">
-+<div class="commcarehq-urls" class="d-none">
-   {% block registered_urls %}
-     {# do not override this block, use registerurl template tag to populate #}
-   {% endblock %}
- </div>
- {% include 'analytics/initial/all.html' %}
--<div class="initial-analytics-data hide">
-+<div class="initial-analytics-data d-none">
-   {% block initial_analytics_data %}
-     {# do not override this block, use initial_analytics_data template tag to populate #}
-   {% endblock %}
- </div>
--<div class="analytics-ab-tests hide">
-+<div class="analytics-ab-tests d-none">
-   {% block analytics_ab_test %}
-     {# do not override this block, use analytics_ab_test template tag to populate #}
-   {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/spec/form_entry/mocha.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/spec/form_entry/mocha.html.diff.txt
deleted file mode 100644
index 24922ccb8338..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/spec/form_entry/mocha.html.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -1,7 +1,7 @@
- {% extends "mocha/base.html" %}
- {% load hq_shared_tags %}
- 
--{% requirejs_main "cloudcare/js/form_entry/spec/main" %}
-+{% requirejs_main_b5 "cloudcare/js/form_entry/spec/main" %}
- 
- {% block stylesheets %}{{ block.super }}
-   <link type="text/css"
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/spec/mocha.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/spec/mocha.html.diff.txt
deleted file mode 100644
index 19cd7a0ff5c2..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/spec/mocha.html.diff.txt
+++ /dev/null
@@ -1,21 +0,0 @@
---- 
-+++ 
-@@ -1,7 +1,7 @@
- {% extends "mocha/base.html" %}
- {% load hq_shared_tags %}
- 
--{% requirejs_main "cloudcare/js/formplayer/spec/main" %}
-+{% requirejs_main_b5 "cloudcare/js/formplayer/spec/main" %}
- 
- {% block dependencies %}
-   {% include "cloudcare/partials/dependencies.html" %}
-@@ -15,7 +15,7 @@
-   <div id="menu-region" class="container"></div>
-   <div id="sidebar-region" class="container"></div>
- 
--  {% include 'cloudcare/partials/bootstrap3/confirmation_modal.html' %}
--  {% include 'cloudcare/partials/bootstrap3/all_templates.html' %}
-+  {% include 'cloudcare/partials/bootstrap5/confirmation_modal.html' %}
-+  {% include 'cloudcare/partials/bootstrap5/all_templates.html' %}
- 
- {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_grid.formplayer-common_grid.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_grid.formplayer-common_grid.style.diff.txt
index e69de29bb2d1..65b81e00caab 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_grid.formplayer-common_grid.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_grid.formplayer-common_grid.style.diff.txt
@@ -0,0 +1,7 @@
+--- 
++++ 
+@@ -2,4 +2,4 @@
+   border-color: #685c53;
+   color: #685c53;
+   font-size: 100%;
+-}+}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_version.formplayer-common_version.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_version.formplayer-common_version.style.diff.txt
index e69de29bb2d1..576659a81126 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_version.formplayer-common_version.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_version.formplayer-common_version.style.diff.txt
@@ -0,0 +1,8 @@
+--- 
++++ 
+@@ -1,4 +1,5 @@
++// TODO b5: replace with utility classes
+ #version-info {
+     text-align: center;
+     display: block
+-}+}

From 2d326c5945c85f5e746d40a936eaf7b8fb4b08e1 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 27 May 2024 11:33:55 -0400
Subject: [PATCH 15/91] Marked cloudcare migration as complete

---
 .../apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json  | 3 +++
 1 file changed, 3 insertions(+)

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 9437b0b70829..09d847cb6141 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
+++ b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
@@ -73,6 +73,9 @@
   "user_importer": {
     "is_complete": true
   },
+  "cloudcare": {
+    "is_complete": true
+  },
   "dropbox": {
     "is_complete": true
   },

From 955e8297f936beb2801b20b1802347ce656b6dd4 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 27 May 2024 11:57:44 -0400
Subject: [PATCH 16/91] Removed bootstrap switch detritus

---
 .../changes_guide/js-bootstrapSwitch.md       | 22 -------------------
 .../bootstrap/spec/bootstrap_3_to_5.json      |  1 -
 .../integration/base_cloudcare_template.html  |  3 ---
 package.json                                  |  1 -
 yarn.lock                                     |  7 ------
 5 files changed, 34 deletions(-)
 delete mode 100644 corehq/apps/hqwebapp/utils/bootstrap/changes_guide/js-bootstrapSwitch.md

diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/js-bootstrapSwitch.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/js-bootstrapSwitch.md
deleted file mode 100644
index 5b4ae5db46d1..000000000000
--- a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/js-bootstrapSwitch.md
+++ /dev/null
@@ -1,22 +0,0 @@
-The `bootstrap-switch` plugin is incompatible with Bootstrap 5, which has its own built-in switch widget.
-
-A similar switch widget is built into Bootstrap 5 and does not require JavaScript instantiation.
-
-An EXAMPLE for how to apply this change is provided below.
-Please see docs for further details.
-
-previously
-```
-$("#mySwitch").bootstrapSwitch();
-```
-
-now
-```
-<div class="form-check form-switch">
-  <input class="form-check-input" type="checkbox" role="switch" id="mySwitch">
-  <label class="form-check-label" for="mySwitch">Default switch checkbox input</label>
-</div>
-```
-
-Old docs: https://bttstrp.github.io/bootstrap-switch/
-New docs: https://getbootstrap.com/docs/5.1/forms/checks-radios/#switches
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/spec/bootstrap_3_to_5.json b/corehq/apps/hqwebapp/utils/bootstrap/spec/bootstrap_3_to_5.json
index d15a90ba62a3..5653aea26922 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/spec/bootstrap_3_to_5.json
+++ b/corehq/apps/hqwebapp/utils/bootstrap/spec/bootstrap_3_to_5.json
@@ -104,7 +104,6 @@
     ],
     "flagged_js_plugins": [
         "affix",
-        "bootstrapSwitch",
         "button",
         "createDateRangePicker",
         "datetimepicker",
diff --git a/corehq/apps/integration/templates/integration/base_cloudcare_template.html b/corehq/apps/integration/templates/integration/base_cloudcare_template.html
index 6d400cd4a2fd..5e2ebec55445 100644
--- a/corehq/apps/integration/templates/integration/base_cloudcare_template.html
+++ b/corehq/apps/integration/templates/integration/base_cloudcare_template.html
@@ -16,9 +16,6 @@
 {% endblock navigation %}
 
 {% block stylesheets %}
-  {% compress css %}
-    <link rel="stylesheet" href="{% static 'bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css' %}"/>
-  {% endcompress %}
   {% compress css %}
     <link type="text/less"
           rel="stylesheet"
diff --git a/package.json b/package.json
index cc84418787fd..b7c1241242d8 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,6 @@
         "blazy": "1.8.2",
         "bootstrap": "3.4.1",
         "bootstrap-daterangepicker": "3.0.3",
-        "bootstrap-switch": "3.3.2",
         "bootstrap-timepicker": "0.5.1",
         "bootstrap3-typeahead": "bassjobsen/Bootstrap-3-Typeahead#~3.1.1",
         "bootstrap5": "npm:bootstrap@5.3.1",
diff --git a/yarn.lock b/yarn.lock
index f2ac534c731a..349cc0954c77 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1159,13 +1159,6 @@ bootstrap-daterangepicker@3.0.3:
     jquery ">=1.10"
     moment "^2.9.0"
 
-bootstrap-switch@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/bootstrap-switch/-/bootstrap-switch-3.3.2.tgz#79ddb49fadc308fb731e257f95957af48996eea7"
-  integrity sha1-ed20n63DCPtzHiV/lZV69ImW7qc=
-  dependencies:
-    jquery ">=1.9.0"
-
 bootstrap-timepicker@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/bootstrap-timepicker/-/bootstrap-timepicker-0.5.1.tgz#1ee36b4a7c27904c7c96da0988b711c9ee9e99b7"

From 59c47d80cd45b0e3c3d3f3d681754725642d3ba1 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 28 May 2024 14:35:45 -0400
Subject: [PATCH 17/91] Bootstrap 5 Migration - Rebuilt diffs

---
 ...ayer-common_grid.formplayer-common_grid.style.diff.txt | 7 -------
 ...ommon_version.formplayer-common_version.style.diff.txt | 8 --------
 2 files changed, 15 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_grid.formplayer-common_grid.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_grid.formplayer-common_grid.style.diff.txt
index 65b81e00caab..e69de29bb2d1 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_grid.formplayer-common_grid.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_grid.formplayer-common_grid.style.diff.txt
@@ -1,7 +0,0 @@
---- 
-+++ 
-@@ -2,4 +2,4 @@
-   border-color: #685c53;
-   color: #685c53;
-   font-size: 100%;
--}+}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_version.formplayer-common_version.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_version.formplayer-common_version.style.diff.txt
index 576659a81126..e69de29bb2d1 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_version.formplayer-common_version.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_version.formplayer-common_version.style.diff.txt
@@ -1,8 +0,0 @@
---- 
-+++ 
-@@ -1,4 +1,5 @@
-+// TODO b5: replace with utility classes
- #version-info {
-     text-align: center;
-     display: block
--}+}

From 4c242034c355521b9777cdf21c8e124172aabf5b Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 28 May 2024 14:48:01 -0400
Subject: [PATCH 18/91] Updated test_update_gruntfile

---
 corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py b/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
index 1fb0c44d108d..9313a7c32ac7 100644
--- a/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
+++ b/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
@@ -419,13 +419,14 @@ def test_update_gruntfile():
         'case_importer',
     ];
     """
-    mocha_paths = ["cloudcare/spec/mocha.html", "cloudcare/spec/form_entry/mocha.html"]
+    mocha_paths = ["notifications/spec/mocha.html"]
     result = update_gruntfile(filedata, mocha_paths)
     expected_result = """
     var apps = [
         'app_manager',
         'export/ko',
-        'notifications',
+        'notifications/bootstrap3',
+        'notifications/bootstrap5',
         'reports_core/choiceListUtils',
         'locations',
         'userreports',

From f22a20a5f7dc46c3e1b33183241dd00c15baf208 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 28 May 2024 14:58:25 -0400
Subject: [PATCH 19/91] Fixed lint errors in Gruntfile.js

---
 Gruntfile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 12503d1f7365..14578f4dc97e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,5 +1,5 @@
-/* globals process */
-
+/* globals module, process, require */
+'use strict';
 module.exports = function (grunt) {
     var headless = require('mocha-headless-chrome'),
         _ = require('lodash'),

From e8a9308eac2a7697a557ad95f84b86e7679ff2a7 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 28 May 2024 15:34:23 -0400
Subject: [PATCH 20/91] Updated MochaView to know which apps have been migrated
 to B5

The alternative is to recreate the bootstrap5 directories for cloudcare
mocha templates, which is differently ugly. This will need to be updated
as apps are migrated to B5, and then removed when the entire platform
is migrated.
---
 corehq/apps/mocha/views.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/corehq/apps/mocha/views.py b/corehq/apps/mocha/views.py
index 3e6715312dad..ab54ce48eb1a 100644
--- a/corehq/apps/mocha/views.py
+++ b/corehq/apps/mocha/views.py
@@ -17,6 +17,9 @@ def dispatch(self, request, *args, **kwargs):
             template_name = f"{bootstrap_version}/{template_name}"
             if bootstrap_version == BOOTSTRAP_5:
                 set_bootstrap_version5()
+        elif app in ['cloudcare']:
+            set_bootstrap_version5()
+
         if config:
             template_name = f"{config}/{template_name}"
         template_name = f"{app}/spec/{template_name}"

From 2d18a5bd09b720fc07c2bc6d1c4b52da48642b15 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 29 May 2024 14:36:31 -0400
Subject: [PATCH 21/91] Fixed search icon alignment in app preview

Oddly, this is an app preview issue, not a small screen size issue.
---
 .../cloudcare/static/cloudcare/js/formplayer/users/views.js | 6 +++++-
 .../templates/cloudcare/partials/users/restore_as.html      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
index 2635edf7cc1a..ffc6acd181a1 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
@@ -6,6 +6,7 @@ hqDefine("cloudcare/js/formplayer/users/views", [
     'backbone.marionette',
     'hqwebapp/js/toggles',
     'cloudcare/js/formplayer/app',
+    'cloudcare/js/formplayer/constants',
     'cloudcare/js/formplayer/utils/utils',
     'cloudcare/js/formplayer/users/models',
     'cloudcare/js/formplayer/users/utils',
@@ -16,6 +17,7 @@ hqDefine("cloudcare/js/formplayer/users/views", [
     Marionette,
     toggles,
     FormplayerFrontend,
+    constants,
     formplayerUtils,
     usersModels,
     usersUtils
@@ -153,12 +155,14 @@ hqDefine("cloudcare/js/formplayer/users/views", [
             'keypress @ui.paginationGoTextBox': 'paginationGoKeyAction',
         },
         templateContext: function () {
-            var paginationOptions = formplayerUtils.paginateOptions(
+            const environment = usersModels.getCurrentUser().environment;
+            const paginationOptions = formplayerUtils.paginateOptions(
                 this.model.get('page') - 1,
                 this.totalPages(),
                 this.collection.total
             );
             return _.extend(paginationOptions, {
+                isAppPreview: environment === constants.PREVIEW_APP_ENVIRONMENT,
                 total: this.collection.total,
                 totalPages: this.totalPages(),
                 limit: this.limit,
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/users/restore_as.html b/corehq/apps/cloudcare/templates/cloudcare/partials/users/restore_as.html
index 23678716039f..67ccbe25c0e5 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/users/restore_as.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/users/restore_as.html
@@ -14,7 +14,7 @@ <h1 class="page-title">{% trans "Log in as user" %}</h1>
           value="<%- query %>"
           placeholder="{% trans_html_attr "Filter workers" %}" />
           <button class="btn btn-outline-primary" type="submit">
-            <i class="fa fa-search" aria-hidden="true"></i>
+            <i class="fa fa-search<% if (isAppPreview) { %> align-top<% } %>" aria-hidden="true"></i>
           </button>
       </div>
     </form>

From a752e40b06e1cbfac9fac73d00a1e4b5ba776ec6 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 29 May 2024 14:37:01 -0400
Subject: [PATCH 22/91] Reduced size of confirmation modal buttons

---
 .../cloudcare/static/cloudcare/js/formplayer/users/views.js   | 2 +-
 .../templates/cloudcare/partials/confirmation_modal.html      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
index ffc6acd181a1..afaea59f85a5 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
@@ -87,7 +87,7 @@ hqDefine("cloudcare/js/formplayer/users/views", [
                 message: _.template($('#user-data-template').html())(
                     { user: this.model.toJSON() }
                 ),
-                confirmText: gettext('Yes, log in as this user'),
+                confirmText: gettext('Log in'),
                 onConfirm: function () {
                     usersUtils.Users.logInAsUser(this.model.get('username'));
                     FormplayerFrontend.regions.getRegion('restoreAsBanner').show(
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/confirmation_modal.html b/corehq/apps/cloudcare/templates/cloudcare/partials/confirmation_modal.html
index 7b7fbba1ec21..cee3454d920f 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/confirmation_modal.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/confirmation_modal.html
@@ -11,11 +11,11 @@ <h4 class="js-modal-title modal-title"></h4>
       </div>
       <div class="modal-footer">
         <button type="button"
-                class="btn btn-primary btn-lg"
+                class="btn btn-primary"
                 id="js-confirmation-confirm"
                 data-bs-dismiss="modal"></button>
         <button type="button"
-                class="btn btn-outline-primary btn-lg"
+                class="btn btn-outline-primary"
                 id="js-confirmation-cancel"
                 data-bs-dismiss="modal"></button>
       </div>

From 385327e085f685d75c6bfaedbebf4ff6e3a1966b Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 29 May 2024 14:42:24 -0400
Subject: [PATCH 23/91] Updated pagination to allow for wrapping in app preview

---
 .../apps/cloudcare/templates/cloudcare/partials/pagination.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/pagination.html b/corehq/apps/cloudcare/templates/cloudcare/partials/pagination.html
index 94bba3a2c9a0..537b667854ff 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/pagination.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/pagination.html
@@ -17,7 +17,7 @@
           </select>
         </div>
         <% if (pageCount > 1) { %>
-          <ul class="pagination pagination-lg mb-2">
+          <ul class="pagination pagination-lg mb-2 flex-wrap"><!-- wrap for the sake of app preview -->
             <!-- Render Previous button -->
             <% if (currentPage > 0) { %>
               <li class="page-item">

From 69bb1c22a8e3e3282b020bbd829ac55e45b73993 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 29 May 2024 14:47:14 -0400
Subject: [PATCH 24/91] Moved styles to center breadcrumb separators to also
 apply to app preview

---
 .../static/cloudcare/scss/formplayer-common/breadcrumbs.scss     | 1 +
 .../static/cloudcare/scss/formplayer-webapp/breadcrumbs.scss     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/breadcrumbs.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/breadcrumbs.scss
index c20075a0b495..29d6a4250a9f 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/breadcrumbs.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/breadcrumbs.scss
@@ -21,6 +21,7 @@
     color: white;
 
     &:before {
+      padding: 0 6px 0 0;
       content: '\f054';
       font-family: 'FontAwesome';
     }
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/breadcrumbs.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/breadcrumbs.scss
index 5c8bc5a3974c..00118218c2f7 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/breadcrumbs.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/breadcrumbs.scss
@@ -5,7 +5,6 @@
   margin-top: -1px;
   .breadcrumb-item {
     &:before {
-      padding: 0 6px 0 0;
       color: #ffffff;
       font-size: 12px;
       vertical-align: top;

From d4a62b7e3026b4b503cd151174ff5e1d92a7da19 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 29 May 2024 19:34:53 +0000
Subject: [PATCH 25/91] "Bootstrap 5 Migration - Rebuilt diffs"

---
 ...readcrumbs.formplayer-common_breadcrumbs.style.diff.txt | 3 ++-
 ...readcrumbs.formplayer-webapp_breadcrumbs.style.diff.txt | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_breadcrumbs.formplayer-common_breadcrumbs.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_breadcrumbs.formplayer-common_breadcrumbs.style.diff.txt
index cff6ffff6c27..eb166b40948b 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_breadcrumbs.formplayer-common_breadcrumbs.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_breadcrumbs.formplayer-common_breadcrumbs.style.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -2,30 +2,34 @@
+@@ -2,30 +2,35 @@
      position: sticky;
      position: -webkit-sticky;
      top: 0;
@@ -31,6 +31,7 @@
 +    color: white;
 +
      &:before {
++      padding: 0 6px 0 0;
        content: '\f054';
        font-family: 'FontAwesome';
      }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_breadcrumbs.formplayer-webapp_breadcrumbs.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_breadcrumbs.formplayer-webapp_breadcrumbs.style.diff.txt
index af2015d21324..9fbc5aa9a2e3 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_breadcrumbs.formplayer-webapp_breadcrumbs.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_breadcrumbs.formplayer-webapp_breadcrumbs.style.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -1,16 +1,11 @@
+@@ -1,16 +1,10 @@
  #breadcrumb-region .breadcrumb,
  .single-app-view .breadcrumb,
  .breadcrumb-form-container .breadcrumb {
@@ -16,11 +16,10 @@
 +  .breadcrumb-item {
      &:before {
 -      padding: 0 6px 0 12px;
-+      padding: 0 6px 0 0;
        color: #ffffff;
        font-size: 12px;
        vertical-align: top;
-@@ -23,16 +18,16 @@
+@@ -23,16 +17,16 @@
  }
  
  #breadcrumb-region .breadcrumb-nav {
@@ -40,7 +39,7 @@
      margin-bottom: 0;
      flex-grow: 1;
    }
-@@ -52,7 +47,7 @@
+@@ -52,7 +46,7 @@
      font-size: 12px;
      margin-bottom: 0px;
      padding-left: 33px;

From 052ed9b93b0a7f87b65cd815ad2d0f2de03ea000 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 3 Jun 2024 11:10:04 -0400
Subject: [PATCH 26/91] Removed focusout handlers, set up time questions to
 initialize to current time

---
 corehq/apps/cloudcare/static/cloudcare/js/utils.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index fbbfc59c86cb..a8a5d709980c 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -379,9 +379,6 @@ hqDefine('cloudcare/js/utils', [
         }
         let tempus = hqTempusDominus.createDatePicker($el.get(0), options);
 
-        $el.on("focusout", function () {
-            tempus.hide();
-        });
         $el.attr("placeholder", dateFormat);
         $el.attr("pattern", "[0-9\-/]+");   // eslint-disable-line no-useless-escape
     };
@@ -402,16 +399,12 @@ hqDefine('cloudcare/js/utils', [
             localization: {
                 format: timeFormat,
             },
-            useCurrent: false,
+            useCurrent: true,
         };
         if (date.isValid()) {
             options.viewDate = new hqTempusDominus.tempusDominus.DateTime(date.format(timeFormat));
         }
         let tempus = hqTempusDominus.createTimePicker($el.get(0), options);
-
-        $el.on("focusout", function () {
-            tempus.hide();
-        });
     };
 
     var smallScreenIsEnabled = function () {

From c814dfc2576010938222412b7a3c24397a37cdcf Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 3 Jun 2024 11:32:11 -0400
Subject: [PATCH 27/91] Increased important of select2 clear icon position

---
 .../apps/hqwebapp/static/hqwebapp/scss/commcarehq/_select2.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_select2.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_select2.scss
index 375d723a6dd7..2920eb1d26e3 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_select2.scss
+++ b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_select2.scss
@@ -160,7 +160,7 @@
 
 .select2-container--default {
   .select2-selection--single .select2-selection__clear {
-    margin-right: 30px;
+    margin-right: 30px !important;
   }
 }
 

From 5858f7c6511f8f01a95477bcb579d3b0b247e8f0 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 3 Jun 2024 12:31:15 -0400
Subject: [PATCH 28/91] Fixed checkbox styling for combined checkboxes
 (QA-6621)

---
 .../templates/cloudcare/partials/form_entry/entry_select.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html
index a85cd6a87e78..507a7ee74ba5 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html
@@ -4,8 +4,8 @@
   <fieldset>
   <legend class="sr-only" data-bind="text: question.caption()"></legend>
     <div class="sel clear">
-      <div data-bind="foreach: choices, as: 'choice'">
-        <div class="form-check" data-bind="css: { checkbox: $parent.isMulti, radio: !$parent.isMulti }, class: $parent.colStyleIfHideLabel">
+      <div data-bind="foreach: choices, as: 'choice', css: {row: $data.colStyleIfHideLabel}">
+        <div data-bind="css: { checkbox: $parent.isMulti, radio: !$parent.isMulti, 'form-check': !$parent.colStyleIfHideLabel}, class: $parent.colStyleIfHideLabel">
           <input data-bind="
                       checked: $parent.rawAnswer,
                       checkedValue: $data,

From 726dc4dc34dd5c8b115a8c779837fba7c8584015 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 3 Jun 2024 12:43:48 -0400
Subject: [PATCH 29/91] Restored background color for menu badges (QA-6622)

---
 .../apps/cloudcare/templates/cloudcare/partials/menu/badge.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/badge.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/badge.html
index 39cd089f22cb..2de916591dff 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/badge.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/badge.html
@@ -6,6 +6,6 @@
   and is different from x === undefined.
   */ %>
   <% if (typeof badgeText !== 'undefined' && badgeText) { %>
-  <span class="badge rounded-pill"><%- badgeText %></span>
+  <span class="badge bg-secondary rounded-pill"><%- badgeText %></span>
   <% } %>
 </script>

From 23ce9243cbf91eac3664ccd62b02ab9479fd73ba Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 3 Jun 2024 12:59:03 -0400
Subject: [PATCH 30/91] Fixed datepicker event (QA-6604)

---
 .../static/cloudcare/js/formplayer/menus/views/query.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
index ec64c6f0f7c3..560abf2f2a66 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views/query.js
@@ -300,7 +300,7 @@ hqDefine("cloudcare/js/formplayer/menus/views/query", [
         events: {
             'change @ui.queryField': 'changeQueryField',
             'change @ui.searchForBlank': 'notifyParentOfFieldChange',
-            'dp.change @ui.queryField': 'changeDateQueryField',
+            'change.td @ui.date': 'changeDateQueryField',
             'click @ui.searchForBlank': 'toggleBlankSearch',
         },
 

From 8a777d7d8d4eed65973e7d6645f42e9ea54ed29d Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 4 Jun 2024 08:41:38 -0400
Subject: [PATCH 31/91] Added tempus dominus compatibility in a few stray
 places

---
 .../cloudcare/static/cloudcare/js/form_entry/entries.js     | 6 +++---
 corehq/apps/cloudcare/static/cloudcare/js/utils.js          | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
index 5f6b3a3e1921..385c2bcc7c59 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
@@ -793,12 +793,12 @@ hqDefine("cloudcare/js/form_entry/entries", [
             var answer = self.answer() ? self.convertServerToClientFormat(self.answer()) : constants.NO_ANSWER;
             self.initWidget(self.$picker, answer);
 
-            self.$picker.on("dp.change", function (e) {
+            self.$picker.on("change.td", function (e) {
                 if (!e.date) {
                     self.answer(constants.NO_ANSWER);
                     return;
                 }
-                self.answer(moment(e.date.toDate()).format(self.serverFormat));
+                self.answer(moment(e.date).format(self.serverFormat));
             });
         };
     }
@@ -834,7 +834,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
         this.templateType = 'time';
         if (question.style) {
             if (question.stylesContains(constants.TIME_12_HOUR)) {
-                this.clientFormat = 'h:mm a';
+                this.clientFormat = 'h:mm T';
             }
         }
         DateTimeEntryBase.call(this, question, options);
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index a8a5d709980c..224213417318 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -398,6 +398,7 @@ hqDefine('cloudcare/js/utils', [
             },
             localization: {
                 format: timeFormat,
+                hourCycle: timeFormat.indexOf('T') == -1 ? 'h23' : 'h12',
             },
             useCurrent: true,
         };

From 0926f547ee8b6efedddd54b89c25ec04000a9de2 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 4 Jun 2024 09:12:42 -0400
Subject: [PATCH 32/91] Updated case search errors to display property

My least favorite thing about this migration is that .invalid-feedback items
only display if they have a sibling with the .is-invalid class. This is a change from
B3, where error messages were styled based on being in a container that used .has-error.
---
 .../cloudcare/partials/query/item.html        | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/item.html
index e0fdfff287ad..8610eaf5a114 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/query/item.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/query/item.html
@@ -23,7 +23,8 @@
     class="<% if (contentTag === 'td') { %>col-sm-6 <% } else { %>input-group-sm <% } %>query-input-group">
 
     <% if (input == "select1") { %>
-    <select class="query-field form-control hqwebapp-select2" data-receive="<%- receive %>"<% if (required) { %> aria-required="true"<% } %>>
+    <select class="query-field form-control hqwebapp-select2<% if (errorMessage) { %> is-invalid<% } %>"
+            data-receive="<%- receive %>"<% if (required) { %> aria-required="true"<% } %>>
         <option value=""></option>
         <% for (let key in itemsetChoicesDict) { %>
         <option value="<%- key %>" <% if (value === String(key)) { %>selected<% } %>>
@@ -33,7 +34,9 @@
     </select>
 
     <% } else if (input == "select") { %>
-    <select multiple class="query-field form-control hqwebapp-select2" data-receive="<%- receive %>"<% if (required) { %> aria-required="true"<% } %>>
+    <select multiple
+            class="query-field form-control hqwebapp-select2<% if (errorMessage) { %> is-invalid<% } %>"
+            data-receive="<%- receive %>"<% if (required) { %> aria-required="true"<% } %>>
         <% for (let key in itemsetChoicesDict) { %>
         <option value="<%- key %>" <% if (value && value.indexOf(String(key)) > -1) { %>selected<% } %>>
             <%- itemsetChoicesDict[key] %>
@@ -45,7 +48,7 @@
     <div class="input-group">
       <input id="<%- text ? text : "" %>"
              type="text"
-             class="date query-field form-control"
+             class="date query-field form-control<% if (errorMessage) { %> is-invalid<% } %>"
              value="<%- value %>"
              <% if (required) { %> aria-required="true"<% } %>>
       <span class="input-group-text"><i class="fa-solid fa-calendar-days"></i></span>
@@ -54,12 +57,14 @@
     <% } else if (input === "daterange") { %>
     <input id="<%- text ? text : "" %>"
            type="text"
-           class="daterange query-field form-control"
+           class="daterange query-field form-control<% if (errorMessage) { %> is-invalid<% } %>"
            value="<%- value %>"
            <% if (required) { %> aria-required="true"<% } %>>
 
     <% } else if (input === "checkbox") { %>
-    <fieldset multiple class="query-field" id="<%- text ? text : "" %>" <% if (required) { %> aria-required="true"<% } %>>
+    <fieldset multiple
+              class="query-field<% if (errorMessage) { %> is-invalid<% } %>"
+              id="<%- text ? text : "" %>" <% if (required) { %> aria-required="true"<% } %>>
       <legend class="sr-only"><%- text ? text : "" %></legend>
       <% for (let key in itemsetChoicesDict) { %>
       <div class="form-check">
@@ -67,7 +72,7 @@
                value="<%- key %>"
                <% if (value && value.indexOf(String(key)) !== -1) { %>checked<% } %>
                id="<%- text ? text : "checkbox" %>-<%- key %>"
-               class="form-check-input">
+               class="form-check-input<% if (errorMessage) { %> is-invalid<% } %>">
         <label class="form-check-label" for="<%- text ? text : "checkbox" %>-<%- key %>">
           <%- itemsetChoicesDict[key] %>
         </label>
@@ -82,22 +87,25 @@
     </div>
 
     <% } else { %>
+
     <input id="<%- text ? text : "" %>"
            type="text"
            class="query-field form-control<% if (errorMessage) { %> is-invalid<% } %>"
            value="<%- value %>"
            data-receive="<%- receive %>"
            <% if (required) { %> aria-required="true"<% } %>>
-           <% } %>
-           <% if (errorMessage) { %> <div class="invalid-feedback"> <%- errorMessage || "" %> </div> <% } %>
-           <% if (allow_blank_value) { %>
-            <div class="form-check">
-              <input type="checkbox" class="form-check-input search-for-blank" <% if (searchForBlank) { %>checked<% } %> id="<%- id %>_allow_blank">
-              <label class="form-check-label" for="<%- id %>_allow_blank">
-                {% trans "Include results where '<%- text %>' is blank" %}
-              </label>
-            </div>
-            <% } %>
+    <% } %>
+
+    <% if (errorMessage) { %> <div class="invalid-feedback"> <%- errorMessage || "" %> </div> <% } %>
+    <% if (allow_blank_value) { %>
+      <div class="form-check">
+        <input type="checkbox" class="form-check-input search-for-blank" <% if (searchForBlank) { %>checked<% } %> id="<%- id %>_allow_blank">
+        <label class="form-check-label" for="<%- id %>_allow_blank">
+          {% trans "Include results where '<%- text %>' is blank" %}
+        </label>
+      </div>
+    <% } %>
+
   </<%- contentTag %>>
   <% if (contentTag !== 'td') { %></td><% } %>
 </script>

From cf5c2b558180d8b74e10ee4e6b8a581bc254617d Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 4 Jun 2024 10:42:59 -0400
Subject: [PATCH 33/91] Restored asterisk for require case search fields
 (QA-6600)

---
 .../hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss
index a62debf98737..4a7d0bd30219 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss
@@ -76,7 +76,7 @@
   }
 }
 
-.query-caption.required .control-label::before, .search-query-group-header.required .search-query-group-header-label::before {
+.query-caption.required label::before, .search-query-group-header.required .search-query-group-header-label::before {
   content: '*';
   font-weight: bold;
   color: #c0392b;

From aeee453ef373094d81988616877746c9273bbc89 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 4 Jun 2024 11:08:45 -0400
Subject: [PATCH 34/91] Updated a few styling rules dependent on classes that
 are no longer used

---
 .../cloudcare/scss/formplayer-webapp/form.scss   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
index 2d3908672d6c..a93a81f74d85 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
@@ -48,10 +48,10 @@ $group-indent: 15px;
     padding-right: $form-text-indent;
   }
 
-  .form-group {
+  .q {
     margin-left: 0px;
     margin-right: 0px;
-    .caption.control-label {
+    .caption {
       display: block;
     }
   }
@@ -152,7 +152,7 @@ $group-indent: 15px;
     display: none;
   }
 
-  .form-group.required {
+  .q.required {
     transition: all .5s;
     margin-bottom: 0;
     label:before {
@@ -160,7 +160,7 @@ $group-indent: 15px;
     }
   }
 
-  .form-group.required.on {
+  .q.required.on {
     background-color: $cc-att-neg-hi;
     border: 10px solid $cc-att-neg-mid;
     border-bottom: none;
@@ -204,14 +204,14 @@ $group-indent: 15px;
     }
   }
 
-  .q.form-group {
+  .q {
     break-inside: avoid;
   }
 
   .panel.panel-default.last,
   .panel.panel-default.last *,
-  .q.form-group.last,
-  .q.form-group.last * {
+  .q.last,
+  .q.last * {
     margin-bottom: 0px;
     padding-bottom: 0px;
     .widget-container {
@@ -234,7 +234,7 @@ $group-indent: 15px;
 .question-tile-row {
   display: flex;
   align-items: start;
-  * .form-group, * p, * .control-label {
+  * .q, * p, * .caption {
     padding-top: 0px !important;
     padding-bottom: 0px !important;
     margin-top: 0px !important;

From afb5663c3ab601e803337ae64cd1f2944253ba3b Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 4 Jun 2024 16:56:36 -0400
Subject: [PATCH 35/91] Fixed error styling for select questions (QA-6627)

This is a bug in https://github.com/dimagi/commcare-hq/pull/34631/
It's causing choices to display error styling if there's an erroranywhere in the form.
---
 .../cloudcare/partials/form_entry/entry_choice_label.html       | 2 +-
 .../templates/cloudcare/partials/form_entry/entry_select.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_choice_label.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_choice_label.html
index c998c91e0265..05371d6a79ea 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_choice_label.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_choice_label.html
@@ -12,7 +12,7 @@
                     id: 'group-' + $parent.entryId + '-choice-' + $index(),
                     'aria-labelledby': $parent.entryId + '-choice-' + $index() + '-sr',
                     name: $parent.entryId,
-                    css: { 'is-invalid': $root.hasError() },
+                    css: { 'is-invalid': $parent.hasError() },
                     class: 'group-' + $parent.entryId,
                 }
             "/>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html
index 507a7ee74ba5..726c2312fde7 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html
@@ -9,7 +9,7 @@
           <input data-bind="
                       checked: $parent.rawAnswer,
                       checkedValue: $data,
-                      css: { 'is-invalid': $root.hasError() },
+                      css: { 'is-invalid': $parent.question.hasError() },
                       attr: {
                           id: 'group-' + $parent.entryId + '-choice-' + $index(),
                           type: $parent.isMulti ? 'checkbox' : 'radio',

From b1859460af01e233aece4ac18667114cb15c9e04 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 4 Jun 2024 17:54:57 -0400
Subject: [PATCH 36/91] Removed contradictory repeat group styles

---
 .../static/cloudcare/scss/formplayer-common/form.scss      | 7 -------
 .../static/cloudcare/scss/formplayer-webapp/form.scss      | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/form.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/form.scss
index 4fa2310c3172..e4f8403a510d 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/form.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/form.scss
@@ -34,10 +34,3 @@ legend {
     border-top: $cc-neutral-hi solid 1px;
     padding-top: 20px;
 }
-
-.question-tile-row {
-  .gr {
-    padding-right: 20px !important;
-    padding-left: 20px !important;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
index a93a81f74d85..7dd62f00fdec 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
@@ -242,13 +242,6 @@ $group-indent: 15px;
   }
 }
 
-.question-tile-row {
-  .gr {
-    padding-right: 0px !important;
-    padding-left: 0px !important;
-  }
-}
-
 .gr-has-no-nested-questions {
   display: none;
 }

From a3f849bebfc5fab4245b2d70e06002d48f192d8e Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 4 Jun 2024 17:55:15 -0400
Subject: [PATCH 37/91] Updated more styles relating to B3 classes no longer
 being used

---
 .../cloudcare/scss/formplayer-webapp/form.scss     | 14 +++++++-------
 .../static/preview_app/scss/preview_app/form.scss  |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
index 7dd62f00fdec..e6a87309d0a6 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
@@ -61,11 +61,11 @@ $group-indent: 15px;
     margin-right: $group-indent;
   }
 
-  .gr.panel {
+  .gr.card {
     border-radius: 0px;
   }
 
-  .rep.panel {
+  .rep.card {
     border-radius: 0px;
   }
 
@@ -89,7 +89,7 @@ $group-indent: 15px;
     }
   }
 
-  .panel-body {
+  .card-body {
     @include media-breakpoint-down(md) {
       padding-left: 0px;
       padding-right: 0px;
@@ -97,7 +97,7 @@ $group-indent: 15px;
   }
 
   .stripe-repeats {
-    > .row, .panel-body > .children > .row {
+    > .row, .card-body > .children > .row {
       &:nth-of-type(odd) {
         background-color: $table-accent-bg;
       }
@@ -133,7 +133,7 @@ $group-indent: 15px;
     }
   }
 
-  .panel-heading {
+  .card-header {
     border-top-left-radius: 0px;
     border-top-right-radius: 0px;
   }
@@ -208,8 +208,8 @@ $group-indent: 15px;
     break-inside: avoid;
   }
 
-  .panel.panel-default.last,
-  .panel.panel-default.last *,
+  .card.last,
+  .card.last *,
   .q.last,
   .q.last * {
     margin-bottom: 0px;
diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss
index 017d60b3651b..d9591eb3d836 100644
--- a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss
@@ -73,7 +73,7 @@
   }
 }
 
-.form-group {
+.q {
   padding: 10px 0;
   label {
     margin-right: 10px;
@@ -81,7 +81,7 @@
   }
 }
 
-.form-group.required {
+.q.required {
   transition: all .5s;
   margin-bottom: 0;
   label:before {
@@ -89,7 +89,7 @@
   }
 }
 
-.form-group.required.on {
+.q.required.on {
   background-color: $cc-att-neg-hi;
   border: 10px solid $cc-att-neg-mid;
   border-bottom: none;
@@ -119,7 +119,7 @@
   border: none;
 }
 
-.form-group .help-block {
+.q .help-block {
   font-size: 11px;
   &:before {
     content: "\f05a";

From 87a31ab6fef4aceb6762765c36ef6fb8c5ba8afe Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 07:46:06 -0400
Subject: [PATCH 38/91] Fixed incorrect check for is-invalid in select choices

This should match the other change in afb5663c3ab601e803337ae64cd1f2944253ba3b
---
 .../cloudcare/partials/form_entry/entry_choice_label.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_choice_label.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_choice_label.html
index 05371d6a79ea..e1975aec402c 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_choice_label.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_choice_label.html
@@ -12,7 +12,7 @@
                     id: 'group-' + $parent.entryId + '-choice-' + $index(),
                     'aria-labelledby': $parent.entryId + '-choice-' + $index() + '-sr',
                     name: $parent.entryId,
-                    css: { 'is-invalid': $parent.hasError() },
+                    css: { 'is-invalid': $parent.question.hasError() },
                     class: 'group-' + $parent.entryId,
                 }
             "/>

From 69213a38ca92d4aa2df6116acc8314fb2d513c72 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 10:16:09 -0400
Subject: [PATCH 39/91] Imported print styles from B3

---
 .../static/hqwebapp/scss/commcarehq.scss      |  1 +
 .../hqwebapp/scss/commcarehq/_print.scss      | 92 +++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_print.scss

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq.scss
index e10e55aa5819..5d67ae875e5e 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq.scss
+++ b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq.scss
@@ -15,6 +15,7 @@
 @import "reboot";
 @import "type";
 @import "commcarehq/type";
+@import "commcarehq/print";
 @import "images";
 @import "containers";
 @import "commcarehq/containers";
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_print.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_print.scss
new file mode 100644
index 000000000000..4bd6fe2ff7aa
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_print.scss
@@ -0,0 +1,92 @@
+@media print {
+  *,
+  *:before,
+  *:after {
+    color: #000 !important; // Black prints faster: h5bp.com/s
+    text-shadow: none !important;
+    background: transparent !important;
+    box-shadow: none !important;
+  }
+
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+
+  // Don't show links that are fragment identifiers,
+  // or use the `javascript:` pseudo protocol
+  a[href^="#"]:after,
+  a[href^="javascript:"]:after {
+    content: "";
+  }
+
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+
+  thead {
+    display: table-header-group; // h5bp.com/t
+  }
+
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+
+  img {
+    max-width: 100% !important;
+  }
+
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+
+  // Bootstrap specific changes start
+
+  // Bootstrap components
+  .navbar {
+    display: none;
+  }
+  .btn,
+  .dropup > .btn {
+    > .caret {
+      border-top-color: #000 !important;
+    }
+  }
+  .label {
+    border: 1px solid #000;
+  }
+
+  .table {
+    border-collapse: collapse !important;
+
+    td,
+    th {
+      background-color: #fff !important;
+    }
+  }
+  .table-bordered {
+    th,
+    td {
+      border: 1px solid #ddd !important;
+    }
+  }
+}

From e6b404421bf21ab35402cf8178648e8312854a70 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 10:24:48 -0400
Subject: [PATCH 40/91] Updated print styles to not limit content width

---
 .../static/cloudcare/scss/formplayer-webapp/form.scss         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
index e6a87309d0a6..10e0f472addc 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
@@ -197,6 +197,10 @@ $group-indent: 15px;
 }
 
 @media print {
+  #content-container {
+    max-width: none;
+  }
+
   .form-container.print-container {
     margin: 0px;
     .page-header {

From 01a4b40bc03dde4b0d2fe26eb5fa7d80fb14cbff Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 10:25:19 -0400
Subject: [PATCH 41/91] Updated col-* rules in print-general.scss

---
 .../scss/formplayer-webapp/print-general.scss | 134 +++++++++---------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/print-general.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/print-general.scss
index 56c3a1d3d2cf..60d2d0d8ee0c 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/print-general.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/print-general.scss
@@ -1,194 +1,194 @@
-// Renders Bootstrap as "small" layout when printing
+// Renders Bootstrap as "medium" layout when printing
 @media print {
-    .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
+    .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
       float: left;
     }
-    .col-sm-12 {
+    .col-md-12 {
       width: 100%;
     }
-    .col-sm-11 {
+    .col-md-11 {
       width: 91.66666667%;
     }
-    .col-sm-10 {
+    .col-md-10 {
       width: 83.33333333%;
     }
-    .col-sm-9 {
+    .col-md-9 {
       width: 75%;
     }
-    .col-sm-8 {
+    .col-md-8 {
       width: 66.66666667%;
     }
-    .col-sm-7 {
+    .col-md-7 {
       width: 58.33333333%;
     }
-    .col-sm-6 {
+    .col-md-6 {
       width: 50%;
     }
-    .col-sm-5 {
+    .col-md-5 {
       width: 41.66666667%;
     }
-    .col-sm-4 {
+    .col-md-4 {
       width: 33.33333333%;
     }
-    .col-sm-3 {
+    .col-md-3 {
       width: 25%;
     }
-    .col-sm-2 {
+    .col-md-2 {
       width: 16.66666667%;
     }
-    .col-sm-1 {
+    .col-md-1 {
       width: 8.33333333%;
     }
-    .col-sm-pull-12 {
+    .col-md-pull-12 {
       right: 100%;
     }
-    .col-sm-pull-11 {
+    .col-md-pull-11 {
       right: 91.66666667%;
     }
-    .col-sm-pull-10 {
+    .col-md-pull-10 {
       right: 83.33333333%;
     }
-    .col-sm-pull-9 {
+    .col-md-pull-9 {
       right: 75%;
     }
-    .col-sm-pull-8 {
+    .col-md-pull-8 {
       right: 66.66666667%;
     }
-    .col-sm-pull-7 {
+    .col-md-pull-7 {
       right: 58.33333333%;
     }
-    .col-sm-pull-6 {
+    .col-md-pull-6 {
       right: 50%;
     }
-    .col-sm-pull-5 {
+    .col-md-pull-5 {
       right: 41.66666667%;
     }
-    .col-sm-pull-4 {
+    .col-md-pull-4 {
       right: 33.33333333%;
     }
-    .col-sm-pull-3 {
+    .col-md-pull-3 {
       right: 25%;
     }
-    .col-sm-pull-2 {
+    .col-md-pull-2 {
       right: 16.66666667%;
     }
-    .col-sm-pull-1 {
+    .col-md-pull-1 {
       right: 8.33333333%;
     }
-    .col-sm-pull-0 {
+    .col-md-pull-0 {
       right: auto;
     }
-    .col-sm-push-12 {
+    .col-md-push-12 {
       left: 100%;
     }
-    .col-sm-push-11 {
+    .col-md-push-11 {
       left: 91.66666667%;
     }
-    .col-sm-push-10 {
+    .col-md-push-10 {
       left: 83.33333333%;
     }
-    .col-sm-push-9 {
+    .col-md-push-9 {
       left: 75%;
     }
-    .col-sm-push-8 {
+    .col-md-push-8 {
       left: 66.66666667%;
     }
-    .col-sm-push-7 {
+    .col-md-push-7 {
       left: 58.33333333%;
     }
-    .col-sm-push-6 {
+    .col-md-push-6 {
       left: 50%;
     }
-    .col-sm-push-5 {
+    .col-md-push-5 {
       left: 41.66666667%;
     }
-    .col-sm-push-4 {
+    .col-md-push-4 {
       left: 33.33333333%;
     }
-    .col-sm-push-3 {
+    .col-md-push-3 {
       left: 25%;
     }
-    .col-sm-push-2 {
+    .col-md-push-2 {
       left: 16.66666667%;
     }
-    .col-sm-push-1 {
+    .col-md-push-1 {
       left: 8.33333333%;
     }
-    .col-sm-push-0 {
+    .col-md-push-0 {
       left: auto;
     }
-    .col-sm-offset-12 {
+    .col-md-offset-12 {
       margin-left: 100%;
     }
-    .col-sm-offset-11 {
+    .col-md-offset-11 {
       margin-left: 91.66666667%;
     }
-    .col-sm-offset-10 {
+    .col-md-offset-10 {
       margin-left: 83.33333333%;
     }
-    .col-sm-offset-9 {
+    .col-md-offset-9 {
       margin-left: 75%;
     }
-    .col-sm-offset-8 {
+    .col-md-offset-8 {
       margin-left: 66.66666667%;
     }
-    .col-sm-offset-7 {
+    .col-md-offset-7 {
       margin-left: 58.33333333%;
     }
-    .col-sm-offset-6 {
+    .col-md-offset-6 {
       margin-left: 50%;
     }
-    .col-sm-offset-5 {
+    .col-md-offset-5 {
       margin-left: 41.66666667%;
     }
-    .col-sm-offset-4 {
+    .col-md-offset-4 {
       margin-left: 33.33333333%;
     }
-    .col-sm-offset-3 {
+    .col-md-offset-3 {
       margin-left: 25%;
     }
-    .col-sm-offset-2 {
+    .col-md-offset-2 {
       margin-left: 16.66666667%;
     }
-    .col-sm-offset-1 {
+    .col-md-offset-1 {
       margin-left: 8.33333333%;
     }
-    .col-sm-offset-0 {
+    .col-md-offset-0 {
       margin-left: 0%;
     }
-    .visible-xs {
+    .visible-sm {
       display: none !important;
     }
-    .hidden-xs {
+    .hidden-sm {
       display: block !important;
     }
-    table.hidden-xs {
+    table.hidden-sm {
       display: table;
     }
-    tr.hidden-xs {
+    tr.hidden-sm {
       display: table-row !important;
     }
-    th.hidden-xs,
-    td.hidden-xs {
+    th.hidden-sm,
+    td.hidden-sm {
       display: table-cell !important;
     }
-    .hidden-xs.hidden-print {
+    .hidden-sm.hidden-print {
       display: none !important;
     }
-    .hidden-sm {
+    .hidden-md {
       display: none !important;
     }
-    .visible-sm {
+    .visible-md {
       display: block !important;
     }
-    table.visible-sm {
+    table.visible-md {
       display: table;
     }
-    tr.visible-sm {
+    tr.visible-md {
       display: table-row !important;
     }
-    th.visible-sm,
-    td.visible-sm {
+    th.visible-md,
+    td.visible-md {
       display: table-cell !important;
     }
-  }
\ No newline at end of file
+  }

From f093222e869c9d0c7c7d904f2e14577b8de9ecf1 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 10:27:30 -0400
Subject: [PATCH 42/91] Updated col-* rules in form.scss

---
 .../scss/formplayer-webapp/form.scss          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
index 10e0f472addc..c3bda0fc21fd 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
@@ -69,18 +69,18 @@ $group-indent: 15px;
     border-radius: 0px;
   }
 
-  .col-sm-12,
-  .col-sm-11,
-  .col-sm-10,
-  .col-sm-9,
-  .col-sm-8,
-  .col-sm-7,
-  .col-sm-6,
-  .col-sm-5,
-  .col-sm-4,
-  .col-sm-3,
-  .col-sm-2,
-  .col-sm-1 {
+  .col-md-12,
+  .col-md-11,
+  .col-md-10,
+  .col-md-9,
+  .col-md-8,
+  .col-md-7,
+  .col-md-6,
+  .col-md-5,
+  .col-md-4,
+  .col-md-3,
+  .col-md-2,
+  .col-md-1 {
     &:first-child {
       padding-left: 0;
     }

From f9597626fc68f6daa48e561250c6337e6b03d39e Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 14:28:41 +0000
Subject: [PATCH 43/91] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../form_entry/add_group.html.diff.txt        |  13 -
 ...form.formplayer-common_form.style.diff.txt |  10 +-
 ...form.formplayer-webapp_form.style.diff.txt | 146 +++++++++-
 ...player-webapp_print-general.style.diff.txt | 272 ++++++++++++++++++
 ...ery.formplayer-webapp_query.style.diff.txt |   7 +-
 .../imports/select2s._select2.style.diff.txt  |   2 +-
 ...w_app_form.preview_app_form.style.diff.txt |  29 +-
 .../style-imports.commcarehq.style.diff.txt   |   3 +-
 8 files changed, 445 insertions(+), 37 deletions(-)
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/add_group.html.diff.txt

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/add_group.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/add_group.html.diff.txt
deleted file mode 100644
index 6e0d0855d200..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/cloudcare/partials/form_entry/add_group.html.diff.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- 
-+++ 
-@@ -1,8 +1,8 @@
- {% load hq_shared_tags %}
- 
- <script type="text/html" id="add-group-fullform-ko-template">
--  <div style="margin-bottom: 10px; margin-right: 10px">
--        <button class="btn btn-default add" href="#"
-+  <div class="mb-1 mr-1">
-+        <button class="btn btn-outline-primary add" href="#"
-                 data-bind="click: newRepeat, text: addChoice"
-                 id="repeat-add-new">
-                 <i class="fa fa-plus"></i>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_form.formplayer-common_form.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_form.formplayer-common_form.style.diff.txt
index bb30a594c935..3576d2bf71d4 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_form.formplayer-common_form.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_form.formplayer-common_form.style.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -31,7 +31,7 @@
+@@ -31,13 +31,6 @@
  }
  
  .gr.repetition:not(:first-child) {
@@ -8,4 +8,10 @@
 +    border-top: $cc-neutral-hi solid 1px;
      padding-top: 20px;
  }
- 
+-
+-.question-tile-row {
+-  .gr {
+-    padding-right: 20px !important;
+-    padding-left: 20px !important;
+-  }
+-}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
index 02c025695f11..797d4b141a29 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
@@ -58,40 +58,90 @@
    }
  
    // Bootstrap introduces -10px left/right margin for row classes. This causes element to overflow parent.
-@@ -51,8 +44,8 @@
+@@ -51,43 +44,43 @@
      margin-right: 0px;
    }
    .question-container {
 -    padding-left: @form-text-indent;
 -    padding-right: @form-text-indent;
+-  }
+-
+-  .form-group {
 +    padding-left: $form-text-indent;
 +    padding-right: $form-text-indent;
-   }
- 
-   .form-group {
-@@ -64,8 +57,8 @@
++  }
++
++  .q {
+     margin-left: 0px;
+     margin-right: 0px;
+-    .caption.control-label {
++    .caption {
+       display: block;
+     }
    }
  
    .group-body {
 -    margin-left: @group-indent;
 -    margin-right: @group-indent;
+-  }
+-
+-  .gr.panel {
 +    margin-left: $group-indent;
 +    margin-right: $group-indent;
++  }
++
++  .gr.card {
+     border-radius: 0px;
    }
  
-   .gr.panel {
-@@ -97,7 +90,7 @@
+-  .rep.panel {
++  .rep.card {
+     border-radius: 0px;
    }
  
-   .panel-body {
+-  .col-sm-12,
+-  .col-sm-11,
+-  .col-sm-10,
+-  .col-sm-9,
+-  .col-sm-8,
+-  .col-sm-7,
+-  .col-sm-6,
+-  .col-sm-5,
+-  .col-sm-4,
+-  .col-sm-3,
+-  .col-sm-2,
+-  .col-sm-1 {
++  .col-md-12,
++  .col-md-11,
++  .col-md-10,
++  .col-md-9,
++  .col-md-8,
++  .col-md-7,
++  .col-md-6,
++  .col-md-5,
++  .col-md-4,
++  .col-md-3,
++  .col-md-2,
++  .col-md-1 {
+     &:first-child {
+       padding-left: 0;
+     }
+@@ -96,29 +89,29 @@
+     }
+   }
+ 
+-  .panel-body {
 -    @media (max-width: @screen-xs-max) {
++  .card-body {
 +    @include media-breakpoint-down(md) {
        padding-left: 0px;
        padding-right: 0px;
      }
-@@ -106,19 +99,19 @@
+   }
+ 
    .stripe-repeats {
-     > .row, .panel-body > .children > .row {
+-    > .row, .panel-body > .children > .row {
++    > .row, .card-body > .children > .row {
        &:nth-of-type(odd) {
 -        background-color: @table-bg-accent;
 +        background-color: $table-accent-bg;
@@ -112,21 +162,33 @@
      border-radius: 8px;
      margin: 2px;
      padding-top: 5px;
-@@ -160,7 +153,7 @@
+@@ -140,7 +133,7 @@
+     }
+   }
+ 
+-  .panel-heading {
++  .card-header {
+     border-top-left-radius: 0px;
+     border-top-right-radius: 0px;
+   }
+@@ -159,17 +152,17 @@
+     display: none;
    }
  
-   .form-group.required {
+-  .form-group.required {
 -    .transition(all .5s);
++  .q.required {
 +    transition: all .5s;
      margin-bottom: 0;
      label:before {
        display: none;
-@@ -168,8 +161,8 @@
+     }
    }
  
-   .form-group.required.on {
+-  .form-group.required.on {
 -    background-color: @cc-att-neg-hi;
 -    border: 10px solid @cc-att-neg-mid;
++  .q.required.on {
 +    background-color: $cc-att-neg-hi;
 +    border: 10px solid $cc-att-neg-mid;
      border-bottom: none;
@@ -148,7 +210,61 @@
      color: white;
      width: auto;
      line-height: 14px;
-@@ -268,3 +261,8 @@
+@@ -204,6 +197,10 @@
+ }
+ 
+ @media print {
++  #content-container {
++    max-width: none;
++  }
++
+   .form-container.print-container {
+     margin: 0px;
+     .page-header {
+@@ -211,14 +208,14 @@
+     }
+   }
+ 
+-  .q.form-group {
++  .q {
+     break-inside: avoid;
+   }
+ 
+-  .panel.panel-default.last,
+-  .panel.panel-default.last *,
+-  .q.form-group.last,
+-  .q.form-group.last * {
++  .card.last,
++  .card.last *,
++  .q.last,
++  .q.last * {
+     margin-bottom: 0px;
+     padding-bottom: 0px;
+     .widget-container {
+@@ -241,7 +238,7 @@
+ .question-tile-row {
+   display: flex;
+   align-items: start;
+-  * .form-group, * p, * .control-label {
++  * .q, * p, * .caption {
+     padding-top: 0px !important;
+     padding-bottom: 0px !important;
+     margin-top: 0px !important;
+@@ -249,13 +246,6 @@
+   }
+ }
+ 
+-.question-tile-row {
+-  .gr {
+-    padding-right: 0px !important;
+-    padding-left: 0px !important;
+-  }
+-}
+-
+ .gr-has-no-nested-questions {
+   display: none;
+ }
+@@ -268,3 +258,8 @@
    padding-top: 0px !important;
    padding-bottom: 7px;
  }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_print-general.formplayer-webapp_print-general.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_print-general.formplayer-webapp_print-general.style.diff.txt
index e69de29bb2d1..96cdd303aba2 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_print-general.formplayer-webapp_print-general.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_print-general.formplayer-webapp_print-general.style.diff.txt
@@ -0,0 +1,272 @@
+--- 
++++ 
+@@ -1,194 +1,194 @@
+-// Renders Bootstrap as "small" layout when printing
++// Renders Bootstrap as "medium" layout when printing
+ @media print {
+-    .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
++    .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+       float: left;
+     }
+-    .col-sm-12 {
++    .col-md-12 {
+       width: 100%;
+     }
+-    .col-sm-11 {
++    .col-md-11 {
+       width: 91.66666667%;
+     }
+-    .col-sm-10 {
++    .col-md-10 {
+       width: 83.33333333%;
+     }
+-    .col-sm-9 {
++    .col-md-9 {
+       width: 75%;
+     }
+-    .col-sm-8 {
++    .col-md-8 {
+       width: 66.66666667%;
+     }
+-    .col-sm-7 {
++    .col-md-7 {
+       width: 58.33333333%;
+     }
+-    .col-sm-6 {
++    .col-md-6 {
+       width: 50%;
+     }
+-    .col-sm-5 {
++    .col-md-5 {
+       width: 41.66666667%;
+     }
+-    .col-sm-4 {
++    .col-md-4 {
+       width: 33.33333333%;
+     }
+-    .col-sm-3 {
++    .col-md-3 {
+       width: 25%;
+     }
+-    .col-sm-2 {
++    .col-md-2 {
+       width: 16.66666667%;
+     }
+-    .col-sm-1 {
++    .col-md-1 {
+       width: 8.33333333%;
+     }
+-    .col-sm-pull-12 {
++    .col-md-pull-12 {
+       right: 100%;
+     }
+-    .col-sm-pull-11 {
++    .col-md-pull-11 {
+       right: 91.66666667%;
+     }
+-    .col-sm-pull-10 {
++    .col-md-pull-10 {
+       right: 83.33333333%;
+     }
+-    .col-sm-pull-9 {
++    .col-md-pull-9 {
+       right: 75%;
+     }
+-    .col-sm-pull-8 {
++    .col-md-pull-8 {
+       right: 66.66666667%;
+     }
+-    .col-sm-pull-7 {
++    .col-md-pull-7 {
+       right: 58.33333333%;
+     }
+-    .col-sm-pull-6 {
++    .col-md-pull-6 {
+       right: 50%;
+     }
+-    .col-sm-pull-5 {
++    .col-md-pull-5 {
+       right: 41.66666667%;
+     }
+-    .col-sm-pull-4 {
++    .col-md-pull-4 {
+       right: 33.33333333%;
+     }
+-    .col-sm-pull-3 {
++    .col-md-pull-3 {
+       right: 25%;
+     }
+-    .col-sm-pull-2 {
++    .col-md-pull-2 {
+       right: 16.66666667%;
+     }
+-    .col-sm-pull-1 {
++    .col-md-pull-1 {
+       right: 8.33333333%;
+     }
+-    .col-sm-pull-0 {
++    .col-md-pull-0 {
+       right: auto;
+     }
+-    .col-sm-push-12 {
++    .col-md-push-12 {
+       left: 100%;
+     }
+-    .col-sm-push-11 {
++    .col-md-push-11 {
+       left: 91.66666667%;
+     }
+-    .col-sm-push-10 {
++    .col-md-push-10 {
+       left: 83.33333333%;
+     }
+-    .col-sm-push-9 {
++    .col-md-push-9 {
+       left: 75%;
+     }
+-    .col-sm-push-8 {
++    .col-md-push-8 {
+       left: 66.66666667%;
+     }
+-    .col-sm-push-7 {
++    .col-md-push-7 {
+       left: 58.33333333%;
+     }
+-    .col-sm-push-6 {
++    .col-md-push-6 {
+       left: 50%;
+     }
+-    .col-sm-push-5 {
++    .col-md-push-5 {
+       left: 41.66666667%;
+     }
+-    .col-sm-push-4 {
++    .col-md-push-4 {
+       left: 33.33333333%;
+     }
+-    .col-sm-push-3 {
++    .col-md-push-3 {
+       left: 25%;
+     }
+-    .col-sm-push-2 {
++    .col-md-push-2 {
+       left: 16.66666667%;
+     }
+-    .col-sm-push-1 {
++    .col-md-push-1 {
+       left: 8.33333333%;
+     }
+-    .col-sm-push-0 {
++    .col-md-push-0 {
+       left: auto;
+     }
+-    .col-sm-offset-12 {
++    .col-md-offset-12 {
+       margin-left: 100%;
+     }
+-    .col-sm-offset-11 {
++    .col-md-offset-11 {
+       margin-left: 91.66666667%;
+     }
+-    .col-sm-offset-10 {
++    .col-md-offset-10 {
+       margin-left: 83.33333333%;
+     }
+-    .col-sm-offset-9 {
++    .col-md-offset-9 {
+       margin-left: 75%;
+     }
+-    .col-sm-offset-8 {
++    .col-md-offset-8 {
+       margin-left: 66.66666667%;
+     }
+-    .col-sm-offset-7 {
++    .col-md-offset-7 {
+       margin-left: 58.33333333%;
+     }
+-    .col-sm-offset-6 {
++    .col-md-offset-6 {
+       margin-left: 50%;
+     }
+-    .col-sm-offset-5 {
++    .col-md-offset-5 {
+       margin-left: 41.66666667%;
+     }
+-    .col-sm-offset-4 {
++    .col-md-offset-4 {
+       margin-left: 33.33333333%;
+     }
+-    .col-sm-offset-3 {
++    .col-md-offset-3 {
+       margin-left: 25%;
+     }
+-    .col-sm-offset-2 {
++    .col-md-offset-2 {
+       margin-left: 16.66666667%;
+     }
+-    .col-sm-offset-1 {
++    .col-md-offset-1 {
+       margin-left: 8.33333333%;
+     }
+-    .col-sm-offset-0 {
++    .col-md-offset-0 {
+       margin-left: 0%;
+     }
+-    .visible-xs {
+-      display: none !important;
+-    }
+-    .hidden-xs {
+-      display: block !important;
+-    }
+-    table.hidden-xs {
+-      display: table;
+-    }
+-    tr.hidden-xs {
+-      display: table-row !important;
+-    }
+-    th.hidden-xs,
+-    td.hidden-xs {
+-      display: table-cell !important;
+-    }
+-    .hidden-xs.hidden-print {
++    .visible-sm {
+       display: none !important;
+     }
+     .hidden-sm {
++      display: block !important;
++    }
++    table.hidden-sm {
++      display: table;
++    }
++    tr.hidden-sm {
++      display: table-row !important;
++    }
++    th.hidden-sm,
++    td.hidden-sm {
++      display: table-cell !important;
++    }
++    .hidden-sm.hidden-print {
+       display: none !important;
+     }
+-    .visible-sm {
++    .hidden-md {
++      display: none !important;
++    }
++    .visible-md {
+       display: block !important;
+     }
+-    table.visible-sm {
++    table.visible-md {
+       display: table;
+     }
+-    tr.visible-sm {
++    tr.visible-md {
+       display: table-row !important;
+     }
+-    th.visible-sm,
+-    td.visible-sm {
++    th.visible-md,
++    td.visible-md {
+       display: table-cell !important;
+     }
+-  }+  }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt
index e7d59c8c0f0f..cbd0aa8e17aa 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt
@@ -27,7 +27,7 @@
      max-width: 600px;
      margin: auto;
    }
-@@ -66,10 +69,10 @@
+@@ -66,14 +69,14 @@
  
  .query-description {
    a {
@@ -40,6 +40,11 @@
    }
  }
  
+-.query-caption.required .control-label::before, .search-query-group-header.required .search-query-group-header-label::before {
++.query-caption.required label::before, .search-query-group-header.required .search-query-group-header-label::before {
+   content: '*';
+   font-weight: bold;
+   color: #c0392b;
 @@ -85,16 +88,28 @@
    font-size: larger;
  }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/select2s._select2.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/select2s._select2.style.diff.txt
index e3b369e36838..6716f1ea2ce9 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/select2s._select2.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/select2s._select2.style.diff.txt
@@ -173,7 +173,7 @@
 +
 +.select2-container--default {
 +  .select2-selection--single .select2-selection__clear {
-+    margin-right: 30px;
++    margin-right: 30px !important;
 +  }
 +}
 +
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_form.preview_app_form.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_form.preview_app_form.style.diff.txt
index dd7f99aa50ab..445137a47bba 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_form.preview_app_form.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_form.preview_app_form.style.diff.txt
@@ -49,21 +49,33 @@
    }
  }
  
-@@ -85,7 +82,7 @@
+@@ -76,7 +73,7 @@
+   }
+ }
+ 
+-.form-group {
++.q {
+   padding: 10px 0;
+   label {
+     margin-right: 10px;
+@@ -84,17 +81,17 @@
+   }
  }
  
- .form-group.required {
+-.form-group.required {
 -  .transition(all .5s);
++.q.required {
 +  transition: all .5s;
    margin-bottom: 0;
    label:before {
      display: none;
-@@ -93,8 +90,8 @@
+   }
  }
  
- .form-group.required.on {
+-.form-group.required.on {
 -  background-color: @cc-att-neg-hi;
 -  border: 10px solid @cc-att-neg-mid;
++.q.required.on {
 +  background-color: $cc-att-neg-hi;
 +  border: 10px solid $cc-att-neg-mid;
    border-bottom: none;
@@ -85,3 +97,12 @@
    color: white;
    width: auto;
    line-height: 14px;
+@@ -122,7 +119,7 @@
+   border: none;
+ }
+ 
+-.form-group .help-block {
++.q .help-block {
+   font-size: 11px;
+   &:before {
+     content: "\f05a";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/style-imports.commcarehq.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/style-imports.commcarehq.style.diff.txt
index f2f74bf555b2..e024285339d8 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/style-imports.commcarehq.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/style-imports.commcarehq.style.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -1,44 +1,94 @@
+@@ -1,44 +1,95 @@
 -@import "_hq/includes/variables.less";
 -@import "_hq/includes/mixins.less";
  
@@ -61,6 +61,7 @@
 +@import "reboot";
 +@import "type";
 +@import "commcarehq/type";
++@import "commcarehq/print";
 +@import "images";
 +@import "containers";
 +@import "commcarehq/containers";

From 8c5ed79a781697e319b19ddafb8069147e14f130 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 11:04:26 -0400
Subject: [PATCH 44/91] Added (back) datepicker.scss

This largely restores B3's preview_app/datepicker.less, just updating the selector's
class name and adding an override for transform.
---
 .../preview_app/scss/preview_app-main.scss    |  1 +
 .../scss/preview_app/datepicker.scss          | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 corehq/apps/hqwebapp/static/preview_app/scss/preview_app/datepicker.scss

diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss
index 0fbc4c7d1705..b353faedd93e 100644
--- a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss
@@ -5,6 +5,7 @@
 $transition-speed: .5s;
 
 @import "preview_app/variables";
+@import "preview_app/datepicker";
 @import "preview_app/notifications";
 @import "preview_app/scrollable";
 @import "preview_app/navigation";
diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/datepicker.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/datepicker.scss
new file mode 100644
index 000000000000..3f0b9faf715e
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/datepicker.scss
@@ -0,0 +1,27 @@
+$datepicker-width: 247px;
+$datepicker-width-tablet: 447px;
+$datepicker-height: 410px;
+$datepicker-height-tablet: 565px;
+
+.tempus-dominus-widget {
+  transform: none !important;
+  position: fixed;
+  top: 30px !important;
+  left: 0px !important;
+  padding-bottom: 15px !important;
+  min-height: $datepicker-height !important;
+
+  padding: 5px !important;
+  width: $datepicker-width !important;
+  margin-left: 2px !important;
+  margin-right: 2px !important;
+
+  .datepicker {
+    margin: auto;
+  }
+}
+
+.preview-tablet-mode .tempus-dominus-widget {
+  width: $datepicker-width-tablet !important;
+  min-height: $datepicker-height-tablet !important;
+}

From dc96524c8db384c92e2659045c0b376111f3e952 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 15:05:49 +0000
Subject: [PATCH 45/91] "Bootstrap 5 Migration - Rebuilt diffs"

---
 ...w_app-main.preview_app-main.style.diff.txt |  3 +-
 ...cker.preview_app_datepicker.style.diff.txt | 44 ++++++++++++-------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app-main.preview_app-main.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app-main.preview_app-main.style.diff.txt
index fc2fee935978..8138b1796613 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app-main.preview_app-main.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app-main.preview_app-main.style.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -1,25 +1,17 @@
+@@ -1,25 +1,18 @@
 -@import '../../hqwebapp/less/_hq/includes/variables.less';
 -@import '../../hqwebapp/less/_hq/includes/mixins.less';
 -
@@ -14,6 +14,7 @@
  
 -@import "preview_app/base";
  @import "preview_app/variables";
++@import "preview_app/datepicker";
  @import "preview_app/notifications";
  @import "preview_app/scrollable";
  @import "preview_app/navigation";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_datepicker.preview_app_datepicker.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_datepicker.preview_app_datepicker.style.diff.txt
index 8fddd46cf8e7..1ffc5bbf63a3 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_datepicker.preview_app_datepicker.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_datepicker.preview_app_datepicker.style.diff.txt
@@ -1,29 +1,39 @@
 --- 
 +++ 
-@@ -1,26 +0,0 @@
+@@ -1,17 +1,18 @@
 -@datepicker-width: 247px;
 -@datepicker-width-tablet: 447px;
 -@datepicker-height: 410px;
 -@datepicker-height-tablet: 565px;
--
++$datepicker-width: 247px;
++$datepicker-width-tablet: 447px;
++$datepicker-height: 410px;
++$datepicker-height-tablet: 565px;
+ 
 -.bootstrap-datetimepicker-widget.dropdown-menu {
--  position: fixed;
--  top: 30px !important;
--  left: 0px !important;
--  padding-bottom: 15px !important;
++.tempus-dominus-widget {
++  transform: none !important;
+   position: fixed;
+   top: 30px !important;
+   left: 0px !important;
+   padding-bottom: 15px !important;
 -  min-height: @datepicker-height !important;
--
--  padding: 5px !important;
++  min-height: $datepicker-height !important;
+ 
+   padding: 5px !important;
 -  width: @datepicker-width !important;
--  margin-left: 2px !important;
--  margin-right: 2px !important;
--
--  .datepicker {
--    margin: auto;
--  }
--}
--
++  width: $datepicker-width !important;
+   margin-left: 2px !important;
+   margin-right: 2px !important;
+ 
+@@ -20,7 +21,7 @@
+   }
+ }
+ 
 -.preview-tablet-mode .bootstrap-datetimepicker-widget.dropdown-menu {
 -  width: @datepicker-width-tablet !important;
 -  min-height: @datepicker-height-tablet !important;
--}
++.preview-tablet-mode .tempus-dominus-widget {
++  width: $datepicker-width-tablet !important;
++  min-height: $datepicker-height-tablet !important;
+ }

From 07e8d91c5cbc9b7b250f54a7bd3b8de25e7f1508 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 5 Jun 2024 15:45:21 -0400
Subject: [PATCH 46/91] Updated stray references to .panel

---
 corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js | 2 +-
 .../cloudcare/static/cloudcare/js/formplayer/menus/views.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
index d446e687a2eb..12578dd8f669 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
@@ -384,7 +384,7 @@ hqDefine("cloudcare/js/formplayer/app", [
 
         window.addEventListener(
             'beforeprint', function () {
-                $('.panel.panel-default, .q.form-group').last().addClass('last');
+                $('.card, .q').last().addClass('last');
             }
         );
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index e91c620131c2..62188440e118 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -489,7 +489,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
 
     const CaseTileView = CaseView.extend({
         tagName: "div",
-        className: "formplayer-request list-cell-wrapper-style panel panel-default",
+        className: "formplayer-request list-cell-wrapper-style card",
         template: _.template($("#case-tile-view-item-template").html() || ""),
         templateContext: function () {
             const dict = CaseTileView.__super__.templateContext.apply(this, arguments);
@@ -513,7 +513,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
 
     const CaseTileViewUnclickable = CaseTileView.extend({
         events: {},
-        className: "list-cell-wrapper-style panel panel-default",
+        className: "list-cell-wrapper-style card",
         rowClick: function () {},
     });
 
@@ -537,7 +537,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
 
     const CaseTileGroupedView = CaseTileView.extend({
         tagName: "div",
-        className: "formplayer-request list-cell-wrapper-style case-tile-group panel panel-default",
+        className: "formplayer-request list-cell-wrapper-style case-tile-group card",
         template: _.template($("#case-tile-grouped-view-item-template").html() || ""),
         templateContext: function () {
             const dict = CaseTileGroupedView.__super__.templateContext.apply(this, arguments);

From 5b347a419e231db8aa3226b5c8c4920c1ef8b7a5 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Thu, 6 Jun 2024 09:09:34 -0400
Subject: [PATCH 47/91] Removed add_grouop.html

I missed this while rebasing on master.
---
 .../partials/form_entry/bootstrap3/add_group.html     | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/add_group.html

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/add_group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/add_group.html
deleted file mode 100644
index bd865c5ffc94..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/add_group.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% load hq_shared_tags %}
-
-<script type="text/html" id="add-group-fullform-ko-template">
-  <div style="margin-bottom: 10px; margin-right: 10px">
-        <button class="btn btn-default add" href="#"
-                data-bind="click: newRepeat, text: addChoice"
-                id="repeat-add-new">
-                <i class="fa fa-plus"></i>
-        </button>
-  </div>
-</script>

From d7825b6a9ffb1b96cd21c6596fcc4e69de52bbb0 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 10 Jun 2024 09:08:43 -0400
Subject: [PATCH 48/91] Fixed rendering and saving of OQPS setting

---
 .../cloudcare/js/formplayer/layout/views/settings.js       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
index dd783bb59819..65bea1ba5d99 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
@@ -68,8 +68,13 @@ hqDefine("cloudcare/js/formplayer/layout/views/settings", [
         events: {
             'change @ui.oneQuestionPerScreen': 'onChangeOneQuestionPerScreen',
         },
+        onRender: function () {
+            if (this.currentUser.displayOptions.oneQuestionPerScreen) {
+                this.ui.oneQuestionPerScreen.attr("checked", "checked");
+            }
+        },
         onChangeOneQuestionPerScreen: function (e, switchValue) {
-            this.currentUser.displayOptions.oneQuestionPerScreen = switchValue;
+            this.currentUser.displayOptions.oneQuestionPerScreen = e.target.value === "on";
             UsersModels.saveDisplayOptions(this.currentUser.displayOptions);
         },
     });

From b82231a909cf21bb6b62ee388c95e1d34823b61e Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 10 Jun 2024 10:38:41 -0400
Subject: [PATCH 49/91] Fixed padding in form error UI

This .col-md-12 isn't necessary, as alerts already take up all available width,
and it's messing with the content's padding.
---
 .../cloudcare/templates/cloudcare/partials/form_entry/form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
index 7f634c521867..676af685c7b2 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
@@ -21,7 +21,7 @@ <h1 class="title" data-bind="text: title, visible: !showInFormNavigation()"></h1
       </div>
       {% if environment == "web-apps" %}
         <div class="row" data-bind="visible: erroredQuestions().length > 0">
-          <div class="col-md-12 alert alert-danger">
+          <div class="alert alert-danger">
             {% blocktrans %}
               Please correct the answers below before submitting.
               <br>

From b8808bab56fe2ce49a4fe760a8ff57fe88b8e9c7 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 10 Jun 2024 10:40:44 -0400
Subject: [PATCH 50/91] Removed unnecessary wrapper containers in debugger's
 Evaluate XPath area

---
 .../cloudcare/templates/cloudcare/partials/debugger.html    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/debugger.html b/corehq/apps/cloudcare/templates/cloudcare/partials/debugger.html
index 958495489c37..984ca02882c6 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/debugger.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/debugger.html
@@ -159,11 +159,7 @@
     }">
     </div>
   </form>
-  <div class="row">
-    <div class="col-md-12">
-      <h4>{% trans "Recent Queries" %}</h4>
-    </div>
-  </div>
+  <h4>{% trans "Recent Queries" %}</h4>
   <!-- ko if: recentXPathQueries().length -->
   <div class="table-responsive">
     <table class="table table-striped table-hover">

From 4c0c6889fcf27af77dfbdafed5852ae7c2ffb7d3 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 10 Jun 2024 12:40:04 -0400
Subject: [PATCH 51/91] Removed spacing wrappers around new repeat button

These don't do anything.
---
 .../cloudcare/partials/form_entry/add_group.html     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/add_group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/add_group.html
index b92e4fb4ba9d..dc38e3f70bac 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/add_group.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/add_group.html
@@ -1,11 +1,9 @@
 {% load hq_shared_tags %}
 
 <script type="text/html" id="add-group-fullform-ko-template">
-  <div class="mb-1 mr-1">
-        <button class="btn btn-outline-primary add" href="#"
-                data-bind="click: newRepeat, text: addChoice"
-                id="repeat-add-new">
-                <i class="fa fa-plus"></i>
-        </button>
-  </div>
+  <button class="btn btn-outline-primary add" href="#"
+          data-bind="click: newRepeat, text: addChoice"
+          id="repeat-add-new">
+    <i class="fa fa-plus"></i>
+  </button>
 </script>

From c2d385542421f12b8bf0fe1234549f332a2d04f4 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 10 Jun 2024 13:23:43 -0400
Subject: [PATCH 52/91] Cleaned up file upload input

The col.*classes add extra right-left padding that misaligns the input with the label.
---
 .../partials/form_entry/entry_file.html       | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_file.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_file.html
index 38a9461dc52f..0c1b68ebf32c 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_file.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_file.html
@@ -1,24 +1,20 @@
 {% load hq_shared_tags %}
 
 <script type="text/html" id="file-entry-ko-template">
-  <div class="row">
-    <div class="col-sm-8">
-      <input type="file" data-bind="
-            value: $data.rawAnswer,
-            css: { 'is-invalid': $parent.hasError() },
-            attr: {
-                id: entryId,
-                'aria-required': $parent.required() ? 'true' : 'false',
-                accept: accept,
-            },
-        "/>
-    </div>
-    <div class="col-sm-4">
-      <button class="btn btn-outline-primary btn-sm float-end" data-bind="
-        click: onClear,
-        text: $root.getTranslation('upload.clear.title', '{% trans_html_attr 'Clear' %}'),
-      ">
-      </button>
-    </div>
+  <div class="d-flex">
+    <input type="file" data-bind="
+          value: $data.rawAnswer,
+          css: { 'is-invalid': $parent.hasError() },
+          attr: {
+              id: entryId,
+              'aria-required': $parent.required() ? 'true' : 'false',
+              accept: accept,
+          },
+      "/>
+    <button class="btn btn-outline-primary btn-sm" data-bind="
+      click: onClear,
+      text: $root.getTranslation('upload.clear.title', '{% trans_html_attr 'Clear' %}'),
+    ">
+    </button>
   </div>
 </script>

From f09358c19a330cb14660c6eee100a15cae9dfcba Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 10 Jun 2024 14:19:21 -0400
Subject: [PATCH 53/91] Added gap to question tiles

This addresses the spacing issue for repeat groups in question tiles that 4c0c688 took care of in B3.
---
 .../cloudcare/partials/form_entry/grouped_element_tile_row.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/grouped_element_tile_row.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/grouped_element_tile_row.html
index 52f3bb83966d..655641f13f77 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/grouped_element_tile_row.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/grouped_element_tile_row.html
@@ -1,3 +1,3 @@
 <script type="text/html" id="grouped-element-tile-row-fullform-ko-template">
-  <div data-bind="template: { name: childTemplate, foreach: $data.children }" class="question-tile-row"/>
+  <div data-bind="template: { name: childTemplate, foreach: $data.children }" class="question-tile-row gap-2"/>
 </script>

From f9e6bcae2373a047cc7eb8b75b9dbbb03968a2a4 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 10 Jun 2024 14:20:10 -0400
Subject: [PATCH 54/91] Simplified question.html

This make for better consistency when trying to align questions, labels, and buttons that use question tiles.
---
 .../static/cloudcare/js/form_entry/form_ui.js | 19 +++++---
 .../partials/form_entry/question.html         | 45 -------------------
 2 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index caa911752f81..2b552aa6bd61 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -947,8 +947,10 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
             return (self.error() || self.serverError()) && !self.dirty();
         });
 
+        self.isButton = self.datatype() === 'select' && self.stylesContains(constants.BUTTON_SELECT);
+        self.isLabel = self.datatype() === 'info';
         self.hasLabelContent = ko.computed(function () {
-            return (
+            return !self.isButton && (
                 ko.utils.unwrapObservable(self.caption)
                 || ko.utils.unwrapObservable(self.caption_markdown)
                 || ko.utils.unwrapObservable(self.help)
@@ -970,8 +972,6 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
             return self.error() === null && self.serverError() === null;
         };
 
-        self.isButton = self.datatype() === 'select' && self.stylesContains(constants.BUTTON_SELECT);
-        self.isLabel = self.datatype() === 'info';
         self.entry = entries.getEntry(self);
         self.entryTemplate = function () {
             return self.entry.templateType + '-entry-ko-template';
@@ -1076,12 +1076,17 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
         const columnWidth = GroupedElementTileRow.calculateElementWidth(self.style);
 
         if (self.stylesContains(constants.PER_ROW_PATTERN)) {
-            self.controlWidth = constants.FULL_WIDTH;
-            self.labelWidth = constants.FULL_WIDTH;
+            self.controlWidth = "";
+            self.labelWidth = "";
             self.questionTileWidth = `col-md-${columnWidth}`;
         } else {
-            self.controlWidth = constants.CONTROL_WIDTH;
-            self.labelWidth = constants.LABEL_WIDTH;
+            if (self.isLabel || self.isButton) {
+                self.controlWidth = "";
+                self.labelWidth = "";
+            } else {
+                self.controlWidth = constants.CONTROL_WIDTH;
+                self.labelWidth = constants.LABEL_WIDTH;
+            }
             self.questionTileWidth = constants.FULL_WIDTH;
             if (!hasLabel) {
                 self.controlWidth += ' ' + constants.LABEL_OFFSET;
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/question.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/question.html
index 9dbd051bc138..99f5a27710a9 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/question.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/question.html
@@ -3,7 +3,6 @@
 
 <script type="text/html" id="question-fullform-ko-template">
   <div data-bind="class:questionTileWidth">
-  <!-- ko if: !isLabel && !isButton -->
   <div class="q row" data-bind="
             css: {
                 error: error,
@@ -83,49 +82,5 @@
        data-bind="visible: $data.required, css: {
                       on: $root.forceRequiredVisible,
                     }">{% trans 'Sorry, this response is required!' %}</div>
-  <!-- /ko -->
-  <!-- ko if: isLabel -->
-    {# appearance attributes TEXT_ALIGN_CENTER TEXT_ALIGN_RIGHT #}
-    <div class="info" data-bind="
-        css: {
-            'text-center': stylesContains('text-align-center'),
-            'text-end': stylesContains('text-align-right'),
-        },
-        attr: {
-            id: entry.entryId + '-label',
-        },
-    ">
-      <span class="ix" data-bind="text: ixInfo($data)">></span>
-      <span class="caption webapp-markdown-output" data-bind="
-          html: ko.utils.unwrapObservable($data.caption_markdown) || caption()
-          "></span>
-      <div class="widget-multimedia" data-bind="
-                template: { name: 'widget-multimedia-ko-template', data: $data }"
-      >
-      </div>
-      <div class="widget-container controls" data-bind="css: controlWidth">
-        <!-- labels only deal with server errors, since there's no data type validation for the browser to do-->
-        <div class="text-danger error-message" data-bind="
-          visible: serverError,
-          text: serverError
-          "></div>
-      </div>
-    </div>
-  <!-- /ko -->
-  <!-- ko if: isButton -->
-  {# appearance attributes TEXT_ALIGN_CENTER TEXT_ALIGN_RIGHT #}
-    <div class="q row" data-bind="
-      css: {
-        error: error,
-        'text-center': stylesContains('text-align-center'),
-        'text-end': stylesContains('text-align-right')
-      }">
-      <div class="widget-container controls col-md-12">
-        <div class="widget" data-bind="
-          template: { name: entryTemplate, data: entry, afterRender: afterRender },
-        "></div>
-      </div>
-    </div>
-  <!-- /ko -->
   </div>
 </script>

From a2029a2dccab90fe877d068aa872bf936887e806 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 10 Jun 2024 14:26:34 -0400
Subject: [PATCH 55/91] Fixed lint errors

---
 .../static/cloudcare/js/formplayer/layout/views/settings.js | 2 +-
 corehq/apps/cloudcare/static/cloudcare/js/utils.js          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
index 65bea1ba5d99..f64f4fe34f75 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
@@ -73,7 +73,7 @@ hqDefine("cloudcare/js/formplayer/layout/views/settings", [
                 this.ui.oneQuestionPerScreen.attr("checked", "checked");
             }
         },
-        onChangeOneQuestionPerScreen: function (e, switchValue) {
+        onChangeOneQuestionPerScreen: function (e) {
             this.currentUser.displayOptions.oneQuestionPerScreen = e.target.value === "on";
             UsersModels.saveDisplayOptions(this.currentUser.displayOptions);
         },
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index 224213417318..023b37de277f 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -377,7 +377,7 @@ hqDefine('cloudcare/js/utils', [
         if (selectedDate) {
             options.viewDate = new hqTempusDominus.tempusDominus.DateTime(selectedDate);
         }
-        let tempus = hqTempusDominus.createDatePicker($el.get(0), options);
+        hqTempusDominus.createDatePicker($el.get(0), options);
 
         $el.attr("placeholder", dateFormat);
         $el.attr("pattern", "[0-9\-/]+");   // eslint-disable-line no-useless-escape
@@ -398,14 +398,14 @@ hqDefine('cloudcare/js/utils', [
             },
             localization: {
                 format: timeFormat,
-                hourCycle: timeFormat.indexOf('T') == -1 ? 'h23' : 'h12',
+                hourCycle: timeFormat.indexOf('T') === -1 ? 'h23' : 'h12',
             },
             useCurrent: true,
         };
         if (date.isValid()) {
             options.viewDate = new hqTempusDominus.tempusDominus.DateTime(date.format(timeFormat));
         }
-        let tempus = hqTempusDominus.createTimePicker($el.get(0), options);
+        hqTempusDominus.createTimePicker($el.get(0), options);
     };
 
     var smallScreenIsEnabled = function () {

From b82bd309cfb8bd2fe9c308c06ed80705b7f636f9 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 10 Jun 2024 15:32:47 -0400
Subject: [PATCH 56/91] Fixed OQPS setting so it can be turned off, not just on

---
 .../static/cloudcare/js/formplayer/layout/views/settings.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
index f64f4fe34f75..bd9d2ea3cba7 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/layout/views/settings.js
@@ -74,7 +74,7 @@ hqDefine("cloudcare/js/formplayer/layout/views/settings", [
             }
         },
         onChangeOneQuestionPerScreen: function (e) {
-            this.currentUser.displayOptions.oneQuestionPerScreen = e.target.value === "on";
+            this.currentUser.displayOptions.oneQuestionPerScreen = e.target.checked;
             UsersModels.saveDisplayOptions(this.currentUser.displayOptions);
         },
     });

From 882870d26204a1d3571d6afc718e68b2bcb60fd6 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 10 Jun 2024 16:19:53 -0400
Subject: [PATCH 57/91] Fixed display of multiselect checkboxes in case tiles

---
 .../cloudcare/scss/formplayer-webapp/case-tile.scss      | 1 +
 ..._case-tile.formplayer-webapp_case-tile.style.diff.txt | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/case-tile.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/case-tile.scss
index 4aaefef9ccd9..6d63815e77c0 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/case-tile.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/case-tile.scss
@@ -148,6 +148,7 @@
   }
 
   .list-cell-wrapper-style {
+    display: block;         // override .card's display: flex rule
     margin: 10px 5px 0 5px;
     border-collapse: collapse;
     vertical-align: top;
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_case-tile.formplayer-webapp_case-tile.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_case-tile.formplayer-webapp_case-tile.style.diff.txt
index 847a22897aad..edb60a083e26 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_case-tile.formplayer-webapp_case-tile.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_case-tile.formplayer-webapp_case-tile.style.diff.txt
@@ -56,7 +56,7 @@
        height: 25vh;
      }
  
-@@ -142,8 +142,8 @@
+@@ -142,20 +142,21 @@
        /* Horizontally center the text (icon) */
        line-height: 12px;
        /* Vertically center the text (icon) */
@@ -67,7 +67,8 @@
      }
    }
  
-@@ -151,11 +151,11 @@
+   .list-cell-wrapper-style {
++    display: block;         // override .card's display: flex rule
      margin: 10px 5px 0 5px;
      border-collapse: collapse;
      vertical-align: top;
@@ -81,7 +82,7 @@
      }
  
      .module-icon,
-@@ -165,14 +165,14 @@
+@@ -165,14 +166,14 @@
      }
  
      &:hover {
@@ -98,7 +99,7 @@
    }
  
    .case-tile-group{
-@@ -205,7 +205,7 @@
+@@ -205,7 +206,7 @@
      }
  
      .list-cell-wrapper-style {

From 15e030b3105e3bc178185a185f4124ec6ce3ca88 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 11 Jun 2024 17:39:52 -0400
Subject: [PATCH 58/91] Updated app preview to show required asterisks

---
 .../templates/cloudcare/partials/query/group.html         | 4 ++--
 .../static/cloudcare/scss/formplayer-common-main.scss     | 1 +
 .../static/cloudcare/scss/formplayer-common/query.scss    | 7 +++++++
 .../static/cloudcare/scss/formplayer-common/webforms.scss | 2 +-
 .../static/cloudcare/scss/formplayer-webapp/query.scss    | 8 --------
 .../static/preview_app/scss/preview_app/form.scss         | 3 ---
 6 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/query.scss

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/group.html
index a71b34e07b2f..8e44e6f8fad4 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/query/group.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/query/group.html
@@ -1,8 +1,8 @@
 <script type="text/template" id="query-view-group-template">
   <td class="search-query-group">
     <% if (named) { %>
-    <div class="search-query-group-header <% if (required) { %> required<% } %>" data-bs-toggle="collapse" data-bs-target="#group-<%- groupKey %>" aria-expanded="true" aria-controls="group-<%- groupKey %>">
-      <label class="search-query-group-header-label fw-bold"><%= groupName %></label>
+    <div class="search-query-group-header d-flex<% if (required) { %> required<% } %>" data-bs-toggle="collapse" data-bs-target="#group-<%- groupKey %>" aria-expanded="true" aria-controls="group-<%- groupKey %>">
+      <label class="search-query-group-header-label fw-bold flex-fill"><%= groupName %></label>
       <i class="fa fa-angle-double-down float-end fs-5"></i>
     </div>
     <% } %>
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common-main.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common-main.scss
index 591873618dd3..9164a16b2423 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common-main.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common-main.scss
@@ -22,6 +22,7 @@ version of FORMPLAYER
 @import "formplayer-common/formnav";
 @import "formplayer-common/markdown-table";
 @import "formplayer-common/address";
+@import "formplayer-common/query";
 @import "formplayer-common/webforms";
 
 @import "debugger/debugger";
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/query.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/query.scss
new file mode 100644
index 000000000000..675d5b374d2f
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/query.scss
@@ -0,0 +1,7 @@
+.query-caption.required label::before, .search-query-group-header.required .search-query-group-header-label::before {
+  content: '*';
+  font-weight: bold;
+  color: $danger;
+  margin: 0 3px;
+  float: left;
+}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/webforms.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/webforms.scss
index cfa3037d6708..63f1212fbde2 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/webforms.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/webforms.scss
@@ -66,7 +66,7 @@ input:invalid {
 .required-group .gr-header .caption::before {
   content: '*';
   font-weight: bold;
-  color: #c0392b;
+  color: $danger;
   margin: 0 3px;
   float: left;
 }
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss
index 4a7d0bd30219..6d7a07c77198 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss
@@ -76,14 +76,6 @@
   }
 }
 
-.query-caption.required label::before, .search-query-group-header.required .search-query-group-header-label::before {
-  content: '*';
-  font-weight: bold;
-  color: #c0392b;
-  margin: 0 3px;
-  float: left;
-}
-
 .search-query-group-header-label {
   font-size: larger;
 }
diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss
index d9591eb3d836..e084a1e14b1b 100644
--- a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss
@@ -84,9 +84,6 @@
 .q.required {
   transition: all .5s;
   margin-bottom: 0;
-  label:before {
-    display: none;
-  }
 }
 
 .q.required.on {

From b12606d5a7438a8cd18f73c2a52ba9636f13ce3f Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 11 Jun 2024 22:12:46 +0000
Subject: [PATCH 59/91] "Bootstrap 5 Migration - Rebuilt diffs"

---
 ...n-main.formplayer-common-main.style.diff.txt |  8 ++++++++
 ...ms.formplayer-common_webforms.style.diff.txt |  9 +++++++++
 ...query.formplayer-webapp_query.style.diff.txt | 17 ++++++++++-------
 ...iew_app_form.preview_app_form.style.diff.txt | 12 ++++++------
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common-main.formplayer-common-main.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common-main.formplayer-common-main.style.diff.txt
index 75a35eec0da8..b87132107d48 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common-main.formplayer-common-main.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common-main.formplayer-common-main.style.diff.txt
@@ -8,3 +8,11 @@
  
  /**
  These are the styles shared across both PREVIEW and the FULL PAGE WEB APP
+@@ -22,6 +22,7 @@
+ @import "formplayer-common/formnav";
+ @import "formplayer-common/markdown-table";
+ @import "formplayer-common/address";
++@import "formplayer-common/query";
+ @import "formplayer-common/webforms";
+ 
+ @import "debugger/debugger";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_webforms.formplayer-common_webforms.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_webforms.formplayer-common_webforms.style.diff.txt
index 3fcfe45f9c26..083d7a98ae28 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_webforms.formplayer-common_webforms.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_webforms.formplayer-common_webforms.style.diff.txt
@@ -9,3 +9,12 @@
    button p {
      margin-bottom: 0;
    }
+@@ -68,7 +66,7 @@
+ .required-group .gr-header .caption::before {
+   content: '*';
+   font-weight: bold;
+-  color: #c0392b;
++  color: $danger;
+   margin: 0 3px;
+   float: left;
+ }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt
index cbd0aa8e17aa..cadc16001154 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt
@@ -27,7 +27,7 @@
      max-width: 600px;
      margin: auto;
    }
-@@ -66,14 +69,14 @@
+@@ -66,35 +69,39 @@
  
  .query-description {
    a {
@@ -38,14 +38,17 @@
 -    color: @cc-brand-low;
 +    color: $cc-brand-low;
    }
+-}
+-
+-.query-caption.required .control-label::before, .search-query-group-header.required .search-query-group-header-label::before {
+-  content: '*';
+-  font-weight: bold;
+-  color: #c0392b;
+-  margin: 0 3px;
+-  float: left;
  }
  
--.query-caption.required .control-label::before, .search-query-group-header.required .search-query-group-header-label::before {
-+.query-caption.required label::before, .search-query-group-header.required .search-query-group-header-label::before {
-   content: '*';
-   font-weight: bold;
-   color: #c0392b;
-@@ -85,16 +88,28 @@
+ .search-query-group-header-label {
    font-size: larger;
  }
  
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_form.preview_app_form.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_form.preview_app_form.style.diff.txt
index 445137a47bba..f9b73116de0c 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_form.preview_app_form.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_form.preview_app_form.style.diff.txt
@@ -58,7 +58,7 @@
    padding: 10px 0;
    label {
      margin-right: 10px;
-@@ -84,17 +81,17 @@
+@@ -84,17 +81,14 @@
    }
  }
  
@@ -67,9 +67,9 @@
 +.q.required {
 +  transition: all .5s;
    margin-bottom: 0;
-   label:before {
-     display: none;
-   }
+-  label:before {
+-    display: none;
+-  }
  }
  
 -.form-group.required.on {
@@ -81,7 +81,7 @@
    border-bottom: none;
    label {
      margin-left: 0;
-@@ -104,13 +101,13 @@
+@@ -104,13 +98,13 @@
  
  .form-group-required-label {
    opacity: 0;
@@ -97,7 +97,7 @@
    color: white;
    width: auto;
    line-height: 14px;
-@@ -122,7 +119,7 @@
+@@ -122,7 +116,7 @@
    border: none;
  }
  

From 7931f7d193978a1b1ce3a22da9be6c626f40043e Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 17 Jun 2024 09:54:09 -0400
Subject: [PATCH 60/91] Removed bottom border from multiselect checkbox cells,
 to match other case list cells

---
 .../hqwebapp/static/cloudcare/scss/formplayer-common/module.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
index ca3f42623fc3..03737d611323 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
@@ -127,6 +127,7 @@ button.clickable-icon {
 .module-table .module-case-list-column-checkbox {
   cursor: default;
   width: 35px;
+  border: 0;
   vertical-align: middle;
 }
 

From b4667a01c121a62ed35ffad241016c325a966cf6 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 17 Jun 2024 10:17:49 -0400
Subject: [PATCH 61/91] Reduced padding for Login As banner on app preview

---
 .../hqwebapp/static/preview_app/scss/preview_app/module.scss   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss
index 424692d2dda0..4f04c0538721 100644
--- a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss
@@ -129,8 +129,7 @@
 
 .module-banner {
   font-size: 11px;
-  padding-left: 6px;
-  padding-right: 6px;
+  padding: 6px;
 }
 
 .module-menu-bar-offset {

From 290fe23a0a644eeffefcc003303c50be1a068492 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 17 Jun 2024 12:54:02 -0400
Subject: [PATCH 62/91] Updated dropdowns to use .form-select instead of
 .form-control

---
 .../cloudcare/js/form_entry/web_form_session.js      |  2 +-
 .../cloudcare/static/cloudcare/js/formplayer/app.js  |  4 ++--
 .../static/cloudcare/js/preview_app/dragscroll.js    |  7 +++++--
 .../static/cloudcare/js/preview_app/main.js          |  2 +-
 .../templates/cloudcare/partials/debugger.html       |  2 +-
 .../partials/form_entry/entry_dropdown.html          |  2 +-
 .../partials/form_entry/entry_multidropdown.html     |  2 +-
 .../templates/cloudcare/partials/pagination.html     |  2 +-
 .../templates/cloudcare/partials/query/item.html     |  4 ++--
 .../templates/cloudcare/partials/settings_view.html  |  2 +-
 .../cloudcare/scss/formplayer-webapp/form.scss       |  2 +-
 .../static/preview_app/scss/preview_app/module.scss  | 12 +++++++-----
 12 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
index f85d3cec8258..f5a4177e6389 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
@@ -228,7 +228,7 @@ hqDefine("cloudcare/js/form_entry/web_form_session", [
                 errorMessage = errors.NO_INTERNET_ERROR;
                 if (action === constants.SUBMIT) {
                     $('.submit').prop('disabled', false);
-                    $('.form-control').prop('disabled', false);
+                    $('.form-control, .form-select').prop('disabled', false);
                 }
             } else if (_.has(resp, 'responseJSON') && resp.responseJSON !== undefined) {
                 errorMessage = formEntryUtils.touchformsError(resp.responseJSON.message);
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
index 12578dd8f669..8a5e2594b102 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
@@ -367,7 +367,7 @@ hqDefine("cloudcare/js/formplayer/app", [
                             "for offline use. Please reconnect to the Internet before " +
                             "continuing."), $("#cloudcare-notifications"));
                         $('.submit').prop('disabled', 'disabled');
-                        $('.form-control').prop('disabled', 'disabled');
+                        $('.form-control, .form-select').prop('disabled', 'disabled');
                     }
                 },reconnectTimingWindow);
             });
@@ -377,7 +377,7 @@ hqDefine("cloudcare/js/formplayer/app", [
                 if ((new Date() - offlineTime) > reconnectTimingWindow) {
                     CloudcareUtils.showSuccess(gettext("You are are back online."), $("#cloudcare-notifications"));
                     $('.submit').prop('disabled', false);
-                    $('.form-control').prop('disabled', false);
+                    $('.form-control, .form-select').prop('disabled', false);
                 }
             }
         );
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/preview_app/dragscroll.js b/corehq/apps/cloudcare/static/cloudcare/js/preview_app/dragscroll.js
index 59d3d6b54dba..e3747fd1d331 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/preview_app/dragscroll.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/preview_app/dragscroll.js
@@ -47,9 +47,12 @@ hqDefine("cloudcare/js/preview_app/dragscroll", ["jquery"], function ($) {
                             lastClientY = e.clientY;
 
                             // monkeypatch
-                            if (!($(e.srcElement).hasClass('form-control') || $(e.target).hasClass('form-control'))) {
+                            if (!(
+                                $(e.srcElement).hasClass('form-control') || $(e.target).hasClass('form-control')
+                                || $(e.srcElement).hasClass('form-select') || $(e.target).hasClass('form-select')
+                            )) {
                                 e.preventDefault();
-                                $('.form-control').blur();
+                                $('.form-control, .form-select').blur();
                             }
 
                         }
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/preview_app/main.js b/corehq/apps/cloudcare/static/cloudcare/js/preview_app/main.js
index cfc21d5ccbce..7fe70401c55e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/preview_app/main.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/preview_app/main.js
@@ -32,7 +32,7 @@ hqDefine("cloudcare/js/preview_app/main", [
         });
 
         $('.dragscroll').on('scroll', function () {
-            $('.form-control').blur();
+            $('.form-control, .form-select').blur();
         });
 
         // Adjust for those pesky scrollbars
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/debugger.html b/corehq/apps/cloudcare/templates/cloudcare/partials/debugger.html
index 984ca02882c6..481d43f63b13 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/debugger.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/debugger.html
@@ -149,7 +149,7 @@
         type="button"
         data-bind="css: { disabled: !selectedXPath() }, click: onClickSelectedXPath"/>
       <div class="col-md-3 float-end">
-        <select class="form-control" data-bind="value: selectedDebugOption, options: debugTraceOptions, optionsText: 'label'"></select>
+        <select class="form-select" data-bind="value: selectedDebugOption, options: debugTraceOptions, optionsText: 'label'"></select>
       </div>
     </div>
     <div class="mb-3" data-bind="template: {
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_dropdown.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_dropdown.html
index b2d1ae28f6c3..95c8c750c396 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_dropdown.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_dropdown.html
@@ -1,5 +1,5 @@
 <script type="text/html" id="dropdown-entry-ko-template">
-  <select class="form-control" data-bind="
+  <select class="form-select" data-bind="
         foreach: options,
         value: rawAnswer,
         css: { 'is-invalid': $parent.hasError() },
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_multidropdown.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_multidropdown.html
index cad95edbdca9..41d962288828 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_multidropdown.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_multidropdown.html
@@ -1,5 +1,5 @@
 <script type="text/html" id="multidropdown-entry-ko-template">
-  <select multiple class="form-control" data-bind="
+  <select multiple class="form-select" data-bind="
         options: choices,
         selectedOptions: rawAnswer,
         css: { 'is-invalid': $parent.hasError() },
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/pagination.html b/corehq/apps/cloudcare/templates/cloudcare/partials/pagination.html
index 537b667854ff..5f18f8bd4cfd 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/pagination.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/pagination.html
@@ -6,7 +6,7 @@
     <div class="container pagination-container">
       <div class="d-flex justify-content-between flex-wrap">
         <div class="module-per-page-container mb-2">
-          <select class="form-control form-control-lg per-page-limit">
+          <select class="form-select form-select-lg per-page-limit">
             <% for(var i = 0; i < rowRange.length; i++) { %>
               <% if (rowRange[i] === limit) { %>
                 <option value="<%- rowRange[i] %>" selected>{% trans "<%- rowRange[i] %> per page" %}</option>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/item.html
index 8610eaf5a114..f2f85eae02d9 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/query/item.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/query/item.html
@@ -23,7 +23,7 @@
     class="<% if (contentTag === 'td') { %>col-sm-6 <% } else { %>input-group-sm <% } %>query-input-group">
 
     <% if (input == "select1") { %>
-    <select class="query-field form-control hqwebapp-select2<% if (errorMessage) { %> is-invalid<% } %>"
+    <select class="query-field form-select hqwebapp-select2<% if (errorMessage) { %> is-invalid<% } %>"
             data-receive="<%- receive %>"<% if (required) { %> aria-required="true"<% } %>>
         <option value=""></option>
         <% for (let key in itemsetChoicesDict) { %>
@@ -35,7 +35,7 @@
 
     <% } else if (input == "select") { %>
     <select multiple
-            class="query-field form-control hqwebapp-select2<% if (errorMessage) { %> is-invalid<% } %>"
+            class="query-field form-select hqwebapp-select2<% if (errorMessage) { %> is-invalid<% } %>"
             data-receive="<%- receive %>"<% if (required) { %> aria-required="true"<% } %>>
         <% for (let key in itemsetChoicesDict) { %>
         <option value="<%- key %>" <% if (value && value.indexOf(String(key)) > -1) { %>selected<% } %>>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/settings_view.html b/corehq/apps/cloudcare/templates/cloudcare/partials/settings_view.html
index 6eab93a10872..faedd2d1dc02 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/settings_view.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/settings_view.html
@@ -30,7 +30,7 @@ <h1 class="page-title">{% trans "Settings" %}</h1>
 <script type="text/template" id="lang-setting-template">
   <th>{% trans "Set the application language" %}</th>
   <td>
-    <select class="form-control js-lang">
+    <select class="form-select js-lang">
       <% _.each(langs, function(lang) { %>
       <option <% if (lang === currentLang) { %>selected<% } %>>
       <%- lang %>
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
index c3bda0fc21fd..84aace2517ea 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
@@ -17,7 +17,7 @@ $group-indent: 15px;
     padding-top: 3px;
   }
 
-  .form-control {
+  .form-control, .form-select {
     font-size: $form-text-size;
   }
 
diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss
index 4f04c0538721..2ae39671a74a 100644
--- a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss
@@ -45,15 +45,17 @@
   }
 }
 
-.module-per-page-container {
-  .pagination-lg .form-control,
-  .pagination-lg .btn{
+.pagination-container {
+  .form-select,
+  .pagination-lg .page-link,
+  .input-group-lg .form-control,
+  .input-group-lg .btn {
     font-size: 11px;
     height: 30px;
     padding: 5px 10px;
   }
-  .pagination-lg .btn [class*='fa-'] {
-    font-size: 11px;
+  .form-select {
+    padding: 5px 20px;  // extra padding for the sake of the arrow
   }
 }
 

From 834840c5e77194fcc6949c39aeda65616c5e0523 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 17 Jun 2024 20:10:38 +0000
Subject: [PATCH 63/91] "Bootstrap 5 Migration - Rebuilt diffs"

---
 ...le.formplayer-common_module.style.diff.txt | 20 +++++---
 ...form.formplayer-webapp_form.style.diff.txt |  6 ++-
 ...p_module.preview_app_module.style.diff.txt | 50 ++++++++++++-------
 3 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_module.formplayer-common_module.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_module.formplayer-common_module.style.diff.txt
index 0a1956f97950..8d09a09be711 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_module.formplayer-common_module.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_module.formplayer-common_module.style.diff.txt
@@ -94,7 +94,15 @@
    color: white;
    padding: 20px 10px;
    cursor: default;
-@@ -135,31 +135,15 @@
+@@ -127,6 +127,7 @@
+ .module-table .module-case-list-column-checkbox {
+   cursor: default;
+   width: 35px;
++  border: 0;
+   vertical-align: middle;
+ }
+ 
+@@ -135,31 +136,15 @@
  }
  
  .module-table-case-list tbody tr:nth-child(even) > td {
@@ -128,7 +136,7 @@
  }
  
  .module-table-case-list tbody tr:hover .module-case-list-column-empty {
-@@ -188,13 +172,13 @@
+@@ -188,13 +173,13 @@
    }
  
    th, td {
@@ -145,7 +153,7 @@
    color: black;
    padding-top: 1rem;
    padding-bottom: 1rem;
-@@ -206,16 +190,16 @@
+@@ -206,16 +191,16 @@
  
  .module-table-case-detail tbody tr:nth-child(odd) {
    th, td {
@@ -165,7 +173,7 @@
      border-top-color: transparent;
      border-left-color: transparent;
      border-right-color: transparent;
-@@ -224,7 +208,7 @@
+@@ -224,7 +209,7 @@
  
  .module-case-detail-continue {
    width: 100%;
@@ -174,7 +182,7 @@
  }
  
  .module-case-detail-btn {
-@@ -269,7 +253,7 @@
+@@ -269,7 +254,7 @@
    bottom: 0;
    position: fixed;
    background-color: rgba(255, 255, 255, 0.9);
@@ -183,7 +191,7 @@
    text-align: center;
  }
  
-@@ -299,7 +283,7 @@
+@@ -299,7 +284,7 @@
    }
  }
  
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
index 797d4b141a29..ad774d6377cd 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
@@ -22,11 +22,13 @@
    }
  
    .controls {
-@@ -18,23 +18,16 @@
+@@ -17,24 +17,17 @@
+     padding-top: 3px;
    }
  
-   .form-control {
+-  .form-control {
 -    font-size: @form-text-size;
++  .form-control, .form-select {
 +    font-size: $form-text-size;
    }
  
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_module.preview_app_module.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_module.preview_app_module.style.diff.txt
index 083e990dffab..6d5fc688ca2b 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_module.preview_app_module.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_module.preview_app_module.style.diff.txt
@@ -15,7 +15,7 @@
    .input-group-lg .form-control,
    .input-group-lg .btn{
      font-size: 11px;
-@@ -45,18 +45,14 @@
+@@ -45,19 +45,17 @@
    }
  }
  
@@ -23,35 +23,39 @@
 -  width: 140px;
 -}
 -
- .module-per-page-container {
--  .input-group-lg .form-control,
+-.module-per-page-container {
++.pagination-container {
++  .form-select,
++  .pagination-lg .page-link,
+   .input-group-lg .form-control,
 -  .input-group-lg .btn{
-+  .pagination-lg .form-control,
-+  .pagination-lg .btn{
++  .input-group-lg .btn {
      font-size: 11px;
      height: 30px;
      padding: 5px 10px;
    }
 -  .input-group-lg .btn [class*='fa-'] {
-+  .pagination-lg .btn [class*='fa-'] {
-     font-size: 11px;
-   }
- }
-@@ -76,13 +72,6 @@
+-    font-size: 11px;
++  .form-select {
++    padding: 5px 20px;  // extra padding for the sake of the arrow
    }
  }
  
+@@ -73,13 +71,6 @@
+ 
+   .module-icon {
+     max-height: 30px;
+-  }
+-}
+-
 -.module-pagination-container .pagination {
 -  font-size: 10px;
 -  [class*='fa-'] {
 -    font-size: 14px;
--  }
--}
--
- .module-case-detail-modal {
-   padding: 0 !important;
-   width: 251px;
-@@ -99,8 +88,7 @@
+   }
+ }
+ 
+@@ -99,8 +90,7 @@
    .modal-content {
      height: 442px;
      overflow-x: hidden;
@@ -61,7 +65,7 @@
    }
  }
  
-@@ -110,8 +98,7 @@
+@@ -110,8 +100,7 @@
    }
  
    .modal-content {
@@ -71,3 +75,13 @@
    }
  
    .btn-lg {
+@@ -142,8 +131,7 @@
+ 
+ .module-banner {
+   font-size: 11px;
+-  padding-left: 6px;
+-  padding-right: 6px;
++  padding: 6px;
+ }
+ 
+ .module-menu-bar-offset {

From 553d7aceb38c8e3cf4c6e87f2ab19b9063aca099 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 18 Jun 2024 15:43:17 -0400
Subject: [PATCH 64/91] Fixed refine search button missing at certain screen
 widths

---
 .../templates/cloudcare/partials/case_list/menu_header.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html
index c7058f3811b8..c5180a081d31 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html
@@ -10,7 +10,7 @@
       </button>
     <% } %>
     <% if (sidebarEnabled) { %>
-      <button id="search-more" class="btn btn-primary d-xs-block d-sm-block d-md-none float-end" type="button"
+      <button id="search-more" class="btn btn-primary d-xs-block d-sm-block d-md-block d-lg-none float-end" type="button"
         data-bs-toggle="collapse" data-bs-target="#sidebar-region" aria-expanded="false" aria-controls="sidebar-region">
         {% trans "Refine search" %}
       </button>

From a71d1373a37889db5dd0820a3dc65f44456ede16 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Thu, 20 Jun 2024 08:39:50 -0400
Subject: [PATCH 65/91] Fixed early wrapping of text in collapsible group
 headers (SAAS-15619)

---
 .../templates/cloudcare/partials/form_entry/sub_group.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
index ef9b8e0bab83..5fefe8205fc5 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
@@ -54,7 +54,7 @@
                 css: {'fa-angle-double-right': !showChildren(), 'fa-angle-double-down': showChildren()},
             "></i>
           </div>
-          <span class="webapp-markdown-output caption" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
+          <span class="webapp-markdown-output caption flex-grow-1" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
           <i class="fa fa-warning text-danger float-end" data-bind="visible: hasError() && !showChildren()"></i>
            <button class="btn btn-outline-danger del float-end" href="#" aria-label="{% trans_html_attr 'Delete Repeat' %}"
                   data-bind="

From 9111a8507234264eba375157eb0252cd5034805d Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 24 Jun 2024 10:56:37 -0400
Subject: [PATCH 66/91] Revert "Adjusted responsive design for header on case
 search screen" (QA-6725)

This reverts commit f946ca3fc67d0980e19fae33b2d8ab8d75bc7c8b.
---
 .../templates/cloudcare/partials/case_list/menu_header.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html
index c5180a081d31..2e4783124bcb 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html
@@ -1,7 +1,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-<div class="page-header menu-header clearfix" id="case-list-menu-header">
+<div class="page-header menu-header d-none d-md-block clearfix" id="case-list-menu-header">
   <div class="float-end">
     <% if (showMap) { %>
       <button id="hide-map-button" class="btn btn-primary float-end" type="button"
@@ -17,7 +17,7 @@
     <% } %>
   </div>
   <% if (title.length > 0) { %>
-    <h1 aria-label="<%- title %>" tabindex="0" class="page-title d-none d-md-block"><%- title %></h1>
+    <h1  aria-label="<%- title %>" tabindex="0" class="page-title"><%- title %></h1>
   <% } %>
   <% if (sidebarEnabled && description.length > 0) { %>
     <div aria-label="<%- description %>" tabindex="0" class="query-description"><%= description %></div>

From f3da6fb3fc4685433f07fc013d4b77bb68ec1bcf Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 24 Jun 2024 11:16:58 -0400
Subject: [PATCH 67/91] Updated date and time widgets to display default values

---
 corehq/apps/cloudcare/static/cloudcare/js/utils.js     |  2 +-
 .../apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index 023b37de277f..bc2af1f8902e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -403,7 +403,7 @@ hqDefine('cloudcare/js/utils', [
             useCurrent: true,
         };
         if (date.isValid()) {
-            options.viewDate = new hqTempusDominus.tempusDominus.DateTime(date.format(timeFormat));
+            options.viewDate = new hqTempusDominus.tempusDominus.DateTime(date.format(dateFormat + ' ' + timeFormat));
         }
         hqTempusDominus.createTimePicker($el.get(0), options);
     };
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js b/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
index 99feb451ca41..9b9b6654cdc1 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
@@ -20,7 +20,7 @@ hqDefine("hqwebapp/js/tempus_dominus", [
     window.Popper = Popper;
 
     let createDatePicker = function (el, options) {
-        return new tempusDominus.TempusDominus(el, _addDefaultOptions(options, {
+        let picker = new tempusDominus.TempusDominus(el, _addDefaultOptions(options, {
             display: {
                 theme: 'light',
                 components: {
@@ -31,6 +31,9 @@ hqDefine("hqwebapp/js/tempus_dominus", [
                 format: 'yyyy-MM-dd',
             }),
         }));
+        if (options.viewDate) {
+            picker.dates.setValue(options.viewDate);
+        }
     };
 
     // This replaces createBootstrap3DefaultDateRangePicker in hqwebapp/js/daterangepicker.config
@@ -71,7 +74,7 @@ hqDefine("hqwebapp/js/tempus_dominus", [
     };
 
     let createTimePicker = function (el, options) {
-        return new tempusDominus.TempusDominus(el, _addDefaultOptions(options, {
+        var picker = new tempusDominus.TempusDominus(el, _addDefaultOptions(options, {
             display: {
                 theme: 'light',
                 components: {
@@ -83,6 +86,9 @@ hqDefine("hqwebapp/js/tempus_dominus", [
                 format: 'H:mm',
             }),
         }));
+        if (options.viewDate) {
+            picker.dates.setValue(options.viewDate);
+        }
     };
 
     // Combine user-passed TD options with default options.

From db72482e41c0bccdf1e66370c3cfb872c8c2b63c Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 24 Jun 2024 17:39:32 -0400
Subject: [PATCH 68/91] Updated date picker to close when date is selected

This behavior is not added to the time picker or the date range picker since
neither of those are single-click interactions.
---
 .../static/cloudcare/js/form_entry/entries.js        |  8 ++++----
 corehq/apps/cloudcare/static/cloudcare/js/utils.js   |  6 ++++--
 .../hqwebapp/static/hqwebapp/js/tempus_dominus.js    | 12 ++++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
index 385c2bcc7c59..fa3e046f0316 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
@@ -791,9 +791,9 @@ hqDefine("cloudcare/js/form_entry/entries", [
             self.$picker = $('#' + self.entryId);
 
             var answer = self.answer() ? self.convertServerToClientFormat(self.answer()) : constants.NO_ANSWER;
-            self.initWidget(self.$picker, answer);
+            self.picker = self.initWidget(self.$picker, answer);
 
-            self.$picker.on("change.td", function (e) {
+            self.picker.subscribe("change.td", function (e) {
                 if (!e.date) {
                     self.answer(constants.NO_ANSWER);
                     return;
@@ -827,7 +827,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
     DateEntry.prototype.clientFormat = 'MM/DD/YYYY';
     DateEntry.prototype.serverFormat = 'YYYY-MM-DD';
     DateEntry.prototype.initWidget = function ($element, answer) {
-        cloudcareUtils.initDatePicker($element, answer);
+        return cloudcareUtils.initDatePicker($element, answer);
     };
 
     function TimeEntry(question, options) {
@@ -845,7 +845,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
     TimeEntry.prototype.clientFormat = 'HH:mm';
     TimeEntry.prototype.serverFormat = 'HH:mm';
     TimeEntry.prototype.initWidget = function ($element, answer) {
-        cloudcareUtils.initTimePicker($element, answer, this.clientFormat);
+        return cloudcareUtils.initTimePicker($element, answer, this.clientFormat);
     };
 
     function EthiopianDateEntry(question, options) {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index bc2af1f8902e..c6b198748036 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -377,10 +377,12 @@ hqDefine('cloudcare/js/utils', [
         if (selectedDate) {
             options.viewDate = new hqTempusDominus.tempusDominus.DateTime(selectedDate);
         }
-        hqTempusDominus.createDatePicker($el.get(0), options);
+        let picker = hqTempusDominus.createDatePicker($el.get(0), options);
 
         $el.attr("placeholder", dateFormat);
         $el.attr("pattern", "[0-9\-/]+");   // eslint-disable-line no-useless-escape
+
+        return picker;
     };
 
     var initTimePicker = function ($el, selectedTime, timeFormat) {
@@ -405,7 +407,7 @@ hqDefine('cloudcare/js/utils', [
         if (date.isValid()) {
             options.viewDate = new hqTempusDominus.tempusDominus.DateTime(date.format(dateFormat + ' ' + timeFormat));
         }
-        hqTempusDominus.createTimePicker($el.get(0), options);
+        return hqTempusDominus.createTimePicker($el.get(0), options);
     };
 
     var smallScreenIsEnabled = function () {
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js b/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
index 9b9b6654cdc1..2aad61586f73 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
@@ -31,9 +31,16 @@ hqDefine("hqwebapp/js/tempus_dominus", [
                 format: 'yyyy-MM-dd',
             }),
         }));
+
         if (options.viewDate) {
             picker.dates.setValue(options.viewDate);
         }
+
+        picker.subscribe("change.td", function () {
+            picker.hide();
+        });
+
+        return picker;
     };
 
     // This replaces createBootstrap3DefaultDateRangePicker in hqwebapp/js/daterangepicker.config
@@ -71,6 +78,8 @@ hqDefine("hqwebapp/js/tempus_dominus", [
                 picker.dates.setValue(picker.dates.picked[0], 1);
             }
         });
+
+        return picker;
     };
 
     let createTimePicker = function (el, options) {
@@ -86,9 +95,12 @@ hqDefine("hqwebapp/js/tempus_dominus", [
                 format: 'H:mm',
             }),
         }));
+
         if (options.viewDate) {
             picker.dates.setValue(options.viewDate);
         }
+
+        return picker;
     };
 
     // Combine user-passed TD options with default options.

From e0f6ea563e789a7d005140f01a0d59f872700f11 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 25 Jun 2024 11:07:46 -0400
Subject: [PATCH 69/91] Added error handling for unrecognizable date/time
 answers

---
 .../hqwebapp/static/hqwebapp/js/tempus_dominus.js     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js b/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
index 2aad61586f73..a617e853a26e 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
@@ -36,10 +36,16 @@ hqDefine("hqwebapp/js/tempus_dominus", [
             picker.dates.setValue(options.viewDate);
         }
 
+        // Since picking a date is a single-click action, hide the picker on date selection
         picker.subscribe("change.td", function () {
             picker.hide();
         });
 
+        $(el).on("error.td", function (e) {
+            picker.dates.setValue(null);
+            e.stopPropagation();
+        });
+
         return picker;
     };
 
@@ -100,6 +106,11 @@ hqDefine("hqwebapp/js/tempus_dominus", [
             picker.dates.setValue(options.viewDate);
         }
 
+        $(el).on("error.td", function (e) {
+            picker.dates.setValue(null);
+            e.stopPropagation();
+        });
+
         return picker;
     };
 

From 0662cbd115772009d8a3df9faba81ed52dc6c107 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 25 Jun 2024 12:05:19 -0400
Subject: [PATCH 70/91] Added date formats

This makes tempus dominus more forgiving about users entering single-digit
months and years, which would previously be rejected as invalid input.
---
 corehq/apps/cloudcare/static/cloudcare/js/utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index c6b198748036..4037e02d851b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -335,8 +335,8 @@ hqDefine('cloudcare/js/utils', [
         return inputDate;
     };
 
-    var dateFormat = 'MM/DD/YYYY';
-    var dateFormats = ['MM/DD/YYYY', 'YYYY-MM-DD', 'M/D/YYYY', 'M/D/YY', 'M-D-YYYY', 'M-D-YY', moment.defaultFormat];
+    var dateFormat = 'M/D/YYYY';
+    var dateFormats = ['MM/DD/YYYY', 'M/DD/YYYY', 'MM/D/YYYY',  'YYYY-MM-DD', 'M/D/YYYY', 'M/D/YY', 'M-D-YYYY', 'M-D-YY', moment.defaultFormat];
 
     // Annoyingly, moment and tempus dominus use different formats.
     // Moment: https://momentjs.com/docs/#/parsing/string-format/

From 4bcfa602d6e6661ce5a6d8b97ee0d8a0d458ab15 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 26 Jun 2024 12:45:23 -0400
Subject: [PATCH 71/91] Fixed offset class (QA-6738)

---
 corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
index a1f1eced8f9e..c0c2b1ed0dd5 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
@@ -54,7 +54,7 @@ hqDefine("cloudcare/js/form_entry/const", [], function () {
 
         // UI
         LABEL_WIDTH: 'col-md-4',
-        LABEL_OFFSET: 'col-md-offset-4',
+        LABEL_OFFSET: 'offset-md-4',
         CONTROL_WIDTH: 'col-md-8',
         BLOCK_NONE: 'block-none',
         BLOCK_SUBMIT: 'block-submit',

From 44359d3e1189f92f2b7b82d000769da9e28ed532 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 26 Jun 2024 13:17:44 -0400
Subject: [PATCH 72/91] Fixed alignment of checkbox questions with lengthy
 labels (QA-6739)

---
 .../apps/cloudcare/static/cloudcare/js/form_entry/entries.js  | 1 +
 .../templates/cloudcare/partials/form_entry/entry_select.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
index fa3e046f0316..e2857e78848e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
@@ -47,6 +47,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
         self.xformParams = function () { return {}; };
         self.placeholderText = '';
         self.broadcastTopics = [];
+        self.colStyleIfHideLabel = ko.observable(null);
         // Returns true if the rawAnswer is valid, false otherwise
         self.isValid = function (rawAnswer) {
             return self.getErrorMessage(rawAnswer) === null;
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html
index 726c2312fde7..798cffa41ad8 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_select.html
@@ -4,8 +4,8 @@
   <fieldset>
   <legend class="sr-only" data-bind="text: question.caption()"></legend>
     <div class="sel clear">
-      <div data-bind="foreach: choices, as: 'choice', css: {row: $data.colStyleIfHideLabel}">
-        <div data-bind="css: { checkbox: $parent.isMulti, radio: !$parent.isMulti, 'form-check': !$parent.colStyleIfHideLabel}, class: $parent.colStyleIfHideLabel">
+      <div data-bind="foreach: choices, as: 'choice', css: {row: $data.colStyleIfHideLabel()}">
+        <div data-bind="css: {'form-check': !$parent.colStyleIfHideLabel()}, class: $parent.colStyleIfHideLabel()">
           <input data-bind="
                       checked: $parent.rawAnswer,
                       checkedValue: $data,

From d62c074503cbf6992d426a1bc4d6509ed5ca5c5c Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Thu, 27 Jun 2024 08:47:18 -0400
Subject: [PATCH 73/91] Updated setting of time value (QA-6735)

This doesn't need to be formatted.
---
 corehq/apps/cloudcare/static/cloudcare/js/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index 4037e02d851b..54acc74f0401 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -405,7 +405,7 @@ hqDefine('cloudcare/js/utils', [
             useCurrent: true,
         };
         if (date.isValid()) {
-            options.viewDate = new hqTempusDominus.tempusDominus.DateTime(date.format(dateFormat + ' ' + timeFormat));
+            options.viewDate = new hqTempusDominus.tempusDominus.DateTime(date);
         }
         return hqTempusDominus.createTimePicker($el.get(0), options);
     };

From 72c21dbe2ac9e47c7d93f709963c9097acdc8111 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Fri, 28 Jun 2024 11:48:21 -0500
Subject: [PATCH 74/91] SAAS-15620: Add margin to h1-h6

* Bootstrap 5 removes the top margin of h1-h6. This affects the
  collapsible group header layout
* Add a class to add an equal margin for h1-h6 top and bottom
* Use it for group headers
---
 .../templates/cloudcare/partials/form_entry/sub_group.html | 2 +-
 .../static/cloudcare/scss/formplayer-webapp/form.scss      | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
index 0340c1e8e73a..dfec49ac1b23 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
@@ -66,7 +66,7 @@
                 css: {'fa-angle-double-right': !showChildren(), 'fa-angle-double-down': showChildren()},
             "></i>
           </div>
-          <span class="webapp-markdown-output caption flex-grow-1" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
+          <span class="webapp-markdown-output mtb-05em-for-hs flex-grow-1" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
           <i class="fa fa-warning text-danger float-end" data-bind="visible: hasError() && !showChildren()"></i>
            <button type="button"
                    class="btn btn-outline-danger del float-end"
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
index 84aace2517ea..fd5ca7e5396e 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
@@ -263,3 +263,10 @@ $group-indent: 15px;
   position: fixed;
   bottom: 35px;
 }
+
+.mtb-05em-for-hs {
+    h1, h2, h3, h4, h5, h6 {
+        margin-top: 0.5em !important;
+        margin-bottom: 0.5em !important;
+    }
+}

From 1861df3ff6f7d556db291fecda50e46adc9af8f1 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Fri, 28 Jun 2024 18:36:31 +0000
Subject: [PATCH 75/91] "Bootstrap 5 Migration - Rebuilt diffs"

---
 ...yer-webapp_form.formplayer-webapp_form.style.diff.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
index ad774d6377cd..bfad06e8a0b4 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
@@ -266,7 +266,7 @@
  .gr-has-no-nested-questions {
    display: none;
  }
-@@ -268,3 +258,8 @@
+@@ -268,3 +258,15 @@
    padding-top: 0px !important;
    padding-bottom: 7px;
  }
@@ -275,3 +275,10 @@
 +  position: fixed;
 +  bottom: 35px;
 +}
++
++.mtb-05em-for-hs {
++    h1, h2, h3, h4, h5, h6 {
++        margin-top: 0.5em !important;
++        margin-bottom: 0.5em !important;
++    }
++}

From c59c8833bb06664256edac9ee90498319673ef3f Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 2 Jul 2024 10:48:24 -0500
Subject: [PATCH 76/91] Update left over reference from $model to $loginModal

---
 .../hqwebapp/static/hqwebapp/js/bootstrap5/inactivity.js    | 2 +-
 .../javascript/hqwebapp/js/inactivity.js.diff.txt           | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/inactivity.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/inactivity.js
index a653126820e9..8984f5cbb02c 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/inactivity.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/inactivity.js
@@ -134,7 +134,7 @@ hqDefine('hqwebapp/js/bootstrap5/inactivity', [
             } else {
                 $newVersionModal.find('#incompleteFormWarning').addClass('d-none');
             }
-            if (!isModalOpen($modal)) {
+            if (!isModalOpen($loginModal)) {
                 if (isModalOpen($warningModal)) {
                     warningModal.hide();
                 }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/inactivity.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/inactivity.js.diff.txt
index a5b723a4c7a1..fcd857dfc4a1 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/inactivity.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/inactivity.js.diff.txt
@@ -81,9 +81,11 @@
 +                $newVersionModal.find('#incompleteFormWarning').removeClass('d-none');
              } else {
 -                $newVersionModal.find('#incompleteFormWarning').hide();
+-            }
+-            if (!isModalOpen($modal)) {
 +                $newVersionModal.find('#incompleteFormWarning').addClass('d-none');
-             }
-             if (!isModalOpen($modal)) {
++            }
++            if (!isModalOpen($loginModal)) {
                  if (isModalOpen($warningModal)) {
 -                    $warningModal.modal('hide');
 +                    warningModal.hide();

From 72a040567c538f35cc0a8d72a63bc6c10c9629d2 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 2 Jul 2024 11:42:11 -0500
Subject: [PATCH 77/91] Remove module-column-name class

In the context of the login as user table the
module-column-name class only set the position to relative.
Since neither the element itself nor it children set a
position offset the only effect it had was resetting the z-index
which interfered with the focus highlight
---
 .../cloudcare/templates/cloudcare/partials/users/user_row.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_row.html b/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_row.html
index 9856d20f4203..409583aff038 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_row.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_row.html
@@ -4,7 +4,7 @@
       <i class="fa fa-user module-icon" aria-hidden="true"></i>
     </div>
   </td>
-  <td class="module-column module-column-name">
+  <td class="module-column">
     <h3>
       <b><%- username %></b>
       <span><%- first_name + ' ' + last_name %></span>

From 0dade8e2e30b9e2b067374debd7195e706e2d2c9 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 2 Jul 2024 14:15:13 -0500
Subject: [PATCH 78/91] Fix linting

---
 .../apps/hqwebapp/static/hqwebapp/js/bootstrap5/inactivity.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/inactivity.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/inactivity.js
index 8984f5cbb02c..c97ca8511c57 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/inactivity.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/inactivity.js
@@ -114,7 +114,7 @@ hqDefine('hqwebapp/js/bootstrap5/inactivity', [
         };
 
         var hideWarningModal = function (showLogin) {
-           $warningModal.hide();
+            $warningModal.hide();
             if (showLogin) {
                 loginModal.show();
             }
@@ -155,7 +155,7 @@ hqDefine('hqwebapp/js/bootstrap5/inactivity', [
                 // Parsing the app id out of URL hash will fail on the web apps home page, login as, etc.
                 // where the hash isn't a JSON object but instead a string like "#apps".
                 // In these cases, there's no app to check for a new version.
-                log("Could not parse app id out of " + window.location.hash)
+                log("Could not parse app id out of " + window.location.hash);
                 selectedAppId = null;
             }
             var domain = initialPageData.get('domain');

From 1dcd275ada677eda0827b005ba180158892c1832 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 2 Jul 2024 19:20:31 +0000
Subject: [PATCH 79/91] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../javascript/hqwebapp/js/inactivity.js.diff.txt          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/inactivity.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/inactivity.js.diff.txt
index fcd857dfc4a1..b39c821fd634 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/inactivity.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/inactivity.js.diff.txt
@@ -57,7 +57,7 @@
  
          var hideWarningModal = function (showLogin) {
 -            $warningModal.modal('hide');
-+           $warningModal.hide();
++            $warningModal.hide();
              if (showLogin) {
 -                $modal.modal({backdrop: 'static', keyboard: false});
 +                loginModal.show();
@@ -99,11 +99,12 @@
                      selectedAppId = urlParams.appId;
                  }
              } catch (error) {
+-                log("Could not parse app id out of " + window.location.hash)
+-                return;
 +                // Parsing the app id out of URL hash will fail on the web apps home page, login as, etc.
 +                // where the hash isn't a JSON object but instead a string like "#apps".
 +                // In these cases, there's no app to check for a new version.
-                 log("Could not parse app id out of " + window.location.hash)
--                return;
++                log("Could not parse app id out of " + window.location.hash);
 +                selectedAppId = null;
              }
              var domain = initialPageData.get('domain');

From 96ea0362d578a777363a4c67c48d399803d32af2 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 2 Jul 2024 15:01:42 -0500
Subject: [PATCH 80/91] Use y instead of tb for top and bottom

Just following bootstrap convention here
---
 .../templates/cloudcare/partials/form_entry/sub_group.html      | 2 +-
 .../hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss  | 2 +-
 ...formplayer-webapp_form.formplayer-webapp_form.style.diff.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
index dfec49ac1b23..8ade3d27b6a1 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
@@ -66,7 +66,7 @@
                 css: {'fa-angle-double-right': !showChildren(), 'fa-angle-double-down': showChildren()},
             "></i>
           </div>
-          <span class="webapp-markdown-output mtb-05em-for-hs flex-grow-1" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
+          <span class="webapp-markdown-output my-05em-for-hs flex-grow-1" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
           <i class="fa fa-warning text-danger float-end" data-bind="visible: hasError() && !showChildren()"></i>
            <button type="button"
                    class="btn btn-outline-danger del float-end"
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
index fd5ca7e5396e..3c7a9e3dac44 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
@@ -264,7 +264,7 @@ $group-indent: 15px;
   bottom: 35px;
 }
 
-.mtb-05em-for-hs {
+.my-05em-for-hs {
     h1, h2, h3, h4, h5, h6 {
         margin-top: 0.5em !important;
         margin-bottom: 0.5em !important;
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
index bfad06e8a0b4..17a35c24b1e3 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
@@ -276,7 +276,7 @@
 +  bottom: 35px;
 +}
 +
-+.mtb-05em-for-hs {
++.my-05em-for-hs {
 +    h1, h2, h3, h4, h5, h6 {
 +        margin-top: 0.5em !important;
 +        margin-bottom: 0.5em !important;

From 517d1cd7ae49de6c7d86cda3905731236ddbeac4 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Wed, 3 Jul 2024 11:44:44 -0500
Subject: [PATCH 81/91] Replace order classes with insert at right spot

In Bootstrap 3 we were able to have and intermediate tag as parent
of the apps. This is not allowed anymore in Bootstrap 5. The order
classes previously used only change the visual order, not the tab
order. Adding a hidden reference div and inserting the apps before
it results in the right order that also keeps the tab order in place.
---
 .../static/cloudcare/js/formplayer/apps/views.js       |  7 +++++++
 .../templates/cloudcare/partials/grid_view/grid.html   | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
index 10ab24d7ec0d..993601bd7bc8 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
@@ -112,6 +112,13 @@ hqDefine("cloudcare/js/formplayer/apps/views", [
         restoreAsKeyAction: _.extend(BaseAppView.restoreAsKeyAction),
         settingsKeyAction: _.extend(BaseAppView.settingsKeyAction),
 
+        // Cannot append at the end of the parent because there are
+        // special grid items.
+        attachHtml: function attachHtml(els, $container) {
+            let childElement = $container.find("#put-apps-here");
+            $container[0].insertBefore(els, childElement[0]);
+        },
+
         initialize: function (options) {
             this.shouldShowIncompleteForms = options.shouldShowIncompleteForms;
         },
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/grid.html b/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/grid.html
index 0c836b27facd..637a6469a63b 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/grid.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/grid.html
@@ -7,8 +7,10 @@ <h1 class="page-title">{% trans "Applications" %}</h1>
   </div>
 
   <div class="row">
+    <div class="d-none" id="put-apps-here"></div>
+
     <% if (shouldShowIncompleteForms) { %>
-    <div class="order-1 grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
+    <div class="grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
       <div class="js-incomplete-sessions-item appicon appicon-incomplete" role="link" tabindex="0" aria-labelledby="grid-template-incomplete-forms-heading">
         <i class="ff ff-incomplete-bg appicon-icon appicon-icon-bg" aria-hidden="true"></i>
         <i class="ff ff-incomplete-fg appicon-icon appicon-icon-fg" aria-hidden="true"></i>
@@ -20,7 +22,7 @@ <h3 id="grid-template-incomplete-forms-heading">{% trans "Incomplete Forms" %}</
     <% } %>
 
     {% if not request|toggle_enabled:"HIDE_SYNC_BUTTON" %}
-    <div class="order-2 grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
+    <div class="grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
       <div class="js-sync-item appicon appicon-sync" role="link" tabindex="0" aria-labelledby="grid-template-sync-heading">
         <i class="ff ff-sync appicon-icon" aria-hidden="true"></i>
         <div class="appicon-title">
@@ -31,7 +33,7 @@ <h3 id="grid-template-sync-heading">{% trans "Sync" %}</h3>
     {% endif %}
 
     {% if request|can_use_restore_as %}
-      <div class="order-3 grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
+      <div class="grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
         <div class="js-restore-as-item appicon appicon-restore-as" role="link" tabindex="0" aria-labelledby="grid-template-login-as-heading">
           <i class="fa fa-user appicon-icon" aria-hidden="true"></i>
           <div class="appicon-title">
@@ -40,7 +42,7 @@ <h3 id="grid-template-login-as-heading">{% trans "Log in as" %}</h3>
         </div>
       </div>
     {% endif %}
-    <div class="order-4 grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
+    <div class="grid-item col-sm-6 col-md-4 col-xl-3 formplayer-request">
       <div class="js-settings appicon appicon-settings" role="link" tabindex="0" aria-labelledby="grid-template-settings-heading">
         <i class="fa-solid fa-gear appicon-icon" aria-hidden="true"></i>
         <div class="appicon-title">

From f5bd21130a6640dee9132379acaa93de2a8f182f Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 9 Jul 2024 06:52:21 +0200
Subject: [PATCH 82/91] Move relative position to direct parent

The relative position is needed to place the hover circle
around the delete/audio icon correctly. But it interfers
with the focus outline of the row.

* Remove it from the row related class
* Add bootstrap class to add the property to the direct
  parent of the icon
* Add separate column for icons to improve the code structure.
---
 .../cloudcare/templates/cloudcare/partials/menu/audio.html   | 4 +++-
 .../templates/cloudcare/partials/sessions/item.html          | 5 ++++-
 .../templates/cloudcare/partials/users/user_row.html         | 2 +-
 .../static/cloudcare/scss/formplayer-common/module.scss      | 4 +---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/audio.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/audio.html
index 5c906ef991f7..b2262a87aef6 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/audio.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/audio.html
@@ -13,7 +13,9 @@
   </td>
   <td class="module-column module-column-name module-column-name-audio">
     <h3><%- displayText ? displayText : "" %></h3>
-    <div class="module-audio-controls-container">
+  </td>
+  <td class="module-column module-column-name-audio">
+    <div class="module-audio-controls-container position-relative">
       <audio class="js-module-audio">
         <source src="<%- audioUrl %>" type="audio/mpeg">
       </audio>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/item.html
index c88333db365e..e7eea885c2b3 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/item.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/item.html
@@ -12,7 +12,10 @@ <h3 class="module-heading" role="link" tabindex="0">
       <% if (caseName) { %>(<%- caseName %>)<% } %>
       opened <%- humanDateOpened %>
     </h3>
-    <div class="module-delete-control" role="button" tabindex="0" aria-label="{% trans_html_attr 'Delete form' %}">
+
+  </td>
+  <td class="module-column">
+    <div class="module-delete-control position-relative" role="button" tabindex="0" aria-label="{% trans_html_attr 'Delete form' %}">
       <i class="fa-regular fa-trash-can module-icon module-delete-icon"></i>
     </div>
   </td>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_row.html b/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_row.html
index 409583aff038..9856d20f4203 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_row.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_row.html
@@ -4,7 +4,7 @@
       <i class="fa fa-user module-icon" aria-hidden="true"></i>
     </div>
   </td>
-  <td class="module-column">
+  <td class="module-column module-column-name">
     <h3>
       <b><%- username %></b>
       <span><%- first_name + ' ' + last_name %></span>
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
index 03737d611323..cec082638a49 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
@@ -5,9 +5,7 @@
     vertical-align: middle;
     transition: background 1s;
   }
-  .module-column-name {
-    position: relative;
-  }
+
   tr:hover {
     .module-column {
       background-color: $cc-bg;

From 0d5c0a00b9ce6c0ce2756e3c7744d1d7944c15a9 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 9 Jul 2024 05:01:45 +0000
Subject: [PATCH 83/91] "Bootstrap 5 Migration - Rebuilt diffs"

---
 ...le.formplayer-common_module.style.diff.txt | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_module.formplayer-common_module.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_module.formplayer-common_module.style.diff.txt
index 8d09a09be711..7f2058788f16 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_module.formplayer-common_module.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_module.formplayer-common_module.style.diff.txt
@@ -1,15 +1,17 @@
 --- 
 +++ 
-@@ -3,14 +3,14 @@
+@@ -3,14 +3,12 @@
      border: none;
      text-align: left;
      vertical-align: middle;
 -    .transition(background 1s);
+-  }
+-  .module-column-name {
+-    position: relative;
+-  }
 +    transition: background 1s;
-   }
-   .module-column-name {
-     position: relative;
-   }
++  }
++
    tr:hover {
      .module-column {
 -      background-color: @cc-bg;
@@ -17,7 +19,7 @@
      }
    }
  }
-@@ -44,7 +44,7 @@
+@@ -44,7 +42,7 @@
  }
  
  .module-icon-container {
@@ -26,7 +28,7 @@
    text-align: center;
    margin: 0 auto;
  
-@@ -54,15 +54,15 @@
+@@ -54,15 +52,15 @@
  }
  
  .module-icon-user {
@@ -45,7 +47,7 @@
    position: absolute;
    top: 50%;
  
-@@ -70,29 +70,29 @@
+@@ -70,29 +68,29 @@
  
  .module-audio-control {
    .module-audio-icon {
@@ -85,7 +87,7 @@
    .module-column-name h3 {
      font-size: 20px;
    }
-@@ -107,7 +107,7 @@
+@@ -107,7 +105,7 @@
  }
  
  .module-table .module-case-list-header {
@@ -94,7 +96,7 @@
    color: white;
    padding: 20px 10px;
    cursor: default;
-@@ -127,6 +127,7 @@
+@@ -127,6 +125,7 @@
  .module-table .module-case-list-column-checkbox {
    cursor: default;
    width: 35px;
@@ -102,7 +104,7 @@
    vertical-align: middle;
  }
  
-@@ -135,31 +136,15 @@
+@@ -135,31 +134,15 @@
  }
  
  .module-table-case-list tbody tr:nth-child(even) > td {
@@ -136,7 +138,7 @@
  }
  
  .module-table-case-list tbody tr:hover .module-case-list-column-empty {
-@@ -188,13 +173,13 @@
+@@ -188,13 +171,13 @@
    }
  
    th, td {
@@ -153,7 +155,7 @@
    color: black;
    padding-top: 1rem;
    padding-bottom: 1rem;
-@@ -206,16 +191,16 @@
+@@ -206,16 +189,16 @@
  
  .module-table-case-detail tbody tr:nth-child(odd) {
    th, td {
@@ -173,7 +175,7 @@
      border-top-color: transparent;
      border-left-color: transparent;
      border-right-color: transparent;
-@@ -224,7 +209,7 @@
+@@ -224,7 +207,7 @@
  
  .module-case-detail-continue {
    width: 100%;
@@ -182,7 +184,7 @@
  }
  
  .module-case-detail-btn {
-@@ -269,7 +254,7 @@
+@@ -269,7 +252,7 @@
    bottom: 0;
    position: fixed;
    background-color: rgba(255, 255, 255, 0.9);
@@ -191,7 +193,7 @@
    text-align: center;
  }
  
-@@ -299,7 +284,7 @@
+@@ -299,7 +282,7 @@
    }
  }
  

From e428f5e6830fe4bb0d6afa690cfa05b3a2f5cc7a Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 9 Jul 2024 12:05:11 +0200
Subject: [PATCH 84/91] Fix css for sscs

* Button bar should be there independent of screen size
* break point for SSCS is lg not md
---
 .../templates/cloudcare/partials/case_list/menu_header.html   | 2 +-
 .../cloudcare/templates/cloudcare/partials/query/list.html    | 2 +-
 .../static/cloudcare/scss/formplayer-webapp/query.scss        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html
index 2e4783124bcb..1ffcd355c806 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/menu_header.html
@@ -1,7 +1,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-<div class="page-header menu-header d-none d-md-block clearfix" id="case-list-menu-header">
+<div class="page-header menu-header clearfix" id="case-list-menu-header">
   <div class="float-end">
     <% if (showMap) { %>
       <button id="hide-map-button" class="btn btn-primary float-end" type="button"
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
index 943a0b01e3ca..b55ef47954b5 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
@@ -3,7 +3,7 @@
 <script type="text/template" id="query-view-list-template">
   <form>
     <% if (sidebarEnabled) { %>
-      <button type="button" class="btn-close d-xs-block d-sm-block d-md-none float-end" aria-label="{% trans "Close" %}"
+      <button type="button" class="btn-close d-block d-lg-none float-end" aria-label="{% trans "Close" %}"
         data-bs-toggle="collapse" data-bs-target="#sidebar-region" aria-expanded="false" aria-controls="sidebar-region">
       </button>
       <div class="query-button-container">
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss
index 6d7a07c77198..894d06d967ed 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/query.scss
@@ -13,11 +13,11 @@
 
 #sidebar-region {
   background: transparent;
-  @include media-breakpoint-up(md) {
+  @include media-breakpoint-up(lg) {
     width: 300px;
     position: absolute;
   }
-  @include media-breakpoint-down(md) {
+  @include media-breakpoint-down(lg) {
     max-width: 600px;
     margin: auto;
   }

From 48892db67d340342f757efb237d1bb48c11df8e2 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 9 Jul 2024 11:23:23 +0000
Subject: [PATCH 85/91] "Bootstrap 5 Migration - Rebuilt diffs"

---
 ...player-webapp_query.formplayer-webapp_query.style.diff.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt
index cadc16001154..78f48449c2f1 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt
@@ -18,12 +18,12 @@
  #sidebar-region {
    background: transparent;
 -  @media (min-width: @screen-md-min) {
-+  @include media-breakpoint-up(md) {
++  @include media-breakpoint-up(lg) {
      width: 300px;
      position: absolute;
    }
 -  @media (max-width: @screen-sm-max) {
-+  @include media-breakpoint-down(md) {
++  @include media-breakpoint-down(lg) {
      max-width: 600px;
      margin: auto;
    }

From a0e6b1a67e2d06e2b0e40be27872b5ce8589810f Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Tue, 9 Jul 2024 13:30:03 +0200
Subject: [PATCH 86/91] Hide case-list-menu-header in preview

---
 .../hqwebapp/static/preview_app/scss/preview_app-main.scss     | 1 +
 .../static/preview_app/scss/preview_app/case-tile.scss         | 3 +++
 .../preview_app-main.preview_app-main.style.diff.txt           | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 corehq/apps/hqwebapp/static/preview_app/scss/preview_app/case-tile.scss

diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss
index b353faedd93e..9b7afdae9a10 100644
--- a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss
@@ -16,3 +16,4 @@ $transition-speed: .5s;
 @import "preview_app/form";
 @import "preview_app/formnav";
 @import "preview_app/debugger";
+@import "preview_app/case-tile";
diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/case-tile.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/case-tile.scss
new file mode 100644
index 000000000000..cc64a7b96771
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/case-tile.scss
@@ -0,0 +1,3 @@
+#case-list-menu-header {
+    display: none;
+}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app-main.preview_app-main.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app-main.preview_app-main.style.diff.txt
index 8138b1796613..6dbc92555c3e 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app-main.preview_app-main.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app-main.preview_app-main.style.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -1,25 +1,18 @@
+@@ -1,25 +1,19 @@
 -@import '../../hqwebapp/less/_hq/includes/variables.less';
 -@import '../../hqwebapp/less/_hq/includes/mixins.less';
 -
@@ -29,3 +29,4 @@
 -@import "preview_app/datepicker";
 -@import "preview_app/panels";
  @import "preview_app/debugger";
++@import "preview_app/case-tile";

From 1dc4e037368afaf0a084f31b56a5c9ce3d6a9fc3 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Wed, 10 Jul 2024 15:32:22 +0200
Subject: [PATCH 87/91] Commenting out invalid validation regex

---
 corehq/apps/cloudcare/static/cloudcare/js/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index 54acc74f0401..4de0e098b996 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -380,7 +380,7 @@ hqDefine('cloudcare/js/utils', [
         let picker = hqTempusDominus.createDatePicker($el.get(0), options);
 
         $el.attr("placeholder", dateFormat);
-        $el.attr("pattern", "[0-9\-/]+");   // eslint-disable-line no-useless-escape
+        // $el.attr("pattern", "[0-9\-/]+");   // eslint-disable-line no-useless-escape
 
         return picker;
     };

From a8b301cb1fea738e3761062d621f1b430d4f718c Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Thu, 11 Jul 2024 13:36:22 +0200
Subject: [PATCH 88/91] Fix regex for date input pattern

---
 corehq/apps/cloudcare/static/cloudcare/js/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index 4de0e098b996..24226b001d3f 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -380,7 +380,7 @@ hqDefine('cloudcare/js/utils', [
         let picker = hqTempusDominus.createDatePicker($el.get(0), options);
 
         $el.attr("placeholder", dateFormat);
-        // $el.attr("pattern", "[0-9\-/]+");   // eslint-disable-line no-useless-escape
+        $el.attr("pattern", "[0-9\\-\\/]+");
 
         return picker;
     };

From bb53865766361248cd8cc7dba908b51939229a0b Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Thu, 11 Jul 2024 14:11:14 +0200
Subject: [PATCH 89/91] Fix page header alignment

---
 .../static/cloudcare/scss/formplayer-webapp/content.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/content.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/content.scss
index 6d8d5272c206..f317b3519061 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/content.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/content.scss
@@ -18,12 +18,19 @@ body {
     font-size: 1.5rem;
     text-transform: uppercase;
     color: $cc-neutral-mid;
-    padding-left: 1.5rem;
+    padding-left: 12px;
     font-weight: bold;
     margin-top: 0px;
   }
 }
 
+.page-header-apps {
+  padding-left: 0;
+  h1 {
+    padding-left: 0;
+  }
+}
+
 .page-footer {
   padding: 14px 8px 7px;
 }

From 921504df9b63352b9215d31260d870d4e1d9c6d5 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Fri, 12 Jul 2024 11:42:51 +0200
Subject: [PATCH 90/91] No hover effect on nested query fields

Was not a thing with B3 either
---
 .../cloudcare/templates/cloudcare/partials/query/group.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/query/group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/query/group.html
index 8e44e6f8fad4..72353fcdfc79 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/query/group.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/query/group.html
@@ -7,7 +7,7 @@
     </div>
     <% } %>
     <div id="group-<%- groupKey %>" class="show">
-      <table class="table table-hover" role="presentation">
+      <table class="table" role="presentation">
         <tbody id="query-group-content">
         </tbody>
       </table>

From 028abf1b38af13386fd812b29d2dd6cf51a5e9a3 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Fri, 12 Jul 2024 11:30:55 +0000
Subject: [PATCH 91/91] "Bootstrap 5 Migration - Rebuilt diffs"

---
 ...ntent.formplayer-webapp_content.style.diff.txt | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_content.formplayer-webapp_content.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_content.formplayer-webapp_content.style.diff.txt
index 1fd8139a8d51..2c08374c8af6 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_content.formplayer-webapp_content.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_content.formplayer-webapp_content.style.diff.txt
@@ -8,7 +8,7 @@
  }
  
  .cloudcare-home-content {
-@@ -13,13 +13,11 @@
+@@ -13,29 +13,26 @@
  }
  
  .page-header {
@@ -20,12 +20,21 @@
 +    font-size: 1.5rem;
      text-transform: uppercase;
 -    color: @cc-neutral-mid;
+-    padding-left: 1.5rem;
 +    color: $cc-neutral-mid;
-     padding-left: 1.5rem;
++    padding-left: 12px;
      font-weight: bold;
      margin-top: 0px;
-@@ -28,14 +26,6 @@
+   }
+ }
  
++.page-header-apps {
++  padding-left: 0;
++  h1 {
++    padding-left: 0;
++  }
++}
++
  .page-footer {
    padding: 14px 8px 7px;
 -}