From 4a49691a4ed6c10d8435c266fda5408e3ba514f0 Mon Sep 17 00:00:00 2001
From: Mathieu Saby <mathsabypro@gmail.com>
Date: Tue, 25 Sep 2018 08:14:32 +0200
Subject: [PATCH] Deplace menu and simplifiy UI

---
 .../webapp/modules/core/langs/translation-en.json |  2 --
 .../scripts/views/data-table/menu-edit-cells.js   | 15 ++++++---------
 .../scripts/views/data-table/replace-dialog.html  |  2 --
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json
index 223daf114..58b0de2d2 100644
--- a/main/webapp/modules/core/langs/translation-en.json
+++ b/main/webapp/modules/core/langs/translation-en.json
@@ -681,8 +681,6 @@
         "case-insensitive": "case insensitive",
         "finding-info1": "Leave blank to add the remplacement string after each character.",
         "finding-info2": "Check \"regular expression\" to find special characters (new lines, tabulations...) or complex patterns.",
-        "finding-options": "Finding options:",
-        "replacement-options": "Replacement options:",
         "replacement-info": "If \"regular expression\" option is checked and finding pattern contains groups delimited with parentheses, $0 will return the complete string matching the pattern, and $1, $2... the 1st, 2d... group.",
         "replace-dont-escape": "Do not escape backslash (\\) automatically.",
         "warning-regex": "Invalid regular expression."
diff --git a/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js b/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js
index da563f467..0811f8d10 100644
--- a/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js
+++ b/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js
@@ -222,11 +222,9 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
     elmts.dialogHeader.text($.i18n._('core-views')["replace"]);
     elmts.or_views_text_to_find.text($.i18n._('core-views')["text-to-find"]);
     elmts.or_views_replacement.text($.i18n._('core-views')["replacement-text"]);
-    elmts.or_views_finding_options.text($.i18n._('core-views')["finding-options"]);
     elmts.or_views_finding_info1.text($.i18n._('core-views')["finding-info1"]);
     elmts.or_views_finding_info2.text($.i18n._('core-views')["finding-info2"]);
     elmts.or_views_replacement_info.text($.i18n._('core-views')["replacement-info"]);
-    elmts.or_views_replacement_options.text($.i18n._('core-views')["replacement-options"]);
     elmts.or_views_find_regExp.text($.i18n._('core-views')["reg-exp"]);
     elmts.or_views_find_case_insensitive.text($.i18n._('core-views')["case-insensitive"]);
     elmts.or_views_replace_dont_escape.text($.i18n._('core-views')["replace-dont-escape"]);
@@ -406,12 +404,6 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
           id: "core/to-empty",
           label: $.i18n._('core-views')["blank-out-empty"],
           click: function() { doTextTransform("\"\"", "keep-original", false, ""); }
-        },
-        {},
-        {
-          id: "core/replace",
-          label: $.i18n._('core-views')["replace"],
-          click: doReplace
         }
       ]
     },
@@ -442,6 +434,11 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
       id: "core/cluster",
       label: $.i18n._('core-views')["cluster-edit"]+"...",
       click: function() { new ClusteringDialog(column.name, "value"); }
+    },
+    {
+      id: "core/replace",
+      label: $.i18n._('core-views')["replace"],
+      click: doReplace
     }
   ]);
 
@@ -574,7 +571,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
         };
 
         Refine.postCoreProcess(
-          "transpose-rows-into-columns", 
+          "transpose-rows-into-columns",
           config,
           null,
           { modelsChanged: true }
diff --git a/main/webapp/modules/core/scripts/views/data-table/replace-dialog.html b/main/webapp/modules/core/scripts/views/data-table/replace-dialog.html
index d2e3155a3..ea216c4e8 100644
--- a/main/webapp/modules/core/scripts/views/data-table/replace-dialog.html
+++ b/main/webapp/modules/core/scripts/views/data-table/replace-dialog.html
@@ -11,7 +11,6 @@
                   <tr>
                     <td >
                       <h3 bind="or_views_text_to_find"></h3>
-                      <p bind="or_views_finding_options"></p>
                       <input type="checkbox" bind="find_case_insensitiveInput" id="$find-case" />
                       <label for="$find-case" bind="or_views_find_case_insensitive"></label>
                       <input type="checkbox" bind="find_regexInput" id="$find-regex" />
@@ -24,7 +23,6 @@
                   <tr>
                     <td>
                       <h3 bind="or_views_replacement"></h3>
-                      <p bind="or_views_replacement_options"></p>
                       <input type="checkbox" bind="replace_dont_escapeInput" id="$replace-escape" />
                       <label for="$replace-escape" bind="or_views_replace_dont_escape"></label>
                       <p bind="or_views_replacement_info"></p>