From 39f4abe263e8d761e26bef2871785d042dbed388 Mon Sep 17 00:00:00 2001
From: Faraphel <rc60650@hotmail.com>
Date: Thu, 4 Jan 2024 22:46:48 +0100
Subject: [PATCH] reorganised the templates inheritances

---
 Palto/Palto/templates/Palto/absence_list.html |  4 ++-
 Palto/Palto/templates/Palto/absence_new.html  |  4 ++-
 Palto/Palto/templates/Palto/absence_view.html |  4 ++-
 .../templates/Palto/base/base-features.html   | 27 +++++++++++++++++++
 .../templates/Palto/{ => base}/base.html      | 21 +++++++--------
 .../templates/Palto/department_view.html      |  4 ++-
 Palto/Palto/templates/Palto/homepage.html     |  8 +++---
 Palto/Palto/templates/Palto/login.html        | 14 +++++++---
 Palto/Palto/templates/Palto/navigation.html   | 20 --------------
 Palto/Palto/templates/Palto/profile.html      |  4 ++-
 .../Palto/templates/Palto/student_group.html  |  4 ++-
 .../Palto/teaching_session_list.html          |  4 ++-
 .../Palto/teaching_session_view.html          |  4 ++-
 .../templates/Palto/teaching_unit_view.html   |  4 ++-
 14 files changed, 79 insertions(+), 47 deletions(-)
 create mode 100644 Palto/Palto/templates/Palto/base/base-features.html
 rename Palto/Palto/templates/Palto/{ => base}/base.html (56%)
 delete mode 100644 Palto/Palto/templates/Palto/navigation.html

diff --git a/Palto/Palto/templates/Palto/absence_list.html b/Palto/Palto/templates/Palto/absence_list.html
index 9e16e6a..ec63067 100644
--- a/Palto/Palto/templates/Palto/absence_list.html
+++ b/Palto/Palto/templates/Palto/absence_list.html
@@ -1,6 +1,8 @@
-{% extends "Palto/base.html" %}
+{% extends "Palto/base/base-features.html" %}
 
 {% block body %}
+    {{ block.super }}
+
     {# table of all the absences #}
     <table>
         <thead>
diff --git a/Palto/Palto/templates/Palto/absence_new.html b/Palto/Palto/templates/Palto/absence_new.html
index e73e87c..19ebbf9 100644
--- a/Palto/Palto/templates/Palto/absence_new.html
+++ b/Palto/Palto/templates/Palto/absence_new.html
@@ -1,6 +1,8 @@
-{% extends "Palto/base.html" %}
+{% extends "Palto/base/base-features.html" %}
 
 {% block body %}
+    {{ block.super }}
+
     <form method="POST" enctype="multipart/form-data">
         {% csrf_token %}
         <table>
diff --git a/Palto/Palto/templates/Palto/absence_view.html b/Palto/Palto/templates/Palto/absence_view.html
index 03e1c27..ce057ef 100644
--- a/Palto/Palto/templates/Palto/absence_view.html
+++ b/Palto/Palto/templates/Palto/absence_view.html
@@ -1,6 +1,8 @@
-{% extends "Palto/base.html" %}
+{% extends "Palto/base/base-features.html" %}
 
 {% block body %}
+    {{ block.super }}
+
     {# absence's information #}
     <table>
         <tr>
diff --git a/Palto/Palto/templates/Palto/base/base-features.html b/Palto/Palto/templates/Palto/base/base-features.html
new file mode 100644
index 0000000..f4c4b5e
--- /dev/null
+++ b/Palto/Palto/templates/Palto/base/base-features.html
@@ -0,0 +1,27 @@
+{% extends "Palto/base/base.html" %}
+{% load static %}
+
+{% block style %}
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static "Palto/css/navigation.css" %}" />
+{% endblock %}
+
+{% block body %}
+    {{ block.super }}
+
+    <nav>
+        <div id="navigation-header">
+            <img id="navigation-icon" src="{% static "Palto/favicon.svg" %}" alt="Palto's icon" />
+            <a id="navigation-title">Palto</a>
+        </div>
+        <div id="navigation-buttons">
+            <a href="{% url "Palto:homepage" %}">Home</a>
+            {% if request.user.is_authenticated %}
+                <a href="{% url "Palto:my_profile" %}">Profile</a>
+                <a href="{% url "Palto:logout" %}">Logout</a>
+            {% else %}
+                <a href="{% url "Palto:login" %}">Login</a>
+            {% endif %}
+        </div>
+    </nav>
+{% endblock %}
\ No newline at end of file
diff --git a/Palto/Palto/templates/Palto/base.html b/Palto/Palto/templates/Palto/base/base.html
similarity index 56%
rename from Palto/Palto/templates/Palto/base.html
rename to Palto/Palto/templates/Palto/base/base.html
index c389599..9893034 100644
--- a/Palto/Palto/templates/Palto/base.html
+++ b/Palto/Palto/templates/Palto/base/base.html
@@ -7,23 +7,22 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="shortcut icon" type="image/png" href="{% static 'Palto/favicon.svg' %}"/>
-    <link rel="stylesheet" href="{% static "Palto/css/base.css" %}" />
     <title>{% block title %}Palto{% endblock %}</title>
 
     {# base style #}
-    <style>
-        {# font #}
-        @font-face {
-            font-family: "Century Gothic";
-            src: url("{% static 'Palto/font/CenturyGothic.ttf' %}");
-        }
-    </style>
 
+    {% block style %}
+        <style>
+            {# font #}
+            @font-face {
+                font-family: "Century Gothic";
+                src: url("{% static 'Palto/font/CenturyGothic.ttf' %}");
+            }
+        </style>
+        <link rel="stylesheet" href="{% static "Palto/css/base.css" %}" />
+    {% endblock %}
 </head>
 <body>
-    {# navigation #}
-    {% include "Palto/navigation.html" %}
-
     {# body #}
     {% block body %}
     {% endblock %}
diff --git a/Palto/Palto/templates/Palto/department_view.html b/Palto/Palto/templates/Palto/department_view.html
index 906a22f..0199784 100644
--- a/Palto/Palto/templates/Palto/department_view.html
+++ b/Palto/Palto/templates/Palto/department_view.html
@@ -1,8 +1,10 @@
-{% extends "Palto/base.html" %}
+{% extends "Palto/base/base-features.html" %}
 {% load dict_tags %}
 
 
 {% block body %}
+    {{ block.super }}
+
     {# department's information #}
     <table>
         <tr>
diff --git a/Palto/Palto/templates/Palto/homepage.html b/Palto/Palto/templates/Palto/homepage.html
index 0795085..7c1b5f6 100644
--- a/Palto/Palto/templates/Palto/homepage.html
+++ b/Palto/Palto/templates/Palto/homepage.html
@@ -1,9 +1,9 @@
-{% extends "Palto/base.html" %}
+{% extends "Palto/base/base-navigation.html" %}
 
 {% block body %}
+    {{ block.super }}
+
     <h1>Palto</h1>
 
-    <p>
-        Palto est un outil de gestion des présences d'élèves dans vos établissements scolaires.
-    </p>
+    <p>Palto est un outil de gestion des présences d'élèves dans vos établissements scolaires.</p>
 {% endblock %}
diff --git a/Palto/Palto/templates/Palto/login.html b/Palto/Palto/templates/Palto/login.html
index d14cca1..251fb42 100644
--- a/Palto/Palto/templates/Palto/login.html
+++ b/Palto/Palto/templates/Palto/login.html
@@ -1,11 +1,19 @@
-{% extends "Palto/base.html" %}
+{% extends "Palto/base/base-navigation.html" %}
+{% load static %}
+
+{% block style %}
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static "Palto/css/login.css" %}" />
+{% endblock %}
 
 {% block body %}
-    <form method="POST">
+    {{ block.super }}
+
+    <form id="login-form" method="POST">
         {% csrf_token %}
         <table>
             {{ form_login.as_table }}
         </table>
         <input type="submit" value="Se connecter">
     </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/Palto/Palto/templates/Palto/navigation.html b/Palto/Palto/templates/Palto/navigation.html
deleted file mode 100644
index eb1e697..0000000
--- a/Palto/Palto/templates/Palto/navigation.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% load static %}
-
-<nav>
-    <link rel="stylesheet" href="{% static "Palto/css/navigation.css" %}" />
-
-    <div id="navigation-header">
-        <img id="navigation-icon" src="{% static "Palto/favicon.svg" %}" alt="Palto's icon" />
-        <a id="navigation-title">Palto</a>
-    </div>
-
-    <div id="navigation-buttons">
-        <a href="{% url "Palto:homepage" %}">Home</a>
-        {% if request.user.is_authenticated %}
-            <a href="{% url "Palto:my_profile" %}">Profile</a>
-            <a href="{% url "Palto:logout" %}">Logout</a>
-        {% else %}
-            <a href="{% url "Palto:login" %}">Login</a>
-        {% endif %}
-    </div>
-</nav>
diff --git a/Palto/Palto/templates/Palto/profile.html b/Palto/Palto/templates/Palto/profile.html
index e879b97..76f2ed3 100644
--- a/Palto/Palto/templates/Palto/profile.html
+++ b/Palto/Palto/templates/Palto/profile.html
@@ -1,7 +1,9 @@
-{% extends "Palto/base.html" %}
+{% extends "Palto/base/base-navigation.html" %}
 {% load dict_tags %}
 
 {% block body %}
+    {{ block.super }}
+
     {{ profile.username }}
     {{ profile.email }}
     {% if profile.is_superuser %}Administrator{% endif %}
diff --git a/Palto/Palto/templates/Palto/student_group.html b/Palto/Palto/templates/Palto/student_group.html
index 56de3b0..8652ab6 100644
--- a/Palto/Palto/templates/Palto/student_group.html
+++ b/Palto/Palto/templates/Palto/student_group.html
@@ -1,6 +1,8 @@
-{% extends "Palto/base.html" %}
+{% extends "Palto/base/base-navigation.html" %}
 
 {% block body %}
+    {{ block.super }}
+
     {# group's information #}
     <table>
         <tr>
diff --git a/Palto/Palto/templates/Palto/teaching_session_list.html b/Palto/Palto/templates/Palto/teaching_session_list.html
index 715d933..f629daf 100644
--- a/Palto/Palto/templates/Palto/teaching_session_list.html
+++ b/Palto/Palto/templates/Palto/teaching_session_list.html
@@ -1,6 +1,8 @@
-{% extends "Palto/base.html" %}
+{% extends "Palto/base/base-navigation.html" %}
 
 {% block body %}
+    {{ block.super }}
+
     {# table of all the sessions #}
     <table>
         <thead>
diff --git a/Palto/Palto/templates/Palto/teaching_session_view.html b/Palto/Palto/templates/Palto/teaching_session_view.html
index ada42aa..8256b93 100644
--- a/Palto/Palto/templates/Palto/teaching_session_view.html
+++ b/Palto/Palto/templates/Palto/teaching_session_view.html
@@ -1,7 +1,9 @@
-{% extends "Palto/base.html" %}
+{% extends "Palto/base/base-navigation.html" %}
 {% load dict_tags %}
 
 {% block body %}
+    {{ block.super }}
+
     {# session's information #}
     <table>
         <tr>
diff --git a/Palto/Palto/templates/Palto/teaching_unit_view.html b/Palto/Palto/templates/Palto/teaching_unit_view.html
index 956aa5c..f9d2bdc 100644
--- a/Palto/Palto/templates/Palto/teaching_unit_view.html
+++ b/Palto/Palto/templates/Palto/teaching_unit_view.html
@@ -1,7 +1,9 @@
-{% extends "Palto/base.html" %}
+{% extends "Palto/base/base-navigation.html" %}
 {% load dict_tags %}
 
 {% block body %}
+    {{ block.super }}
+
     {# unit's information #}
     <table>
         <tr>