diff --git a/resources/js/wysiwyg/plugins-customhr.js b/resources/js/wysiwyg/plugins-customhr.js index d484284ca..df1984d4e 100644 --- a/resources/js/wysiwyg/plugins-customhr.js +++ b/resources/js/wysiwyg/plugins-customhr.js @@ -10,7 +10,7 @@ function register(editor, url) { parentNode.insertBefore(hrElem, cNode); }); - editor.ui.registry.addButton('hr', { + editor.ui.registry.addButton('customhr', { icon: 'horizontal-rule', tooltip: 'Insert horizontal line', onAction() { diff --git a/resources/js/wysiwyg/toolbars.js b/resources/js/wysiwyg/toolbars.js index 208b3c508..9debb08b5 100644 --- a/resources/js/wysiwyg/toolbars.js +++ b/resources/js/wysiwyg/toolbars.js @@ -36,7 +36,7 @@ function registerPrimaryToolbarGroups(editor) { editor.ui.registry.addGroupToolbarButton('insertoverflow', { icon: 'more-drawer', tooltip: 'More', - items: 'hr codeeditor drawio media details' + items: 'customhr codeeditor drawio media details' }); } diff --git a/resources/lang/en/editor.php b/resources/lang/en/editor.php index faf351da2..670c1c5e1 100644 --- a/resources/lang/en/editor.php +++ b/resources/lang/en/editor.php @@ -144,9 +144,11 @@ return [ 'url' => 'URL', 'text_to_display' => 'Text to display', 'title' => 'Title', - 'open_link' => 'Open link in...', + 'open_link' => 'Open link', + 'open_link_in' => 'Open link in...', 'open_link_current' => 'Current window', 'open_link_new' => 'New window', + 'remove_link' => 'Remove link', 'insert_collapsible' => 'Insert collapsible block', 'collapsible_unwrap' => 'Unwrap', 'edit_label' => 'Edit label', diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php index e7fbe37d9..978e67464 100644 --- a/resources/lang/en/entities.php +++ b/resources/lang/en/entities.php @@ -50,6 +50,7 @@ return [ 'permissions_role_everyone_else' => 'Everyone Else', 'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.', 'permissions_role_override' => 'Override permissions for role', + 'permissions_inherit_defaults' => 'Inherit defaults', // Search 'search_results' => 'Search Results', diff --git a/resources/views/form/entity-permissions-row.blade.php b/resources/views/form/entity-permissions-row.blade.php index d4c6c4ac1..1cfb6ec98 100644 --- a/resources/views/form/entity-permissions-row.blade.php +++ b/resources/views/form/entity-permissions-row.blade.php @@ -25,7 +25,7 @@ $inheriting - Boolean if the current row should be marked as inheriting default
@include('form.custom-checkbox', [ 'name' => 'entity-permissions-inherit', - 'label' => 'Inherit defaults', + 'label' => trans('entities.permissions_inherit_defaults'), 'value' => 'true', 'checked' => $inheriting ])