study-faraphel/M1-Palto-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/extra-pages' into extra-pages

Browse source 
# Conflicts:
#	Palto/Palto/templates/Palto/homepage.html
#	Palto/Palto/templates/Palto/login.html
#	Palto/Palto/templates/Palto/profile.html
#	Palto/Palto/templates/Palto/student_group.html
#	Palto/Palto/templates/Palto/teaching_session_list.html
#	Palto/Palto/templates/Palto/teaching_session_view.html
#	Palto/Palto/templates/Palto/teaching_unit_view.html
This commit is contained in:
Faraphel 2024-01-04 22:51:00 +01:00
commit d55ac2e4f8
6 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Palto/Palto/templates/Palto/homepage.html
View file

@ -1,9 +1,9 @@
{% extends "Palto/base/base-features.html" %}
{% extends "Palto/base.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 %}

4
Palto/Palto/templates/Palto/profile.html
View file

@ -1,9 +1,7 @@
{% extends "Palto/base/base-features.html" %}
{% extends "Palto/base.html" %}
{% load dict_tags %}
{% block body %}
{{ block.super }}
{{ profile.username }}
{{ profile.email }}
{% if profile.is_superuser %}Administrator{% endif %}

4
Palto/Palto/templates/Palto/student_group.html
View file

@ -1,8 +1,6 @@
{% extends "Palto/base/base-features.html" %}
{% extends "Palto/base.html" %}
{% block body %}
{{ block.super }}
{# group's information #}
<table>
<tr>

4
Palto/Palto/templates/Palto/teaching_session_list.html
View file

@ -1,8 +1,6 @@
{% extends "Palto/base/base-features.html" %}
{% extends "Palto/base.html" %}
{% block body %}
{{ block.super }}
{# table of all the sessions #}
<table>
<thead>

4
Palto/Palto/templates/Palto/teaching_session_view.html
View file

@ -1,9 +1,7 @@
{% extends "Palto/base/base-features.html" %}
{% extends "Palto/base.html" %}
{% load dict_tags %}
{% block body %}
{{ block.super }}
{# session's information #}
<table>
<tr>

4
Palto/Palto/templates/Palto/teaching_unit_view.html
View file

@ -1,9 +1,7 @@
{% extends "Palto/base/base-features.html" %}
{% extends "Palto/base.html" %}
{% load dict_tags %}
{% block body %}
{{ block.super }}
{# unit's information #}
<table>
<tr>