Skip to content

Commit

Permalink
Docs update (#212)
Browse files Browse the repository at this point in the history
  • Loading branch information
solverat committed Dec 14, 2023
1 parent 79f1bfa commit 68c4dc9
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
15 changes: 7 additions & 8 deletions PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,10 @@
| Q | A |
|---------------|----------------------------------------------------|
| Branch? | dev-master for features / 4.x for bug fixes |
| Bug fix? | yes/no |
| New feature? | yes/no |
| BC breaks? | no |
| Deprecations? | yes/no |
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any --> |
| Q | A
| ------------- | ---
| Bug fix? | yes/no
| New feature? | yes/no
| BC breaks? | no
| Deprecations? | yes/no
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->

<!--
Write a short README entry for your feature/bugfix here (replace this comment block.)
Expand Down
12 changes: 8 additions & 4 deletions docs/13_Wysiwyg_Editor.md
@@ -1,4 +1,4 @@
# CK-Editor Configuration
# Wysiwyg Editor Configuration

The Toolbox Bundle allows you to override and specify the wysiwyg configuration.
There are several reasons for that:
Expand Down Expand Up @@ -34,6 +34,9 @@ toolbox:
toolbar2: 'blocks | styles'

```
> [!IMPORTANT]
> If your extending style formats, you also have to extend the [html sanitize](https://pimcore.com/docs/platform/Pimcore/Documents/Editables/WYSIWYG/#extending-symfony-html-sanitizer-configuration)
> otherwise you're applied data will be removed after persisting!
### Area Editor Configuration
If you only need to modify the toolbar configuration for document areas, add this to your configuration:
Expand All @@ -51,7 +54,8 @@ toolbox:
### Object Editor Configuration
If you only need to modify the toolbar configuration for objects, add this to your configuration:

> **Note!** The object configuration does not respect different toolbox context environments at the moment.
> [!NOTE]
> The object configuration does not respect different toolbox context environments at the moment.
> Objects are not restricted to any sites by nature which makes any context-binding quite impossible.
**Example**
Expand All @@ -66,10 +70,10 @@ toolbox:
```

## TinyMce Editor Plugins
Toolbox provides some CK-Editor Plugins:
Toolbox provides some additional Editor Plugins:

### Google Opt Out
![ck-editor-google-opt-out](https://user-images.githubusercontent.com/700119/37820009-9dd6a418-2e7f-11e8-94b4-99c7a001a3a9.png)
![editor-google-opt-out](https://user-images.githubusercontent.com/700119/37820009-9dd6a418-2e7f-11e8-94b4-99c7a001a3a9.png)

Add a link to allow user to disable google analytics tracking.
There is also a [frontend Javascript Plugin](./80_Javascript.md).
Expand Down

0 comments on commit 68c4dc9

Please sign in to comment.