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 #} 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 }} + {% csrf_token %}
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 #}
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 }} + +{% endblock %} + +{% block body %} + {{ block.super }} + + +{% 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 @@ - {% block title %}Palto{% endblock %} {# base style #} - + {% block style %} + + + {% endblock %} - {# 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 #}
diff --git a/Palto/Palto/templates/Palto/homepage.html b/Palto/Palto/templates/Palto/homepage.html index 0795085..e1faee0 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-features.html" %} {% block body %} + {{ block.super }} +

Palto

-

- Palto est un outil de gestion des présences d'élèves dans vos établissements scolaires. -

+

Palto est un outil de gestion des présences d'élèves dans vos établissements scolaires.

{% endblock %} diff --git a/Palto/Palto/templates/Palto/login.html b/Palto/Palto/templates/Palto/login.html index d14cca1..7221a98 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-features.html" %} +{% load static %} + +{% block style %} + {{ block.super }} + +{% endblock %} {% block body %} - + {{ block.super }} + + {% csrf_token %}
{{ form_login.as_table }}
-{% 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 %} - - diff --git a/Palto/Palto/templates/Palto/profile.html b/Palto/Palto/templates/Palto/profile.html index e879b97..3c8397e 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-features.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..0a7543f 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-features.html" %} {% block body %} + {{ block.super }} + {# group's information #} diff --git a/Palto/Palto/templates/Palto/teaching_session_list.html b/Palto/Palto/templates/Palto/teaching_session_list.html index 715d933..aea92e3 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-features.html" %} {% block body %} + {{ block.super }} + {# table of all the sessions #}
diff --git a/Palto/Palto/templates/Palto/teaching_session_view.html b/Palto/Palto/templates/Palto/teaching_session_view.html index ada42aa..0901425 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-features.html" %} {% load dict_tags %} {% block body %} + {{ block.super }} + {# session's information #}
diff --git a/Palto/Palto/templates/Palto/teaching_unit_view.html b/Palto/Palto/templates/Palto/teaching_unit_view.html index 956aa5c..fb1716f 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-features.html" %} {% load dict_tags %} {% block body %} + {{ block.super }} + {# unit's information #}