Merge remote-tracking branch 'origin/orangejenny-patch-16' into autos…

…taging
dimagi · Oct 29, 2024 · c870450 · c870450
2 parents 4473d46 + c98c5ab
commit c870450
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 13 deletions.
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/tableau_template.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/tableau_template.html.diff.txt
@@ -3,10 +3,10 @@
 @@ -1,4 +1,4 @@
 -{% extends "hqwebapp/bootstrap3/base_section.html" %}
 +{% extends "hqwebapp/bootstrap5/base_section.html" %}
- {% load compress %}
  {% load hq_shared_tags %}
- {% load i18n %}
-@@ -21,7 +21,7 @@
+
+ {% block page_content %}
+@@ -18,7 +18,7 @@
          <i class="fa fa-spin fa-spinner"></i>
      </div>
      <div id="vizContainer"></div>

diff --git a/corehq/apps/integration/templates/integration/base_cloudcare_template.html b/corehq/apps/integration/templates/integration/base_cloudcare_template.html
@@ -1,6 +1,5 @@
 {% extends "hqwebapp/bootstrap5/base_navigation.html" %}
 {% load i18n %}
-{% load static %}
 {% load hq_shared_tags %}
 {% load compress %}
 

diff --git a/corehq/apps/integration/templates/integration/web_app_dialer.html b/corehq/apps/integration/templates/integration/web_app_dialer.html
@@ -1,7 +1,6 @@
 {% extends "integration/base_cloudcare_template.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
-{% load static %}
 {% load compress %}
 {% requirejs_main_b5 "integration/js/dialer/domain_dialer_main" %}
 

diff --git a/corehq/apps/integration/templates/integration/web_app_gaen_otp.html b/corehq/apps/integration/templates/integration/web_app_gaen_otp.html
@@ -1,7 +1,6 @@
 {% extends "integration/base_cloudcare_template.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
-{% load static %}
 {% load compress %}
 
 {% block stylesheets %}

diff --git a/corehq/apps/integration/templates/integration/web_app_integration_err.html b/corehq/apps/integration/templates/integration/web_app_integration_err.html
@@ -1,7 +1,6 @@
 {% extends "integration/base_cloudcare_template.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
-{% load static %}
 {% load compress %}
 {% requirejs_main_b5 "integration/js/dialer/domain_dialer_main" %}
 

diff --git a/corehq/apps/reports/templates/reports/bootstrap3/tableau_template.html b/corehq/apps/reports/templates/reports/bootstrap3/tableau_template.html
@@ -1,8 +1,5 @@
 {% extends "hqwebapp/bootstrap3/base_section.html" %}
-{% load compress %}
 {% load hq_shared_tags %}
-{% load i18n %}
-{% load static %}
 
 {% block page_content %}
 

diff --git a/corehq/apps/reports/templates/reports/bootstrap5/tableau_template.html b/corehq/apps/reports/templates/reports/bootstrap5/tableau_template.html
@@ -1,8 +1,5 @@
 {% extends "hqwebapp/bootstrap5/base_section.html" %}
-{% load compress %}
 {% load hq_shared_tags %}
-{% load i18n %}
-{% load static %}
 
 {% block page_content %}