From 6a56aa9fde4f4b4175bf01095ee1bc2e3c746358 Mon Sep 17 00:00:00 2001
From: FyloZ <fylozdev@gmail.com>
Date: Thu, 8 Oct 2020 23:55:07 -0400
Subject: [PATCH] =?UTF-8?q?Ajout=20des=20ic=C3=B4nes=20pour=20les=20recett?=
 =?UTF-8?q?es=20non=20approuv=C3=A9es.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/css/recipesList.css    | 10 ++++------
 src/main/resources/static/icons/bucket.svg       |  5 +++++
 src/main/resources/static/js/recipeResearch.js   | 10 +++++++---
 src/main/resources/templates/fragments.html      |  4 ++++
 src/main/resources/templates/index.html          |  9 ++++-----
 src/main/resources/templates/recipe/editor.html  |  4 ++++
 src/main/resources/templates/recipe/remover.html |  4 ++++
 7 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 src/main/resources/static/icons/bucket.svg

diff --git a/src/main/resources/static/css/recipesList.css b/src/main/resources/static/css/recipesList.css
index 7aa0cbc..3033842 100644
--- a/src/main/resources/static/css/recipesList.css
+++ b/src/main/resources/static/css/recipesList.css
@@ -32,12 +32,10 @@ h1 {
     max-width: 400px;
 }
 
-.descriptionCell {
-    /*border-right-color: #e6e6e6;*/
-    /*border-right-style: solid;*/
-    /*border-right-width: 2px;*/
-}
-
 .researchEnabled .companyTab:not(.researchResult), .researchEnabled .recipeRow:not(.researchResult) {
     display: none;
 }
+
+.iconsColumn img {
+    margin-top: 5px;
+}
diff --git a/src/main/resources/static/icons/bucket.svg b/src/main/resources/static/icons/bucket.svg
new file mode 100644
index 0000000..7fd119b
--- /dev/null
+++ b/src/main/resources/static/icons/bucket.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"  width="24" height="24" viewBox="0 0 24 24">
+    <path fill="#fdd835" d="M19,11.5C19,11.5 17,13.67 17,15A2,2 0 0,0 19,17A2,2 0 0,0 21,15C21,13.67 19,11.5 19,11.5M5.21,10L10,5.21L14.79,10M16.56,8.94L7.62,0L6.21,1.41L8.59,3.79L3.44,8.94C2.85,9.5 2.85,10.47 3.44,11.06L8.94,16.56C9.23,16.85 9.62,17 10,17C10.38,17 10.77,16.85 11.06,16.56L16.56,11.06C17.15,10.47 17.15,9.5 16.56,8.94Z" />
+</svg>
diff --git a/src/main/resources/static/js/recipeResearch.js b/src/main/resources/static/js/recipeResearch.js
index db650ae..eed1467 100644
--- a/src/main/resources/static/js/recipeResearch.js
+++ b/src/main/resources/static/js/recipeResearch.js
@@ -1,9 +1,13 @@
 $(() => {
     $(".recipeRow").each(function () {
+        const iconsColumn = $(this).find(".iconsColumn")
         if (!$(this).data("approbationdate")) {
-            const icon = $(this).find(".icon");
-            icon.removeAttr("hidden");
-            icon.attr({title: recipeNotApproved})
+            const icon = $("<img />")
+                .attr({
+                    src: recipeNotApprovedIconPath,
+                    title: recipeNotApproved
+                })
+            iconsColumn.append(icon)
         }
     });
 });
diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html
index a56c4a9..1163e96 100644
--- a/src/main/resources/templates/fragments.html
+++ b/src/main/resources/templates/fragments.html
@@ -219,5 +219,9 @@
     const printingMessage = formatMessage("[[#{recipe.print.printing}]]");
 </script>
 
+<script th:fragment="iconsPath">
+    const recipeNotApprovedIconPath = "[[@{|${baseUrl}/icons/warning.svg|}]]"
+</script>
+
 </body>
 </html>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 85c85fa..fcdb361 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -28,8 +28,8 @@
                     <th th:text="#{recipe.color}"></th>
                     <th th:text="#{recipe.description}"></th>
                     <th th:text="#{recipe.sample}"></th>
-                    <th></th>
-                    <th></th>
+                    <th><!-- Bouton --></th>
+                    <th><!-- Icônes --></th>
                 </tr>
                 <tr class="recipeRow" th:each="recipe : ${recipeMap.get(company)}"
                     th:data-approbationDate="${recipe.approbationDate}" th:data-recipeId="${recipe.id}">
@@ -40,9 +40,7 @@
                         <button class="gotoRecipe" th:data-recipeid="${recipe.id}" type="button"
                                 th:text="#{keyword.see}"></button>
                     </td>
-                    <td>
-                        <img class="icon" th:src="@{|${baseUrl}/icons/warning.svg|}" alt="warning icon"
-                             style="padding-top: 3px" hidden/>
+                    <td class="iconsColumn">
                     </td>
                 </tr>
             </table>
@@ -54,6 +52,7 @@
 <!-- Fragment du pied de page -->
 <footer th:include="fragments.html :: footer(null, true)"></footer>
 
+<script th:include="fragments.html :: iconsPath"></script>
 <script th:src="@{|${baseUrl}/js/recipeResearch.js|}"></script>
 <script th:src="@{|${baseUrl}/js/recipeList.js|}"></script>
 <script>
diff --git a/src/main/resources/templates/recipe/editor.html b/src/main/resources/templates/recipe/editor.html
index 785ca38..5dcf82b 100644
--- a/src/main/resources/templates/recipe/editor.html
+++ b/src/main/resources/templates/recipe/editor.html
@@ -29,6 +29,7 @@
                     <th th:text="#{recipe.description}"></th>
                     <th th:text="#{recipe.sample}"></th>
                     <th></th>
+                    <th></th>
                 </tr>
                 <tr class="recipeRow" th:each="recipe : ${recipeMap.get(company)}"
                     th:data-approbationDate="${recipe.approbationDate}" th:data-recipeId="${recipe.id}">
@@ -39,6 +40,8 @@
                         <button class="editRecipe" th:data-code="${recipe.name}"
                                 th:data-recipeId="${recipe.id}" type="button" th:text="#{menu.edit}"></button>
                     </td>
+                    <td class="iconsColumn">
+                    </td>
                 </tr>
             </table>
         </div>
@@ -49,6 +52,7 @@
 <!-- Fragment du pied de page -->
 <footer th:include="fragments.html :: footer(null, true)"></footer>
 
+<script th:include="fragments.html :: iconsPath"></script>
 <script th:src="@{|${baseUrl}/js/recipeResearch.js|}"></script>
 <script th:src="@{|${baseUrl}/js/recipeList.js|}"></script>
 <script>
diff --git a/src/main/resources/templates/recipe/remover.html b/src/main/resources/templates/recipe/remover.html
index e48a00d..79fc38e 100644
--- a/src/main/resources/templates/recipe/remover.html
+++ b/src/main/resources/templates/recipe/remover.html
@@ -30,6 +30,7 @@
                         <th th:text="#{recipe.description}"></th>
                         <th th:text="#{recipe.sample}"></th>
                         <th></th>
+                        <th></th>
                     </tr>
                     <tr class="recipeRow" th:each="recipe : ${recipeMap.get(company)}"
                         th:data-approbationDate="${recipe.approbationDate}" th:data-recipeId="${recipe.id}">
@@ -41,6 +42,8 @@
                                     th:data-entityid="${recipe.id}" type="button"
                                     th:text="#{keyword.delete}"></button>
                         </td>
+                        <td class="iconsColumn">
+                        </td>
                     </tr>
                 </table>
             </div>
@@ -52,6 +55,7 @@
 <!-- Fragment du pied de page -->
 <footer th:include="fragments.html :: footer(null, true)"></footer>
 
+<script th:include="fragments.html :: iconsPath"></script>
 <script th:src="@{|${baseUrl}/js/recipeResearch.js|}"></script>
 <script th:src="@{|${baseUrl}/js/recipeList.js|}"></script>
 </body>