remove refs to bootstrap3 template folder

clinicedc · Jan 20, 2025 · 596ec1b · 596ec1b
1 parent ee7c6d4
commit 596ec1b
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 16 deletions.
diff --git a/edc_model_admin/admin_site.py b/edc_model_admin/admin_site.py
@@ -5,7 +5,6 @@
 from django.contrib.sites.shortcuts import get_current_site
 from django.template.response import TemplateResponse
 from django.urls import NoReverseMatch, reverse
-from edc_dashboard.utils import get_bootstrap_version
 from edc_protocol.research_protocol_config import ResearchProtocolConfig
 
 admin.site.enable_nav_sidebar = False
@@ -41,8 +40,8 @@ class EdcAdminSite(DjangoAdminSite):
 
     index_template = "edc_model_admin/admin/index.html"
     app_index_template = "edc_model_admin/admin/app_index.html"
-    login_template = f"edc_auth/bootstrap{get_bootstrap_version()}/login.html"
-    logout_template = f"edc_auth/bootstrap{get_bootstrap_version()}/login.html"
+    login_template = "edc_auth/login.html"
+    logout_template = "edc_auth/login.html"
     enable_nav_sidebar = False
     final_catch_all_view = True
     site_url = "/administration/"

diff --git a/...emplates/edc_additional_instructions.html → ...el_admin/edc_additional_instructions.html b/...emplates/edc_additional_instructions.html → ...el_admin/edc_additional_instructions.html
diff --git a/...del_admin/templates/edc_instructions.html → ...tes/edc_model_admin/edc_instructions.html b/...del_admin/templates/edc_instructions.html → ...tes/edc_model_admin/edc_instructions.html
diff --git a/...el_admin/templates/edc_revision_line.html → ...es/edc_model_admin/edc_revision_line.html b/...el_admin/templates/edc_revision_line.html → ...es/edc_model_admin/edc_revision_line.html
diff --git a/...odel_admin/templates/edc_submit_line.html → ...ates/edc_model_admin/edc_submit_line.html b/...odel_admin/templates/edc_submit_line.html → ...ates/edc_model_admin/edc_submit_line.html
diff --git a/edc_model_admin/templates/logout_row.html → ...templates/edc_model_admin/logout_row.html b/edc_model_admin/templates/logout_row.html → ...templates/edc_model_admin/logout_row.html
diff --git a/...templates/navbar_for_admin_templates.html → ...del_admin/navbar_for_admin_templates.html b/...templates/navbar_for_admin_templates.html → ...del_admin/navbar_for_admin_templates.html
diff --git a/...plates/navbar_for_admin_templates_b3.html → ..._admin/navbar_for_admin_templates_b3.html b/...plates/navbar_for_admin_templates_b3.html → ..._admin/navbar_for_admin_templates_b3.html
diff --git a/...odel_admin/templates/yes_no_coloring.html → ...ates/edc_model_admin/yes_no_coloring.html b/...odel_admin/templates/yes_no_coloring.html → ...ates/edc_model_admin/yes_no_coloring.html
diff --git a/edc_model_admin/templatetags/edc_admin_modify.py b/edc_model_admin/templatetags/edc_admin_modify.py
@@ -88,7 +88,7 @@ def get_cancel_url(context, cancel_attr=None):
     return cancel_url
 
 
-@register.inclusion_tag("edc_submit_line.html", takes_context=True)
+@register.inclusion_tag("edc_model_admin/edc_submit_line.html", takes_context=True)
 def edc_submit_row(
     context,
     cancel_url: str | None = None,
@@ -123,7 +123,7 @@ def edc_submit_row(
     return django_submit_row(context)
 
 
-@register.inclusion_tag("logout_row.html", takes_context=True)
+@register.inclusion_tag("edc_model_admin/logout_row.html", takes_context=True)
 def logout_row(context):
     return dict(
         perms=context.get("perms"),
@@ -133,7 +133,7 @@ def logout_row(context):
     )
 
 
-@register.inclusion_tag("edc_revision_line.html", takes_context=True)
+@register.inclusion_tag("edc_model_admin/edc_revision_line.html", takes_context=True)
 def revision_row(context):
     return dict(
         copyright=context.get("copyright") or ResearchProtocolConfig().copyright,
@@ -143,12 +143,12 @@ def revision_row(context):
     )
 
 
-@register.inclusion_tag("edc_instructions.html", takes_context=True)
+@register.inclusion_tag("edc_model_admin/edc_instructions.html", takes_context=True)
 def instructions(context):
     return {"instructions": context.get("instructions")}
 
 
-@register.inclusion_tag("edc_additional_instructions.html", takes_context=True)
+@register.inclusion_tag("edc_model_admin/edc_additional_instructions.html", takes_context=True)
 def additional_instructions(context):
     return {
         "additional_instructions": context.get("additional_instructions"),
@@ -166,7 +166,7 @@ def get_label_lower(model) -> str:
     return ""
 
 
-@register.inclusion_tag("yes_no_coloring.html", takes_context=False)
+@register.inclusion_tag("edc_model_admin/yes_no_coloring.html", takes_context=False)
 def yes_no_coloring(value) -> dict:
     context = dict(value=value)
     if value == YES:
@@ -176,12 +176,13 @@ def yes_no_coloring(value) -> dict:
     return context
 
 
-@register.inclusion_tag("navbar_for_admin_templates.html", takes_context=True)
+@register.inclusion_tag("edc_model_admin/navbar_for_admin_templates.html", takes_context=True)
 def show_navbar_for_admin_templates(context):
-    """bootstrap 5"""
     return context
 
 
-@register.inclusion_tag("navbar_for_admin_templates_b3.html", takes_context=True)
+@register.inclusion_tag(
+    "edc_model_admin/navbar_for_admin_templates_b3.html", takes_context=True
+)
 def show_navbar_for_admin_templates_b3(context):
     return context
diff --git a/edc_model_admin/tests/templates/crfmodel_list.html b/edc_model_admin/tests/templates/crfmodel_list.html
@@ -1,4 +1,4 @@
-{% extends 'edc_dashboard/bootstrap3/base.html' %}
+{% extends 'edc_dashboard/base.html' %}
 {% load static %}
 
 {% block main %}

diff --git a/edc_model_admin/tests/templates/dashboard.html b/edc_model_admin/tests/templates/dashboard.html
@@ -1,4 +1,4 @@
-{% extends 'edc_dashboard/bootstrap3/base.html' %}
+{% extends 'edc_dashboard/base.html' %}
 {% load static %}
 {% load i18n %}
 

diff --git a/edc_model_admin/tests/templates/dashboard2.html b/edc_model_admin/tests/templates/dashboard2.html
@@ -1,4 +1,4 @@
-{% extends 'edc_dashboard/bootstrap3/base.html' %}
+{% extends 'edc_dashboard/base.html' %}
 {% load static %}
 
 {% block main %}

diff --git a/edc_model_admin/tests/templates/home.html b/edc_model_admin/tests/templates/home.html
@@ -1,4 +1,4 @@
-{% extends 'edc_dashboard/bootstrap3/base.html' %}
+{% extends 'edc_dashboard/base.html' %}
 {% load static %}
 
 {% block main %}