Merge branch 'main' of https://github.com/HugoooR/isv-project

image_project/init_image/templates/init_image/align_horizontal.html

@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Document</title>
+    <link rel="stylesheet" href="../../media/style.css">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
         integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
 
@@ -41,13 +42,30 @@
             <form class="border boder-1 border-black p-3 w-50" action="" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
                 <div class="form-group mb-3">
-                    <label class="mb-2" for="images">Choississez des images</label>
+                    <label class="mb-2" for="images">Choose your image</label>
                     <input type="file" id="images" name="images[]" accept="image/*" multiple><br>
                 </div>
                 <input type="submit" class="btn btn-primary mt-3" value="Telecharger">
             </form>
         </div>
+
+        <div class="d-flex mb-5 justify-content-center flex-wrap">
+            {% if image_classique %}
+                {% for i in tab_number %}
+                    <div class="container__image">
+                        <img class="w-100 h-100" src="../../media/image_classique_{{i}}.png">
+                    </div>
+                {% endfor %}
+            {% endif %}
+        </div>
+
         {% if image_classique %}
+            <div class="w-100">
+                <img class="w-100 mb-5" src="../../media/image_fusion-horizontal.png">
+            </div>
+        {% endif %}
+
+        <!-- {% if image_classique %}
             <div class="w-full">
                     {% for i in tab_number %}
                             <div class="container__image">
@@ -56,7 +74,9 @@
                     {% endfor %}
                 <img class="w-100" src="../../media/image_fusion-horizontal.png">
             </div>
-        {% endif %}
+        {% endif %} -->
+
+
     </div>
 
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"

image_project/init_image/templates/init_image/align_vertical.html

@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Document</title>
+    <link rel="stylesheet" href="../../media/style.css">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
         integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
 
@@ -41,13 +42,30 @@
             <form class="border boder-1 border-black p-3 w-50" action="" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
                 <div class="form-group mb-3">
-                    <label class="mb-2" for="images">Choississez des images</label>
+                    <label class="mb-2" for="images">Choose your image</label>
                     <input type="file" id="images" name="images[]" accept="image/*" multiple><br>
                 </div>
                 <input type="submit" class="btn btn-primary mt-3" value="Telecharger">
             </form>
         </div>
+
+        <div class="d-flex mb-5 justify-content-center flex-wrap">
+            {% if image_classique %}
+                {% for i in tab_number %}
+                    <div class="container__image">
+                        <img class="w-100 h-100" src="../../media/image_classique_{{i}}.png">
+                    </div>
+                {% endfor %}
+            {% endif %}
+        </div>
+
         {% if image_classique %}
+            <div class="w-100">
+                <img class="w-100 mb-5" src="../../media/image_fusion-vertical.png">
+            </div>
+        {% endif %}
+
+        <!-- {% if image_classique %}
             <div class="w-full">
                 {% for i in tab_number %}
                     <div class="container__image">
@@ -56,7 +74,8 @@
                 {% endfor %}
                     <img class="w-100" src="../../media/image_fusion-vertical.png">
             </div>
-        {% endif %}
+        {% endif %} -->
+        
     </div>
 
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"

image_project/init_image/templates/init_image/animation.html

@@ -41,11 +41,11 @@
             <form class="border boder-1 border-black p-3 w-50" action="" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
                 <div class="form-group mb-3">
-                    <label class="mb-2" for="images">Choississez une image</label>
+                    <label class="mb-2" for="images">Choose your image</label>
                     <input type="file" id="images" name="images[]" accept="image/*" multiple><br>
                 </div>
                 <div class="form-group">
-                    <label class="mb-2" for="duree">Durée en ms: </label>
+                    <label class="mb-2" for="duree">Duration in ms: </label>
                     <input type="text" id="duree" name="duree" accept="image/*">
                 </div>
                 <input type="submit" class="btn btn-primary mt-3" value="Telecharger">

image_project/init_image/templates/init_image/black_white.html

@@ -41,7 +41,7 @@
             <form class="border boder-1 border-black p-3 w-50" action="" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
                 <div class="form-group">
-                    <label class="mb-2" for="image">Choississez une image</label>
+                    <label class="mb-2" for="image">Choose your image</label>
                     <input type="file" id="image" name="image" accept="image/*">
                 </div>
                 <input type="submit" class="btn btn-primary mt-3" value="Telecharger">

image_project/init_image/templates/init_image/fusion.html

@@ -41,23 +41,23 @@
             <form class="border boder-1 border-black p-3 w-50" action="" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
                 <div class="form-group">
-                    <label class="mb-2" for="image">Choississez une image</label>
+                    <label class="mb-2" for="image">Choose your image</label>
                     <input type="file" id="image" name="image" accept="image/*">
                 </div>
                 <div class="form-group mb-3">
-                    <label class="mb-2" for="image2">Choississez une image</label>
+                    <label class="mb-2" for="image2">Choose your image</label>
                     <input type="file" id="image2" name="image2" accept="image/*">
                 </div>
                 <div class="form-group">
-                    <label class="mb-2" for="opacite">Choississez une opacité</label>
+                    <label class="mb-2" for="opacite">Choose an opacity</label>
                     <input type="text" id="opacite" name="opacite" accept="image/*">
                 </div>
                 <div class="form-group">
-                    <label class="mb-2" for="position_x">Choississez une position x</label>
+                    <label class="mb-2" for="position_x">Choose a position x</label>
                     <input type="text" id="position_x" name="position_x" accept="image/*">
                 </div>
                 <div class="form-group">
-                    <label class="mb-2" for="position_y">Choississez une position y</label>
+                    <label class="mb-2" for="position_y">Choose a position y</label>
                     <input type="text" id="position_y" name="position_y" accept="image/*">
                 </div>
                 <input type="submit" class="btn btn-primary mt-3" value="Telecharger">

image_project/init_image/templates/init_image/gray.html

@@ -41,7 +41,7 @@
             <form class="border boder-1 border-black p-3 w-50" action="" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
                 <div class="form-group">
-                    <label class="mb-2" for="image">Choississez une image</label>
+                    <label class="mb-2" for="image">Choose your image</label>
                     <input type="file" id="image" name="image" accept="image/*">
                 </div>
                 <input type="submit" class="btn btn-primary mt-3" value="Telecharger">

image_project/init_image/templates/init_image/index.html

@@ -24,11 +24,10 @@
     </div>
 
     <div class="container">
-      <h3>Mini projet</h3>
+      <h3>Little project</h3>
       <div>
-        L'objectif de ce projet est de réaliser une application web qui regroupe plusieurs fonctionnalités 
+        The objective of this project is to create a web application that brings together several features on image transformation. 
-        sur la transformation d'images. Vous pouvez naviguez sur nos différentes fonctionnalités à l'aide de notre 
+        You can navigate our different features using our menu. More information below.
-        menu. Plus d'information en dessous.
       </div>
       <br>
       <br>
@@ -57,15 +56,15 @@
               </tr>
               <tr>
                 <th scope="row">Align_V</th>
-                <td>Align vertically two images</td>
+                <td>Align vertically many images</td>
               </tr>
               <tr>
                 <th scope="row">Align_H</th>
-                <td>Align horizontally two images</td>
+                <td>Align horizontally many images</td>
               </tr>
               <tr>
                 <th scope="row">Fusion</th>
-                <td>Merge of two image with an opacity and a position</td>
+                <td>Merge of two image with an opacity and a position (x,y)</td>
               </tr>
               <tr>
                 <th scope="row">Animation</th>

image_project/init_image/templates/init_image/resize.html

@@ -41,15 +41,15 @@
             <form class="border boder-1 border-black p-3 w-50" action="" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
                 <div class="form-group mb-3">
-                    <label class="mb-2" for="image">Choississez une image</label>
+                    <label class="mb-2" for="image">Choose your image</label>
                     <input type="file" id="image" name="image" accept="image/*">
                 </div>
                 <div class="form-group">
-                    <label class="mb-2" for="hauteur">Choississez une nouvelle hauteur</label>
+                    <label class="mb-2" for="hauteur">Enter a new height</label>
                     <input type="text" id="hauteur" name="hauteur" accept="image/*">
                 </div>
                 <div class="form-group">
-                    <label class="mb-2" for="largeur">Choississez une nouvelle largeur</label>
+                    <label class="mb-2" for="largeur">Enter a new width</label>
                     <input type="text" id="largeur" name="largeur" accept="image/*">
                 </div>
                 <input type="submit" class="btn btn-primary mt-3" value="Telecharger">