Move the edition dependent templates to their own dir

code4romania · Jul 11, 2024 · ae5971a · ae5971a
1 parent 8b0d607
commit ae5971a
Show file tree

Hide file tree

Showing 10 changed files with 684 additions and 671 deletions.
diff --git a/backend/civil_society_vote/urls.py b/backend/civil_society_vote/urls.py
@@ -16,7 +16,11 @@
 
 urlpatterns_i18n = i18n_patterns(
     path(_("about/"), StaticPageView.as_view(template_name="about.html"), name="about"),
-    path(_("rules/"), StaticPageView.as_view(template_name="rules.html"), name="rules"),
+    path(
+        _("%(CURRENT_EDITION_TYPE)s/rules/") % {"CURRENT_EDITION_TYPE": settings.CURRENT_EDITION_TYPE},
+        StaticPageView.as_view(template_name=f"{settings.CURRENT_EDITION_TYPE}/rules.html"),
+        name="rules",
+    ),
     path(
         _("terms/"),
         StaticPageView.as_view(template_name="terms_and_conditions.html"),

diff --git a/backend/hub/templates/candidate/base.html b/backend/hub/templates/candidate/base.html
@@ -6,7 +6,9 @@
 {% block content %}
 
 {% block extra-header %}
-{% include "partials/ces_header.html" %}
+    {% with header_template=CURRENT_EDITION_TYPE|add:"/edition_header.html" %}
+        {% include header_template %}
+    {% endwith %}
 {% endblock %}
 
 {% block domain-filters %}

diff --git a/backend/hub/templates/candidate/list.html b/backend/hub/templates/candidate/list.html
@@ -4,7 +4,9 @@
 {% load i18n %}
 
 {% block extra-header %}
-{% include "partials/ces_header.html" %}
+    {% with header_template=CURRENT_EDITION_TYPE|add:"/edition_header.html" %}
+        {% include header_template %}
+    {% endwith %}
 {% endblock %}
 
 

diff --git a/backend/hub/templates/candidate/results.html b/backend/hub/templates/candidate/results.html
@@ -5,7 +5,9 @@
 {% load hub_tags %}
 
 {% block extra-header %}
-{% include "partials/ces_results_header.html" %}
+    {% with header_template=CURRENT_EDITION_TYPE|add:"/edition_results_header.html" %}
+        {% include header_template %}
+    {% endwith %}
 {% endblock %}
 
 

diff --git a/...nd/hub/templates/partials/ces_header.html → ...end/hub/templates/ces/edition_header.html b/...nd/hub/templates/partials/ces_header.html → ...end/hub/templates/ces/edition_header.html
diff --git a/...emplates/partials/ces_results_header.html → ...templates/ces/edition_results_header.html b/...emplates/partials/ces_results_header.html → ...templates/ces/edition_results_header.html
diff --git a/backend/hub/templates/rules.html → backend/hub/templates/ces/rules.html b/backend/hub/templates/rules.html → backend/hub/templates/ces/rules.html
diff --git a/backend/hub/templates/committee/list.html b/backend/hub/templates/committee/list.html
@@ -8,7 +8,9 @@
 {% endblock domain-filters %}
 
 {% block extra-header %}
-{% include "partials/ces_header.html" %}
+    {% with header_template=CURRENT_EDITION_TYPE|add:"/edition_header.html" %}
+        {% include header_template %}
+    {% endwith %}
 {% endblock %}
 
 {% block left-side-view %}