CretinsMotorisesIngenieux
/
Marin
5
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: CretinsMotorisesIngenieux:77e4bce9f0e1846c9b822328cbcb48b387eb3c61
Branches Tags
CretinsMotorisesIngenieux:master
...
compare: CretinsMotorisesIngenieux:374410a792af8c65530ffcebdf21d5bd89589a70
Branches Tags
CretinsMotorisesIngenieux:master

2 Commits
77e4bce9f0 ... 374410a792

Author SHA1 Message Date
Jaenai Rugengande Ihimbazwe 374410a792 Merge branch 'master' of https://forge.chapril.org/CretinsMotorisesIngenieux/Marin 2021-12-03 01:28:08 +01:00
Jaenai Rugengande Ihimbazwe 0db1fa1538 Maj temp bateau. 2021-12-03 01:27:37 +01:00
1 changed files with 41 additions and 0 deletions
Show Stats Expand all files Collapse all files

41
templates/bateau.html
View File

@ -1,14 +1,54 @@
<!DOCTYPE html>
<<<<<<< HEAD
<!--- Variables
nom
constructeur
dimensions
installation
condamnation
origine
histoire
!-->
=======
>>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
<!-- saved from url=(0055)file:///C:/Users/rugja/Marin/templates/bateau_temp.html -->
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>{{nom}}</title>
<<<<<<< HEAD
<link href="../static/style.css" rel="stylesheet" type="text/css">
=======
<link href="file:///C:/Users/rugja/Marin/templates/style.css" rel="stylesheet" type="text/css">
>>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
</head>
<body>
<h1>{{nom}}}</h1>
<table>
<tbody><tr>
<<<<<<< HEAD
<td>Nom</td>
<td>{{NomBateau}}</td>
</tr>
<tr>
<td>Constructeur</td>
<td>{{nom}}</td>
</tr>
<tr>
<td>Dimensions</td>
<td>{{Dimensions}}</td>
</tr>
<tr>
<td>Installation</td>
<td>{{Date}}</td>
</tr>
<tr>
<td>Condamnation</td>
<td>{{Date}}</td>
</tr>
<tr>
<td>Origine</td>
<td>{{ville}}</td>
=======
<th>Nom</th>
<th>{{NomBateau}}</th>
</tr>
@ -31,6 +71,7 @@
<tr>
<th>Origine</th>
<th>{{ville}}</th>
>>>>>>> 61d0bb5f79632cfca295415fba8312c0abc41cf5
</tr>
</tbody></table>
<p>