Merge pull request #4667 from open-formulieren/backport/4653-tinymce-…

…toolbar-options

🐛 [#4653] Add blocks dropdown to TinyMCE toolbar (2.7.x backport)

.github/workflows/ci.yml

@@ -251,12 +251,18 @@ jobs:
           # default to version in .sdk-release file
           SDK_TAG=$(cat .sdk-release | tr -d '[:space:]')
 
-          case $VERSION in
-            # if building master -> include latest image of SDK
-            master) SDK_TAG=latest;;
-            # PRs result in version 'merge' that'll go to master -> include latest image of SDK
-            merge) SDK_TAG=latest;;
-          esac
+          # PRs have the base_ref, straight up pushes don't
+          if [[ "${{ github.base_ref }}" == stable/* ]]; then
+            echo "pull request to stable branch"
+          else
+            echo "not a pull request to a stable branch"
+            case $VERSION in
+              # if building master -> include latest image of SDK
+              master) SDK_TAG=latest;;
+              # PRs result in version 'merge' that'll go to master -> include latest image of SDK
+              merge) SDK_TAG=latest;;
+            esac
+          fi
 
           echo "sdk_tag=${SDK_TAG}" >> $GITHUB_OUTPUT
 

src/openforms/conf/tinymce_config.json

@@ -21,10 +21,11 @@
         "help",
         "wordcount"
     ],
-    "toolbar": "undo redo | formatselect | bold italic backcolor | alignleft aligncenter alignright alignjustify | table bullist numlist outdent indent | link unlink removeformat | help",
+    "toolbar": "undo redo | blocks | bold italic backcolor | alignleft aligncenter alignright alignjustify | table bullist numlist outdent indent | link unlink removeformat | help",
     "content_style": "body { font-family:Helvetica,Arial,sans-serif; font-size:14px }",
     "default_link_target": "_blank",
     "link_default_protocol": "https",
     "link_assume_external_targets": false,
-    "convert_urls": false
+    "convert_urls": false,
+    "block_formats": "Paragraph=p; Heading 2=h2; Heading 3=h3; Heading 4=h4; Heading 5=h5; Heading 6=h6"
 }