From df874bcd1337024b3e8f19c24861a807a9cc9815 Mon Sep 17 00:00:00 2001 From: Antoine Waehren Date: Fri, 3 Dec 2021 04:20:23 +0100 Subject: [PATCH] Maj avec templates head, header, smallheader dans toutes les pages. Maj style dark. --- static/style_dark.css | 4 ++-- templates/bateau.html | 18 ++++-------------- templates/error.html | 9 ++------- templates/expedition.html | 11 +++++------ templates/head.html | 3 +++ templates/header.html | 1 + templates/index.html | 6 ++---- templates/sauvees.html | 18 ++++-------------- templates/sauveteur.html | 4 +--- templates/searchresults.html | 16 +++------------- templates/smallheader.html | 26 +++++++++++--------------- templates/station.html | 18 ++++-------------- 12 files changed, 42 insertions(+), 92 deletions(-) create mode 100644 templates/head.html diff --git a/static/style_dark.css b/static/style_dark.css index cdd2210..eaee40d 100644 --- a/static/style_dark.css +++ b/static/style_dark.css @@ -23,7 +23,7 @@ table, tr, td { } #banner { - background-color: #dfcba8; + background-color: #a36f13; margin-left: calc(-50vw + 50%); margin-right: calc(-50vw + 50%); margin-top: calc(-50vw + 50%); @@ -34,7 +34,7 @@ table, tr, td { } #banner_index { - background-color: #dfcba8; + background-color: #a36f13; margin-left: calc(-50vw + 50%); margin-right: calc(-50vw + 50%); margin-top: calc(-50vw + 50%); diff --git a/templates/bateau.html b/templates/bateau.html index 1069fbf..1f98113 100644 --- a/templates/bateau.html +++ b/templates/bateau.html @@ -8,23 +8,13 @@ condamnation origine histoire !--> - - + + {{nom}} - Sauveuteurs du dunkerquois - - + {% include 'head.html' %} - -
- Proposer une modification -
- - -
+ {% include "smallheader.html" %}

{{nom}}}

{{HistoireBateau}}

diff --git a/templates/error.html b/templates/error.html index db3aaad..12fe07a 100644 --- a/templates/error.html +++ b/templates/error.html @@ -1,16 +1,11 @@ - 404 Not Found - Sauveuteurs du dunkerquois - - + {% include 'head.html' %} - + {% include 'smallheader.html' %}

Page introuvable !

Retour à la page d'accueil.

diff --git a/templates/expedition.html b/templates/expedition.html index 43a1bc3..dd7b5b4 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -4,12 +4,11 @@ date evenement !--> - - - {{siecle}}- Sauveteurs du dunkerquois - - + + {{siecle}}- Sauveuteurs du dunkerquois + {% include 'head.html' %} + {% include "smallheader.html" %}

{{siecle}}

- \ No newline at end of file + diff --git a/templates/head.html b/templates/head.html new file mode 100644 index 0000000..fbbdfb6 --- /dev/null +++ b/templates/head.html @@ -0,0 +1,3 @@ + + + diff --git a/templates/header.html b/templates/header.html index 34e09d0..1610d2b 100644 --- a/templates/header.html +++ b/templates/header.html @@ -3,6 +3,7 @@

Sauveteurs du dunkerquois

+
diff --git a/templates/index.html b/templates/index.html index 5955599..11e0719 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,12 +1,10 @@ - Sauveteurs du dunkerquois - - + {% include 'head.html' %} - {% include 'header.html' %} + {% include 'header.html' %}

diff --git a/templates/sauvees.html b/templates/sauvees.html index 951a3db..4ed38e0 100644 --- a/templates/sauvees.html +++ b/templates/sauvees.html @@ -7,22 +7,12 @@ place histoire !--> - - + {{nom}}{{prenom}}- Sauveuteurs du dunkerquois - + {% include 'head.html' %} - -
- Proposer une modification - - - - + {% include "smallheader.html" %}

{{nom}}}{{prenom}}

{{histoire}}

@@ -48,4 +38,4 @@ histoire - \ No newline at end of file + diff --git a/templates/sauveteur.html b/templates/sauveteur.html index dbb21e2..5880cfa 100644 --- a/templates/sauveteur.html +++ b/templates/sauveteur.html @@ -11,10 +11,8 @@ description !--> - {{nom}} {{prenom}} - Sauveuteurs du dunkerquois - - + {% include 'head.html' %} {% include "smallheader.html" %} diff --git a/templates/searchresults.html b/templates/searchresults.html index c0650b6..5f8e261 100644 --- a/templates/searchresults.html +++ b/templates/searchresults.html @@ -1,20 +1,10 @@ - - {{nom}} {{prenom}} - Sauveuteurs du dunkerquois - - + Recherche - Sauveuteurs du dunkerquois + {% include 'head.html' %} - -
-
- - -
+ {% include "smallheader.html" %}

Résultats de la recherche :

diff --git a/templates/smallheader.html b/templates/smallheader.html index f9105e8..200a6a2 100644 --- a/templates/smallheader.html +++ b/templates/smallheader.html @@ -1,15 +1,11 @@ -
- - -
- Proposer une modification - -
- - - - -
+ + +
+Proposer une modification + + + + diff --git a/templates/station.html b/templates/station.html index 5e4f20b..df5bbf0 100644 --- a/templates/station.html +++ b/templates/station.html @@ -5,22 +5,12 @@ date evenement !--> - - +{{nom}} - Sauveuteurs du dunkerquois - + {% include 'head.html' %} - -
- Proposer une modification - - - - + {% include "smallheader.html" %}

{{nom}}

@@ -41,4 +31,4 @@ evenement
{{Evenement}}
- \ No newline at end of file +