refactor nav, blocks, macros, templates. fix image shortcodes

17 files changed, 79 insertions, 20 deletions

diff --git a/content/_index.fr.md b/content/_index.fr.md
index 3511f76..a31a970 100644
--- a/content/_index.fr.md
+++ b/content/_index.fr.md
@@ -1,4 +1,5 @@
 +++
 paginate_by = 3
 sort_by = "date"
+template = "index.html"
 +++
diff --git a/content/_index.md b/content/_index.md
index 3511f76..a31a970 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,4 +1,5 @@
 +++
 paginate_by = 3
 sort_by = "date"
+template = "index.html"
 +++
diff --git a/content/archive/_index.fr.md b/content/archive/_index.fr.md
index b1a35cf..6234b9b 100644
--- a/content/archive/_index.fr.md
+++ b/content/archive/_index.fr.md
@@ -1,3 +1,6 @@
 +++
 template = "archive.html"
+
+[extra]
+sec = "blog"
 +++
diff --git a/content/archive/_index.md b/content/archive/_index.md
index b1a35cf..6234b9b 100644
--- a/content/archive/_index.md
+++ b/content/archive/_index.md
@@ -1,3 +1,6 @@
 +++
 template = "archive.html"
+
+[extra]
+sec = "blog"
 +++
diff --git a/content/blog/_index.fr.md b/content/blog/_index.fr.md
new file mode 100644
index 0000000..a31a970
--- /dev/null
+++ b/content/blog/_index.fr.md
@@ -0,0 +1,5 @@
++++
+paginate_by = 3
+sort_by = "date"
+template = "index.html"
++++
diff --git a/content/blog/_index.md b/content/blog/_index.md
new file mode 100644
index 0000000..a31a970
--- /dev/null
+++ b/content/blog/_index.md
@@ -0,0 +1,5 @@
++++
+paginate_by = 3
+sort_by = "date"
+template = "index.html"
++++
diff --git a/content/images/_index.md b/content/images/_index.md
new file mode 100644
index 0000000..800a244
--- /dev/null
+++ b/content/images/_index.md
@@ -0,0 +1,3 @@
++++
+render = false
++++
diff --git a/content/overview-rich-content/ferris-gesture.svg b/content/images/ferris-gesture.svg
index d819588..d819588 100644
--- a/content/overview-rich-content/ferris-gesture.svg
+++ b/content/images/ferris-gesture.svg
diff --git a/content/overview-rich-content/ferris.svg b/content/images/ferris.svg
index 1409b10..1409b10 100644
--- a/content/overview-rich-content/ferris.svg
+++ b/content/images/ferris.svg
diff --git a/content/overview-abridge/index.fr.md b/content/overview-abridge/index.fr.md
index b4f84e6..3f307bc 100644
--- a/content/overview-abridge/index.fr.md
+++ b/content/overview-abridge/index.fr.md
@@ -11,8 +11,6 @@ tags = ["Features","Config"]
 toc = true
 +++
 
-A fast, lightweight, and modern [Zola](https://getzola.org) theme utilizing [abridge.css](https://github.com/Jieiku/abridge.css) (a class-light semantic HTML CSS Framework). Perfect [Lighthouse](https://pagespeed.web.dev/report?url=abridge.netlify.app), [YellowLabTools](https://yellowlab.tools/), and [Observatory](https://observatory.mozilla.org/analyze/abridge.netlify.app) scores. Here is a [Zola Themes Benchmarks](https://github.com/Jieiku/zola-themes-benchmarks/blob/main/README.md) Page.
-
 Un thème [Zola](https://getzola.org) rapide, léger et moderne utilisant [abridge.css](https://github.com/Jieiku/abridge.css) (un framework HTML CSS sémantique léger en classe ). Scores parfait [Lighthouse](https://pagespeed.web.dev/report?url=abridge.netlify.app), [YellowLabTools](https://yellowlab.tools/) et [Observatory](https://observatory.mozilla.org/analyze/abridge.netlify.app). Voici une page [Zola Themes Benchmarks](https://github.com/Jieiku/zola-themes-benchmarks/blob/main/README.md).
 <!-- more -->
 
diff --git a/content/overview-images/index.fr.md b/content/overview-images/index.fr.md
index 8504e8a..96c899c 100644
--- a/content/overview-images/index.fr.md
+++ b/content/overview-images/index.fr.md
@@ -47,13 +47,13 @@ Cet article couvre les **shortcodes imgswap et img**. Les images peuvent égalem
 
 ## Utilisation (chemin racine /)
 ```rs
-{{/* img(src="/overview-rich-content/ferris.svg" alt="Ferris le Rustacé") */}}
+{{/* img(src="/images/ferris.svg" alt="Ferris le Rustacé") */}}
 ```
 **Sortir**
 ```html
-{{ img(src="/overview-rich-content/ferris.svg" alt="Ferris le Rustacé") }}
+{{ img(src="/images/ferris.svg" alt="Ferris le Rustacé") }}
 ```
-{{ img(src="/overview-rich-content/ferris.svg" alt="Ferris le Rustacé") }}
+{{ img(src="/images/ferris.svg" alt="Ferris le Rustacé") }}
 
 # Image SVG directement dans le code
 ```html
@@ -99,10 +99,10 @@ Lorsque vous passez votre souris sur l'image, l'image à comparer s'affiche.
 
 ## Utilisation (chemin racine /)
 ```rs
-{{/* imgswap(main_src="/overview-rich-content/ferris.svg" swap_src="/overview-rich-content/ferris-gesture.svg") */}}
+{{/* imgswap(main_src="/images/ferris.svg" swap_src="/images/ferris-gesture.svg") */}}
 ```
 **Sortir**
 ```html
-{{ imgswap(main_src="/overview-rich-content/ferris.svg" swap_src="/overview-rich-content/ferris-gesture.svg") }}
+{{ imgswap(main_src="/images/ferris.svg" swap_src="/images/ferris-gesture.svg") }}
 ```
-{{ imgswap(main_src="/overview-rich-content/ferris.svg" swap_src="/overview-rich-content/ferris-gesture.svg") }}
+{{ imgswap(main_src="/images/ferris.svg" swap_src="/images/ferris-gesture.svg") }}
diff --git a/content/overview-images/index.md b/content/overview-images/index.md
index ed430db..6c515cd 100644
--- a/content/overview-images/index.md
+++ b/content/overview-images/index.md
@@ -47,13 +47,13 @@ This post covers the **imgswap and img shortcodes**. Images can also be embedded
 
 ## Usage (root path /)
 ```rs
-{{/* img(src="/overview-rich-content/ferris.svg" alt="Ferris the Rustacean") */}}
+{{/* img(src="/images/ferris.svg" alt="Ferris the Rustacean") */}}
 ```
 **Output**
 ```html
-{{ img(src="/overview-rich-content/ferris.svg" alt="Ferris the Rustacean") }}
+{{ img(src="/images/ferris.svg" alt="Ferris the Rustacean") }}
 ```
-{{ img(src="/overview-rich-content/ferris.svg" alt="Ferris the Rustacean") }}
+{{ img(src="/images/ferris.svg" alt="Ferris the Rustacean") }}
 
 # SVG image directly in code
 ```html
@@ -99,10 +99,10 @@ When you hover your mouse over the image it will display the image to compare.
 
 ## Usage (root path /)
 ```rs
-{{/* imgswap(main_src="/overview-rich-content/ferris.svg" swap_src="/overview-rich-content/ferris-gesture.svg") */}}
+{{/* imgswap(main_src="/images/ferris.svg" swap_src="/images/ferris-gesture.svg") */}}
 ```
 **Output**
 ```html
-{{ imgswap(main_src="/overview-rich-content/ferris.svg" swap_src="/overview-rich-content/ferris-gesture.svg") }}
+{{ imgswap(main_src="/images/ferris.svg" swap_src="/images/ferris-gesture.svg") }}
 ```
-{{ imgswap(main_src="/overview-rich-content/ferris.svg" swap_src="/overview-rich-content/ferris-gesture.svg") }}
+{{ imgswap(main_src="/images/ferris.svg" swap_src="/images/ferris-gesture.svg") }}
diff --git a/content/overview-math.fr.md b/content/overview-math.fr.md
index e24b4e6..7097702 100644
--- a/content/overview-math.fr.md
+++ b/content/overview-math.fr.md
@@ -1,5 +1,5 @@
 +++
-title = "Notations mathématiques"
+title = "Notation mathématiques"
 description = "Exemple d'article présentant l'affichage des notations mathématiques, rendu possible par la bibliothèque KaTeX."
 date = 2021-05-05
 updated = 2022-01-01
diff --git a/content/overview-math.md b/content/overview-math.md
index c34d2f2..446f537 100644
--- a/content/overview-math.md
+++ b/content/overview-math.md
@@ -1,5 +1,5 @@
 +++
-title = "Mathematical Notations"
+title = "Mathematical Notation"
 description = "Sample article showcasing the display of Mathematical Notations, made possible by the KaTeX library."
 date = 2021-05-05
 updated = 2022-01-01
diff --git a/content/pages/contact.fr.md b/content/pages/contact.fr.md
index cae2626..27ad163 100644
--- a/content/pages/contact.fr.md
+++ b/content/pages/contact.fr.md
@@ -2,6 +2,26 @@
 title = "Contact"
 description = "Pour nous joindre, veuillez utiliser le formulaire de contact sur cette page."
 path = "fr/contact"
-template = "contact.fr.html"
+template = "pages.html"
 draft = false
 +++
+
+<p>Vous voulez entrer en contact ? Remplissez le formulaire ci-dessous pour m'envoyer un message et je vous répondrai dans les plus brefs délais !</p>
+<form name="contact" method="POST">
+  <p>
+    <label for="name">Nom</label>
+    <input type="text" placeholder="Nom" id="name" required data-validation-required-message="S'il vous plaît entrez votre nom." />
+  </p>
+  <p>
+    <label for="email">Adresse e-mail</label>
+    <input type="email" placeholder="nom@example.com" id="email" required data-validation-required-message="Veuillez saisir votre adresse e-mail." />
+  </p>
+  <p>
+    <label for="message">Message</label>
+    <textarea rows="5" placeholder="Message" id="message" required data-validation-required-message="Veuillez entrer un message."></textarea>
+  </p>
+  <div id="success"></div>
+  <p>
+    <button type="submit" id="sendMessageButton">Envoyer</button>
+  </p>
+</form>
diff --git a/content/pages/contact.md b/content/pages/contact.md
index 306b360..a16ed7e 100644
--- a/content/pages/contact.md
+++ b/content/pages/contact.md
@@ -2,6 +2,26 @@
 title = "Contact"
 description = "To reach us please use the contact form on this page."
 path = "contact"
-template = "contact.html"
+template = "pages.html"
 draft = false
-+++
\ No newline at end of file
++++
+
+<p>Want to get in touch? Fill out the form below to send me a message and I will get back to you as soon as possible!</p>
+<form name="contact" method="POST">
+  <p>
+    <label for="name">Name</label>
+    <input type="text" placeholder="Name" id="name" required data-validation-required-message="Please enter your name." />
+  </p>
+  <p>
+    <label for="email">Email Address</label>
+    <input type="email" placeholder="name@example.com" id="email" required data-validation-required-message="Please enter your email address." />
+  </p>
+  <p>
+    <label for="message">Message</label>
+    <textarea rows="5" placeholder="Message" id="message" required data-validation-required-message="Please enter a message."></textarea>
+  </p>
+  <div id="success"></div>
+  <p>
+    <button type="submit" id="sendMessageButton">Send</button>
+  </p>
+</form>
diff --git a/content/pages/privacy.md b/content/pages/privacy.md
index 52bfc01..1b7eec5 100644
--- a/content/pages/privacy.md
+++ b/content/pages/privacy.md
@@ -12,4 +12,4 @@ draft = false
 - This site does not store data in the browser to be shared, sent, or sold to third-parties.
 - No personal information is shared, sent, or sold to third-parties.
 
-**Effective Date:** _1st Jan 2022_
\ No newline at end of file
+**Effective Date:** _1st Jan 2022_