Merge branch 'master' into i/9083

ckeditor · Feb 26, 2021 · 852e3dc · 852e3dc
2 parents abcbf04 + ef35b84
commit 852e3dc
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 11 deletions.
diff --git a/packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder-options.js b/packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder-options.js
@@ -9,7 +9,7 @@ ClassicEditor
 	.create( document.querySelector( '#snippet-ckfinder-options' ), {
 		toolbar: {
 			items: [
-				'ckfinder', '|', 'heading', '|', 'bold', 'italic', '|', 'undo', 'redo'
+				'heading', '|', 'bold', 'italic', '|', 'undo', 'redo', '|', 'ckfinder'
 			],
 			viewportTopOffset: 100
 		},

diff --git a/packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder-upload-only.html b/packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder-upload-only.html
@@ -1,3 +1,5 @@
 <div id="snippet-ckfinder-upload-only">
-	Use the toolbar button to insert an image.
+	<p><strong>CKEditor 5</strong> offers multiple ways to include images in your rich content. You can choose whichever you find more comfortable and efficient for you needs.</p>
+	<p>To upload an image, you can paste it or drag and drop it into the editor.</p>
+	<p>Alternatively, use the toolbar button to insert an image selected from your disk.</p>
 </div>
diff --git a/packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder-upload-only.js b/packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder-upload-only.js
@@ -9,7 +9,7 @@ ClassicEditor
 	.create( document.querySelector( '#snippet-ckfinder-upload-only' ), {
 		toolbar: {
 			items: [
-				'uploadImage', '|', 'heading', '|', 'bold', 'italic', '|', 'undo', 'redo'
+				'heading', '|', 'bold', 'italic', '|', 'undo', 'redo', '|', 'uploadImage'
 			],
 			viewportTopOffset: 100
 		},

diff --git a/packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder.html b/packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder.html
@@ -1,3 +1,5 @@
 <div id="snippet-ckfinder">
-	Use the toolbar button to open the CKFinder file manager. Use the file manager's interface to insert an image or a link to a file.
+	<p><strong>CKEditor 5</strong> offers multiple ways to include images in your rich content. You can choose whichever you find more comfortable and efficient for you needs.</p>
+	<p>To upload an image, you can paste it or drag and drop it into the editor.</p>
+	<p>Alternatively, use the toolbar button to open the CKFinder file manager. Use the file manager's interface to insert an image or a link to a file. Thanks to CKFinder you can also edit images, organize them into folders or delete from the server.</p>
 </div>
diff --git a/packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder.js b/packages/ckeditor5-ckfinder/docs/_snippets/features/ckfinder.js
@@ -9,7 +9,7 @@ ClassicEditor
 	.create( document.querySelector( '#snippet-ckfinder' ), {
 		toolbar: {
 			items: [
-				'ckfinder', '|', 'heading', '|', 'bold', 'italic', '|', 'undo', 'redo'
+				'heading', '|', 'bold', 'italic', '|', 'undo', 'redo', '|', 'ckfinder'
 			],
 			viewportTopOffset: 100
 		},
@@ -27,8 +27,8 @@ ClassicEditor
 
 		window.attachTourBalloon( {
 			target: window.findToolbarItem( editor.ui.view.toolbar,
-				item => item.buttonView && item.buttonView.label && item.buttonView.label === 'Insert image or file' ),
-			text: 'Click to open a file manager.',
+				item => item.label && item.label === 'Insert image or file' ),
+			text: 'Click to open the file manager.',
 			editor
 		} );
 	} )

diff --git a/packages/ckeditor5-easy-image/docs/_snippets/features/easy-image.html b/packages/ckeditor5-easy-image/docs/_snippets/features/easy-image.html
@@ -1,3 +1,4 @@
 <div id="snippet-image-upload">
+	<p><strong>CKEditor 5</strong> offers multiple ways to include images in your rich content. You can choose whichever you find more comfortable and efficient for you needs. Use classic interface, or boost productivity with the advanced image handling offered.</p>
 	<p>Paste or drop an image directly into the editor. You can also use the "Insert image" button in the toolbar.</p>
 </div>
diff --git a/packages/ckeditor5-remove-format/docs/_snippets/features/build-remove-format-source.js b/packages/ckeditor5-remove-format/docs/_snippets/features/build-remove-format-source.js
@@ -19,6 +19,6 @@ import Superscript from '@ckeditor/ckeditor5-basic-styles/src/superscript';
 import Code from '@ckeditor/ckeditor5-basic-styles/src/code';
 
 ClassicEditor.builtinPlugins.push(
-	RemoveFormat, Alignment, Font, Bold, Italic, Underline, Strikethrough, Subscript, Superscript, Code );
+	Alignment, Font, Bold, Italic, Underline, Strikethrough, Subscript, Superscript, Code, RemoveFormat );
 
 window.ClassicEditor = ClassicEditor;
diff --git a/packages/ckeditor5-remove-format/docs/_snippets/features/remove-format.js b/packages/ckeditor5-remove-format/docs/_snippets/features/remove-format.js
@@ -9,22 +9,24 @@ ClassicEditor
 	.create( document.querySelector( '#editor' ), {
 		toolbar: {
 			items: [
-				'removeformat',
-				'|',
 				'bold',
 				'italic',
 				'underline',
 				'strikethrough',
 				'code',
 				'subscript',
 				'superscript',
+				'|',
 				'fontSize',
 				'fontFamily',
+				'|',
 				'alignment',
 				'link',
 				'|',
 				'undo',
-				'redo'
+				'redo',
+				'|',
+				'removeformat'
 			],
 			viewportTopOffset: window.getViewportTopOffsetConfig()
 		}

diff --git a/packages/ckeditor5-upload/docs/_snippets/features/base64-upload.html b/packages/ckeditor5-upload/docs/_snippets/features/base64-upload.html
@@ -1,4 +1,5 @@
 <div id="snippet-image-base64-upload">
+	<p><strong>CKEditor 5</strong> offers multiple ways to include images in your rich content. You can choose whichever you find more comfortable and efficient for you needs. Use classic interface, or boost productivity with the advanced image handling offered.</p>
 	<p>Paste or drop an image directly into the editor. You can also use the "Insert image" button in the toolbar.</p>
 </div>