diff --git a/src/css/contextmenu.css b/src/css/contextmenu.css index 7e9688c..3c2f2a7 100644 --- a/src/css/contextmenu.css +++ b/src/css/contextmenu.css @@ -290,6 +290,9 @@ div.jsoneditor-contextmenu button.jsoneditor-type-modes > div.jsoneditor-icon { height: 30px; line-height: 30px; + font-family: arial, sans-serif; + font-size: 11pt; + background: #3883fa; color: white; } diff --git a/src/css/menu.css b/src/css/menu.css index 3cce9d5..d706661 100644 --- a/src/css/menu.css +++ b/src/css/menu.css @@ -11,7 +11,6 @@ div.jsoneditor-menu { color: white; background-color: #3883fa; border-bottom: 1px solid #3883fa; - overflow: hidden; } div.jsoneditor-menu > button, diff --git a/src/js/Node.js b/src/js/Node.js index 5a6720b..e007e9c 100644 --- a/src/js/Node.js +++ b/src/js/Node.js @@ -3732,30 +3732,31 @@ Node.prototype.showContextMenu = function (anchor, onClose) { Node.prototype._showSortModal = function () { var node = this; + // TODO: escape the translated text var content = '
' + - '
Sort
' + + '
' + translate('sort') + '
' + '
' + '' + '' + '' + - ' ' + + ' ' + ' ' + '' + '' + - ' ' + + ' ' + ' ' + '' + '' + '' + '' + diff --git a/src/js/i18n.js b/src/js/i18n.js index 0b3c46f..9adca5a 100644 --- a/src/js/i18n.js +++ b/src/js/i18n.js @@ -28,6 +28,7 @@ var _defs = { 'insertTitle': 'Insert a new field with type \'auto\' before this field (Ctrl+Ins)', 'insertSub': 'Select the type of the field to be inserted', 'object': 'Object', + 'ok': 'Ok', 'redo': 'Redo (Ctrl+Shift+Z)', 'removeText': 'Remove', 'removeTitle': 'Remove selected fields (Ctrl+Del)', @@ -37,6 +38,13 @@ var _defs = { 'showMoreStatus': 'displaying ${visibleChilds} of ${totalChilds} items.', 'sort': 'Sort', 'sortTitle': 'Sort the childs of this ', + 'sortFieldLabel': 'Field:', + 'sortDirectionLabel': 'Direction:', + 'sortFieldTitle': 'Select the nested field by which to sort the array or object', + 'sortAscending': 'Ascending', + 'sortAscendingTitle': 'Sort the selected field in ascending order', + 'sortDescending': 'Descending', + 'sortDescendingTitle': 'Sort the selected field in descending order', 'string': 'String', 'type': 'Type', 'typeTitle': 'Change the type of this field', @@ -80,6 +88,7 @@ var _defs = { 'insertTitle': 'Inserir um novo campo do tipo \'auto\' antes deste campo (Ctrl+Ins)', 'insertSub': 'Selecionar o tipo de campo a ser inserido', 'object': 'Objeto', + 'ok': 'Ok', 'redo': 'Refazer (Ctrl+Shift+Z)', 'removeText': 'Remover', 'removeTitle': 'Remover campos selecionados (Ctrl+Del)', @@ -92,6 +101,20 @@ var _defs = { 'showMoreStatus': 'exibindo ${visibleChilds} de ${totalChilds} itens.', 'sort': 'Organizar', 'sortTitle': 'Organizar os filhos deste ', + // TODO: correctly translate sortFieldLabel + 'sortFieldLabel': 'Field:', + // TODO: correctly translate sortDirectionLabel + 'sortDirectionLabel': 'Direction:', + // TODO: correctly translate sortFieldTitle + 'sortFieldTitle': 'Select the nested field by which to sort the array or object', + // TODO: correctly translate sortAscending + 'sortAscending': 'Ascending', + // TODO: correctly translate sortAscendingTitle + 'sortAscendingTitle': 'Sort the selected field in ascending order', + // TODO: correctly translate sortDescending + 'sortDescending': 'Descending', + // TODO: correctly translate sortDescendingTitle + 'sortDescendingTitle': 'Sort the selected field in descending order', 'string': 'Texto', 'type': 'Tipo', 'typeTitle': 'Mudar o tipo deste campo',
Field:' + translate('sortFieldLabel') + ' ' + - ' ' + ' ' + '
Direction:' + translate('sortDirectionLabel') + ' ' + '
' + '' + '' + '
' + @@ -3763,7 +3764,7 @@ Node.prototype._showSortModal = function () { '
' + - ' ' + + ' ' + '