diff --git a/app.py b/app.py index 739bcc7..4cfb380 100644 --- a/app.py +++ b/app.py @@ -25,6 +25,13 @@ def sauveteur(idsauveteur): def bateau(idbateau): return pages.bateau(idbateau) +@app.route('/modifications') +@app.route('/modifications/') +@app.route('/modification') +@app.route('/modification/') +def modifs(): + return pages.modifs() + @app.route('/expeditions/') @app.route('/expedition/') def expe(idexpe): diff --git a/pages.py b/pages.py index 9377c46..2e822dd 100644 --- a/pages.py +++ b/pages.py @@ -10,6 +10,9 @@ dbname = "site.db" def main(): return render_template("index.html") +def modifs(): + return render_template("modification.html") + def error(): return render_template("error.html") @@ -17,20 +20,18 @@ def bateau(idbateau): dico = {} dico["NomBateau"] = "Le Bateau" dico["nom"] = "Le constructeur" - dico["Dimensions"] = 666 - dico["DateInstallation"] = "Aujourd'hui" - dico["DateCondamnation"] = "Demain" - dico["ville"] = "ici" + dico["date_naissance"] = "Aujourd'hui" + dico["date_mort"] = "Demain" dico["HistoireBateau"] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam at odio cursus, rutrum odio non, dignissim risus. Pellentesque non varius ante. Vivamus scelerisque pulvinar mauris, nec imperdiet ante mattis et." result = lib.ex_sql(dbname,"SELECT * FROM bateau WHERE ship_id=?",(idbateau,)) if len(result)>=1: result = result[0] dico["nom"] = result["nom"] print(result) - dico["Dimensions"] = result["dimension"] - dico["DateInstallation"] = result["date_naissance"] - dico["DateCondamnation"] = result["date_mort"] - return render_template("sauveteur.html",**dico) + dico["date_naissance"] = result["date_naissance"] + dico["date_mort"] = result["date_mort"] + dico["Histoire"] = result["histoire"] + return render_template("bateau.html",**dico) else: return error() diff --git a/static/style.css b/static/style.css index 75b7dcc..3c31d44 100644 --- a/static/style.css +++ b/static/style.css @@ -20,6 +20,10 @@ table, tr, td { display: flex; } +.form-pad { + padding: 20px; +} + #banner { background-color: #dfcba8; margin-left: calc(-50vw + 50%); @@ -41,8 +45,11 @@ table, tr, td { } #logo_title { + padding-top: 10px; + padding-bottom: 10px; font-weight: bold; font-size: 30px; + color: black; } #searchresults { diff --git a/static/style_dark.css b/static/style_dark.css index eaee40d..75c4f39 100644 --- a/static/style_dark.css +++ b/static/style_dark.css @@ -1,5 +1,5 @@ body { - background: black; + background: #313131; font-family: arial; color: white; } @@ -22,8 +22,12 @@ table, tr, td { display: flex; } +.form-pad { + padding: 20px; +} + #banner { - background-color: #a36f13; + background-color: #9C7228; margin-left: calc(-50vw + 50%); margin-right: calc(-50vw + 50%); margin-top: calc(-50vw + 50%); @@ -34,7 +38,7 @@ table, tr, td { } #banner_index { - background-color: #a36f13; + background-color: #9C7228; margin-left: calc(-50vw + 50%); margin-right: calc(-50vw + 50%); margin-top: calc(-50vw + 50%); @@ -43,8 +47,15 @@ table, tr, td { } #logo_title { + padding-top: 10px; + padding-bottom: 10px; font-weight: bold; font-size: 30px; + color: white; +} + +#searchresults { + width: 75%; } .searchbar { @@ -55,3 +66,11 @@ table, tr, td { .right-align { margin-left: auto; } + +a:link { +color: #8F9BFF; +} + +a:visited { +color: #9BA6FF; +} diff --git a/templates/bateau.html b/templates/bateau.html new file mode 100644 index 0000000..a02f13b --- /dev/null +++ b/templates/bateau.html @@ -0,0 +1,26 @@ + + + {{nom}} {{prenom}} - Sauveteurs du Dunkerquois + {% include 'head.html' %} + + + {% include "smallheader.html" %} +

{{nom}} - Un navire

+
+

{{Histoire}}

+

+ + + + + + + + + + +
Nom{{nom}}
Mise à flot{{date_naissance}}
Mise en arrêt{{date_mort}}
+

+
+ + diff --git a/templates/error.html b/templates/error.html index 674979b..1576fd6 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 0fba98b..fd4372e 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -1,4 +1,5 @@ +<<<<<<< HEAD +======= +>>>>>>> f53b67000eac017030794619a1ccd0eaa7ad151e {{nom}}- Sauveteurs du dunkerquois {% include 'head.html' %} +<<<<<<< HEAD {% include "smallheader.html" %}

{{nom}}

@@ -27,4 +31,10 @@ histoire {{date}} - \ No newline at end of file + +======= + {% include "smallheader.html" %} +

{{siecle}}

+ + +>>>>>>> f53b67000eac017030794619a1ccd0eaa7ad151e diff --git a/templates/head.html b/templates/head.html index fbbdfb6..05ae535 100644 --- a/templates/head.html +++ b/templates/head.html @@ -1,3 +1,3 @@ - + diff --git a/templates/header.html b/templates/header.html index d17926b..83c4f40 100644 --- a/templates/header.html +++ b/templates/header.html @@ -1,7 +1,8 @@

diff --git a/templates/modification.html b/templates/modification.html new file mode 100644 index 0000000..c5fae74 --- /dev/null +++ b/templates/modification.html @@ -0,0 +1,18 @@ + + + {{nom}} {{prenom}} - Sauveuteurs du dunkerquois + {% include 'head.html' %} + + + {% include "smallheader.html" %} +

Proposer une modification :

+ + Votre nom (facultatif) :

+ Votre prénom (facultatif) :

+ Votre adresse e-mail (facultatif) :

+ Nom de l'article à modifier :

+ Modification suggérée :


+ +
+ + diff --git a/templates/sauvees.html b/templates/sauvees.html index 4ed38e0..0d0f56b 100644 --- a/templates/sauvees.html +++ b/templates/sauvees.html @@ -1,12 +1,4 @@ - - {{nom}}{{prenom}}- Sauveuteurs du dunkerquois {% include 'head.html' %} @@ -35,7 +27,5 @@ histoire {{place}} - - - - + + diff --git a/templates/sauveteur.html b/templates/sauveteur.html index 5880cfa..671cea6 100644 --- a/templates/sauveteur.html +++ b/templates/sauveteur.html @@ -1,15 +1,4 @@ - - {{nom}} {{prenom}} - Sauveuteurs du dunkerquois {% include 'head.html' %} diff --git a/templates/searchresults.html b/templates/searchresults.html index 5f8e261..2e0cc72 100644 --- a/templates/searchresults.html +++ b/templates/searchresults.html @@ -1,6 +1,6 @@ - Recherche - Sauveuteurs du dunkerquois + Recherche - Sauveteurs du Dunkerquois {% include 'head.html' %} diff --git a/templates/smallheader.html b/templates/smallheader.html index a2d3938..a84b466 100644 --- a/templates/smallheader.html +++ b/templates/smallheader.html @@ -4,7 +4,7 @@ Sauveteurs du Dunkerquois
-Proposer une modification +Proposer une modification
diff --git a/templates/station.html b/templates/station.html index df5bbf0..088f64c 100644 --- a/templates/station.html +++ b/templates/station.html @@ -1,17 +1,11 @@ - - {{nom}} - Sauveuteurs du dunkerquois {% include 'head.html' %} {% include "smallheader.html" %} -

{{nom}}

+

{{nom}}

@@ -22,7 +16,7 @@ evenement - +
Date {{Annee}}