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

---
 resources/www/thesaurus/styles/main.scss     | 12 ++++++--
 templates/web/thesaurus/properties.html.twig | 31 ++++++++++++++++----
 templates/web/thesaurus/thesaurus.html.twig  |  9 +++---
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/resources/www/thesaurus/styles/main.scss b/resources/www/thesaurus/styles/main.scss
index 96a602ee38..11286f213e 100644
--- a/resources/www/thesaurus/styles/main.scss
+++ b/resources/www/thesaurus/styles/main.scss
@@ -351,7 +351,8 @@ H3, H4 {
 }
 
 #delete_sy {
-  background: $blue-tsr;
+  background: orange;
+  border: 1px solid darken(orange,20%);
   color: #fff;
   font-weight: bold;
   padding: 1px 10px;
@@ -404,7 +405,7 @@ H3, H4 {
 
 .populate_btn {
   position: absolute;
-  background: $blue-tsr;
+  background: #884c92;
   z-index: 2;
   right: 50px;
   top: 50px;
@@ -416,7 +417,7 @@ H3, H4 {
   cursor: pointer;
 
   &:hover {
-    background: darken($blue-tsr, 20%);
+    background: darken(#884c92, 20%);
   }
 }
 
@@ -429,4 +430,9 @@ H3, H4 {
     border-bottom-right-radius: 0;
     border-bottom-left-radius: 0;
   }
+}
+
+#flagsMenu p {
+  color: #fff;
+  padding: 0 10px;
 }
\ No newline at end of file
diff --git a/templates/web/thesaurus/properties.html.twig b/templates/web/thesaurus/properties.html.twig
index 87de82a6ca..224679cec6 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: supprimer' | trans }}</a>
+    <a href="javascript:void(0)" id="delete_sy">{{ 'thesaurus::menu:  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,16 @@
                                     myGUI.select(document.getElementById("THE_{{ id }}"));
                                     break;
                             }
-                        }
+                        }*/
+                        var new_url =  $('#url_properties').val();
+                        $.ajax({
+                            type: "GET",
+                            url: `${new_url}`,
+                            success: function(data){
+                                $('#DLG_PROPERTIES').html('');
+                                $('#DLG_PROPERTIES').append(data);
+                            }
+                        });
                     }
                     break;
             }
@@ -313,7 +322,7 @@
                             ;
                         if(tr)
                             myGUI.select(tr);
-                        switch(o.id.substr(0, 4))
+                       /* switch(o.id.substr(0, 4))
                         {
                             case "FLG_":    // le drapeau
                                 document.getElementById("flagsMenu").runAsMenu( evt, tr );
@@ -323,7 +332,7 @@
                             $('.delete_term').html('');
                             $('.delete_term', tr).append($('#syMenu').html());
                                 break;
-                        }
+                        }*/
                     }
                     break;
                 case "MOUSEDOWN":
@@ -342,6 +351,18 @@
                                 syChgPos(-1);
                                 break;
                         }
+
+                        switch(o.id.substr(0, 4))
+                        {
+                            case "FLG_":    // le drapeau
+                                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());
+                                break;
+                        }
                     }
                     break;
                 case "DBLCLICK":
diff --git a/templates/web/thesaurus/thesaurus.html.twig b/templates/web/thesaurus/thesaurus.html.twig
index 8d33e0b25f..bbd0c4db32 100644
--- a/templates/web/thesaurus/thesaurus.html.twig
+++ b/templates/web/thesaurus/thesaurus.html.twig
@@ -343,7 +343,7 @@
             <br/>
 
         </form>
-
+        <input type="hidden" id="url_properties">
         <div id="clipboard" style="position:absolute; top:0px; left:0px; z-index:99">&nbsp;</div>
 
 
@@ -643,9 +643,10 @@
                             url += "&piv={{ piv }}";
                             url += "&id=" + o.id.substr(4);
                             url += "&typ=CT";
-
+                            $('#url_properties').val(url);
                            // 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 }}');
+
                             break;
                         case "kcterm_search":
                             $("#SEARCH_DLG").dialog("option", "buttons",
@@ -754,7 +755,7 @@
                                         url += "&piv={{ piv }}";
                                         url += "&id=" + o.id.substr(4);
                                         url += "&typ=CT";
-
+                                        $('#url_properties').val(url);
                                         //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 }}');
                                     }
@@ -1158,7 +1159,7 @@
                                         url += "&piv={{ piv }}";
                                         url += "&id=" + o.id.substr(4);
                                         url += "&typ=TH";
-
+                                        $('#url_properties').val(url);
                                       //  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 }}');