Start of work on tree structure

algoo · Jun 25, 2024 · 0324300 · 0324300
1 parent 2593e05
commit 0324300
Show file tree

Hide file tree

Showing 106 changed files with 155 additions and 265 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.vite/deps_temp_3bdf9138/package.json b/.vite/deps_temp_3bdf9138/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
diff --git a/...ent/templates/jinja/blocks/footer.en.html → ...nt/templates/jinja2/blocks/footer.en.html b/...ent/templates/jinja/blocks/footer.en.html → ...nt/templates/jinja2/blocks/footer.en.html
@@ -18,10 +18,10 @@
             <a href="{{ url('index') }}">Home</a>
           </li>
           <li class="list-item me-4">
-            <a href="{{ url('page', args=['temoignages-clients']) }}">Customer testimonials (FR)</a>
+            <a href="{{ url_slug('page', 'temoignages-clients') }}">Customer testimonials (FR)</a>
           </li>
           <li class="list-item me-4">
-            <a href="../assets/docs/galae_price_list.pdf" target="_blank">Download the price
+            <a href="{{ static('assets/docs/galae_price_list.pdf') }}" target="_blank">Download the price
               list</a>
           </li>
           <li class="list-item me-4">
@@ -41,7 +41,7 @@
             <a href="https://mail.galae.net/" target="_blank">Account management</a>
           </li>
           <li class="list-item me-4">
-            <a href="{{ url('page', args=['generateur-enregistrements-dns']) }}">DNS record generator (FR)</a>
+            <a href="{{ url_slug('page', 'generateur-enregistrements-dns') }}">DNS record generator (FR)</a>
           </li>
         </ul>
       </div>

diff --git a/...ent/templates/jinja/blocks/footer.fr.html → ...nt/templates/jinja2/blocks/footer.fr.html b/...ent/templates/jinja/blocks/footer.fr.html → ...nt/templates/jinja2/blocks/footer.fr.html
@@ -18,10 +18,10 @@
             <a href="{{ url('index') }}">Accueil</a>
           </li>
           <li class="list-item me-4">
-            <a href="{{ url('page', args=['temoignages-clients']) }}">Témoignages clients</a>
+            <a href="{{ url_slug('page', 'temoignages-clients') }}">Témoignages clients</a>
           </li>
           <li class="list-item me-4">
-            <a href="../assets/docs/grille_tarifaire_galae.pdf" target="_blank">Télécharger la
+            <a href="{{ static('assets/docs/grille_tarifaire_galae.pdf') }}" target="_blank">Télécharger la
               grille tarifaire</a>
           </li>
           <li class="list-item me-4">
@@ -42,7 +42,7 @@
             <a href="https://mail.galae.net/" target="_blank">Gestion de mon compte</a>
           </li>
           <li class="list-item me-4">
-            <a href="{{ url('page', args=['generateur-enregistrements-dns']) }}">Générateur d'enregistrements DNS</a>
+            <a href="{{ url_slug('page', 'generateur-enregistrements-dns') }}">Générateur d'enregistrements DNS</a>
           </li>
         </ul>
       </div>

diff --git a/...ent/templates/jinja/blocks/header.en.html → ...nt/templates/jinja2/blocks/header.en.html b/...ent/templates/jinja/blocks/header.en.html → ...nt/templates/jinja2/blocks/header.en.html
diff --git a/...ent/templates/jinja/blocks/header.fr.html → ...nt/templates/jinja2/blocks/header.fr.html b/...ent/templates/jinja/blocks/header.fr.html → ...nt/templates/jinja2/blocks/header.fr.html
@@ -1,6 +1,5 @@
 {% from "widgets/page_header.html" import page_header%}
-
-{{ page_header(
+{{ page_header (
         PRIMARY_TITLE = "le service e-mail éthique et libre facturé à l'usage",
         SECONDARY_TITLE = "pour des e-mails standards et interopérables et un service intégralement basé sur des technologies auto-hébergeables",
         THIRD_TITLE = "Le service est désormais ouvert !"

diff --git a/...th_content_and_primary_secondary_cta.html → ...th_content_and_primary_secondary_cta.html b/...th_content_and_primary_secondary_cta.html → ...th_content_and_primary_secondary_cta.html
diff --git a/..._with_content_dark_background_no_cta.html → ..._with_content_dark_background_no_cta.html b/..._with_content_dark_background_no_cta.html → ..._with_content_dark_background_no_cta.html
diff --git a/...ck_h2_with_ul_content_and_image_left.html → ...ck_h2_with_ul_content_and_image_left.html b/...ck_h2_with_ul_content_and_image_left.html → ...ck_h2_with_ul_content_and_image_left.html
diff --git a/...k_h2_with_ul_content_and_image_right.html → ...k_h2_with_ul_content_and_image_right.html b/...k_h2_with_ul_content_and_image_right.html → ...k_h2_with_ul_content_and_image_right.html
diff --git a/.../templates/jinja/widgets/page_header.html → ...templates/jinja2/widgets/page_header.html b/.../templates/jinja/widgets/page_header.html → ...templates/jinja2/widgets/page_header.html
diff --git a/.../jinja/widgets/page_section_main_cta.html → ...jinja2/widgets/page_section_main_cta.html b/.../jinja/widgets/page_section_main_cta.html → ...jinja2/widgets/page_section_main_cta.html
diff --git a/...widgets/page_section_reference_logos.html → ...widgets/page_section_reference_logos.html b/...widgets/page_section_reference_logos.html → ...widgets/page_section_reference_logos.html
diff --git a/...templates/jinja/widgets/testimonials.html → ...emplates/jinja2/widgets/testimonials.html b/...templates/jinja/widgets/testimonials.html → ...emplates/jinja2/widgets/testimonials.html
diff --git a/content/pages/temoignages-clients.md → content/pages/fr/temoignages-clients.md b/content/pages/temoignages-clients.md → content/pages/fr/temoignages-clients.md
diff --git a/content/pages/img.png b/content/pages/img.png
diff --git a/content/pages/img_1.png b/content/pages/img_1.png
diff --git a/content/pages/index.md.jj b/content/pages/index.md.jj
diff --git a/content/pages/a_page.md → content/pages/test/dir/a_page.md b/content/pages/a_page.md → content/pages/test/dir/a_page.md
@@ -11,5 +11,5 @@ engine jinja2
 
 <h2>Page 1</h2>
 
-<p>Go to <a href="{{ url('page', args=['page2']) }}">page 2</a> </p>
+<p>Go to <a href="{{ url_slug('page', 'page2') }}">page 2</a> </p>
 
diff --git a/content/templates/django/blocks/footer.en.html b/content/templates/django/blocks/footer.en.html
@@ -21,7 +21,7 @@
             <a href="{% url 'page' 'temoignages-clients' %}">Customer testimonials (FR)</a>
           </li>
           <li class="list-item me-4">
-            <a href="../assets/docs/galae_price_list.pdf" target="_blank">Download the price
+            <a href="{{ static('assets/docs/galae_price_list.pdf') }}" target="_blank">Download the price
               list</a>
           </li>
           <li class="list-item me-4">

diff --git a/content/templates/django/blocks/footer.fr.html b/content/templates/django/blocks/footer.fr.html
@@ -21,7 +21,7 @@
             <a href="{% url 'page' 'temoignages-clients' %}">Témoignages clients</a>
           </li>
           <li class="list-item me-4">
-            <a href="../assets/docs/grille_tarifaire_galae.pdf" target="_blank">Télécharger la
+            <a href="{{ static('assets/docs/grille_tarifaire_galae.pdf') }}" target="_blank">Télécharger la
               grille tarifaire</a>
           </li>
           <li class="list-item me-4">

diff --git a/content/templates/jinja/base.html → content/templates/jinja2/base.html b/content/templates/jinja/base.html → content/templates/jinja2/base.html
@@ -1,4 +1,4 @@
-{% from "widgets/navbar.html" import navbar %}
+{% from "blocks/block.html" import block %}
 
 
 
@@ -27,43 +27,29 @@
 
 <body>
 
-{% if object.metadata.lang == "fr" %}
-  {{ navbar( 
-    CTA_LABEL="Découvrir les tarifs",
-    CTA_TARGET="",
-    CTA_URL="#pricing",
-    CHANGE_LANG_URL="/pages/en-index.html",
-    CHANGE_LANG_FLAG_URL="assets/img/lang-gb.svg",
-    CHANGE_LANG_ALT="English version" 
-  ) }}
-{% else %}
-  {{ navbar(
-    CTA_LABEL="See pricing",
-    CTA_TARGET="",
-    CTA_URL="#pricing",
-    CHANGE_LANG_URL="/pages/fr-index.html",
-    CHANGE_LANG_FLAG_URL="assets/img/lang-fr.svg",
-    CHANGE_LANG_ALT="Version française" 
-  ) }}
-{% endif %}
+  {{ block(
+    NAME = "navbar",
+    VERSION = object.metadata.lang|default(""),
+    DEFAULT_NAME = "navbar.fr.html"
+) }}
 
 <header>
-  {% if object.metadata.lang == "fr" %}
-    {% include "blocks/header.fr.html" %}
-  {% else %}
-    {% include "blocks/header.en.html" %}
-  {% endif %}
+  {{ block(
+      NAME = "header",
+      VERSION = object.metadata.lang|default(""),
+      DEFAULT_NAME = "header.fr.html"
+  ) }}
 </header>
 
 <main>
   {% block content %}{% endblock %}
 </main>
 
-{% if object.metadata.lang == "fr" %}
-  {% include "blocks/footer.fr.html" %}
-{% else %}
-  {% include "blocks/footer.en.html" %}
-{% endif %}
+{{ block(
+  NAME = "footer",
+  VERSION = object.metadata.lang|default(""),
+  DEFAULT_NAME = "footer.fr.html"
+) }}
 
 <!-- Bootstrap core JS-->
 <script src="{{ static('js/bootstrap.bundle.min.js') }}"></script>

diff --git a/content/templates/jinja2/blocks/block.html b/content/templates/jinja2/blocks/block.html
@@ -0,0 +1,20 @@
+
+{% macro block(NAME = "", VERSION = "", DEFAULT_NAME = "") %}
+
+    {% if VERSION != "" %}
+        {% include [
+            "blocks/" + NAME + "." + VERSION + ".html",
+            "blocks/" + NAME.split('.')[0] + '.' + VERSION + '.' + NAME.split('.')[-1],
+            "blocks/" + DEFAULT_NAME + ".html", 
+            "blocks/" + DEFAULT_NAME
+        ] %}
+    {% else %}
+        {% include [
+            "blocks/" + NAME + ".html", 
+            "blocks/" + NAME,
+            "blocks/" + DEFAULT_NAME + ".html", 
+            "blocks/" + DEFAULT_NAME
+        ] %}
+    {% endif %}
+
+{% endmacro %}
diff --git a/content/templates/jinja2/blocks/navbar.en.html b/content/templates/jinja2/blocks/navbar.en.html
@@ -0,0 +1,10 @@
+{% from "widgets/navbar.html" import navbar %}
+
+{{ navbar(
+    CTA_LABEL="See pricing",
+    CTA_TARGET="",
+    CTA_URL="#pricing",
+    CHANGE_LANG_URL="fr-index",
+    CHANGE_LANG_FLAG_URL="assets/img/lang-fr.svg",
+    CHANGE_LANG_ALT="Version française" 
+  ) }}
diff --git a/content/templates/jinja2/blocks/navbar.fr.html b/content/templates/jinja2/blocks/navbar.fr.html
@@ -0,0 +1,10 @@
+{% from "widgets/navbar.html" import navbar %}
+
+{{ navbar( 
+    CTA_LABEL="Découvrir les tarifs",
+    CTA_TARGET="",
+    CTA_URL="#pricing",
+    CHANGE_LANG_URL="en-index",
+    CHANGE_LANG_FLAG_URL="assets/img/lang-gb.svg",
+    CHANGE_LANG_ALT="English version" 
+  ) }}
diff --git a/content/templates/jinja/image.html → content/templates/jinja2/image.html b/content/templates/jinja/image.html → content/templates/jinja2/image.html
diff --git a/content/templates/jinja/page.html → content/templates/jinja2/page.html b/content/templates/jinja/page.html → content/templates/jinja2/page.html
diff --git a/content/templates/jinja2/post.html b/content/templates/jinja2/post.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block content %}
+Publié le {{ object.timestamp.strftime("%Y-%m-%d") }}.
+
+<h1>{{ object.title }}</h1>
+{{ object.content_md|safe }}
+{% endblock %}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,5 +11,5 @@ engine jinja2

		<h2>Page 1</h2>

		<p>Go to <a href="{{ url('page', args=['page2']) }}">page 2</a> </p>
		<p>Go to <a href="{{ url_slug('page', 'page2') }}">page 2</a> </p>