s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Deplace menu and simplifiy UI

Browse Source
This commit is contained in:
Mathieu Saby 2018-09-25 08:14:32 +02:00
parent 338fa585d3
commit 4a49691a4e
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/webapp/modules/core/langs/translation-en.json
View File

@ -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."

13
main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js
View File

@ -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
}
]);

2
main/webapp/modules/core/scripts/views/data-table/replace-dialog.html
View File

@ -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>