From 237f7a05a472c3d3c9199b3b35c53b2a47fe0cd5 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia-webagency.com>
Date: Wed, 1 Jul 2020 17:40:22 +0400
Subject: [PATCH] PHRAS-3148

---
 .../thesaurus/images/caret-right-solid-grey.svg   |  1 -
 .../www/thesaurus/images/caret-right-solid.svg    |  1 -
 resources/www/thesaurus/styles/main.scss          |  7 +------
 templates/web/thesaurus/new-term.html.twig        |  8 ++++----
 templates/web/thesaurus/properties.html.twig      | 15 +++++++++------
 templates/web/thesaurus/thesaurus.html.twig       |  8 ++++++--
 6 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 resources/www/thesaurus/images/caret-right-solid-grey.svg
 delete mode 100644 resources/www/thesaurus/images/caret-right-solid.svg

diff --git a/resources/www/thesaurus/images/caret-right-solid-grey.svg b/resources/www/thesaurus/images/caret-right-solid-grey.svg
deleted file mode 100644
index fdb08248f8..0000000000
--- a/resources/www/thesaurus/images/caret-right-solid-grey.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="caret-right" class="svg-inline--fa fa-caret-right fa-w-6" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192 512"><path fill="#6d6d6d" d="M0 384.662V127.338c0-17.818 21.543-26.741 34.142-14.142l128.662 128.662c7.81 7.81 7.81 20.474 0 28.284L34.142 398.804C21.543 411.404 0 402.48 0 384.662z"></path></svg>
\ No newline at end of file
diff --git a/resources/www/thesaurus/images/caret-right-solid.svg b/resources/www/thesaurus/images/caret-right-solid.svg
deleted file mode 100644
index 3a94fb933c..0000000000
--- a/resources/www/thesaurus/images/caret-right-solid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="caret-right" class="svg-inline--fa fa-caret-right fa-w-6" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192 512"><path fill="#fff" d="M0 384.662V127.338c0-17.818 21.543-26.741 34.142-14.142l128.662 128.662c7.81 7.81 7.81 20.474 0 28.284L34.142 398.804C21.543 411.404 0 402.48 0 384.662z"></path></svg>
\ No newline at end of file
diff --git a/resources/www/thesaurus/styles/main.scss b/resources/www/thesaurus/styles/main.scss
index 11286f213e..f611bd69c0 100644
--- a/resources/www/thesaurus/styles/main.scss
+++ b/resources/www/thesaurus/styles/main.scss
@@ -301,12 +301,8 @@ H3, H4 {
   position: relative;
   text-decoration: none;
   color: #fff;
-  padding: 5px 6px 5px 16px;
-  background-image: url('#{$iconsPath}caret-right-solid.svg');
-  background-size: 5px;
-  background-position: 5px;
+  padding: 5px 6px;
   background-color: #535353;
-  background-repeat: no-repeat;
 
 }
 
@@ -326,7 +322,6 @@ H3, H4 {
   text-decoration: none;
   color: lighten(#535353, 10%);
   overflow: hidden;
-  background-image: url('#{$iconsPath}caret-right-solid-grey.svg');
 }
 
 .menu A.disabled:hover {
diff --git a/templates/web/thesaurus/new-term.html.twig b/templates/web/thesaurus/new-term.html.twig
index 4151103aa2..9d50c4f9b5 100644
--- a/templates/web/thesaurus/new-term.html.twig
+++ b/templates/web/thesaurus/new-term.html.twig
@@ -52,9 +52,9 @@
                     {{ 'thesaurus:: selectionner la provenance a accepter' | trans }}
                 {% endif %}
                 <br/>
-                <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:100px;">
+                <input type="button" id="cancel_button" class="cancel_btn" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" >
                 &nbsp;&nbsp;&nbsp;
-                <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:100px;">
+                <input type="button" id="submit_button" class="validate_btn" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');">
             </form>
         </div>
         {% else %}
@@ -70,9 +70,9 @@
         {{ prop_label }}
         <br/>
         <form class="thesaurus_confirm_bottom_block">
-            <input type="button" id="cancel_button" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" style="width:100px;">
+            <input type="button" id="cancel_button" class="cancel_btn" value="{{ 'boutton::annuler' | trans }}" onclick="clkBut('cancel');" >
             &nbsp;&nbsp;&nbsp;
-            <input type="button" id="submit_button" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" style="width:100px;">
+            <input type="button" id="submit_button" class="validate_btn" value="{{ 'boutton::valider' | trans }}" onclick="clkBut('submit');" >
         </form>
         {% endif %}
 </body>
diff --git a/templates/web/thesaurus/properties.html.twig b/templates/web/thesaurus/properties.html.twig
index 224679cec6..78510851a1 100644
--- a/templates/web/thesaurus/properties.html.twig
+++ b/templates/web/thesaurus/properties.html.twig
@@ -30,7 +30,7 @@
             });
         </script>
 <div class="menu" id="syMenu" style="z-index:999">
-    <a href="javascript:void(0)" id="delete_sy">{{ 'thesaurus::menu:  Mettre dans le stock' | trans }}</a>
+    <a href="javascript:void(0)" id="delete_sy">{{ 'thesaurus:properties::  Mettre dans le stock' | trans }}</a>
 </div>
     <div id="desktop" class="dialog">
         <div class="menu" id="flagsMenu" style="z-index:999">
@@ -223,7 +223,7 @@
                         sy_list = ret.getElementsByTagName("sy_list").item(0);
                         //refresh_sy(sy_list);
 
-                      /*  refresh = ret.getElementsByTagName("refresh");
+                        refresh = ret.getElementsByTagName("refresh");
                         for(i=0; i<refresh.length; i++)
                         {
                             switch(refresh.item(i).getAttribute("type"))
@@ -237,7 +237,7 @@
                                     myGUI.select(document.getElementById("THE_{{ id }}"));
                                     break;
                             }
-                        }*/
+                        }
                         var new_url =  $('#url_properties').val();
                         $.ajax({
                             type: "GET",
@@ -358,9 +358,12 @@
                                 document.getElementById("flagsMenu").runAsMenu( evt, tr );
                                 break;
                             case "SYN_":    // le synonyme
-                                document.getElementById("syMenu").runAsMenu( evt, tr );
-                                $('.delete_term').html('');
-                                $('.delete_term', tr).append($('#syMenu').html());
+                                if (stock == false)
+                                    {
+                                        document.getElementById("syMenu").runAsMenu(evt, tr);
+                                        $('.delete_term').html('');
+                                        $('.delete_term', tr).append($('#syMenu').html());
+                                    }
                                 break;
                         }
                     }
diff --git a/templates/web/thesaurus/thesaurus.html.twig b/templates/web/thesaurus/thesaurus.html.twig
index bbd0c4db32..dfcc12fdd1 100644
--- a/templates/web/thesaurus/thesaurus.html.twig
+++ b/templates/web/thesaurus/thesaurus.html.twig
@@ -355,6 +355,7 @@
 
             //Ajax function to get data
             var title = '';
+            var stock = false;
             function loadDataAjax(urls, width, height, bloc, title) {
                     $(bloc).dialog({
                         title: title,
@@ -644,6 +645,7 @@
                             url += "&id=" + o.id.substr(4);
                             url += "&typ=CT";
                             $('#url_properties').val(url);
+                            stock = true;
                            // w = window.open(url, "PROPERTIES", "directories=no, height=340, width=500, location=no, menubar=no, resizable=yes, scrollbars=no, status=no, toolbar=no");
                             w = loadDataAjax(url, 500 , 340, '#DLG_PROPERTIES','{{ 'thesaurus:dialog:: properties'  | trans }}');
 
@@ -756,6 +758,7 @@
                                         url += "&id=" + o.id.substr(4);
                                         url += "&typ=CT";
                                         $('#url_properties').val(url);
+                                        stock = false;
                                         //w = window.open(url, "PROPERTIES", "directories=no, height=340, width=500, location=no, menubar=no, resizable=yes, scrollbars=no, status=no, toolbar=no");
                                         w = loadDataAjax(url, 500 , 340,'#DLG_PROPERTIES', '{{ 'thesaurus:: Proprietes' | trans }}');
                                     }
@@ -1084,7 +1087,7 @@
                                                             url += "&sylng=" + encodeURIComponent(lng);
 
                                                           //  w = window.open(url, "NEWTERM", "directories=no, height=290, width=490, location=no, menubar=no, resizable=yes, scrollbars=yes, status=no, toolbar=no");
-                                                            w = loadDataAjax(url,490, 290,"#NEWSY_DLG_CONFIRM",'{% if typ == "TS" %}{{ 'thesaurus:: Nouveau terme specifique' | trans }}{% else %}{{ 'thesaurus:: Nouveau synonyme' | trans }}{% endif %}');
+                                                            w = loadDataAjax(url,490, 350,"#NEWSY_DLG_CONFIRM",'{% if typ == "TS" %}{{ 'thesaurus:: Nouveau terme specifique' | trans }}{% else %}{{ 'thesaurus:: Nouveau synonyme' | trans }}{% endif %}');
                                                         }
                                                     }
                                                 ],
@@ -1150,7 +1153,7 @@
                                         url +=  "&piv={{ piv }}";
                                         url += "&tid=" + o.id.substr(4);
                                        // w = window.open(url, "LINK", "directories=no, height=340, width=500, location=no, menubar=no, resizable=yes, scrollbars=no, status=no, toolbar=no");
-                                        w = loadDataAjax(url,700, 400, "#DLG_LINK_FIELD_1", '{{ 'thesaurus:: Lier la branche de thesaurus au champ' | trans }}');
+                                        w = loadDataAjax(url,700, 430, "#DLG_LINK_FIELD_1", '{{ 'thesaurus:: Lier la branche de thesaurus au champ' | trans }}');
                                         break;
                                     case "kterm_properties":
                                         var myObj = { "win":window };
@@ -1160,6 +1163,7 @@
                                         url += "&id=" + o.id.substr(4);
                                         url += "&typ=TH";
                                         $('#url_properties').val(url);
+                                        stock = false;
                                       //  w = window.open(url, "PROPERTIES", "directories=no, height=300, width=500, location=no, menubar=no, resizable=yes, scrollbars=no, status=no, toolbar=no");
                                        w = loadDataAjax(url,700, 400, "#DLG_PROPERTIES", '{{ 'thesaurus:: Proprietes' | trans }}');