Rename include and extends

Author: fabienheureux

core/templatetags/analytics_tags.py

@@ -3,11 +3,11 @@
 register = template.Library()
 
 
-@register.inclusion_tag("analytics/matomo.html")
+@register.inclusion_tag("ui/analytics/matomo.html")
 def matomo(id):
     return {"matomo_url": "stats.beta.gouv.fr", "matomo_id": id}
 
 
-@register.inclusion_tag("analytics/posthog_data_attributes.html")
+@register.inclusion_tag("ui/analytics/posthog_data_attributes.html")
 def posthog_data_attributes(key):
     return {"key": key}

previews/template_preview.py

@@ -44,7 +44,6 @@ def get_default_action():
 
 
 class PinPointForm(forms.Form):
-
     action = forms.ModelChoiceField(
         queryset=Action.objects.all(),
         label="Action",
@@ -150,23 +149,23 @@ def acteur_pinpoint(
 
     def button(self, **kwargs):
         context = {"href": "google.fr", "text": "test"}
-        return render_to_string("components/button.html", context)
+        return render_to_string("ui/components/button.html", context)
 
     def code(self, **kwargs):
         context = {
             "script": '<script src="https://quefairedemesdechets.ademe.local/iframe.js"></script>',
         }
-        return render_to_string("components/code/code.html", context)
+        return render_to_string("ui/components/code/code.html", context)
 
     def logo(self, **kwargs):
-        return render_to_string("components/logo/header.html")
+        return render_to_string("ui/components/logo/header.html")
 
     def logo_homepage(self, **kwargs):
-        return render_to_string("components/logo/homepage.html")
+        return render_to_string("ui/components/logo/homepage.html")
 
     def produit_legacy_heading(self, **kwargs):
         context = {"title": "Coucou !"}
-        return render_to_string("components/produit/legacy_heading.html", context)
+        return render_to_string("ui/components/produit/legacy_heading.html", context)
 
     @register_form_class(ProduitHeadingForm)
     def produit_heading(self, synonyme=None, pronom="mon", **kwargs):
@@ -177,7 +176,7 @@ def produit_heading(self, synonyme=None, pronom="mon", **kwargs):
 
         context.update(pronom=pronom)
 
-        return render_to_string("components/produit/heading.html", context)
+        return render_to_string("ui/components/produit/heading.html", context)
 
     @register_form_class(ProduitHeadingForm)
     def produit_heading_family(self, synonyme=None, pronom="mon", **kwargs):
@@ -188,7 +187,7 @@ def produit_heading_family(self, synonyme=None, pronom="mon", **kwargs):
 
         context.update(pronom=pronom)
 
-        return render_to_string("components/produit/heading_family.html", context)
+        return render_to_string("ui/components/produit/heading_family.html", context)
 
 
 class ModalsPreview(LookbookPreview):
@@ -229,11 +228,11 @@ def home(self, **kwargs):
             },
             "ASSISTANT": {"faites_decouvrir_ce_site": "Faites découvrir ce site !"},
         }
-        return render_to_string("pages/home.html", context)
+        return render_to_string("ui/pages/home.html", context)
 
     def produit(self, **kwargs):
         context = {"object": Synonyme.objects.first()}
-        return render_to_string("pages/produit.html", context)
+        return render_to_string("ui/pages/produit.html", context)
 
 
 class SnippetsPreview(LookbookPreview):
@@ -244,21 +243,21 @@ def header(self, **kwargs):
         **Markdown syntax is supported in docstring**
         """
         context = {"request": None}
-        return render_to_string("components/header/header.html", context)
+        return render_to_string("ui/components/header/header.html", context)
 
     def footer(self, **kwargs):
-        return render_to_string("components/footer/footer.html")
+        return render_to_string("ui/components/footer/footer.html")
 
     def suggestions(self, **kwargs):
         context = {
             "heading": "Coucou",
             "suggestions": [("coucou", "google.fr"), ("youpi", "google.fr")],
         }
-        return render_to_string("components/suggestions/suggestions.html", context)
+        return render_to_string("ui/components/suggestions/suggestions.html", context)
 
     def share_and_embed(self, **kwargs):
         context = {"heading": "Faites découvrir ce site"}
-        return render_to_string("snippets/share_and_embed.html", context)
+        return render_to_string("ui/snippets/share_and_embed.html", context)
 
 
 class IframePreview(LookbookPreview):
@@ -364,7 +363,7 @@ def P01_3_3(self, **kwargs):
         - [ ] Le contour de la recherche doit être en couleur #53918C
         """
         context = {"search_form": SearchForm()}
-        return render_to_string("components/search/view.html", context)
+        return render_to_string("ui/components/search/view.html", context)
 
     def P01_10_2(self, **kwargs):
         """
@@ -378,7 +377,7 @@ def P01_10_2(self, **kwargs):
         - [ ] Avec le CSS désactivé, le label rechercher du bouton s'affiche
         """
         context = {"search_form": SearchForm()}
-        return render_to_string("components/search/view.html", context)
+        return render_to_string("ui/components/search/view.html", context)
 
     def P01_10_7(self, **kwargs):
         """
@@ -394,7 +393,7 @@ def P01_10_7(self, **kwargs):
         - [ ] Le focus du champ de recherche affiche un contour bleu bien visible
         """
         context = {"search_form": SearchForm()}
-        return render_to_string("components/search/view.html", context)
+        return render_to_string("ui/components/search/view.html", context)
 
     def P01_13_8(self, **kwargs):
         """
@@ -414,10 +413,10 @@ def P01_13_8(self, **kwargs):
             {% load dsfr_tags %}
 
             <p class="fr-h2">Logo en homepage</p>
-            {% include "components/logo/homepage.html" %}
+            {% include "ui/components/logo/homepage.html" %}
             <hr>
             <p class="fr-h2">Logo du header</p>
-            {% include "components/logo/header.html" %}
+            {% include "ui/components/logo/header.html" %}
             """,
         )
         return template.render(Context({}))

qfdmd/forms.py

@@ -16,7 +16,7 @@
 
 
 class SearchInput(forms.TextInput):
-    template_name = "components/search/widget.html"
+    template_name = "ui/components/search/widget.html"
 
 
 class SearchForm(DsfrBaseForm):

qfdmd/models.py

@@ -225,7 +225,7 @@ def family(self):
 class ProduitPage(
     CompiledFieldMixin, Page, GenreNombreModel, TitleFields, AncestorFieldsMixin
 ):
-    template = "pages/produit_page.html"
+    template = "ui/pages/produit_page.html"
     subpage_types = [
         "qfdmd.synonymepage",
     ]
@@ -355,7 +355,7 @@ class FamilyPageTag(TaggedItemBase):
 
 
 class FamilyPage(ProduitPage):
-    template = "pages/family_page.html"
+    template = "ui/pages/family_page.html"
     subpage_types = ["qfdmd.produitpage", "qfdmd.synonymepage"]
 
     class Meta:
@@ -589,7 +589,7 @@ def en_savoir_plus(self):
             return None
 
         return render_to_string(
-            "components/produit/_en_savoir_plus.html",
+            "ui/components/produit/_en_savoir_plus.html",
             {"liens": [produit_lien.lien for produit_lien in produit_liens]},
         )
 

qfdmd/templatetags/qfdmd_tags.py

@@ -36,7 +36,7 @@ def genre_nombre_from(reusable_content: ReusableContent, page):
     return richtext(content.replace("<objet>", replacement))
 
 
-@register.inclusion_tag("components/patchwork/patchwork.html")
+@register.inclusion_tag("ui/components/patchwork/patchwork.html")
 def patchwork() -> dict:
     from qfdmd.models import Synonyme
 
@@ -90,7 +90,7 @@ def get_file_content() -> str:
         return ""
 
 
-@register.inclusion_tag("components/carte/carte.html", takes_context=True)
+@register.inclusion_tag("ui/components/carte/carte.html", takes_context=True)
 def carte(context, carte_config: CarteConfig) -> dict:
     page = context.get("page")
     return {

qfdmd/views.py

@@ -44,7 +44,7 @@ def get_assistant_script(request):
     return static_file_content_from("embed/assistant.js")
 
 
-SEARCH_VIEW_TEMPLATE_NAME = "components/search/view.html"
+SEARCH_VIEW_TEMPLATE_NAME = "ui/components/search/view.html"
 
 
 def search_view(request) -> HttpResponse:
@@ -83,7 +83,7 @@ def dispatch(self, request, *args, **kwargs):
 @method_decorator(cache_control(max_age=60 * 15), name="dispatch")
 @method_decorator(vary_on_headers("logged-in", "iframe"), name="dispatch")
 class HomeView(AssistantBaseView, ListView):
-    template_name = "pages/home.html"
+    template_name = "ui/pages/home.html"
     model = Suggestion
 
     def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
@@ -117,7 +117,7 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
 
 
 class SynonymeDetailView(AssistantBaseView, DetailView):
-    template_name = "pages/produit.html"
+    template_name = "ui/pages/produit.html"
     model = Synonyme
 
     def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:

qfdmo/views/adresses.py

@@ -69,9 +69,9 @@ def setup(self, request, *args, **kwargs):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         if self.turbo:
-            context.update(turbo=True, base_template="layout/turbo.html")
+            context.update(turbo=True, base_template="ui/layout/turbo.html")
         else:
-            context.update(base_template="layout/base.html")
+            context.update(base_template="ui/layout/base.html")
 
         return context
 
@@ -532,7 +532,7 @@ class FormulaireSearchActeursView(SearchActeursView):
     modifiée."""
 
     is_iframe = True
-    template_name = "pages/formulaire.html"
+    template_name = "ui/pages/formulaire.html"
     form_class = FormulaireForm
 
     def get_context_data(self, **kwargs):
@@ -638,10 +638,10 @@ def acteur_detail_redirect(request, identifiant_unique):
 
 
 def acteur_detail(request, uuid):
-    base_template = "layout/carte.html"
+    base_template = "ui/layout/carte.html"
 
     if request.headers.get("Turbo-Frame"):
-        base_template = "layout/turbo.html"
+        base_template = "ui/layout/turbo.html"
 
     latitude = request.GET.get("latitude")
     longitude = request.GET.get("longitude")
@@ -692,7 +692,7 @@ def acteur_detail(request, uuid):
             )
         )
 
-    return render(request, "components/carte/acteur.html", context)
+    return render(request, "ui/components/carte/acteur.html", context)
 
 
 def solution_admin(request, identifiant_unique):

qfdmo/views/carte.py

@@ -15,7 +15,7 @@
 
 class CarteSearchActeursView(SearchActeursView):
     is_carte = True
-    template_name = "pages/carte.html"
+    template_name = "ui/pages/carte.html"
     form_class = CarteForm
 
     def get_initial(self, *args, **kwargs):

qfdmo/views/configurator.py

@@ -21,7 +21,7 @@
 
 class ConfiguratorView(FormView):
     form_class = ConfiguratorForm
-    template_name = "pages/configurateur/base.html"
+    template_name = "ui/pages/configurateur/base.html"
 
     def get_initial(self) -> dict[str, Any]:
         """Populate the view with values passed as a querystring in the URL"""
@@ -102,7 +102,7 @@ def _compile_script_tag(self, attributes) -> str:
 
 class AdvancedConfiguratorView(LoginRequiredMixin, FormView):
     form_class = AdvancedConfiguratorForm
-    template_name = "pages/configurateur/avance.html"
+    template_name = "ui/pages/configurateur/avance.html"
 
     def get_initial(self):
         initial = super().get_initial()

templates/base.html

@@ -1,4 +1,4 @@
-{% extends "layout/assistant.html" %}
+{% extends "ui/layout/assistant.html" %}
 {% comment %}
 This overrides the base.html used by Sites Faciles.
 At the moment, Sites Faciles does not namespace this template and